From 7ae69ed9e28b3503475d076b7c26faed07760900 Mon Sep 17 00:00:00 2001
From: alish <alish@ever.co>
Date: Thu, 28 Mar 2019 11:14:36 +0200
Subject: [PATCH 001/382] feat(ever-merchant): create/edit customer with
 default image EV-1177

---
 .../src/@shared/user/mutation/user-mutation.component.ts   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts b/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
index adfe83e96..caaee3818 100644
--- a/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
+++ b/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
@@ -160,6 +160,7 @@ export class UserMutationComponent {
 			const lastNameLetter = user.lastName
 				? user.lastName.charAt(0).toUpperCase()
 				: '';
+
 			if (firstNameLetter || lastNameLetter) {
 				user.image = getDummyImage(
 					300,
@@ -167,7 +168,11 @@ export class UserMutationComponent {
 					firstNameLetter + lastNameLetter
 				);
 			} else {
-				// TODO if first/last name not exist
+				const firstCityLetter = user.geoLocation.city
+					.charAt(0)
+					.toUpperCase();
+
+				user.image = getDummyImage(300, 300, firstCityLetter);
 			}
 		}
 

From d0a0849909315c8e91038522c056f28f834caf5e Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@ever.co>
Date: Thu, 28 Mar 2019 13:09:58 +0200
Subject: [PATCH 002/382] feat(ever-merchant): styling fix

---
 .../carrier-track-popup/carrier-track-popup.html         | 3 ++-
 .../carrier-track-popup/carrier-track-popup.scss         | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.html b/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.html
index 02a41994d..a92b51abd 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.html
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.html
@@ -8,7 +8,8 @@ <h2 *ngIf="user">Delivery Tracking</h2>
 			<img [src]="carrierIcon" />
 			<h4>Carrier</h4>
 		</div>
-		<h3>{{ carrier.fullName }} <small>@{{ carrier.username }} </small></h3>
+		<h3>{{ carrier.fullName }}</h3>
+		<small>@{{ carrier.username }} </small>
 		<li><i class="fa fa-phone"></i> {{ carrier.phone}}</li>
 		<li>
 			<i class="fa fa-map-pin"></i> {{ carrier.geoLocation.streetAddress
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.scss b/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.scss
index 1c3a6a211..8e4a6b8f5 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.scss
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.scss
@@ -49,7 +49,10 @@ $h: 570px;
 					box-sizing: border-box;
 					margin: 0;
 					border-bottom: 1px solid rgb(185, 185, 185);
-					height: 170px;
+					height: auto;
+					&:last-child {
+						border: none;
+					}
 
 					div {
 						display: flex;
@@ -72,11 +75,13 @@ $h: 570px;
 
 					h3 {
 						margin-left: 10px;
-						line-height: 0.4;
+						//line-height: 1;
 					}
 
 					small {
 						font-size: 0.7em;
+						margin-left: 10px;
+						transform: translateY(-5px);
 					}
 
 					li {

From 84d07491cda8d0e7d90257a5377d234a9a20f797 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 28 Mar 2019 14:28:14 +0200
Subject: [PATCH 003/382] fix(ever-api): fix folder name

---
 backend/api/src/@pyro/db-server/{Model.ts => model2.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename backend/api/src/@pyro/db-server/{Model.ts => model2.ts} (100%)

diff --git a/backend/api/src/@pyro/db-server/Model.ts b/backend/api/src/@pyro/db-server/model2.ts
similarity index 100%
rename from backend/api/src/@pyro/db-server/Model.ts
rename to backend/api/src/@pyro/db-server/model2.ts

From 0f24cfa676bb5aac5311d478d4972761481a3582 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 28 Mar 2019 14:28:56 +0200
Subject: [PATCH 004/382] fix(ever-api): fix correct folder name

---
 backend/api/src/@pyro/db-server/{model2.ts => model.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename backend/api/src/@pyro/db-server/{model2.ts => model.ts} (100%)

diff --git a/backend/api/src/@pyro/db-server/model2.ts b/backend/api/src/@pyro/db-server/model.ts
similarity index 100%
rename from backend/api/src/@pyro/db-server/model2.ts
rename to backend/api/src/@pyro/db-server/model.ts

From 1cab3aede18b5931ce0f983c4afe9b5d76b124fa Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 28 Mar 2019 14:52:33 +0200
Subject: [PATCH 005/382] fix: 'core-js/es7/reflect' build error, for
 'shop-mobile' and 'carrier-mobile' apps

---
 carrier/mobile-ionic/tsconfig.json | 5 ++++-
 shop/mobile-ionic/tsconfig.json    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/carrier/mobile-ionic/tsconfig.json b/carrier/mobile-ionic/tsconfig.json
index ac9b321dc..db730eafe 100644
--- a/carrier/mobile-ionic/tsconfig.json
+++ b/carrier/mobile-ionic/tsconfig.json
@@ -22,7 +22,10 @@
 				"./modules/client.common.angular2/mongoose-placeholder"
 			],
 			"typeorm": ["./modules/client.common.angular2/typeorm-placeholder"],
-			"environment": ["./environments/environment"]
+			"environment": ["./environments/environment"],
+			"core-js/es7/reflect": [
+				"node_modules/core-js/proposals/reflect-metadata"
+			]
 		},
 		"lib": ["es2017", "dom", "esnext"],
 		"noUnusedLocals": false,
diff --git a/shop/mobile-ionic/tsconfig.json b/shop/mobile-ionic/tsconfig.json
index ac9b321dc..db730eafe 100644
--- a/shop/mobile-ionic/tsconfig.json
+++ b/shop/mobile-ionic/tsconfig.json
@@ -22,7 +22,10 @@
 				"./modules/client.common.angular2/mongoose-placeholder"
 			],
 			"typeorm": ["./modules/client.common.angular2/typeorm-placeholder"],
-			"environment": ["./environments/environment"]
+			"environment": ["./environments/environment"],
+			"core-js/es7/reflect": [
+				"node_modules/core-js/proposals/reflect-metadata"
+			]
 		},
 		"lib": ["es2017", "dom", "esnext"],
 		"noUnusedLocals": false,

From aaa53aa5e6aaa836b9137601282cff6ded17c3a9 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 28 Mar 2019 15:07:38 +0200
Subject: [PATCH 006/382] fix: try to fix 'core-js/es7/reflect' build error,
 for 'shop-mobile' and 'carrier-mobile'

---
 carrier/mobile-ionic/tsconfig.json | 2 +-
 shop/mobile-ionic/tsconfig.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/carrier/mobile-ionic/tsconfig.json b/carrier/mobile-ionic/tsconfig.json
index db730eafe..b40f2ae87 100644
--- a/carrier/mobile-ionic/tsconfig.json
+++ b/carrier/mobile-ionic/tsconfig.json
@@ -24,7 +24,7 @@
 			"typeorm": ["./modules/client.common.angular2/typeorm-placeholder"],
 			"environment": ["./environments/environment"],
 			"core-js/es7/reflect": [
-				"node_modules/core-js/proposals/reflect-metadata"
+				"../node_modules/core-js/proposals/reflect-metadata"
 			]
 		},
 		"lib": ["es2017", "dom", "esnext"],
diff --git a/shop/mobile-ionic/tsconfig.json b/shop/mobile-ionic/tsconfig.json
index db730eafe..b40f2ae87 100644
--- a/shop/mobile-ionic/tsconfig.json
+++ b/shop/mobile-ionic/tsconfig.json
@@ -24,7 +24,7 @@
 			"typeorm": ["./modules/client.common.angular2/typeorm-placeholder"],
 			"environment": ["./environments/environment"],
 			"core-js/es7/reflect": [
-				"node_modules/core-js/proposals/reflect-metadata"
+				"../node_modules/core-js/proposals/reflect-metadata"
 			]
 		},
 		"lib": ["es2017", "dom", "esnext"],

From 4977aaae06241d5d7991989ca7e3089bb24ed648 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 28 Mar 2019 15:25:37 +0200
Subject: [PATCH 007/382] chore(ever-merchant): update package "core-js"

---
 merchant/tablet-ionic/package.json  | 4 ++--
 merchant/tablet-ionic/tsconfig.json | 5 ++++-
 merchant/tablet-ionic/yarn.lock     | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index bbfb00871..af9218286 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -62,9 +62,9 @@
 		"@angular/http": "^7.2.9",
 		"@angular/platform-browser": "^7.2.9",
 		"@angular/platform-browser-dynamic": "^7.2.9",
+		"@angular/pwa": "^0.13.6",
 		"@angular/router": "^7.2.9",
 		"@angular/service-worker": "^7.2.9",
-		"@angular/pwa": "^0.13.6",
 		"@ionic-native/barcode-scanner": "^5.2.0",
 		"@ionic-native/call-number": "^5.2.0",
 		"@ionic-native/camera": "^5.2.0",
@@ -132,7 +132,7 @@
 		"cordova-plugin-uniquedeviceid": "^1.3.2",
 		"cordova-plugin-vibration": "^3.1.0",
 		"cordova-plugin-whitelist": "^1.3.3",
-		"core-js": "^2.6.5",
+		"core-js": "^3.0.0",
 		"cryptiles": "^4.1.3",
 		"es6-promise-plugin": "^4.2.2",
 		"font-awesome": "^4.7.0",
diff --git a/merchant/tablet-ionic/tsconfig.json b/merchant/tablet-ionic/tsconfig.json
index 016d8c103..401fe467c 100644
--- a/merchant/tablet-ionic/tsconfig.json
+++ b/merchant/tablet-ionic/tsconfig.json
@@ -21,7 +21,10 @@
 				"./modules/client.common.angular2/mongoose-placeholder"
 			],
 			"typeorm": ["./modules/client.common.angular2/typeorm-placeholder"],
-			"environment": ["./environments/environment"]
+			"environment": ["./environments/environment"],
+			"core-js/es7/reflect": [
+				"../node_modules/core-js/proposals/reflect-metadata"
+			]
 		},
 		"lib": ["es2017", "dom", "esnext"],
 		"noUnusedLocals": false,
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 8dd8de7ba..33a7e0fc0 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -3186,10 +3186,10 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d"
   integrity sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A==
 
-core-js@^2.6.5:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
-  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
+core-js@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957"
+  integrity sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"

From 856783205f057d23a532069ed7639895095724a7 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 29 Mar 2019 01:33:34 +0200
Subject: [PATCH 008/382] docs: clarify configurations in README

---
 README.md | 47 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index acdbea01c..b02ea1505 100644
--- a/README.md
+++ b/README.md
@@ -108,13 +108,15 @@ yarn bootstrap
 
 This will install required packages in all Platform projects using Lerna
 
+Note: if above command fails for any reason, you can try to install required packages manually by running `yarn` inside every sub-folder with 'package.json' file
+
 ### Lerna (manual installation)
 
 We are using [Lerna](https://github.com/lerna/lerna) for mono-repo management.
 You need to run the following command from working folder where you cloned Ever git repo, which will install Lerna together with other packages:
 
 ```
-yarn install
+yarn
 ```
 
 You may instead install Lerna globally:
@@ -144,31 +146,50 @@ It is also possible to use [AWS DocumentDB](https://aws.amazon.com/documentdb) o
 
 _Note: we currently integrating [Mongo Memory Server](https://github.com/nodkz/mongodb-memory-server) which will allow to test Platform without need to install MongoDB locally._
 
-### Platform Configuration (optional)
+### Platform Configuration
+
+#### Default
+
+We created templates & initial configuration files (with reasonable defaults) for each project in the Platform, to save your time and keep things simple.
 
-We created templates & initial configuration files (with reasonable defaults) for each project in the Platform, to save your time and keep things simple:
+In the Angular based projects, the "standard" environment configuration files `environment.ts` and `environment.prod.ts` will be auto-generated from .env file (if it's exists) or from default settings on the first app run.
 
--   For _Backend (API)_ configuration, the `./backend/api/.env.template` file should be copied into `./backend/api/.env` and relevant changes should (optionally) be done.
+So, the following files will be auto-generated:
 
-    **IMPORTANT**: you should have `./backend/api/.env` file in place to be able to run the Platform on developer machine if you want to use different settings to our defaults.
+-   in Admin UI: `./admin/website-angular/src/environments/environment.ts` and `./admin/website-angular/src/environments/environment.prod.ts`.
+-   in Mobile Shop: `./shop/mobile-ionic/src/environments/environment.ts` and `./shop/mobile-ionic/src/environments/environment.prod.ts`
+-   in Web Shop: `./shop/website-angular/src/environments/environment.ts` and `./shop/website-angular/src/environments/environment.prod.ts`
+-   in Carrier App: `./carrier/mobile-ionic/src/environments/environment.ts` and `./carrier/mobile-ionic/src/environments/environment.prod.ts`
+-   in Merchant App: `./merchant/tablet-ionic/src/environments/environment.ts` and `./merchant/tablet-ionic/src/environments/environment.prod.ts`
 
--   For _Admin_ Angular App configuration, the `./admin/website-angular/.env.template` file should be copied into `./admin/website-angular/.env` and relevant changes should (optionally) be done.
+Note: you should never edit auto-generated files above and instead you should edit relevant .env files for custom configurations, see more details below.
 
-    Note: the "Standard" Angular environment configuration files `./admin/website-angular/src/environments/environment.ts` and `./admin/website-angular/src/environments/environment.prod.ts` will be auto-generated from .env file (if it's exists) or from default settings on the first app run
+#### Custom / Manual
 
--   For _Merchant_ Ionic App configuration, see `./merchant/tablet-ionic/src/environments/environment.ts` and `./merchant/tablet-ionic/src/environments/environment.prod.ts` files. If you need to run Merchant App using PM2 (as Web app, not Tablet App), needs copy `./merchant/tablet-ionic/.env.template` to `./merchant/tablet-ionic/.env` and make relevant changes (if required)
+-   For _Backend (API)_ configuration, the `./backend/api/.env.template` file should be copied into `./backend/api/.env` and relevant changes should be done in the `.env` file.
+    It means you should have `./backend/api/.env` file in place to be able to run the Platform on developer machine if you want to use different settings to our defaults.
 
--   For _Shopping Mobile_ App (Ionic) configuration, see `./shop/mobile-ionic/src/environments/environment.ts` and `./shop/mobile-ionic/src/environments/environment.prod.ts` files
+-   For _Admin_ Angular App configuration, the `./admin/website-angular/.env.template` file should be copied into `./admin/website-angular/.env` and relevant changes should be done in the `.env` file.
 
--   For _Shopping Website_ configuration, see `./shop/website-angular/src/environments/environment.ts` and `./shop/website-angular/src/environments/environment.prod.ts` files
+-   For _Merchant_ Ionic App configuration, the `./merchant/tablet-ionic/.env.template` file should be copied into `./merchant/tablet-ionic/.env` and relevant changes should be done in the `.env` file.
+    If you need to run Merchant App using PM2 (as Web app, not Tablet App), needs copy `./merchant/tablet-ionic/.env.template` to `./merchant/tablet-ionic/.env` and make relevant changes (if required)
 
--   For _Carrier Mobile_ App (Ionic) configuration, see `./carrier/mobile-ionic/src/environments/environment.ts` and `./carrier/mobile-ionic/src/environments/environment.prod.ts` files
+-   For _Shopping Mobile_ App (Ionic) configuration, the `./shop/mobile-ionic/.env.template` file should be copied into `./shop/mobile-ionic/.env` and relevant changes should be done in the `.env` file.
+
+-   For _Shopping Website_ configuration, the `./shop/website-angular/.env.template` file should be copied into `./shop/website-angular/.env` and relevant changes should be done in the `.env` file.
+
+-   For _Carrier Mobile_ App (Ionic) configuration, the `./carrier/mobile-ionic/.env.template` file should be copied into `./carrier/mobile-ionic/.env` and relevant changes should be done in the `.env` file.
 
 Notes:
 
--   for initial development run no changes required in the `.env` or `environment.ts` files in the projects, unless some manual changes were done to the Backend (API) configuration. However, to enable some of the Platform features, you may need to change relevant configurations at corresponding files.
+-   For initial development no changes required in the `.env` files in the projects, unless some manual changes were done to the Backend (API) configuration. However, to enable some of the Platform features, you may need to change relevant configurations in corresponding `.env` files.
+
+-   As a general rule, files `.env` are configurations you should never make public (and of course never commit to Git repo), unless you removed all private/secure parameters from them.
+    In addition, for Angular based projects, you should never put any secure settings (e.g. Secret Keys, API Keys, etc) in `environment.ts` and `environment.prod.ts` files because all of them will be loaded into the browser and made public.
+    Because we are using auto-generated `environment.ts` and `environment.prod.ts` files, it means you should never put any secure settings into `.env` files in our Angular projects.
+    The only safe place to put your secure settings is `.env` file on the backend API/Server project!
 
--   files `.env`, `environment.ts`, `environment.prod.ts` are configurations you should never make public, unless you removed all private/secure parameters from them.
+-   We are using dotenv (.env) in Angular based projects for consistency with configuration between all our Platform projects only.
 
 ### Run Platform Projects
 

From 4cd41c8a76403a700533f43f38ce908df6216f56 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 29 Mar 2019 01:34:15 +0200
Subject: [PATCH 009/382] chore: tiny workspace fix

---
 ever.code-workspace | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ever.code-workspace b/ever.code-workspace
index 9228242e4..2eefb2752 100644
--- a/ever.code-workspace
+++ b/ever.code-workspace
@@ -20,7 +20,7 @@
 		}
 	],
 	"settings": {
-		"typescript.tsdk": "node_modules/typescript/lib",
+		"typescript.tsdk": "./node_modules/typescript/lib",
 		"debug.node.autoAttach": "on",
 		"search.usePCRE2": true,
 		"git.ignoreLimitWarning": true

From d882d2105e0956aca36d708cc875d2ec542f1074 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 29 Mar 2019 01:38:23 +0200
Subject: [PATCH 010/382] fix: getting Ionic builds working - we forgot to turn
 type of the "Ionic" projects when switch from Ionic 3 to Ionic 4 -
 improvements to generation of environment.ts files in Angular projects - some
 packages updates and related fixes - remove deprecated `pro_id` setting in
 Ionic configs - some tiny fixes to make code to build in production env

---
 admin/website-angular/scripts/configure.ts    | 13 ++++
 admin/website-angular/tsconfig.json           |  1 +
 carrier/mobile-ionic/config.xml               |  4 +-
 carrier/mobile-ionic/ionic.config.json        |  3 +-
 carrier/mobile-ionic/ionic.project            |  2 +-
 carrier/mobile-ionic/package.json             | 53 ++++++++-------
 carrier/mobile-ionic/scripts/configure.ts     | 13 ++++
 .../src/pages/information/about/about.ts      |  2 +-
 .../src/pages/language/language.ts            |  4 +-
 .../src/pages/main/delivery/delivery.ts       |  4 ++
 carrier/mobile-ionic/tsconfig.json            |  1 +
 carrier/mobile-ionic/yarn.lock                | 67 ++++++++++---------
 merchant/tablet-ionic/ionic.config.json       |  3 +-
 merchant/tablet-ionic/ionic.project           |  2 +-
 merchant/tablet-ionic/package.json            |  1 -
 merchant/tablet-ionic/scripts/configure.ts    | 13 ++++
 merchant/tablet-ionic/tsconfig.json           |  1 +
 merchant/tablet-ionic/yarn.lock               |  5 --
 shared/core/interfaces/IUser.ts               |  1 +
 shared/core/interfaces/IUserOrder.ts          |  1 +
 shop/mobile-ionic/config.xml                  |  2 +-
 shop/mobile-ionic/ionic.config.json           |  3 +-
 shop/mobile-ionic/ionic.project               |  2 +-
 shop/mobile-ionic/package.json                |  3 +-
 shop/mobile-ionic/scripts/configure.ts        | 13 ++++
 shop/mobile-ionic/tsconfig.json               |  1 +
 shop/website-angular/scripts/configure.ts     | 13 ++++
 27 files changed, 153 insertions(+), 78 deletions(-)

diff --git a/admin/website-angular/scripts/configure.ts b/admin/website-angular/scripts/configure.ts
index 736b3193d..df3593a96 100644
--- a/admin/website-angular/scripts/configure.ts
+++ b/admin/website-angular/scripts/configure.ts
@@ -72,6 +72,9 @@ try {
 } catch {}
 
 const envFileDest: string = isProd ? 'environment.prod.ts' : 'environment.ts';
+const envFileDestOther: string = !isProd
+	? 'environment.prod.ts'
+	: 'environment.ts';
 
 writeFile(`./src/environments/${envFileDest}`, envFileContent, function(err) {
 	if (err) {
@@ -80,3 +83,13 @@ writeFile(`./src/environments/${envFileDest}`, envFileContent, function(err) {
 		console.log(`Generated Angular environment file: ${envFileDest}`);
 	}
 });
+
+writeFile(`./src/environments/${envFileDestOther}`, '', function(err) {
+	if (err) {
+		console.log(err);
+	} else {
+		console.log(
+			`Generated Second Empty Angular environment file: ${envFileDestOther}`
+		);
+	}
+});
diff --git a/admin/website-angular/tsconfig.json b/admin/website-angular/tsconfig.json
index df9889e83..a5485a907 100644
--- a/admin/website-angular/tsconfig.json
+++ b/admin/website-angular/tsconfig.json
@@ -7,6 +7,7 @@
 		"moduleResolution": "node",
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
+		"importHelpers": true,
 		"noImplicitAny": false,
 		"preserveConstEnums": true,
 		"allowSyntheticDefaultImports": true,
diff --git a/carrier/mobile-ionic/config.xml b/carrier/mobile-ionic/config.xml
index 09ff4fe32..b905294f7 100644
--- a/carrier/mobile-ionic/config.xml
+++ b/carrier/mobile-ionic/config.xml
@@ -82,8 +82,6 @@
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.2" />
     <plugin name="cordova-plugin-whitelist" spec="~1.3.3" />
     <plugin name="cordova-plugin-email-composer" spec="^0.8.15" />
-    <engine name="browser" spec="5.0.3" />
-    <engine name="android" spec="7.1.1" />
     <plugin name="mx.ferreyra.callnumber" spec="^0.0.2" />
     <plugin name="cordova-plugin-camera" spec="4.0.3" />
     <plugin name="cordova-plugin-device" spec="2.0.2" />
@@ -100,4 +98,6 @@
     <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
     <plugin name="cordova-plugin-statusbar" spec="2.4.2" />
     <plugin name="cordova-plugin-vibration" spec="3.1.0" />
+    <engine name="browser" spec="^6.0.0" />
+    <engine name="android" spec="7.1.4" />
 </widget>
diff --git a/carrier/mobile-ionic/ionic.config.json b/carrier/mobile-ionic/ionic.config.json
index e25bfa24a..13663cd18 100644
--- a/carrier/mobile-ionic/ionic.config.json
+++ b/carrier/mobile-ionic/ionic.config.json
@@ -3,7 +3,6 @@
 	"integrations": {
 		"cordova": {}
 	},
-	"type": "ionic-angular",
-	"pro_id": "16ee2ab7",
+	"type": "angular",
 	"id": "16ee2ab7"
 }
diff --git a/carrier/mobile-ionic/ionic.project b/carrier/mobile-ionic/ionic.project
index ae2a14447..c16db3f07 100644
--- a/carrier/mobile-ionic/ionic.project
+++ b/carrier/mobile-ionic/ionic.project
@@ -3,6 +3,6 @@
   "integrations": {
     "cordova": {}
   },
-  "type": "ionic-angular",
+  "type": "angular",
   "app_id": "16ee2ab7" 
 }
\ No newline at end of file
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index af60cd936..3d778b353 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -97,37 +97,36 @@
 		"apollo-link-ws": "^1.0.17",
 		"call-number": "~1.0.1",
 		"connect": "^3.6.6",
-		"cordova-android": "^7.1.4",
+		"cordova-android": "7.1.4",
 		"cordova-android-support-gradle-release": "^2.0.1",
 		"cordova-browser": "^6.0.0",
+		"cordova-open-native-settings": "^1.5.2",
 		"cordova-plugin-appavailability": "^0.4.2",
-		"cordova-plugin-device": "2.0.2",
+		"cordova-plugin-badge": "^0.8.8",
+		"cordova-plugin-camera": "^4.0.3",
+		"cordova-plugin-device": "^2.0.2",
 		"cordova-plugin-dialogs": "^2.0.1",
-		"cordova-plugin-geolocation": "4.0.1",
-		"cordova-plugin-globalization": "1.11.0",
-		"cordova-plugin-google-analytics": "1.8.6",
+		"cordova-plugin-email-composer": "^0.9.2",
+		"cordova-plugin-geolocation": "^4.0.1",
+		"cordova-plugin-globalization": "^1.11.0",
+		"cordova-plugin-google-analytics": "^1.8.6",
 		"cordova-plugin-inappbrowser": "^3.0.0",
 		"cordova-plugin-intercom": "^6.2.0",
 		"cordova-plugin-ionic-keyboard": "^2.1.3",
-		"cordova-plugin-ionic-webview": "^4.0.0",
-		"cordova-plugin-mixpanel": "4.5.2",
-		"cordova-plugin-splashscreen": "5.0.2",
-		"cordova-plugin-statusbar": "2.4.2",
+		"cordova-plugin-ionic-webview": "^4.0.1",
+		"cordova-plugin-local-notification": "^0.9.0-beta.2",
+		"cordova-plugin-mixpanel": "^4.5.2",
+		"cordova-plugin-network-information": "^2.0.1",
+		"cordova-plugin-screen-orientation": "^3.0.1",
+		"cordova-plugin-splashscreen": "^5.0.2",
+		"cordova-plugin-statusbar": "^2.4.2",
 		"cordova-plugin-uniquedeviceid": "^1.3.2",
-		"cordova-plugin-vibration": "3.1.0",
+		"cordova-plugin-vibration": "^3.1.0",
 		"cordova-plugin-whitelist": "^1.3.3",
-		"cordova-open-native-settings": "^1.5.2",
-		"cordova-plugin-badge": "^0.8.8",
-		"cordova-plugin-camera": "4.0.3",
-		"cordova-plugin-email-composer": "^0.9.2",
-		"cordova-plugin-local-notification": "0.9.0-beta.2",
-		"cordova-plugin-network-information": "2.0.1",
-		"cordova-plugin-screen-orientation": "^3.0.1",
-		"phonegap-plugin-barcodescanner": "^8.0.1",
 		"core-js": "^3.0.0",
 		"cryptiles": "^4.1.3",
-		"font-awesome": "^4.7.0",
 		"es6-promise-plugin": "^4.2.2",
+		"font-awesome": "^4.7.0",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"hooks-fixed": "^2.0.2",
@@ -137,8 +136,9 @@
 		"mongoose": "^5.4.19",
 		"mpath": "^0.5.1",
 		"mquery": "^3.2.0",
-		"mx.ferreyra.callnumber": "^0.0.2",
+		"mx.ferreyra.callnumber": "0.0.2",
 		"node-sass": "^4.11.0",
+		"phonegap-plugin-barcodescanner": "^8.0.1",
 		"qrcode": "^1.3.3",
 		"reflect-metadata": "^0.1.13",
 		"rxjs": "^6.4.0",
@@ -147,12 +147,11 @@
 		"save": "^2.3.3",
 		"socket.io-client": "^2.2.0",
 		"stripe": "^6.28.0",
-		"swiper": "^4.5.0",
 		"sw-toolbox": "^3.6.0",
+		"swiper": "^4.5.0",
 		"tslib": "^1.9.3",
 		"uuid": "^3.3.2",
 		"waves": "^0.1.1",
-		"webpack-merge": "^4.2.1",
 		"zone.js": "^0.9.0"
 	},
 	"devDependencies": {
@@ -209,7 +208,8 @@
 		"tslint": "^5.14.0",
 		"yargs": "^13.2.2",
 		"typescript": "~3.2.4",
-		"webpack-bundle-analyzer": "^3.1.0"
+		"webpack-bundle-analyzer": "^3.1.0",
+		"webpack-merge": "^4.2.1"
 	},
 	"config": {
 		"ionic_webpack": "./config/webpack.config.js"
@@ -227,7 +227,9 @@
 				"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
 			},
 			"cordova-plugin-ionic-keyboard": {},
-			"cordova-plugin-google-analytics": {},
+			"cordova-plugin-google-analytics": {
+				"GMS_VERSION": "11.0.1"
+			},
 			"cordova-plugin-network-information": {},
 			"cordova-plugin-mixpanel": {
 				"PLAY_SERVICES_VERSION": "+"
@@ -246,7 +248,8 @@
 				"ANDROID_SUPPORT_V4_VERSION": "27.+"
 			},
 			"cordova-plugin-vibration": {},
-			"cordova-plugin-local-notification": {}
+			"cordova-plugin-local-notification": {},
+			"call-number": {}
 		}
 	},
 	"engines": {
diff --git a/carrier/mobile-ionic/scripts/configure.ts b/carrier/mobile-ionic/scripts/configure.ts
index 249b8ef44..9b17ea4c9 100644
--- a/carrier/mobile-ionic/scripts/configure.ts
+++ b/carrier/mobile-ionic/scripts/configure.ts
@@ -69,6 +69,9 @@ export const environment: Environment = {
 `;
 
 const envFileDest: string = isProd ? 'environment.prod.ts' : 'environment.ts';
+const envFileDestOther: string = !isProd
+	? 'environment.prod.ts'
+	: 'environment.ts';
 
 // we always want first to remove old generated files (one of them is not needed for current build)
 try {
@@ -85,3 +88,13 @@ writeFile(`./src/environments/${envFileDest}`, envFileContent, function(err) {
 		console.log(`Generated Angular environment file: ${envFileDest}`);
 	}
 });
+
+writeFile(`./src/environments/${envFileDestOther}`, '', function(err) {
+	if (err) {
+		console.log(err);
+	} else {
+		console.log(
+			`Generated Second Empty Angular environment file: ${envFileDestOther}`
+		);
+	}
+});
diff --git a/carrier/mobile-ionic/src/pages/information/about/about.ts b/carrier/mobile-ionic/src/pages/information/about/about.ts
index 268980f4d..96c042e58 100644
--- a/carrier/mobile-ionic/src/pages/information/about/about.ts
+++ b/carrier/mobile-ionic/src/pages/information/about/about.ts
@@ -10,7 +10,7 @@ import { environment } from 'environment';
 	styleUrls: ['about.scss']
 })
 export class AboutPage {
-	protected aboutHtml: string;
+	aboutHtml: string;
 
 	protected appVersion: string;
 
diff --git a/carrier/mobile-ionic/src/pages/language/language.ts b/carrier/mobile-ionic/src/pages/language/language.ts
index c4fc5566f..c6f2d9195 100644
--- a/carrier/mobile-ionic/src/pages/language/language.ts
+++ b/carrier/mobile-ionic/src/pages/language/language.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-
 import { TranslateService } from '@ngx-translate/core';
 import { DeviceRouter } from '@modules/client.common.angular2/routers/device-router.service';
 
@@ -22,11 +21,12 @@ export class LanguagePage {
 		return localStorage.getItem('_deviceId');
 	}
 
-	languageChange(val) {
+	languageChange() {
 		localStorage.setItem('_language', this.language);
 
 		// Example: "en-US".substr(0, 2) = "en"
 		const langAbbreviation = this.language.substr(0, 2);
+
 		this._langTranslator.use(langAbbreviation);
 
 		if (this.deviceId) {
diff --git a/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts b/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts
index c5c7b5550..53c08a8d1 100644
--- a/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts
+++ b/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts
@@ -27,6 +27,10 @@ export class DeliveryPage implements AfterViewInit {
 	carrierUserDistance: string;
 	disabledButtons: boolean = true;
 
+	get fullAddress() {
+		return this.selectedOrder.user.fullAddress;
+	}
+
 	constructor(
 		private orderRouter: OrderRouter,
 		private mixpanel: Mixpanel,
diff --git a/carrier/mobile-ionic/tsconfig.json b/carrier/mobile-ionic/tsconfig.json
index b40f2ae87..498cfd056 100644
--- a/carrier/mobile-ionic/tsconfig.json
+++ b/carrier/mobile-ionic/tsconfig.json
@@ -6,6 +6,7 @@
 		"moduleResolution": "node",
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
+		"importHelpers": true,
 		"noImplicitAny": false,
 		"preserveConstEnums": true,
 		"allowSyntheticDefaultImports": true,
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index d9b1c1f07..f6366e309 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -1226,7 +1226,7 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@1:
+abbrev@*, abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
@@ -1444,7 +1444,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
-ansi@^0.3.1:
+ansi@*, ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
 
@@ -1913,7 +1913,7 @@ backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
 
-balanced-match@^1.0.0:
+balanced-match@*, balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
@@ -2121,13 +2121,13 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@^0.1.0:
+bplist-parser@*, bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@^1.1.7:
+brace-expansion@*, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
@@ -2864,7 +2864,7 @@ compression@^1.5.2, compression@^1.6.0:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@0.0.1:
+concat-map@*, concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
@@ -2994,7 +2994,7 @@ cordova-android-support-gradle-release@^2.0.1:
     semver "5.1.0"
     xml2js "~0.4.19"
 
-cordova-android@^7.1.4:
+cordova-android@7.1.4:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/cordova-android/-/cordova-android-7.1.4.tgz#25261ad66cc64f42a30b70be005901fa30e2430e"
   integrity sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==
@@ -3075,12 +3075,12 @@ cordova-plugin-badge@^0.8.8:
   resolved "https://registry.yarnpkg.com/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz#0924018699b48f92dd3b33615452737582144c96"
   integrity sha512-RhIBtd5xhD/iLnxjt35jvOae28oNW/wtMZBOmQR3Rf0y4wirvA1bpAZEhBoFqL+rZGhsd6ddOdQXdex1T0DRyQ==
 
-cordova-plugin-camera@4.0.3:
+cordova-plugin-camera@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/cordova-plugin-camera/-/cordova-plugin-camera-4.0.3.tgz#7373a5938318c86ccfd84e3713e2382d10fe076b"
   integrity sha1-c3Olk4MYyGzP2E43E+I4LRD+B2s=
 
-cordova-plugin-device@2.0.2:
+cordova-plugin-device@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/cordova-plugin-device/-/cordova-plugin-device-2.0.2.tgz#fc08f3722e67eef7b6c67bfc99a83df6add0baba"
   integrity sha1-/Ajzci5n7ve2xnv8mag99q3Quro=
@@ -3095,17 +3095,17 @@ cordova-plugin-email-composer@^0.9.2:
   resolved "https://registry.yarnpkg.com/cordova-plugin-email-composer/-/cordova-plugin-email-composer-0.9.2.tgz#264c66d45679acf2781c2cec54e32b2c1facfdb8"
   integrity sha512-w8eQZ6lbYWut13o/Cprixmacfyq5hds7DAjuTL34eQhyWWd/DA/o6ziiyY3So2ZOozeQ4DxQpyPN4BiqUKcyew==
 
-cordova-plugin-geolocation@4.0.1:
+cordova-plugin-geolocation@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.0.1.tgz#4703fa649d2405d25a9a732c99ebf868754a2c04"
   integrity sha1-RwP6ZJ0kBdJamnMsmev4aHVKLAQ=
 
-cordova-plugin-globalization@1.11.0:
+cordova-plugin-globalization@^1.11.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/cordova-plugin-globalization/-/cordova-plugin-globalization-1.11.0.tgz#eac3158100298493afa30be8940e698f61efbcfe"
   integrity sha1-6sMVgQAphJOvowvolA5pj2HvvP4=
 
-cordova-plugin-google-analytics@1.8.6:
+cordova-plugin-google-analytics@^1.8.6:
   version "1.8.6"
   resolved "https://registry.yarnpkg.com/cordova-plugin-google-analytics/-/cordova-plugin-google-analytics-1.8.6.tgz#7886bd7ac9264e4dec7355ebed64d939b274731a"
   integrity sha512-shg8e3ris1MzmhC8roraScc2GEcfe7sVlbKkvrO3wZUAlYr31sf+4wxZr/VQB6tEcPsmTAkoNjGr1zMwoYjMeg==
@@ -3125,22 +3125,22 @@ cordova-plugin-ionic-keyboard@^2.1.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.1.3.tgz#6b050d5b7cb4393d5758b55f45a46372f25178fe"
   integrity sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ==
 
-cordova-plugin-ionic-webview@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.0.tgz#d00f36761309d31ade55e9740731ffca141f4e54"
-  integrity sha512-4CNDDXS9PZ+j38ZpzFqC6Ua5GySr/McXTPnWdRfhFSbuFCL6B/xhIHUVoeoj48wo6Sh+gDURvbaH9uu1Z53TJA==
+cordova-plugin-ionic-webview@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.1.tgz#2ff5e73998d87316d3ab8dbe4b6ccf768ab7f637"
+  integrity sha512-rJf7jFQNw7l0U4Y7P6DjxwmO/qQgS7xqiTgwDbNFS4z4+FZ3EZyupll7/cFEDnxGRNMgWsMKDhIABUo5mIDaUQ==
 
-cordova-plugin-local-notification@0.9.0-beta.2:
+cordova-plugin-local-notification@^0.9.0-beta.2:
   version "0.9.0-beta.2"
   resolved "https://registry.yarnpkg.com/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-beta.2.tgz#e3a0b4a35d11f95bb4f1e367d9baee9909cca695"
   integrity sha512-63n77K1pt8dnbWnNR8QWETi9Glezi1bvNHvHWmGNIOv0xCb0phZnm+Ku49BQ+omwe8Z5voMvrA4I03SYPpv38w==
 
-cordova-plugin-mixpanel@4.5.2:
+cordova-plugin-mixpanel@^4.5.2:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/cordova-plugin-mixpanel/-/cordova-plugin-mixpanel-4.5.2.tgz#76a78090c6333715618901e53e2782da9d3ac06c"
   integrity sha512-+mlT7fw4ug+wU5/KlR5TX8lZQbyF7jsk/Ol8PNcizfxI7xU6URA5Y/qhTNzOZGjf4Iga6XhJx/VPz9fEzep1iA==
 
-cordova-plugin-network-information@2.0.1:
+cordova-plugin-network-information@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/cordova-plugin-network-information/-/cordova-plugin-network-information-2.0.1.tgz#e90421f430c6ab76d409223f25fcefbbbce17690"
   integrity sha1-6QQh9DDGq3bUCSI/Jfzvu7zhdpA=
@@ -3150,12 +3150,12 @@ cordova-plugin-screen-orientation@^3.0.1:
   resolved "https://registry.yarnpkg.com/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.1.tgz#75a357ce2938081e8f61d4605394b6d77463c1f8"
   integrity sha1-daNXzik4CB6PYdRgU5S213Rjwfg=
 
-cordova-plugin-splashscreen@5.0.2:
+cordova-plugin-splashscreen@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.2.tgz#747e74f56e201cd585bc62d14bca19f6867ff1ed"
   integrity sha1-dH509W4gHNWFvGLRS8oZ9oZ/8e0=
 
-cordova-plugin-statusbar@2.4.2:
+cordova-plugin-statusbar@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.2.tgz#fc1fbdc0d8d7033a7e8e1f1f7ff167ac9bd4faf6"
   integrity sha1-/B+9wNjXAzp+jh8ff/FnrJvU+vY=
@@ -3165,7 +3165,7 @@ cordova-plugin-uniquedeviceid@^1.3.2:
   resolved "https://registry.yarnpkg.com/cordova-plugin-uniquedeviceid/-/cordova-plugin-uniquedeviceid-1.3.2.tgz#be05947af2fd1815cb8e3407d72df68c8522fa96"
   integrity sha1-vgWUevL9GBXLjjQH1y32jIUi+pY=
 
-cordova-plugin-vibration@3.1.0:
+cordova-plugin-vibration@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cordova-plugin-vibration/-/cordova-plugin-vibration-3.1.0.tgz#63e57a1de72e318b0944ef727d7c4eff13ca2c93"
   integrity sha1-Y+V6HecuMYsJRO9yfXxO/xPKLJM=
@@ -3175,7 +3175,7 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
 
@@ -5762,14 +5762,14 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
-inflight@^1.0.4:
+inflight@*, inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -7301,7 +7301,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -7514,7 +7514,7 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-mx.ferreyra.callnumber@^0.0.2:
+mx.ferreyra.callnumber@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/mx.ferreyra.callnumber/-/mx.ferreyra.callnumber-0.0.2.tgz#dda64ced1d5a19e801d5c64f17f02bcd0599cb63"
   integrity sha512-J9FJiMrfWG9Q8AQEz/cgYLcXTTD/Z5+vfq29hn8K7yVWjxkSzr7zFi7Dpn8wcv2iKHBHDJY+U0z8yoAzDugXMw==
@@ -7906,7 +7906,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -10945,7 +10945,7 @@ unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
-underscore@^1.8.3:
+underscore@*, underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
 
@@ -11008,6 +11008,11 @@ unix-crypt-td-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
 
+unorm@*:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
+  integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
+
 unorm@^1.3.3:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.4.1.tgz#364200d5f13646ca8bcd44490271335614792300"
@@ -11510,7 +11515,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@1:
+wrappy@*, wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
@@ -11589,7 +11594,7 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
 
-xmldom@0.1.x:
+xmldom@*, xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
 
diff --git a/merchant/tablet-ionic/ionic.config.json b/merchant/tablet-ionic/ionic.config.json
index 77e760472..1558cc608 100644
--- a/merchant/tablet-ionic/ionic.config.json
+++ b/merchant/tablet-ionic/ionic.config.json
@@ -3,7 +3,6 @@
 	"integrations": {
 		"cordova": {}
 	},
-	"type": "ionic-angular",
-	"pro_id": "4e9f4799",
+	"type": "angular",
 	"id": "4e9f4799"
 }
diff --git a/merchant/tablet-ionic/ionic.project b/merchant/tablet-ionic/ionic.project
index 21de1f922..274537d40 100644
--- a/merchant/tablet-ionic/ionic.project
+++ b/merchant/tablet-ionic/ionic.project
@@ -3,6 +3,6 @@
   "integrations": {
     "cordova": {}
   },
-  "type": "ionic-angular",
+  "type": "angular",
   "app_id": "4e9f4799" 
 }
\ No newline at end of file
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index af9218286..3c8c2f2a1 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -139,7 +139,6 @@
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"imagesloaded": "^4.1.4",
-		"ionic-angular": "^3.9.4",
 		"ionic-selectable": "4.4.0",
 		"ionicons": "^4.5.5",
 		"jsbarcode": "^3.11.0",
diff --git a/merchant/tablet-ionic/scripts/configure.ts b/merchant/tablet-ionic/scripts/configure.ts
index c6bbf79a1..d7ce0014c 100644
--- a/merchant/tablet-ionic/scripts/configure.ts
+++ b/merchant/tablet-ionic/scripts/configure.ts
@@ -73,6 +73,9 @@ export const environment: Environment = {
 `;
 
 const envFileDest: string = isProd ? 'environment.prod.ts' : 'environment.ts';
+const envFileDestOther: string = !isProd
+	? 'environment.prod.ts'
+	: 'environment.ts';
 
 // we always want first to remove old generated files (one of them is not needed for current build)
 try {
@@ -89,3 +92,13 @@ writeFile(`./src/environments/${envFileDest}`, envFileContent, function(err) {
 		console.log(`Generated Angular environment file: ${envFileDest}`);
 	}
 });
+
+writeFile(`./src/environments/${envFileDestOther}`, '', function(err) {
+	if (err) {
+		console.log(err);
+	} else {
+		console.log(
+			`Generated Second Empty Angular environment file: ${envFileDestOther}`
+		);
+	}
+});
diff --git a/merchant/tablet-ionic/tsconfig.json b/merchant/tablet-ionic/tsconfig.json
index 401fe467c..3b32ab5f7 100644
--- a/merchant/tablet-ionic/tsconfig.json
+++ b/merchant/tablet-ionic/tsconfig.json
@@ -6,6 +6,7 @@
 		"moduleResolution": "node",
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
+		"importHelpers": true,
 		"noImplicitAny": false,
 		"preserveConstEnums": true,
 		"allowSyntheticDefaultImports": true,
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 33a7e0fc0..0d790856b 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -5820,11 +5820,6 @@ invert-kv@^2.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
-ionic-angular@^3.9.4:
-  version "3.9.4"
-  resolved "https://registry.yarnpkg.com/ionic-angular/-/ionic-angular-3.9.4.tgz#4d5b94798e686a8cc45c4c2e5307400c58a4f70d"
-  integrity sha512-zuiNQqC1sQL1M4nTDnC9yyt2WITwINl8cCGnjTvGT/PlJ42ci56TN5mojarulcl+5KqA7KdqGvqouwufKwZnSg==
-
 ionic-selectable@4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/ionic-selectable/-/ionic-selectable-4.4.0.tgz#20c3279e67eabe35ac0d92981e5cd764d0b54ee9"
diff --git a/shared/core/interfaces/IUser.ts b/shared/core/interfaces/IUser.ts
index e8d71a204..b157a7b20 100644
--- a/shared/core/interfaces/IUser.ts
+++ b/shared/core/interfaces/IUser.ts
@@ -28,6 +28,7 @@ interface IUser extends IUserCreateObject, IUserInitializeObject, DBRawObject {
 	_id: PyroObjectId;
 	geoLocation: IGeoLocation;
 	devicesIds: string[];
+	readonly fullAddress: string;
 }
 
 export default IUser;
diff --git a/shared/core/interfaces/IUserOrder.ts b/shared/core/interfaces/IUserOrder.ts
index 7876cbfc6..7312acaa1 100644
--- a/shared/core/interfaces/IUserOrder.ts
+++ b/shared/core/interfaces/IUserOrder.ts
@@ -25,6 +25,7 @@ interface IUserOrder
 	_id: PyroObjectId;
 	geoLocation: IGeoLocation;
 	devicesIds: string[];
+	readonly fullAddress: string;
 }
 
 export default IUserOrder;
diff --git a/shop/mobile-ionic/config.xml b/shop/mobile-ionic/config.xml
index 55ca4d48d..4ab67b5a5 100644
--- a/shop/mobile-ionic/config.xml
+++ b/shop/mobile-ionic/config.xml
@@ -108,6 +108,6 @@
     <plugin name="cordova-android-support-gradle-release" spec="^2.0.1">
         <variable name="ANDROID_SUPPORT_VERSION" value="27.+" />
     </plugin>
-    <engine name="browser" spec="5.0.4" />
+    <engine name="browser" spec="^6.0.0" />
     <engine name="android" spec="^7.1.4" />
 </widget>
diff --git a/shop/mobile-ionic/ionic.config.json b/shop/mobile-ionic/ionic.config.json
index 8a08bb922..01f239c02 100644
--- a/shop/mobile-ionic/ionic.config.json
+++ b/shop/mobile-ionic/ionic.config.json
@@ -3,7 +3,6 @@
 	"integrations": {
 		"cordova": {}
 	},
-	"type": "ionic-angular",
-	"pro_id": "897e13e3",
+	"type": "angular",
 	"id": "897e13e3"
 }
diff --git a/shop/mobile-ionic/ionic.project b/shop/mobile-ionic/ionic.project
index bb7cd9169..698ebb51f 100644
--- a/shop/mobile-ionic/ionic.project
+++ b/shop/mobile-ionic/ionic.project
@@ -3,6 +3,6 @@
   "integrations": {
     "cordova": {}
   },
-  "type": "ionic-angular",
+  "type": "angular",
   "app_id": "897e13e3" 
 }
\ No newline at end of file
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index a95483276..7dd9334e2 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -196,7 +196,8 @@
 		"tslint": "^5.14.0",
 		"yargs": "^13.2.2",
 		"typescript": "~3.2.4",
-		"webpack-bundle-analyzer": "^3.1.0"
+		"webpack-bundle-analyzer": "^3.1.0",
+		"webpack-merge": "^4.2.1"
 	},
 	"cordova": {
 		"platforms": [
diff --git a/shop/mobile-ionic/scripts/configure.ts b/shop/mobile-ionic/scripts/configure.ts
index d34e8ba09..9aee96d24 100644
--- a/shop/mobile-ionic/scripts/configure.ts
+++ b/shop/mobile-ionic/scripts/configure.ts
@@ -118,6 +118,9 @@ export const environment: Environment = {
 `;
 
 const envFileDest: string = isProd ? 'environment.prod.ts' : 'environment.ts';
+const envFileDestOther: string = !isProd
+	? 'environment.prod.ts'
+	: 'environment.ts';
 
 // we always want first to remove old generated files (one of them is not needed for current build)
 try {
@@ -134,3 +137,13 @@ writeFile(`./src/environments/${envFileDest}`, envFileContent, function(err) {
 		console.log(`Generated Angular environment file: ${envFileDest}`);
 	}
 });
+
+writeFile(`./src/environments/${envFileDestOther}`, '', function(err) {
+	if (err) {
+		console.log(err);
+	} else {
+		console.log(
+			`Generated Second Empty Angular environment file: ${envFileDestOther}`
+		);
+	}
+});
diff --git a/shop/mobile-ionic/tsconfig.json b/shop/mobile-ionic/tsconfig.json
index b40f2ae87..498cfd056 100644
--- a/shop/mobile-ionic/tsconfig.json
+++ b/shop/mobile-ionic/tsconfig.json
@@ -6,6 +6,7 @@
 		"moduleResolution": "node",
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
+		"importHelpers": true,
 		"noImplicitAny": false,
 		"preserveConstEnums": true,
 		"allowSyntheticDefaultImports": true,
diff --git a/shop/website-angular/scripts/configure.ts b/shop/website-angular/scripts/configure.ts
index ed0611857..3ae148b0b 100644
--- a/shop/website-angular/scripts/configure.ts
+++ b/shop/website-angular/scripts/configure.ts
@@ -132,6 +132,9 @@ try {
 } catch {}
 
 const envFileDest: string = isProd ? 'environment.prod.ts' : 'environment.ts';
+const envFileDestOther: string = !isProd
+	? 'environment.prod.ts'
+	: 'environment.ts';
 
 writeFile(
 	`./src/environments/${envFileDest}`,
@@ -144,3 +147,13 @@ writeFile(
 		}
 	}
 );
+
+writeFile(`./src/environments/${envFileDestOther}`, '', function(err) {
+	if (err) {
+		console.log(err);
+	} else {
+		console.log(
+			`Generated Second Empty Angular environment file: ${envFileDest}`
+		);
+	}
+});

From 6eb218c50a96131a4e2b11abde3cf1ab381bc2a8 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 29 Mar 2019 01:39:07 +0200
Subject: [PATCH 011/382] chore: let's try to build Ionic projects for
 production in Circle

---
 .circleci/config.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad87af307..90298d280 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -127,6 +127,9 @@ jobs:
             - run:
                   name: Run Build
                   command: cd carrier/mobile-ionic && yarn build
+            - run:
+                  name: Run Ionic Build (Production)
+                  command: cd carrier/mobile-ionic && yarn ionic:build:prod
             - save_cache:
                   name: Save Yarn Package Cache
                   key: yarn-packages-carrier-mobile-ionic-{{ checksum "yarn.lock" }}
@@ -167,6 +170,9 @@ jobs:
             - run:
                   name: Run Build
                   command: cd shop/mobile-ionic && yarn build
+            - run:
+                  name: Run Ionic Build (Production)
+                  command: cd shop/mobile-ionic && yarn ionic:build:prod
             - save_cache:
                   name: Save Yarn Package Cache
                   key: yarn-packages-shop-mobile-ionic-{{ checksum "yarn.lock" }}
@@ -247,6 +253,9 @@ jobs:
             - run:
                   name: Run Build
                   command: cd merchant/tablet-ionic && yarn build
+            - run:
+                  name: Run Ionic Build (Production)
+                  command: cd merchant/tablet-ionic && yarn ionic:build:prod
             - save_cache:
                   name: Save Yarn Package Cache
                   key: yarn-packages-merchant-tablet-ionic-{{ checksum "yarn.lock" }}

From 49f9f193bfdbbbed0ab674fb130b1d2e83857bb9 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 29 Mar 2019 03:27:52 +0300
Subject: [PATCH 012/382] fix: lots of fixes to make build working

---
 merchant/tablet-ionic/ngsw-config.json        | 20 ++++++++
 .../user/mutation/user-mutation.component.ts  |  2 +-
 .../carrier-deliveries-table/warehouse.ts     | 12 ++++-
 .../confirm-delete-popup.ts                   |  2 +-
 .../order-canceled/order-canceled.ts          |  2 +-
 .../order-delivered/order-delivered.ts        |  2 +-
 .../order-delivery-problem.ts                 |  3 +-
 .../order-warehouse-preparation-problem.ts    |  2 +-
 .../order-with-carrier/order-with-carrier.ts  |  4 +-
 .../order-without-carrier.ts                  |  4 +-
 .../warehouse-order-modal.component.html      | 51 ++++++++++---------
 .../warehouse-order-modal.component.scss      |  8 +--
 .../add-new-carrier/add-new-carrier.ts        |  7 ++-
 .../carrier-addr-popup/carrier-addr-popup.ts  | 12 ++---
 .../carrier-edit-popup/carrier-edit-popup.ts  |  6 ++-
 .../customer-email-popup.ts                   |  2 +-
 .../src/pages/+language/language.ts           |  2 +-
 .../tablet-ionic/src/pages/+track/track.ts    |  2 +-
 .../product-images-popup.component.html       |  2 +-
 .../src/pages/+warehouse/warehouse.ts         |  2 +-
 20 files changed, 91 insertions(+), 56 deletions(-)
 create mode 100644 merchant/tablet-ionic/ngsw-config.json

diff --git a/merchant/tablet-ionic/ngsw-config.json b/merchant/tablet-ionic/ngsw-config.json
new file mode 100644
index 000000000..0cb79dabc
--- /dev/null
+++ b/merchant/tablet-ionic/ngsw-config.json
@@ -0,0 +1,20 @@
+{
+	"index": "/index.html",
+	"assetGroups": [
+		{
+			"name": "app",
+			"installMode": "prefetch",
+			"resources": {
+				"files": ["/favicon.ico", "/index.html", "/*.css", "/*.js"]
+			}
+		},
+		{
+			"name": "assets",
+			"installMode": "lazy",
+			"updateMode": "prefetch",
+			"resources": {
+				"files": ["/assets/**"]
+			}
+		}
+	]
+}
diff --git a/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts b/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
index caaee3818..b79ce3226 100644
--- a/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
+++ b/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
@@ -18,7 +18,7 @@ import { getDummyImage } from '@modules/server.common/utils';
 @Component({
 	selector: 'user-mutation',
 	templateUrl: './user-mutation.component.html',
-	styleUrls: ['/user-mutation.component.scss']
+	styleUrls: ['./user-mutation.component.scss']
 })
 export class UserMutationComponent {
 	readonly form: FormGroup = this._formBuilder.group({
diff --git a/merchant/tablet-ionic/src/components/carrier-deliveries-table/warehouse.ts b/merchant/tablet-ionic/src/components/carrier-deliveries-table/warehouse.ts
index 2ede4ff3c..0b5342caa 100644
--- a/merchant/tablet-ionic/src/components/carrier-deliveries-table/warehouse.ts
+++ b/merchant/tablet-ionic/src/components/carrier-deliveries-table/warehouse.ts
@@ -6,8 +6,8 @@ import Warehouse from '@modules/server.common/entities/Warehouse';
 @Component({
 	template: `
 		<span class="storeAddress">
-			<strong *ngIf="order.warehouse.name">{{
-				order.warehouse.name
+			<strong *ngIf="getStoreName(order)">{{
+				getStoreName(order)
 			}}</strong>
 			<div class="address">{{ getStoreFullAddress(order) }}</div>
 		</span>
@@ -24,6 +24,14 @@ export class WarehouseComponent implements ViewCell, OnInit {
 		this.order = this.rowData.order;
 	}
 
+	getStoreName(order: Order) {
+		const store: Warehouse = order.warehouse as Warehouse;
+
+		if (store) return store.name;
+
+		return null;
+	}
+
 	getStoreFullAddress(order: Order) {
 		const store: Warehouse = order.warehouse as Warehouse;
 
diff --git a/merchant/tablet-ionic/src/components/confirm-delete-popup/confirm-delete-popup.ts b/merchant/tablet-ionic/src/components/confirm-delete-popup/confirm-delete-popup.ts
index fb9c93e4c..b3b370e7e 100644
--- a/merchant/tablet-ionic/src/components/confirm-delete-popup/confirm-delete-popup.ts
+++ b/merchant/tablet-ionic/src/components/confirm-delete-popup/confirm-delete-popup.ts
@@ -4,7 +4,7 @@ import { ModalController } from '@ionic/angular';
 export interface IConfirmDeleteData {
 	image: string;
 	name: string;
-	statis?: string;
+	status?: string;
 	phone?: string;
 	addresses: string;
 }
diff --git a/merchant/tablet-ionic/src/components/order-canceled/order-canceled.ts b/merchant/tablet-ionic/src/components/order-canceled/order-canceled.ts
index 8c7e4e318..2cc922939 100644
--- a/merchant/tablet-ionic/src/components/order-canceled/order-canceled.ts
+++ b/merchant/tablet-ionic/src/components/order-canceled/order-canceled.ts
@@ -12,7 +12,7 @@ export class OrderCanceledComponent {
 	getWarehouseStatus: Function;
 
 	@Input()
-	protected order: Order;
+	order: Order;
 
 	constructor(private _translateProductLocales: ProductLocalesService) {}
 
diff --git a/merchant/tablet-ionic/src/components/order-delivered/order-delivered.ts b/merchant/tablet-ionic/src/components/order-delivered/order-delivered.ts
index a8f0d2919..a6ef4ae9c 100644
--- a/merchant/tablet-ionic/src/components/order-delivered/order-delivered.ts
+++ b/merchant/tablet-ionic/src/components/order-delivered/order-delivered.ts
@@ -12,7 +12,7 @@ export class OrderDeliveredComponent {
 	getWarehouseStatus: () => void;
 
 	@Input()
-	protected order: Order;
+	order: Order;
 
 	constructor(private _translateProductLocales: ProductLocalesService) {}
 
diff --git a/merchant/tablet-ionic/src/components/order-delivery-problem/order-delivery-problem.ts b/merchant/tablet-ionic/src/components/order-delivery-problem/order-delivery-problem.ts
index 0a7ec162a..dc3e370a3 100644
--- a/merchant/tablet-ionic/src/components/order-delivery-problem/order-delivery-problem.ts
+++ b/merchant/tablet-ionic/src/components/order-delivery-problem/order-delivery-problem.ts
@@ -10,8 +10,9 @@ import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
 export class OrderDeliveryProblemComponent {
 	@Input()
 	getWarehouseStatus: () => void;
+
 	@Input()
-	protected order: Order;
+	order: Order;
 
 	constructor(private _translateProductLocales: ProductLocalesService) {}
 
diff --git a/merchant/tablet-ionic/src/components/order-warehouse-preparation-problem/order-warehouse-preparation-problem.ts b/merchant/tablet-ionic/src/components/order-warehouse-preparation-problem/order-warehouse-preparation-problem.ts
index 966a8485d..986c38fdc 100644
--- a/merchant/tablet-ionic/src/components/order-warehouse-preparation-problem/order-warehouse-preparation-problem.ts
+++ b/merchant/tablet-ionic/src/components/order-warehouse-preparation-problem/order-warehouse-preparation-problem.ts
@@ -12,7 +12,7 @@ export class OrderWarehousePreparationProblemComponent {
 	getWarehouseStatus: () => void;
 
 	@Input()
-	protected order: Order;
+	order: Order;
 
 	constructor(private _translateProductLocales: ProductLocalesService) {}
 
diff --git a/merchant/tablet-ionic/src/components/order-with-carrier/order-with-carrier.ts b/merchant/tablet-ionic/src/components/order-with-carrier/order-with-carrier.ts
index 1405e6e1a..af47b1cfe 100644
--- a/merchant/tablet-ionic/src/components/order-with-carrier/order-with-carrier.ts
+++ b/merchant/tablet-ionic/src/components/order-with-carrier/order-with-carrier.ts
@@ -14,10 +14,10 @@ export class OrderWithCarrierComponent {
 	getWarehouseStatus: () => void;
 
 	@Input()
-	protected order: Order;
+	order: Order;
 
 	@Input()
-	protected onUpdateWarehouseStatus: any;
+	onUpdateWarehouseStatus: any;
 
 	constructor(private _translateProductLocales: ProductLocalesService) {}
 
diff --git a/merchant/tablet-ionic/src/components/order-without-carrier/order-without-carrier.ts b/merchant/tablet-ionic/src/components/order-without-carrier/order-without-carrier.ts
index 249666452..34bc8e369 100644
--- a/merchant/tablet-ionic/src/components/order-without-carrier/order-without-carrier.ts
+++ b/merchant/tablet-ionic/src/components/order-without-carrier/order-without-carrier.ts
@@ -13,10 +13,10 @@ export class OrderWithoutCarrierComponent {
 	getWarehouseStatus: () => void;
 
 	@Input()
-	protected order: Order;
+	order: Order;
 
 	@Input()
-	protected onUpdateWarehouseStatus: any;
+	onUpdateWarehouseStatus: any;
 
 	constructor(private _translateProductLocales: ProductLocalesService) {}
 
diff --git a/merchant/tablet-ionic/src/components/order/make-order/+warehouse-order-modal/warehouse-order-modal.component.html b/merchant/tablet-ionic/src/components/order/make-order/+warehouse-order-modal/warehouse-order-modal.component.html
index e069ddc44..66adb1fbb 100644
--- a/merchant/tablet-ionic/src/components/order/make-order/+warehouse-order-modal/warehouse-order-modal.component.html
+++ b/merchant/tablet-ionic/src/components/order/make-order/+warehouse-order-modal/warehouse-order-modal.component.html
@@ -1,26 +1,31 @@
-<nb-card id="make-order">
+<div class="nb-card" id="make-order">
+	<div class="nb-card-header header-color">
+		<div class="pull-left" *ngIf="showOrderAction">
+			{{ TRANSLATE_PREFIXES.MAKE_ORDER | translate }}
+		</div>
 
-    <nb-card-header class="header-color">
-        <div class="pull-left" *ngIf="showOrderAction">
-            {{ TRANSLATE_PREFIXES.MAKE_ORDER | translate }}
-        </div>
+		<div class="checkbox" *ngIf="!showOrderAction">
+			<label>
+				<input type="checkbox" (change)="toggleAvalableProducts()" />
+				{{ TRANSLATE_PREFIXES.ONLY_AVAILABLE | translate }}
+			</label>
+		</div>
+	</div>
 
-        <div class="checkbox" *ngIf="!showOrderAction">
-            <label>
-                <input type="checkbox" (change)="toggleAvalableProducts()">
-                {{ TRANSLATE_PREFIXES.ONLY_AVAILABLE | translate }}
-            </label>
-        </div>
-    </nb-card-header>
+	<div class="nb-card-body">
+		<ng2-smart-table
+			[settings]="settingsSmartTable"
+			[source]="sourceSmartTable"
+		></ng2-smart-table>
+	</div>
 
-    <nb-card-body>
-        <ng2-smart-table [settings]="settingsSmartTable" [source]="sourceSmartTable"></ng2-smart-table>
-    </nb-card-body>
-
-    <nb-card-footer *ngIf="showOrderAction">
-        <button (click)="makeOrder()" [disabled]="!canOrder" class="btn btn-sm btn-primary">
-            {{ TRANSLATE_PREFIXES.ORDER | translate }}
-        </button>
-    </nb-card-footer>
-
-</nb-card>
\ No newline at end of file
+	<div class="nb-card-footer" *ngIf="showOrderAction">
+		<button
+			(click)="makeOrder()"
+			[disabled]="!canOrder"
+			class="btn btn-sm btn-primary"
+		>
+			{{ TRANSLATE_PREFIXES.ORDER | translate }}
+		</button>
+	</div>
+</div>
diff --git a/merchant/tablet-ionic/src/components/order/make-order/+warehouse-order-modal/warehouse-order-modal.component.scss b/merchant/tablet-ionic/src/components/order/make-order/+warehouse-order-modal/warehouse-order-modal.component.scss
index 4c08963a1..3e7190a19 100644
--- a/merchant/tablet-ionic/src/components/order/make-order/+warehouse-order-modal/warehouse-order-modal.component.scss
+++ b/merchant/tablet-ionic/src/components/order/make-order/+warehouse-order-modal/warehouse-order-modal.component.scss
@@ -1,7 +1,7 @@
-nb-card {
+.nb-card {
 	margin: 0;
 
-	nb-card-header {
+	.nb-card-header {
 		border: none;
 		div.checkbox label {
 			cursor: pointer;
@@ -17,7 +17,7 @@ nb-card {
 		}
 	}
 
-	nb-card-body {
+	.nb-card-body {
 		padding: 0;
 
 		ng2-smart-table {
@@ -25,7 +25,7 @@ nb-card {
 		}
 	}
 
-	nb-card-footer {
+	.nb-card-footer {
 		button {
 			float: right;
 			margin-right: 2%;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
index 3f3d41287..61d611ab6 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
@@ -9,7 +9,6 @@ import {
 	OnChanges
 } from '@angular/core';
 import { ICarrierCreateObject } from '@modules/server.common/interfaces/ICarrier';
-
 import { getDummyImage } from '@modules/server.common/utils';
 import { FileUploader } from 'ng2-file-upload';
 import { BasicInfoFormComponent } from './basic-info/basic-info-form.component';
@@ -19,8 +18,8 @@ import { LocationFormComponent } from './location/location-form.component';
 
 @Component({
 	selector: 'add-new-carrier',
-	templateUrl: 'add-new-carrier.html',
-	styleUrls: ['/add-new-carrier.scss']
+	templateUrl: './add-new-carrier.html',
+	styleUrls: ['./add-new-carrier.scss']
 })
 export class AddNewCarrierComponent implements OnInit, OnDestroy, OnChanges {
 	uploader: FileUploader;
@@ -108,7 +107,7 @@ export class AddNewCarrierComponent implements OnInit, OnDestroy, OnChanges {
 		this.isNextStepThreeAvailable = false;
 	}
 
-	toStep2event(data) {
+	toStep2event($event) {
 		this.isNextStepOneAvailable = false;
 		this.isNextStepTwoAvailable = true;
 		this.isNextStepThreeAvailable = false;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
index b978a501c..8f5264a5c 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
@@ -18,12 +18,12 @@ export class CarrierAddrPopupPage implements OnInit {
 	@Input()
 	geoLocation: GeoLocation;
 
-	private city: any;
-	private country: any;
-	private street: any;
-	private house: any;
-	private apartment: any;
-	private coordinates: any;
+	city: any;
+	country: any;
+	street: any;
+	house: any;
+	apartment: any;
+	coordinates: any;
 
 	constructor(public modalCtrl: ModalController) {}
 
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
index 17577e18d..66c36c08c 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
@@ -127,6 +127,7 @@ export class CarrierEditPopupPage implements OnInit, OnDestroy, OnChanges {
 
 		this.cancelModal();
 	}
+
 	get password() {
 		return this.accountForm.password.value;
 	}
@@ -137,8 +138,7 @@ export class CarrierEditPopupPage implements OnInit, OnDestroy, OnChanges {
 		this.isNextStepThreeAvailable = false;
 	}
 
-	toStep2event() {
-		// This is event emitter, not a function
+	toStep2event($event) {
 		this.isNextStepOneAvailable = false;
 		this.isNextStepTwoAvailable = true;
 		this.isNextStepThreeAvailable = false;
@@ -155,6 +155,7 @@ export class CarrierEditPopupPage implements OnInit, OnDestroy, OnChanges {
 		this.isNextStepTwoAvailable = false;
 		this.isNextStepThreeAvailable = true;
 	}
+
 	cancelModal() {
 		this.modalCtrl.dismiss();
 	}
@@ -163,6 +164,7 @@ export class CarrierEditPopupPage implements OnInit, OnDestroy, OnChanges {
 		const prevOrComplete = data;
 		this.buttonClickEvent.emit(prevOrComplete);
 	}
+
 	onClickComplete(data) {
 		this._updateCarrier();
 	}
diff --git a/merchant/tablet-ionic/src/pages/+customers/customer-email-popup/customer-email-popup.ts b/merchant/tablet-ionic/src/pages/+customers/customer-email-popup/customer-email-popup.ts
index 94c2b2ef6..15bc7196e 100644
--- a/merchant/tablet-ionic/src/pages/+customers/customer-email-popup/customer-email-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+customers/customer-email-popup/customer-email-popup.ts
@@ -11,7 +11,7 @@ export class CustomerEmailPopupPage implements OnInit {
 	@Input()
 	user: any;
 
-	private email: any;
+	email: any;
 
 	constructor(
 		public loadingCtrl: LoadingController,
diff --git a/merchant/tablet-ionic/src/pages/+language/language.ts b/merchant/tablet-ionic/src/pages/+language/language.ts
index 5857cf3d3..502b3c896 100644
--- a/merchant/tablet-ionic/src/pages/+language/language.ts
+++ b/merchant/tablet-ionic/src/pages/+language/language.ts
@@ -18,8 +18,8 @@ export class LanguagePage implements OnInit {
 	selected: string;
 
 	constructor(
+		public translate: TranslateService,
 		private _deviceRouter: DeviceRouter,
-		private translate: TranslateService,
 		private store: Store
 	) {}
 
diff --git a/merchant/tablet-ionic/src/pages/+track/track.ts b/merchant/tablet-ionic/src/pages/+track/track.ts
index 6994bfedd..2559c55c1 100644
--- a/merchant/tablet-ionic/src/pages/+track/track.ts
+++ b/merchant/tablet-ionic/src/pages/+track/track.ts
@@ -29,7 +29,7 @@ export class TrackPage implements OnInit, OnDestroy {
 	map: google.maps.Map;
 
 	selectedCarrier: Carrier;
-	private carriers: Carrier[];
+	carriers: Carrier[];
 	private carriers$: Subscription;
 	private warehouse$: Subscription;
 	private params$: Subscription;
diff --git a/merchant/tablet-ionic/src/pages/+warehouse/product-pictures-popup/product-images-popup.component.html b/merchant/tablet-ionic/src/pages/+warehouse/product-pictures-popup/product-images-popup.component.html
index 07eb81a29..f8cc40820 100644
--- a/merchant/tablet-ionic/src/pages/+warehouse/product-pictures-popup/product-images-popup.component.html
+++ b/merchant/tablet-ionic/src/pages/+warehouse/product-pictures-popup/product-images-popup.component.html
@@ -12,7 +12,7 @@ <h4 class="custom-title-popup d-flex">
 		<ion-row>
 			<e-cu-file-uploader
 				[buttonFullSpace]="true"
-				[name]="firstName?.value"
+				[name]=""
 				[fileUrl]="imagesUrls"
 				[inputCustomStyle]="true"
 				(uploadedImgObj)="addImageObj($event)"
diff --git a/merchant/tablet-ionic/src/pages/+warehouse/warehouse.ts b/merchant/tablet-ionic/src/pages/+warehouse/warehouse.ts
index 174a25381..f5afb2cfa 100644
--- a/merchant/tablet-ionic/src/pages/+warehouse/warehouse.ts
+++ b/merchant/tablet-ionic/src/pages/+warehouse/warehouse.ts
@@ -33,7 +33,6 @@ export enum OrderState {
 })
 export class WarehousePage {
 	private warehouse$: any;
-
 	filterMode: OrdersFilterModes = 'ready';
 	warehouse: Warehouse;
 	OrderState: any = OrderState;
@@ -41,6 +40,7 @@ export class WarehousePage {
 	productsLoading: boolean = true;
 	ordersCount: number;
 	showRelevant: boolean = true;
+	showAllProducts: boolean = false;
 	focusedOrder: Order;
 	focusedOrder$: any;
 

From c3396a9d4fcd1817a777e7e0dba6728311315f45 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 29 Mar 2019 10:47:45 +0200
Subject: [PATCH 013/382] feat(ever-admin): initialized "Merchants Setup" page
 EV-1187

---
 .../+merchants/merchants.component.html       | 15 ++++++++++++
 .../+merchants/merchants.component.scss       |  2 ++
 .../+setup/+merchants/merchants.component.ts  |  7 ++++++
 .../+setup/+merchants/merchants.module.ts     | 24 +++++++++++++++++++
 .../src/app/pages/+setup/setup.component.html | 16 +++++++++----
 .../src/app/pages/+setup/setup.component.ts   |  6 +++++
 .../src/app/pages/+setup/setup.module.ts      |  4 ++++
 7 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
new file mode 100644
index 000000000..d536a8531
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -0,0 +1,15 @@
+<div class="setup-merchants-page">
+	<div class="row">
+		<div class="col-md-9">
+			<nb-card>
+				<nb-card-body> </nb-card-body>
+			</nb-card>
+		</div>
+
+		<div class="col-md-3">
+			<nb-card>
+				<nb-card-body> </nb-card-body>
+			</nb-card>
+		</div>
+	</div>
+</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.scss
new file mode 100644
index 000000000..5930d7d47
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.scss
@@ -0,0 +1,2 @@
+.setup-merchants-page {
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
new file mode 100644
index 000000000..320ccae97
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+	styleUrls: ['./merchants.component.scss'],
+	templateUrl: './merchants.component.html'
+})
+export class SetupMerchantsComponent {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
new file mode 100644
index 000000000..c382d133c
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ThemeModule } from 'app/@theme';
+import { RouterModule, Routes } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { SetupMerchantsComponent } from './merchants.component';
+
+const routes: Routes = [
+	{
+		path: '',
+		component: SetupMerchantsComponent
+	}
+];
+
+@NgModule({
+	imports: [
+		CommonModule,
+		ThemeModule,
+		RouterModule.forChild(routes),
+		TranslateModule.forChild()
+	],
+	declarations: [SetupMerchantsComponent]
+})
+export class SetupMerchantsModule {}
diff --git a/admin/website-angular/src/app/pages/+setup/setup.component.html b/admin/website-angular/src/app/pages/+setup/setup.component.html
index 8b13285e1..4c896f629 100644
--- a/admin/website-angular/src/app/pages/+setup/setup.component.html
+++ b/admin/website-angular/src/app/pages/+setup/setup.component.html
@@ -1,11 +1,17 @@
 <nb-card class="col-12" [nbSpinner]="loading">
-
 	<nb-card-header>
-		<h1>{{"FAKE_DATA.SETUP" | translate}}</h1>
+		<h1>{{ 'FAKE_DATA.SETUP' | translate }}</h1>
 	</nb-card-header>
 
 	<nb-card-body>
-		<button class="btn btn-primary" (click)="navigateToFakeDataPage()">{{"FAKE_DATA.GENERATE_INITIAL_DATA" | translate}} </button>
+		<button class="btn btn-primary mr-3" (click)="navigateToFakeDataPage()">
+			{{ 'FAKE_DATA.GENERATE_INITIAL_DATA' | translate }}
+		</button>
+		<button
+			class="btn btn-primary"
+			(click)="navigateToSetupMerchantsPage()"
+		>
+			Setup Merchants
+		</button>
 	</nb-card-body>
-
-</nb-card>
\ No newline at end of file
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/setup.component.ts b/admin/website-angular/src/app/pages/+setup/setup.component.ts
index 38e2a57d1..38dc23382 100644
--- a/admin/website-angular/src/app/pages/+setup/setup.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/setup.component.ts
@@ -15,4 +15,10 @@ export class SetupComponent {
 		this._router.navigate(['/generate-initial-data']);
 		this.loading = false;
 	}
+
+	navigateToSetupMerchantsPage() {
+		this.loading = true;
+		this._router.navigate(['/setup/merchants']);
+		this.loading = false;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/setup.module.ts b/admin/website-angular/src/app/pages/+setup/setup.module.ts
index a3951b082..759f817dc 100644
--- a/admin/website-angular/src/app/pages/+setup/setup.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/setup.module.ts
@@ -10,6 +10,10 @@ const routes: Routes = [
 	{
 		path: '',
 		component: SetupComponent
+	},
+	{
+		path: 'merchants',
+		loadChildren: './+merchants/merchants.module#SetupMerchantsModule'
 	}
 ];
 

From 7f76f137a41bbb7d49c5bdac1158d36ff8a2aac0 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 29 Mar 2019 11:22:35 +0200
Subject: [PATCH 014/382] feat(ever-admin): added vertical Wizard with steps in
 Merchants Setup page - Admin app EV-1187

---
 .../src/app/@theme/styles/styles.scss         | 14 ++++
 .../+merchants/merchants.component.html       | 81 ++++++++++++++++++-
 .../+setup/+merchants/merchants.module.ts     |  4 +-
 3 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index 290dc12ed..3a756ed57 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -183,3 +183,17 @@ ea-product-create .card-footer {
 .ng-select .ng-select-container .ng-value-container .ng-input > input {
 	height: auto !important;
 }
+
+.setup-merchants-page {
+	nb-stepper {
+		.step-content {
+			width: 100%;
+			text-align: center;
+
+			button {
+				margin: 8px;
+				border: 0;
+			}
+		}
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index d536a8531..212efd51c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -2,7 +2,86 @@
 	<div class="row">
 		<div class="col-md-9">
 			<nb-card>
-				<nb-card-body> </nb-card-body>
+				<nb-card-body>
+					<nb-stepper orientation="vertical">
+						<nb-step label="Account">
+							<h3>Account</h3>
+
+							<button nbButton disabled nbStepperNext>
+								PREV
+							</button>
+							<button nbButton nbStepperNext>NEXT</button>
+						</nb-step>
+						<nb-step label="Basic info">
+							<h3>Basic info</h3>
+
+							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperNext>NEXT</button>
+						</nb-step>
+						<nb-step label="Contact info">
+							<h3>Contact info</h3>
+
+							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperNext>NEXT</button>
+						</nb-step>
+						<nb-step label="Location">
+							<h3>Location</h3>
+
+							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperNext>
+								NEXT
+							</button>
+						</nb-step>
+						<nb-step label="Payments">
+							<h3>Payments</h3>
+
+							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperNext>
+								NEXT
+							</button>
+						</nb-step>
+						<nb-step label="Manufacturing">
+							<h3>Manufacturing</h3>
+
+							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperNext>
+								NEXT
+							</button>
+						</nb-step>
+						<nb-step label="Delivery & Takeaway Settings">
+							<h3>Delivery & Takeaway Settings</h3>
+
+							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperNext>
+								NEXT
+							</button>
+						</nb-step>
+						<nb-step label="Orders Settings">
+							<h3>Orders Settings</h3>
+
+							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperNext>
+								NEXT
+							</button>
+						</nb-step>
+						<nb-step label="Product categories">
+							<h3>Product categories</h3>
+
+							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperNext>
+								NEXT
+							</button>
+						</nb-step>
+						<nb-step label="Products">
+							<h3>Products</h3>
+
+							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton disabled nbStepperNext>
+								NEXT
+							</button>
+						</nb-step>
+					</nb-stepper>
+				</nb-card-body>
 			</nb-card>
 		</div>
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index c382d133c..693dbeabc 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -4,6 +4,7 @@ import { ThemeModule } from 'app/@theme';
 import { RouterModule, Routes } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { SetupMerchantsComponent } from './merchants.component';
+import { NbStepperModule } from '@nebular/theme';
 
 const routes: Routes = [
 	{
@@ -17,7 +18,8 @@ const routes: Routes = [
 		CommonModule,
 		ThemeModule,
 		RouterModule.forChild(routes),
-		TranslateModule.forChild()
+		TranslateModule.forChild(),
+		NbStepperModule
 	],
 	declarations: [SetupMerchantsComponent]
 })

From 557549b208a91d590907f9b1d7c601db1cc0b847 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 29 Mar 2019 12:14:08 +0200
Subject: [PATCH 015/382] feat(ever-admin): initialized instructions on
 "Merchants Setup" EV-1187

---
 .../instructions/instructions.component.html        |  6 ++++++
 .../instructions/instructions.component.ts          | 13 +++++++++++++
 .../+setup/+merchants/merchants.component.html      |  8 ++++----
 .../app/pages/+setup/+merchants/merchants.module.ts |  3 ++-
 4 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.html
new file mode 100644
index 000000000..39ba7f9fc
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.html
@@ -0,0 +1,6 @@
+<nb-card>
+	<nb-card-header>
+		<h5>How to setup {{ stepper.selected.label }}?</h5>
+	</nb-card-header>
+	<nb-card-body> </nb-card-body>
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.ts
new file mode 100644
index 000000000..e133f3dd6
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.ts
@@ -0,0 +1,13 @@
+import { Component, Input } from '@angular/core';
+import { NbStepperComponent } from '@nebular/theme';
+
+@Component({
+	selector: 'ea-merchants-setup-instructions',
+	templateUrl: './instructions.component.html'
+})
+export class MerchantsSetupInstructionsComponent {
+	@Input()
+	stepper: NbStepperComponent;
+
+	constructor() {}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 212efd51c..adb88553b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -3,7 +3,7 @@
 		<div class="col-md-9">
 			<nb-card>
 				<nb-card-body>
-					<nb-stepper orientation="vertical">
+					<nb-stepper #nbStepper orientation="vertical">
 						<nb-step label="Account">
 							<h3>Account</h3>
 
@@ -86,9 +86,9 @@ <h3>Products</h3>
 		</div>
 
 		<div class="col-md-3">
-			<nb-card>
-				<nb-card-body> </nb-card-body>
-			</nb-card>
+			<ea-merchants-setup-instructions
+				[stepper]="nbStepper"
+			></ea-merchants-setup-instructions>
 		</div>
 	</div>
 </div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index 693dbeabc..ec1c3e841 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -5,6 +5,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { SetupMerchantsComponent } from './merchants.component';
 import { NbStepperModule } from '@nebular/theme';
+import { MerchantsSetupInstructionsComponent } from './instructions/instructions.component';
 
 const routes: Routes = [
 	{
@@ -21,6 +22,6 @@ const routes: Routes = [
 		TranslateModule.forChild(),
 		NbStepperModule
 	],
-	declarations: [SetupMerchantsComponent]
+	declarations: [SetupMerchantsComponent, MerchantsSetupInstructionsComponent]
 })
 export class SetupMerchantsModule {}

From e2f016c3d802814342cd2075a9762bed25017f0b Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@ever.co>
Date: Fri, 29 Mar 2019 15:43:27 +0200
Subject: [PATCH 016/382] feat(ever-merchant): rewrote and extended carrier
 tracking page

---
 .../warehouses-orders.resolver.ts             |   6 +
 .../warehouses-orders.types.graphql           |   2 +
 .../api/src/services/orders/OrdersService.ts  |  21 ++
 .../tablet-ionic/src/pages/+track/track.html  |   8 +-
 .../src/pages/+track/track.module.ts          |   3 +-
 .../tablet-ionic/src/pages/+track/track.ts    | 232 ++++++++++++------
 .../src/services/orders.service.ts            |  20 ++
 .../src/services/warehouse-orders.service.ts  |  30 +++
 8 files changed, 238 insertions(+), 84 deletions(-)

diff --git a/backend/api/src/graphql/warehouses-orders/warehouses-orders.resolver.ts b/backend/api/src/graphql/warehouses-orders/warehouses-orders.resolver.ts
index 83f386fd1..d87fdf442 100644
--- a/backend/api/src/graphql/warehouses-orders/warehouses-orders.resolver.ts
+++ b/backend/api/src/graphql/warehouses-orders/warehouses-orders.resolver.ts
@@ -116,6 +116,12 @@ export class WarehouseOrdersResolver {
 		};
 	}
 
+	@Query()
+	async getOrdersInDelivery(_, { storeId }: { storeId: string }) {
+		const order = await this._ordersService.getOrdersInDelivery(storeId);
+		return order || [];
+	}
+
 	@Mutation()
 	async createOrder(
 		_,
diff --git a/backend/api/src/graphql/warehouses-orders/warehouses-orders.types.graphql b/backend/api/src/graphql/warehouses-orders/warehouses-orders.types.graphql
index 3b3f536a4..4aa932c1d 100644
--- a/backend/api/src/graphql/warehouses-orders/warehouses-orders.types.graphql
+++ b/backend/api/src/graphql/warehouses-orders/warehouses-orders.types.graphql
@@ -50,5 +50,7 @@ type Query {
 
 	getCountOfStoreOrders(storeId: String!, status: String!): Int!
 
+	getOrdersInDelivery(storeId: String!): [Order]!
+
 	removeUserOrders(storeId: String!, userId: String!): RemovedUserOrdersObj
 }
diff --git a/backend/api/src/services/orders/OrdersService.ts b/backend/api/src/services/orders/OrdersService.ts
index e560a42a5..bb2bd4e0b 100644
--- a/backend/api/src/services/orders/OrdersService.ts
+++ b/backend/api/src/services/orders/OrdersService.ts
@@ -844,6 +844,27 @@ export class OrdersService extends DBService<Order>
 		return orders.filter((o) => o.isCompleted);
 	}
 
+	@asyncListener()
+	async getOrdersInDelivery(storeId: string): Promise<Order[]> {
+		const order = await this.Model.find({
+			isDeleted: false,
+			isCancelled: false,
+			warehouse: storeId,
+			carrierStatus: {
+				$in: [
+					OrderCarrierStatus.CarrierPickedUpOrder,
+					OrderCarrierStatus.CarrierStartDelivery,
+					OrderCarrierStatus.CarrierArrivedToCustomer
+				]
+			}
+		})
+			.populate('carrier user')
+			.lean()
+			.exec();
+
+		return order;
+	}
+
 	private _getOrderTotalPrice(order: Order): number {
 		return _.sum(_.map(order.products, (p) => p.count * p.price));
 	}
diff --git a/merchant/tablet-ionic/src/pages/+track/track.html b/merchant/tablet-ionic/src/pages/+track/track.html
index ece4700ee..f885da23f 100644
--- a/merchant/tablet-ionic/src/pages/+track/track.html
+++ b/merchant/tablet-ionic/src/pages/+track/track.html
@@ -14,13 +14,13 @@ <h1 class="title">Track Carriers</h1>
 	<div #gmap id="mapDiv" class="map"></div>
 	<div class="sidebar">
 		<ion-item class="statistics">
-			Total Active Carriers - {{ totalActiveCarriers }}
+			Total Active Carriers: {{ totalActiveCarriers }}
 		</ion-item>
 		<ion-item class="statistics">
-			Total Carriers - {{ totalCarriers }}
+			Total Carriers: {{ totalCarriers }}
 		</ion-item>
 		<ion-item class="statistics">
-			Total Deliveries - {{ totalDeliveries }}
+			Total Deliveries: {{ totalDeliveries }}
 		</ion-item>
 		<ion-item *ngIf="showCheckboxFilters" (click)="refreshMap();">
 			<ion-label>Show active only</ion-label>
@@ -44,7 +44,7 @@ <h1 class="title">Track Carriers</h1>
 				#filterComponent
 				item-content
 				[(ngModel)]="selectedCarrier"
-				[items]="carriers"
+				[items]="carrierListDropdown"
 				itemValueField="id"
 				itemTextField="fullName"
 				[canSearch]="true"
diff --git a/merchant/tablet-ionic/src/pages/+track/track.module.ts b/merchant/tablet-ionic/src/pages/+track/track.module.ts
index 7a432994d..6c4eb8699 100644
--- a/merchant/tablet-ionic/src/pages/+track/track.module.ts
+++ b/merchant/tablet-ionic/src/pages/+track/track.module.ts
@@ -10,6 +10,7 @@ import { IonicModule } from '@ionic/angular';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { IonicSelectableModule } from 'ionic-selectable';
+import { WarehouseOrdersService } from '../../services/warehouse-orders.service';
 
 const routes: Routes = [
 	{
@@ -30,6 +31,6 @@ const routes: Routes = [
 		FormsModule,
 		RouterModule.forChild(routes)
 	],
-	providers: [CarrierService, WarehousesService]
+	providers: [CarrierService, WarehousesService, WarehouseOrdersService]
 })
 export class TrackPageModule {}
diff --git a/merchant/tablet-ionic/src/pages/+track/track.ts b/merchant/tablet-ionic/src/pages/+track/track.ts
index 6994bfedd..84c2f8340 100644
--- a/merchant/tablet-ionic/src/pages/+track/track.ts
+++ b/merchant/tablet-ionic/src/pages/+track/track.ts
@@ -8,13 +8,11 @@ import {
 
 import Carrier from '@modules/server.common/entities/Carrier';
 import { CarrierService } from '../../../src/services/carrier.service';
-import Warehouse from '@modules/server.common/entities/Warehouse';
-import { WarehouseCarriersRouter } from '@modules/client.common.angular2/routers/warehouse-carriers-router.service';
-import { takeUntil } from 'rxjs/operators';
 import { Subject, Subscription } from 'rxjs';
 import { IonicSelectableComponent } from 'ionic-selectable';
 import { ActivatedRoute, Router } from '@angular/router';
 import { WarehousesService } from 'services/warehouses.service';
+import { WarehouseOrdersService } from '../../services/warehouse-orders.service';
 
 declare var google: any;
 
@@ -30,11 +28,15 @@ export class TrackPage implements OnInit, OnDestroy {
 
 	selectedCarrier: Carrier;
 	private carriers: Carrier[];
+	private carriersOnDisplay: Carrier[];
+	private carrierListDropdown: Carrier[];
 	private carriers$: Subscription;
 	private warehouse$: Subscription;
 	private params$: Subscription;
 	private warehouseCoordinates: any;
+	private orders$: Subscription;
 	private _ngDestroy$ = new Subject<void>();
+	markers: google.maps.Marker[] = [];
 	totalDeliveries = 0;
 	totalCarriers = 0;
 	totalActiveCarriers = 0;
@@ -42,13 +44,20 @@ export class TrackPage implements OnInit, OnDestroy {
 	showActiveOnly = true;
 	showCheckboxFilters = true;
 	loadingMap = false;
+	listOfOrders: any;
+	storeIcon = 'http://maps.google.com/mapfiles/kml/pal3/icon21.png';
+	sharedCarrierIcon = 'http://maps.google.com/mapfiles/kml/pal4/icon23.png';
+	userIcon = 'http://maps.google.com/mapfiles/kml/pal3/icon48.png';
+	carrierIcon = 'http://maps.google.com/mapfiles/kml/pal4/icon54.png';
+	sharedCarrierListId: string[];
 	@ViewChild('filterComponent') filterComponent: IonicSelectableComponent;
 
 	constructor(
 		private carrierService: CarrierService,
 		private route: ActivatedRoute,
 		private router: Router,
-		private warehouseService: WarehousesService
+		private warehouseService: WarehousesService,
+		private warehouseOrderService: WarehouseOrdersService
 	) {}
 
 	openModal() {
@@ -84,6 +93,7 @@ export class TrackPage implements OnInit, OnDestroy {
 				this.carriers$ = this.carrierService
 					.getAllCarriers()
 					.subscribe((carriers) => {
+						this.loadGoogleMaps();
 						this.carriers = carriers.filter((car) => {
 							if (
 								currentWarehouse.usedCarriersIds.includes(
@@ -106,22 +116,28 @@ export class TrackPage implements OnInit, OnDestroy {
 							}
 						});
 						let total = 0;
+
 						this.carriers.forEach((car) => {
 							total += car.numberOfDeliveries;
 						});
+
 						this.totalDeliveries = total;
+
 						this.params$ = this.route.params.subscribe((res) => {
 							this.totalActiveCarriers = this.carriers.filter(
 								(car) => car.status === 0
 							).length;
+
 							if (res.id) {
 								this.selectedCarrier = this.carriers.filter(
 									(car) => car.id === res.id
 								)[0];
 								this.showCheckboxFilters = false;
-								this.loadMap([this.selectedCarrier]);
+								this.carriersOnDisplay = [this.selectedCarrier];
+								this.renderCarriers([this.selectedCarrier]);
 							} else {
-								this.loadMap(this.carriers);
+								this.filterDisplayedCarriers();
+								this.renderCarriers(this.carriersOnDisplay);
 							}
 						});
 					});
@@ -132,89 +148,145 @@ export class TrackPage implements OnInit, OnDestroy {
 		return localStorage.getItem('_warehouseId');
 	}
 
-	loadMap(carriers: Carrier[]) {
-		this.loadingMap = true;
-		const initialCoords = new google.maps.LatLng(
-			carriers[0].geoLocation.loc.coordinates[1],
-			carriers[0].geoLocation.loc.coordinates[0]
-		);
+	drawOrderRoutes() {
+		this.warehouseOrderService
+			.getOrdersInDelivery(this.warehouseId)
+			.then((orderList) => {
+				this.listOfOrders = orderList;
+				this.listOfOrders.forEach((order) => {
+					const carrier = this.carriersOnDisplay.find(
+						(x) => x.id === order.carrier.id
+					);
 
-		const mapProp = {
-			center: initialCoords,
-			zoom: 15,
-			mapTypeId: google.maps.MapTypeId.ROADMAP
-		};
+					if (carrier && carrier.shared) {
+						this.addMarker(
+							{
+								lat:
+									order.carrier.geoLocation.loc
+										.coordinates[1],
+								lng:
+									order.carrier.geoLocation.loc.coordinates[0]
+							},
+							this.map,
+							this.sharedCarrierIcon
+						);
+					}
 
-		const storeIcon = 'http://maps.google.com/mapfiles/kml/pal3/icon21.png';
-		const sharedCarrierIcon =
-			'http://maps.google.com/mapfiles/kml/pal4/icon23.png';
-		const userIcon = 'http://maps.google.com/mapfiles/kml/pal3/icon48.png';
-		const carrierIcon =
-			'http://maps.google.com/mapfiles/kml/pal4/icon54.png';
+					const carriersWithOrders = orderList.map(
+						(o) => o.carrier.id
+					);
+					this.carriers = this.carriers.filter((car) => {
+						if (
+							!carriersWithOrders.includes(car.id) &&
+							car.shared
+						) {
+							return false;
+						} else {
+							return true;
+						}
+					});
+					this.carrierListDropdown = this.carriers;
 
-		this.map = new google.maps.Map(this.gmapElement.nativeElement, mapProp);
-		if (this.showActiveOnly) {
-			carriers = carriers.filter((car) => car.status === 0);
-		}
+					if (
+						this.carriersOnDisplay
+							.map((car) => car.id)
+							.includes(order.carrier.id)
+					) {
+						this.addMarker(
+							{
+								lat: order.user.geoLocation.loc.coordinates[1],
+								lng: order.user.geoLocation.loc.coordinates[0]
+							},
+							this.map,
+							this.userIcon
+						);
 
-		if (this.showAssignedOnly) {
-			carriers = carriers.filter((car) => car.shared === false);
-		}
+						const request = {
+							origin: new google.maps.LatLng(
+								order.carrier.geoLocation.loc.coordinates[1],
+								order.carrier.geoLocation.loc.coordinates[0]
+							),
+							destination: new google.maps.LatLng(
+								order.user.geoLocation.loc.coordinates[1],
+								order.user.geoLocation.loc.coordinates[0]
+							),
+							travelMode: 'DRIVING'
+						};
+						const directionsDisplay = new google.maps.DirectionsRenderer(
+							{
+								polylineOptions: {
+									strokeColor: `hsl(${Math.floor(
+										Math.random() * 320
+									)},100%,50%)`
+								}
+							}
+						);
+						const directionsService = new google.maps.DirectionsService();
+						directionsService.route(request, function(res, stat) {
+							if (stat === 'OK') {
+								directionsDisplay.setDirections(res);
+							}
+						});
 
-		carriers.forEach(async (carrier) => {
+						directionsDisplay.setOptions({
+							suppressMarkers: true
+						});
+
+						directionsDisplay.setMap(this.map);
+					}
+				});
+			});
+	}
+
+	renderCarriers(carriers: Carrier[]) {
+		if (this.markers.length > 0) {
+			this.markers.forEach((m) => {
+				m.setMap(null);
+			});
+			this.markers = [];
+		}
+		carriers.forEach((carrier) => {
 			const mylatLng = {
 				lat: carrier.geoLocation.loc.coordinates[1],
 				lng: carrier.geoLocation.loc.coordinates[0]
 			};
-			const order = await this.carrierService.getCarrierCurrentOrder(
-				carrier.id
-			);
-			this.addMarker(this.warehouseCoordinates, this.map, storeIcon);
-
-			if (order) {
-				this.addMarker(
-					{
-						lat: order.user.geoLocation.loc.coordinates[1],
-						lng: order.user.geoLocation.loc.coordinates[0]
-					},
-					this.map,
-					userIcon
-				);
-				const request = {
-					origin: new google.maps.LatLng(
-						carrier.geoLocation.loc.coordinates[1],
-						carrier.geoLocation.loc.coordinates[0]
-					),
-					destination: new google.maps.LatLng(
-						order.user.geoLocation.loc.coordinates[1],
-						order.user.geoLocation.loc.coordinates[0]
-					),
-					travelMode: 'DRIVING'
-				};
-				const directionsDisplay = new google.maps.DirectionsRenderer({
-					polylineOptions: {
-						strokeColor: `hsl(${Math.floor(
-							Math.random() * 320
-						)},100%,50%)`
-					}
-				});
-				const directionsService = new google.maps.DirectionsService();
-				directionsService.route(request, function(res, stat) {
-					if (stat === 'OK') {
-						directionsDisplay.setDirections(res);
-					}
-				});
+			this.addMarker(this.warehouseCoordinates, this.map, this.storeIcon);
 
-				directionsDisplay.setOptions({
-					suppressMarkers: true
-				});
-
-				directionsDisplay.setMap(this.map);
+			if (!carrier.shared) {
+				this.addMarker(mylatLng, this.map, this.carrierIcon);
 			}
-			carrier.shared
-				? this.addMarker(mylatLng, this.map, sharedCarrierIcon)
-				: this.addMarker(mylatLng, this.map, carrierIcon);
 		});
+		this.drawOrderRoutes();
+	}
+
+	filterDisplayedCarriers() {
+		let filteredCarriers = this.carriers;
+		if (this.showActiveOnly && this.carriers.length > 1) {
+			filteredCarriers = filteredCarriers.filter(
+				(car) => car.status === 0
+			);
+		}
+
+		if (this.showAssignedOnly && this.carriers.length > 1) {
+			filteredCarriers = filteredCarriers.filter(
+				(car) => car.shared === false
+			);
+		}
+		this.carrierListDropdown = filteredCarriers;
+		this.carriersOnDisplay = filteredCarriers;
+	}
+
+	loadGoogleMaps() {
+		this.loadingMap = true;
+		const initialCoords = new google.maps.LatLng(42.7089136, 23.3702736);
+
+		const mapProp = {
+			center: initialCoords,
+			zoom: 13,
+			mapTypeId: google.maps.MapTypeId.ROADMAP
+		};
+
+		this.map = new google.maps.Map(this.gmapElement.nativeElement, mapProp);
 		this.loadingMap = false;
 	}
 
@@ -223,15 +295,17 @@ export class TrackPage implements OnInit, OnDestroy {
 		map: google.maps.Map,
 		icon: string
 	) {
-		return new google.maps.Marker({
+		const marker = new google.maps.Marker({
 			position,
 			map,
 			icon
 		});
+		this.markers.push(marker);
 	}
 
 	refreshMap() {
-		this.loadMap(this.carriers);
+		this.filterDisplayedCarriers();
+		this.renderCarriers(this.carriersOnDisplay);
 	}
 
 	ngOnDestroy() {
diff --git a/merchant/tablet-ionic/src/services/orders.service.ts b/merchant/tablet-ionic/src/services/orders.service.ts
index 0eac5fe53..e491b0651 100644
--- a/merchant/tablet-ionic/src/services/orders.service.ts
+++ b/merchant/tablet-ionic/src/services/orders.service.ts
@@ -2,6 +2,8 @@ import { Injectable } from '@angular/core';
 import { Apollo } from 'apollo-angular';
 import gql from 'graphql-tag';
 import { map, share } from 'rxjs/operators';
+import Order from '@modules/server.common/entities/Order';
+import { Observable } from 'rxjs';
 
 @Injectable()
 export class OrdersService {
@@ -46,4 +48,22 @@ export class OrdersService {
 				share()
 			);
 	}
+	getOrders(): Observable<Order[]> {
+		return this._apollo
+			.watchQuery<{ orders: Order[] }>({
+				query: gql`
+					query Orders {
+						orders {
+							carrierId
+							isCompleted
+						}
+					}
+				`,
+				pollInterval: 4000
+			})
+			.valueChanges.pipe(
+				map((res) => res.data.orders),
+				share()
+			);
+	}
 }
diff --git a/merchant/tablet-ionic/src/services/warehouse-orders.service.ts b/merchant/tablet-ionic/src/services/warehouse-orders.service.ts
index 07bcd2362..b36cd4fe3 100644
--- a/merchant/tablet-ionic/src/services/warehouse-orders.service.ts
+++ b/merchant/tablet-ionic/src/services/warehouse-orders.service.ts
@@ -205,4 +205,34 @@ export class WarehouseOrdersService {
 
 		return res.data['removeUserOrders'];
 	}
+	async getOrdersInDelivery(storeId: string) {
+		const res = await this._apollo
+			.query({
+				query: gql`
+					query GetOrdersInDelivery($storeId: String!) {
+						getOrdersInDelivery(storeId: $storeId) {
+							carrier {
+								id
+								geoLocation {
+									loc {
+										coordinates
+									}
+								}
+							}
+							user {
+								geoLocation {
+									loc {
+										coordinates
+									}
+								}
+							}
+						}
+					}
+				`,
+				variables: { storeId }
+			})
+			.toPromise();
+
+		return res.data['getOrdersInDelivery'];
+	}
 }

From fde400997d4e75a184b322868b77312a793f371a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 29 Mar 2019 15:54:32 +0200
Subject: [PATCH 017/382] feat(ever-admin): added step "Account", in Setup
 Merchants page - Admin app EV-1188

---
 .../components/account/account.component.html | 151 ++++++++++++++++++
 .../components/account/account.component.scss |   5 +
 .../components/account/account.component.ts   |  26 +++
 .../components/components.module.ts           |  20 +++
 .../+merchants/merchants.component.html       |  12 +-
 .../+setup/+merchants/merchants.module.ts     |   4 +-
 6 files changed, 215 insertions(+), 3 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
new file mode 100644
index 000000000..813c9a2e2
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
@@ -0,0 +1,151 @@
+<nb-card class="setup-merchant-account">
+	<nb-card-header>Account</nb-card-header>
+	<nb-card-body>
+		<form class="row m-0" #accountForm="ngForm">
+			<div class="form-group col-md-6">
+				<label for="email">Email address</label>
+				<input
+					nbInput
+					type="email"
+					class="form-control"
+					id="email"
+					name="email-input"
+					placeholder="Email"
+					[(ngModel)]="account.email"
+					#email="ngModel"
+					[ngClass]="{
+						'input-danger':
+							email.invalid && (email.dirty || email.touched),
+						'input-success':
+							email.valid && (email.dirty || email.touched)
+					}"
+					required
+					email
+				/>
+				<small
+					class="text-danger"
+					*ngIf="email.invalid && (email.dirty || email.touched)"
+				>
+					<span *ngIf="email.errors.required">Email is required</span>
+					<span *ngIf="email.errors.email"
+						>Email must be a valid email address</span
+					>
+				</small>
+			</div>
+			<div class="form-group col-md-6">
+				<label for="username">Username</label>
+				<input
+					nbInput
+					type="text"
+					class="form-control"
+					id="username"
+					name="username-input"
+					placeholder="Username"
+					[(ngModel)]="account.username"
+					#username="ngModel"
+					[ngClass]="{
+						'input-danger':
+							username.invalid &&
+							(username.dirty || username.touched),
+						'input-success':
+							username.valid &&
+							(username.dirty || username.touched)
+					}"
+					required
+					minlength="3"
+				/>
+				<small
+					class="text-danger"
+					*ngIf="
+						username.invalid && (username.dirty || username.touched)
+					"
+				>
+					<span *ngIf="username.errors.required"
+						>Username is required</span
+					>
+					<span *ngIf="username.errors.minlength"
+						>Username must be at least 3 characters</span
+					>
+				</small>
+			</div>
+			<div class="form-group col-md-6">
+				<label for="pass">Password</label>
+				<input
+					nbInput
+					type="password"
+					class="form-control"
+					id="pass"
+					name="pass-input"
+					[(ngModel)]="account.password"
+					#password="ngModel"
+					placeholder="Password"
+					[ngClass]="{
+						'input-danger':
+							password.invalid &&
+							(password.dirty || password.touched),
+						'input-success':
+							password.valid &&
+							(password.dirty || password.touched)
+					}"
+					minlength="4"
+					required
+				/>
+				<small
+					class="text-danger"
+					*ngIf="
+						password.invalid && (password.dirty || password.touched)
+					"
+				>
+					<span *ngIf="password.errors.required"
+						>Password is required</span
+					>
+					<span *ngIf="password.errors.minlength"
+						>Password must be at least 4 characters</span
+					>
+				</small>
+			</div>
+			<div class="form-group col-md-6">
+				<label for="r-pass">Repeat password</label>
+				<input
+					nbInput
+					type="password"
+					class="form-control"
+					id="rPass"
+					name="r-pass-input"
+					[(ngModel)]="account.repeatPassword"
+					#rPassword="ngModel"
+					placeholder="Repeat password"
+					[ngClass]="{
+						'input-danger':
+							(rPassword.invalid ||
+								rPassword.value !== password.value) &&
+							(rPassword.dirty || rPassword.touched),
+						'input-success':
+							rPassword.value === password.value &&
+							(rPassword.dirty || rPassword.touched)
+					}"
+					required
+				/>
+				<small
+					class="text-danger"
+					*ngIf="
+						(rPassword.invalid ||
+							rPassword.value !== password.value) &&
+						(rPassword.dirty || rPassword.touched)
+					"
+				>
+					<span *ngIf="rPassword.errors?.required"
+						>Repeat password is required</span
+					>
+					<span
+						*ngIf="
+							!rPassword.errors?.required &&
+							rPassword.value !== password.value
+						"
+						>Passwords do not match</span
+					>
+				</small>
+			</div>
+		</form>
+	</nb-card-body>
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.scss
new file mode 100644
index 000000000..e36c87480
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.scss
@@ -0,0 +1,5 @@
+.setup-merchant-account {
+	nb-card-body {
+		text-align: left;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
new file mode 100644
index 000000000..95bd628ff
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
@@ -0,0 +1,26 @@
+import { Component, ViewChild } from '@angular/core';
+import { NgForm } from '@angular/forms';
+
+@Component({
+	selector: 'ea-merchants-setup-account',
+	templateUrl: './account.component.html',
+	styleUrls: ['./account.component.scss']
+})
+export class AccountComponent {
+	@ViewChild('accountForm')
+	accountForm: NgForm;
+
+	account = {
+		email: '',
+		username: '',
+		password: '',
+		repeatPassword: ''
+	};
+
+	get formValid() {
+		return (
+			this.accountForm.valid &&
+			this.account.password === this.account.repeatPassword
+		);
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
new file mode 100644
index 000000000..5c1263993
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ThemeModule } from 'app/@theme';
+import { TranslateModule } from '@ngx-translate/core';
+import { AccountComponent } from './account/account.component';
+import { FormsModule } from '@angular/forms';
+
+const COMPONENTS = [AccountComponent];
+
+@NgModule({
+	imports: [
+		CommonModule,
+		ThemeModule,
+		FormsModule,
+		TranslateModule.forChild()
+	],
+	declarations: COMPONENTS,
+	exports: COMPONENTS
+})
+export class SetupMerchantsComponentsModule {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index adb88553b..293e96e91 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -5,12 +5,20 @@
 				<nb-card-body>
 					<nb-stepper #nbStepper orientation="vertical">
 						<nb-step label="Account">
-							<h3>Account</h3>
+							<ea-merchants-setup-account
+								#account
+							></ea-merchants-setup-account>
 
 							<button nbButton disabled nbStepperNext>
 								PREV
 							</button>
-							<button nbButton nbStepperNext>NEXT</button>
+							<button
+								nbButton
+								nbStepperNext
+								[disabled]="!account.formValid"
+							>
+								NEXT
+							</button>
 						</nb-step>
 						<nb-step label="Basic info">
 							<h3>Basic info</h3>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index ec1c3e841..dc6c5b232 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -6,6 +6,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { SetupMerchantsComponent } from './merchants.component';
 import { NbStepperModule } from '@nebular/theme';
 import { MerchantsSetupInstructionsComponent } from './instructions/instructions.component';
+import { SetupMerchantsComponentsModule } from './components/components.module';
 
 const routes: Routes = [
 	{
@@ -20,7 +21,8 @@ const routes: Routes = [
 		ThemeModule,
 		RouterModule.forChild(routes),
 		TranslateModule.forChild(),
-		NbStepperModule
+		NbStepperModule,
+		SetupMerchantsComponentsModule
 	],
 	declarations: [SetupMerchantsComponent, MerchantsSetupInstructionsComponent]
 })

From e4d7ef422ba3a2429278b4a5bb5f703388bdd576 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 29 Mar 2019 16:00:59 +0200
Subject: [PATCH 018/382] fix(ever-admin): small validation fix in Setup
 Merchants page Account step - Admin app EV-1188

---
 .../+merchants/components/account/account.component.html      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
index 813c9a2e2..2baaf731c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
@@ -118,10 +118,12 @@
 					[ngClass]="{
 						'input-danger':
 							(rPassword.invalid ||
-								rPassword.value !== password.value) &&
+								rPassword.value !== password.value ||
+								password.invalid) &&
 							(rPassword.dirty || rPassword.touched),
 						'input-success':
 							rPassword.value === password.value &&
+							password.valid &&
 							(rPassword.dirty || rPassword.touched)
 					}"
 					required

From 41f9d89f496eea46683946829aef2964bec11937 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 29 Mar 2019 16:10:01 +0200
Subject: [PATCH 019/382] fix(ever-admin): path on instructions component in
 Setup Merchants page - Admin app EV-1188

---
 .../instructions/instructions.component.html                | 6 +++++-
 .../{ => components}/instructions/instructions.component.ts | 0
 .../src/app/pages/+setup/+merchants/merchants.module.ts     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename admin/website-angular/src/app/pages/+setup/+merchants/{ => components}/instructions/instructions.component.html (50%)
 rename admin/website-angular/src/app/pages/+setup/+merchants/{ => components}/instructions/instructions.component.ts (100%)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
similarity index 50%
rename from admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.html
rename to admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index 39ba7f9fc..a54847a97 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -2,5 +2,9 @@
 	<nb-card-header>
 		<h5>How to setup {{ stepper.selected.label }}?</h5>
 	</nb-card-header>
-	<nb-card-body> </nb-card-body>
+	<nb-card-body>
+		<div *ngIf="stepper.index === 0">
+			TODO add translate for Account
+		</div>
+	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.ts
similarity index 100%
rename from admin/website-angular/src/app/pages/+setup/+merchants/instructions/instructions.component.ts
rename to admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.ts
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index dc6c5b232..7e39d68b4 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -5,8 +5,8 @@ import { RouterModule, Routes } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { SetupMerchantsComponent } from './merchants.component';
 import { NbStepperModule } from '@nebular/theme';
-import { MerchantsSetupInstructionsComponent } from './instructions/instructions.component';
 import { SetupMerchantsComponentsModule } from './components/components.module';
+import { MerchantsSetupInstructionsComponent } from './components/instructions/instructions.component';
 
 const routes: Routes = [
 	{

From 6ee322acc4e82d1ab424a2d84a9eb3eb27aa0cba Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 29 Mar 2019 16:12:36 +0200
Subject: [PATCH 020/382] fix(ever-merchant): small TODO fix

---
 .../components/instructions/instructions.component.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index a54847a97..f95dc007d 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -4,7 +4,7 @@ <h5>How to setup {{ stepper.selected.label }}?</h5>
 	</nb-card-header>
 	<nb-card-body>
 		<div *ngIf="stepper.index === 0">
-			TODO add translate for Account
+			TODO add instructions for Account
 		</div>
 	</nb-card-body>
 </nb-card>

From 0c4d5142e9c8653633f9b83637f8c834dfaaa22d Mon Sep 17 00:00:00 2001
From: blagovest <blagovest@ever.co>
Date: Fri, 29 Mar 2019 16:15:03 +0200
Subject: [PATCH 021/382] feat(ever-carrier): add translates EV-1185

---
 carrier/mobile-ionic/src/assets/i18n/bg.json       |  7 +++++--
 carrier/mobile-ionic/src/assets/i18n/en.json       |  7 +++++--
 carrier/mobile-ionic/src/assets/i18n/he.json       |  7 +++++--
 carrier/mobile-ionic/src/assets/i18n/ru.json       |  7 +++++--
 .../mobile-ionic/src/pages/language/language.html  | 14 ++++++++------
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/carrier/mobile-ionic/src/assets/i18n/bg.json b/carrier/mobile-ionic/src/assets/i18n/bg.json
index 944210df2..64b2c9161 100644
--- a/carrier/mobile-ionic/src/assets/i18n/bg.json
+++ b/carrier/mobile-ionic/src/assets/i18n/bg.json
@@ -5,7 +5,6 @@
 	},
 	"CURRENT_DIRECTION": "ltr",
 	"SIDEBAR_SIDE": "left",
-
 	"MAIN_VIEW": {
 		"EVERCO_DRIVER": "Шофьор"
 	},
@@ -64,7 +63,11 @@
 		"TITLE": "Условия за ползване"
 	},
 	"LANGUAGE_VIEW": {
-		"TITLE": "Изберете език"
+		"TITLE": "Изберете език",
+		"ENGLISH": "Английски",
+		"BULGARIAN": "Български",
+		"HEBREW": "Иврит",
+		"RUSSIAN": "Руски"
 	},
 	"LIST_VIEW": {
 		"YOU_NAVIGATED_HERE_FROM": "От тук сте навигирали"
diff --git a/carrier/mobile-ionic/src/assets/i18n/en.json b/carrier/mobile-ionic/src/assets/i18n/en.json
index 88f483528..689e67481 100644
--- a/carrier/mobile-ionic/src/assets/i18n/en.json
+++ b/carrier/mobile-ionic/src/assets/i18n/en.json
@@ -5,7 +5,6 @@
 	},
 	"CURRENT_DIRECTION": "ltr",
 	"SIDEBAR_SIDE": "left",
-
 	"MAIN_VIEW": {
 		"EVERCO_DRIVER": "Carrier"
 	},
@@ -64,7 +63,11 @@
 		"TITLE": "Terms of Use"
 	},
 	"LANGUAGE_VIEW": {
-		"TITLE": "Select language"
+		"TITLE": "Select language",
+		"ENGLISH": "English",
+		"BULGARIAN": "Bulgarian",
+		"HEBREW": "Hebrew",
+		"RUSSIAN": "Rusian"
 	},
 	"LIST_VIEW": {
 		"YOU_NAVIGATED_HERE_FROM": "You navigated here from"
diff --git a/carrier/mobile-ionic/src/assets/i18n/he.json b/carrier/mobile-ionic/src/assets/i18n/he.json
index 6f724d6fc..51d90cd1a 100644
--- a/carrier/mobile-ionic/src/assets/i18n/he.json
+++ b/carrier/mobile-ionic/src/assets/i18n/he.json
@@ -5,7 +5,6 @@
 	},
 	"CURRENT_DIRECTION": "rtl",
 	"SIDEBAR_SIDE": "right",
-
 	"MAIN_VIEW": {
 		"EVERCO_DRIVER": "נהג"
 	},
@@ -64,7 +63,11 @@
 		"TITLE": "תנאי שימוש"
 	},
 	"LANGUAGE_VIEW": {
-		"TITLE": "בחירת שפה"
+		"TITLE": "בחירת שפה",
+		"ENGLISH": "אנגלית",
+		"BULGARIAN": "בולגרית",
+		"HEBREW": "עברית",
+		"RUSSIAN": "רוסית"
 	},
 	"LIST_VIEW": {
 		"YOU_NAVIGATED_HERE_FROM": "אתה מנווט כאן מ"
diff --git a/carrier/mobile-ionic/src/assets/i18n/ru.json b/carrier/mobile-ionic/src/assets/i18n/ru.json
index 654815815..0fd611c7b 100644
--- a/carrier/mobile-ionic/src/assets/i18n/ru.json
+++ b/carrier/mobile-ionic/src/assets/i18n/ru.json
@@ -5,7 +5,6 @@
 	},
 	"CURRENT_DIRECTION": "ltr",
 	"SIDEBAR_SIDE": "left",
-
 	"MAIN_VIEW": {
 		"EVERCO_DRIVER": "Курьер"
 	},
@@ -64,7 +63,11 @@
 		"TITLE": "Условия эксплуатации"
 	},
 	"LANGUAGE_VIEW": {
-		"TITLE": "Выберите язык"
+		"TITLE": "Выберите язык",
+		"ENGLISH": "Английский",
+		"BULGARIAN": "Болгарский",
+		"HEBREW": "Иврит",
+		"RUSSIAN": "Русский"
 	},
 	"LIST_VIEW": {
 		"YOU_NAVIGATED_HERE_FROM": "Вы перешли сюда из"
diff --git a/carrier/mobile-ionic/src/pages/language/language.html b/carrier/mobile-ionic/src/pages/language/language.html
index 6d86e9593..4ba0a0c61 100644
--- a/carrier/mobile-ionic/src/pages/language/language.html
+++ b/carrier/mobile-ionic/src/pages/language/language.html
@@ -18,22 +18,24 @@
 	<div class="content">
 		<ion-radio-group [(ngModel)]="language" (ionChange)="languageChange()">
 			<ion-item>
-				<ion-label>Български</ion-label>
-				<ion-radio value="bg-BG"></ion-radio>
+				<ion-label>{{ 'LANGUAGE_VIEW.ENGLISH' | translate }}</ion-label>
+				<ion-radio value="en-US"></ion-radio>
 			</ion-item>
 
 			<ion-item>
-				<ion-label>English</ion-label>
-				<ion-radio value="en-US"></ion-radio>
+				<ion-label
+					>{{ 'LANGUAGE_VIEW.BULGARIAN' | translate }}</ion-label
+				>
+				<ion-radio value="bg-BG"></ion-radio>
 			</ion-item>
 
 			<ion-item>
-				<ion-label>עברית</ion-label>
+				<ion-label>{{ 'LANGUAGE_VIEW.HEBREW' | translate }}</ion-label>
 				<ion-radio value="he-IL"></ion-radio>
 			</ion-item>
 
 			<ion-item>
-				<ion-label>Русский</ion-label>
+				<ion-label>{{ 'LANGUAGE_VIEW.RUSSIAN' | translate }}</ion-label>
 				<ion-radio value="ru-RU"></ion-radio>
 			</ion-item>
 		</ion-radio-group>

From e7035cdccad1db5159970e061383a2043a22ae7a Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@ever.co>
Date: Fri, 29 Mar 2019 16:39:08 +0200
Subject: [PATCH 022/382] refactor(ever-merchant): fixed formatting issues

---
 merchant/tablet-ionic/src/services/warehouse-orders.service.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/merchant/tablet-ionic/src/services/warehouse-orders.service.ts b/merchant/tablet-ionic/src/services/warehouse-orders.service.ts
index b36cd4fe3..c3bd88356 100644
--- a/merchant/tablet-ionic/src/services/warehouse-orders.service.ts
+++ b/merchant/tablet-ionic/src/services/warehouse-orders.service.ts
@@ -205,6 +205,7 @@ export class WarehouseOrdersService {
 
 		return res.data['removeUserOrders'];
 	}
+
 	async getOrdersInDelivery(storeId: string) {
 		const res = await this._apollo
 			.query({

From 7b35d4256d0fa1f4f1ba327bef3fca66b5f83edb Mon Sep 17 00:00:00 2001
From: blagovest <blagovest@ever.co>
Date: Fri, 29 Mar 2019 16:40:44 +0200
Subject: [PATCH 023/382] feat(ever-carrier): add translates EV-1185

---
 carrier/mobile-ionic/src/pages/language/language.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/carrier/mobile-ionic/src/pages/language/language.html b/carrier/mobile-ionic/src/pages/language/language.html
index 4ba0a0c61..3f885dc15 100644
--- a/carrier/mobile-ionic/src/pages/language/language.html
+++ b/carrier/mobile-ionic/src/pages/language/language.html
@@ -13,7 +13,6 @@
 	</div>
 </ion-header>
 
-<!-- TODO add translate -->
 <ion-content scroll="false" padding class="language-content">
 	<div class="content">
 		<ion-radio-group [(ngModel)]="language" (ionChange)="languageChange()">

From 2087a0081bee44376567f4d2fe4f1600dabb2ef5 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 29 Mar 2019 17:03:36 +0200
Subject: [PATCH 024/382] feat(ever-admin): initialize step "Basic info", in
 Setup Merchants page - Admin app EV-1189

---
 .../basic-info/basic-info.component.html      | 37 +++++++++++++++++++
 .../basic-info/basic-info.component.scss      |  5 +++
 .../basic-info/basic-info.component.ts        | 16 ++++++++
 .../components/components.module.ts           |  3 +-
 .../instructions/instructions.component.html  |  3 ++
 .../+merchants/merchants.component.html       |  2 +-
 6 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
new file mode 100644
index 000000000..3918c2b42
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
@@ -0,0 +1,37 @@
+<nb-card class="setup-merchant-basic-info">
+	<nb-card-header>Basic info</nb-card-header>
+	<nb-card-body>
+		<form class="row m-0" #basicInfoForm="ngForm">
+			<div class="form-group col-md-6">
+				<label for="name">Name</label>
+				<input
+					nbInput
+					type="text"
+					class="form-control"
+					id="name"
+					name="name-input"
+					placeholder="Name"
+					[(ngModel)]="basicInfo.name"
+					#name="ngModel"
+					[ngClass]="{
+						'input-danger':
+							name.invalid && (name.dirty || name.touched),
+						'input-success':
+							name.valid && (name.dirty || name.touched)
+					}"
+					required
+					minlength="4"
+				/>
+				<small
+					class="text-danger"
+					*ngIf="name.invalid && (name.dirty || name.touched)"
+				>
+					<span *ngIf="name.errors.required">Name is required</span>
+					<span *ngIf="name.errors.minlength"
+						>Name must be at least 4 characters</span
+					>
+				</small>
+			</div>
+		</form>
+	</nb-card-body>
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss
new file mode 100644
index 000000000..b91331c86
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss
@@ -0,0 +1,5 @@
+.setup-merchant-basic-info {
+	nb-card-body {
+		text-align: left;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
new file mode 100644
index 000000000..11bc02fc4
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -0,0 +1,16 @@
+import { Component, ViewChild } from '@angular/core';
+import { NgForm } from '@angular/forms';
+
+@Component({
+	selector: 'ea-merchants-setup-basic-info',
+	templateUrl: './basic-info.component.html',
+	styleUrls: ['./basic-info.component.scss']
+})
+export class BasicInfoComponent {
+	@ViewChild('basicInfoForm')
+	basicInfoForm: NgForm;
+
+	basicInfo = {
+		name: ''
+	};
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 5c1263993..b7dc11337 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -4,8 +4,9 @@ import { ThemeModule } from 'app/@theme';
 import { TranslateModule } from '@ngx-translate/core';
 import { AccountComponent } from './account/account.component';
 import { FormsModule } from '@angular/forms';
+import { BasicInfoComponent } from './basic-info/basic-info.component';
 
-const COMPONENTS = [AccountComponent];
+const COMPONENTS = [AccountComponent, BasicInfoComponent];
 
 @NgModule({
 	imports: [
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index f95dc007d..1c5ab1e0b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -6,5 +6,8 @@ <h5>How to setup {{ stepper.selected.label }}?</h5>
 		<div *ngIf="stepper.index === 0">
 			TODO add instructions for Account
 		</div>
+		<div *ngIf="stepper.index === 1">
+			TODO add instructions for Basic info
+		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 293e96e91..651d2d03f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -21,7 +21,7 @@
 							</button>
 						</nb-step>
 						<nb-step label="Basic info">
-							<h3>Basic info</h3>
+							<ea-merchants-setup-basic-info></ea-merchants-setup-basic-info>
 
 							<button nbButton nbStepperPrevious>PREV</button>
 							<button nbButton nbStepperNext>NEXT</button>

From 05577dd3216f9014ff9dbd8e44f20e37f09879c0 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 29 Mar 2019 20:14:47 +0300
Subject: [PATCH 025/382] fix(ever-merchant): TrackPage property should be
 public

---
 merchant/tablet-ionic/src/pages/+track/track.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/merchant/tablet-ionic/src/pages/+track/track.ts b/merchant/tablet-ionic/src/pages/+track/track.ts
index 322234b4b..b74fe4f43 100644
--- a/merchant/tablet-ionic/src/pages/+track/track.ts
+++ b/merchant/tablet-ionic/src/pages/+track/track.ts
@@ -22,15 +22,14 @@ declare var google: any;
 	styleUrls: ['./track.scss']
 })
 export class TrackPage implements OnInit, OnDestroy {	    
-	private carriersOnDisplay: Carrier[];
-	private carrierListDropdown: Carrier[];
+	private carriersOnDisplay: Carrier[];	
 	private carriers$: Subscription;
 	private warehouse$: Subscription;
 	private params$: Subscription;
 	private warehouseCoordinates: any;
 	private orders$: Subscription;
 	private _ngDestroy$ = new Subject<void>();
-  
+	
 	map: google.maps.Map;
 	selectedCarrier: Carrier;
 	carriers: Carrier[];    
@@ -47,6 +46,7 @@ export class TrackPage implements OnInit, OnDestroy {
 	sharedCarrierIcon = 'http://maps.google.com/mapfiles/kml/pal4/icon23.png';
 	userIcon = 'http://maps.google.com/mapfiles/kml/pal3/icon48.png';
 	carrierIcon = 'http://maps.google.com/mapfiles/kml/pal4/icon54.png';
+	carrierListDropdown: Carrier[];
 	sharedCarrierListId: string[];
   
   @ViewChild('gmap')

From 0c93e86d51e33c66b1a00301f31e31b8ee7a05e0 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:03:48 +0000
Subject: [PATCH 026/382] chore(package): update @angular/cli to version 7.3.7

---
 admin/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index dd97e5d0d..4a1241100 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -149,7 +149,7 @@
 	"devDependencies": {
 		"conventional-changelog-cli": "^2.0.11",
 		"@angular-devkit/build-angular": "^0.13.1",
-		"@angular/cli": "^7.3.1",
+		"@angular/cli": "^7.3.7",
 		"@angular/compiler-cli": "^7.2.4",
 		"@angular/language-service": "^7.2.4",
 		"@babel/core": "^7.2.2",

From 49fffbf295662aed4c3dabadbe3877b3a99951d7 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:03:51 +0000
Subject: [PATCH 027/382] chore(package): update @angular/cli to version 7.3.7

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 3d778b353..b3539ee87 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -161,7 +161,7 @@
 		"@angular-devkit/build-angular": "~0.13.6",
 		"@angular-devkit/core": "~7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.6",
+		"@angular/cli": "^7.3.7",
 		"@angular/compiler": "^7.2.10",
 		"@angular/compiler-cli": "^7.2.10",
 		"@angular/language-service": "^7.2.10",

From d7a741e35f2265399cdbf02b66ed226d2d126df1 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:03:54 +0000
Subject: [PATCH 028/382] chore(package): update @angular/cli to version 7.3.7

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 3c8c2f2a1..1bdb91233 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -174,7 +174,7 @@
 		"@angular-devkit/build-angular": "^0.13.6",
 		"@angular-devkit/core": "^7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.6",
+		"@angular/cli": "^7.3.7",
 		"@angular/compiler": "^7.2.9",
 		"@angular/compiler-cli": "^7.2.9",
 		"@angular/language-service": "^7.2.9",

From 4d99f12f8ea2aefa029fe9f04d5e043d86f1d068 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:03:57 +0000
Subject: [PATCH 029/382] chore(package): update @angular/cli to version 7.3.7

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 7dd9334e2..d219db72f 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -149,7 +149,7 @@
 		"@angular-devkit/build-angular": "~0.13.6",
 		"@angular-devkit/core": "~7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.6",
+		"@angular/cli": "^7.3.7",
 		"@angular/compiler": "~7.2.10",
 		"@angular/compiler-cli": "~7.2.10",
 		"@angular/language-service": "^7.2.10",

From c692e42b627f16095c3599094cdfca295741d890 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:04:00 +0000
Subject: [PATCH 030/382] chore(package): update @angular/cli to version 7.3.7

---
 shop/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 976f104e3..0b8760af7 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -164,7 +164,7 @@
 		"@angular-devkit/build-angular": "^0.13.4",
 		"@angular-devkit/build-optimizer": "^0.13.4",
 		"@angular-extensions/testing-library": "^3.1.0",
-		"@angular/cli": "^7.3.4",
+		"@angular/cli": "^7.3.7",
 		"@angular/compiler-cli": "^7.2.7",
 		"@angular/language-service": "^7.2.7",
 		"@compodoc/compodoc": "^1.1.9",

From 95996dfad5dca5adc0dbabf928a365102737a30f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:04:04 +0000
Subject: [PATCH 031/382] chore(package): update lockfile
 shop/website-angular/yarn.lock

---
 shop/website-angular/yarn.lock | 71 +++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 26 deletions(-)

diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index fa4b8abbd..a2b1fba29 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -15,6 +15,14 @@
     "@angular-devkit/core" "7.3.4"
     rxjs "6.3.3"
 
+"@angular-devkit/architect@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
+  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
 "@angular-devkit/build-angular@^0.13.4":
   version "0.13.4"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.4.tgz#f8b12bfae1d80b0aafc916f04b42a79b30c4cf7c"
@@ -97,12 +105,23 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.4.tgz#918c9349835f3a4c9a7128ebcda0738b623fc89e"
-  integrity sha512-BLI4MDHmpzw+snu/2Dw1nMmfJ0VAARTbU6DrmzXyl2Se45+iE/tdRy4yNx3IfHhyoCrVZ15R0y9CXeEsLftlIg==
+"@angular-devkit/core@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
   dependencies:
-    "@angular-devkit/core" "7.3.4"
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
+  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
 "@angular-extensions/testing-library@^3.1.0":
@@ -129,16 +148,16 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.4.tgz#6bd2214c71391bdd07de806a2ca2777da2e3fd2a"
-  integrity sha512-uGL8xiQf+GvuJvqvMUu/XHcijbq9ocbX487LO2PgJ29etHfI7dC0toJbQ8ob+HnF9e1qwMe+uu45OU4C2p+a1A==
+"@angular/cli@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
+  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
   dependencies:
-    "@angular-devkit/architect" "0.13.4"
-    "@angular-devkit/core" "7.3.4"
-    "@angular-devkit/schematics" "7.3.4"
-    "@schematics/angular" "7.3.4"
-    "@schematics/update" "0.13.4"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
+    "@schematics/update" "0.13.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
@@ -400,22 +419,22 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@schematics/angular@7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.4.tgz#ba36efdd5474b793eb693d47772f998e6bd6043e"
-  integrity sha512-Bb5DZQ8MeP8yhxPe6nVqyQ7sGVNwUx6nXPlrQV45ZycD3nJlqsuxr2DE75HFpn5oU+vlkq9J/Sys4WLJ4E/OMw==
+"@schematics/angular@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
+  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
   dependencies:
-    "@angular-devkit/core" "7.3.4"
-    "@angular-devkit/schematics" "7.3.4"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     typescript "3.2.4"
 
-"@schematics/update@0.13.4":
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.4.tgz#a6e3b2a546940e647beef9d9e5e2e73e2f16f53d"
-  integrity sha512-YarSCCBSVPVG/MyN5H/FliRwaIDoeercy5Nip+NWZJsDyvtsAekO9s6QwizSvAr3541MmSQFeQICsjyM2dl3Bg==
+"@schematics/update@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
+  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
   dependencies:
-    "@angular-devkit/core" "7.3.4"
-    "@angular-devkit/schematics" "7.3.4"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"

From 78856d1d53d5282c164a2293693f23f66cc72921 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:04:09 +0000
Subject: [PATCH 032/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18357 +++++++++++---------------
 1 file changed, 7744 insertions(+), 10613 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index a46cfc435..797b7de3a 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -5,25 +5,27 @@
 	"requires": true,
 	"dependencies": {
 		"@angular-builders/custom-webpack": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.2.0.tgz",
-			"integrity": "sha512-m6K1T7rDofyxxxgRdAHEUfjbvu8G3RL3XKeAieDbbHSRhsptEAgYdBx5BpkW+xrrfgX5TWG6AZaEgfPNlJtbAA==",
+			"version": "7.4.3",
+			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.4.3.tgz",
+			"integrity": "sha512-dizPcKBSdgM8ztVbhOdVxHnfV/FBkTi1ZirsxWaw1B0S0KuPTESnsJaZA15i8Y2l202hCPs5fJfqy5aCoRrs1Q==",
+			"dev": true,
 			"requires": {
 				"lodash": "^4.17.10"
 			}
 		},
 		"@angular-builders/dev-server": {
-			"version": "7.2.1",
-			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.2.1.tgz",
-			"integrity": "sha512-hQZD/aB/jMq4Yf3+lkkGpU8OFAQwZ+S+422P+m2NkZ40+UXLsJpVzDRFMcL0GGObjwTxhxrmw6wFUk+2V5TwIg=="
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.3.1.tgz",
+			"integrity": "sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==",
+			"dev": true
 		},
 		"@angular-devkit/architect": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.0.tgz",
-			"integrity": "sha512-oDBrWlfKh/0t2ag4T8gz9xzPMItxfctinlsHxhw7dPQ+etq1mIcWgQkiKiDrz4l46YiGipBRlC55j+6f37omAA==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.7.tgz",
+			"integrity": "sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
+				"@angular-devkit/core": "7.3.7",
 				"rxjs": "6.3.3"
 			},
 			"dependencies": {
@@ -39,24 +41,23 @@
 			}
 		},
 		"@angular-devkit/build-angular": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.0.tgz",
-			"integrity": "sha512-JjoSXbmwOsuDJxngyChr6aOSZ2qsrvSL1MHwqgXhZswmC/KghBF0aZ7y8Wzr27zDCQ174Axts7+IAk6b+aWIqw==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz",
+			"integrity": "sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/build-optimizer": "0.13.0",
-				"@angular-devkit/build-webpack": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@ngtools/webpack": "7.3.0",
-				"ajv": "6.7.0",
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/build-optimizer": "0.13.7",
+				"@angular-devkit/build-webpack": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@ngtools/webpack": "7.3.7",
+				"ajv": "6.9.1",
 				"autoprefixer": "9.4.6",
 				"circular-dependency-plugin": "5.0.2",
 				"clean-css": "4.2.1",
 				"copy-webpack-plugin": "4.6.0",
 				"file-loader": "3.0.1",
 				"glob": "7.1.3",
-				"istanbul": "0.4.5",
 				"istanbul-instrumenter-loader": "3.0.1",
 				"karma-source-map-support": "1.3.0",
 				"less": "3.9.0",
@@ -77,12 +78,12 @@
 				"semver": "5.6.0",
 				"source-map-loader": "0.2.4",
 				"source-map-support": "0.5.10",
-				"speed-measure-webpack-plugin": "1.3.0",
+				"speed-measure-webpack-plugin": "1.3.1",
 				"stats-webpack-plugin": "0.7.0",
 				"style-loader": "0.23.1",
 				"stylus": "0.54.5",
 				"stylus-loader": "3.0.2",
-				"terser-webpack-plugin": "1.2.1",
+				"terser-webpack-plugin": "1.2.2",
 				"tree-kill": "1.2.1",
 				"webpack": "4.29.0",
 				"webpack-dev-middleware": "3.5.1",
@@ -92,2094 +93,1378 @@
 				"webpack-subresource-integrity": "1.1.0-rc.6"
 			},
 			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.0.tgz",
-					"integrity": "sha512-fhWuzbMVV/UNYE7rHSKutrWTCZle34N5cdtFz6qhK1k/wn7Vmtg9cFOwzx0SPdIlOEn576NB4DS/4UG3B5WCUQ==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "1.2.3",
-						"source-map": "0.5.6",
-						"typescript": "3.2.4",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"@angular-devkit/build-webpack": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.0.tgz",
-					"integrity": "sha512-idtFoSbQ3Y3WqXlDlU7oTPV9TIU1kjLqce0nK1Kst+t40GTc+Q4iUJJ7KsKE3nV6TPyrL1N/IvIF7+hSJnYm8A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/architect": "0.13.0",
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
-					}
-				},
-				"@ngtools/webpack": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.0.tgz",
-					"integrity": "sha512-U/By0Jlwy7nYwrGNtFirTg1aAsEHBL/9DhfFxPI0iu27FWiMttROuN6hmKbbnOmpbiYAVl5qTy3WXPXUIJjG1A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"enhanced-resolve": "4.1.0",
-						"rxjs": "6.3.3",
-						"tree-kill": "1.2.1",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"abbrev": {
-					"version": "1.0.9",
-					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-					"integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
 				"cacache": {
-					"version": "10.0.4",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-					"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"bluebird": "^3.5.1",
-						"chownr": "^1.0.1",
-						"glob": "^7.1.2",
-						"graceful-fs": "^4.1.11",
-						"lru-cache": "^4.1.1",
-						"mississippi": "^2.0.0",
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
 						"mkdirp": "^0.5.1",
 						"move-concurrently": "^1.0.1",
 						"promise-inflight": "^1.0.1",
 						"rimraf": "^2.6.2",
-						"ssri": "^5.2.4",
-						"unique-filename": "^1.1.0",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
 						"y18n": "^4.0.0"
 					}
 				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
 				},
-				"cliui": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 					"dev": true,
 					"requires": {
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"yallist": "^3.0.2"
 					}
 				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
 					}
 				},
-				"copy-webpack-plugin": {
-					"version": "4.6.0",
-					"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
-					"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"cacache": "^10.0.4",
-						"find-cache-dir": "^1.0.0",
-						"globby": "^7.1.1",
-						"is-glob": "^4.0.0",
-						"loader-utils": "^1.1.0",
-						"minimatch": "^3.0.4",
-						"p-limit": "^1.0.0",
-						"serialize-javascript": "^1.4.0"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
 					}
 				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
+				"parse5": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+					"dev": true
 				},
-				"decamelize": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-					"dev": true,
-					"requires": {
-						"xregexp": "4.0.0"
-					}
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
 				},
-				"del": {
+				"pkg-dir": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-					"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
 					"dev": true,
 					"requires": {
-						"globby": "^6.1.0",
-						"is-path-cwd": "^1.0.0",
-						"is-path-in-cwd": "^1.0.0",
-						"p-map": "^1.1.1",
-						"pify": "^3.0.0",
-						"rimraf": "^2.2.8"
-					},
-					"dependencies": {
-						"globby": {
-							"version": "6.1.0",
-							"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-							"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-							"dev": true,
-							"requires": {
-								"array-union": "^1.0.1",
-								"glob": "^7.0.3",
-								"object-assign": "^4.0.1",
-								"pify": "^2.0.0",
-								"pinkie-promise": "^2.0.0"
-							},
-							"dependencies": {
-								"pify": {
-									"version": "2.3.0",
-									"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-									"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-									"dev": true
-								}
-							}
-						}
+						"find-up": "^3.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.8.1",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-					"integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"esprima": "^2.7.1",
-						"estraverse": "^1.9.1",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.2.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.2.0",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-							"integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"tslib": "^1.9.0"
 					}
 				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
 					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
+						"figgy-pudding": "^3.5.1"
 					}
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"terser-webpack-plugin": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz",
+					"integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"file-loader": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
-					"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.0.2",
-						"schema-utils": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
+						"cacache": "^11.0.2",
+						"find-cache-dir": "^2.0.0",
+						"schema-utils": "^1.0.0",
+						"serialize-javascript": "^1.4.0",
+						"source-map": "^0.6.1",
+						"terser": "^3.16.1",
+						"webpack-sources": "^1.1.0",
+						"worker-farm": "^1.5.2"
 					}
 				},
-				"has-flag": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
 					"dev": true
-				},
-				"http-signature": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-					"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+				}
+			}
+		},
+		"@angular-devkit/build-optimizer": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz",
+			"integrity": "sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "1.2.3",
+				"source-map": "0.5.6",
+				"typescript": "3.2.4",
+				"webpack-sources": "1.3.0"
+			}
+		},
+		"@angular-devkit/build-webpack": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz",
+			"integrity": "sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"assert-plus": "^1.0.0",
-						"jsprim": "^1.2.2",
-						"sshpk": "^1.7.0"
+						"tslib": "^1.9.0"
 					}
-				},
-				"invert-kv": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-					"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-					"dev": true
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				}
+			}
+		},
+		"@angular-devkit/core": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+			"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+			"dev": true,
+			"requires": {
+				"ajv": "6.9.1",
+				"chokidar": "2.0.4",
+				"fast-json-stable-stringify": "2.0.0",
+				"rxjs": "6.3.3",
+				"source-map": "0.7.3"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				}
+			}
+		},
+		"@angular-devkit/schematics": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+			"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"tslib": "^1.9.0"
 					}
-				},
-				"istanbul": {
-					"version": "0.4.5",
-					"resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-					"integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-					"dev": true,
-					"requires": {
-						"abbrev": "1.0.x",
-						"async": "1.x",
-						"escodegen": "1.8.x",
-						"esprima": "2.7.x",
-						"glob": "^5.0.15",
-						"handlebars": "^4.0.1",
-						"js-yaml": "3.x",
-						"mkdirp": "0.5.x",
-						"nopt": "3.x",
-						"once": "1.x",
-						"resolve": "1.1.x",
-						"supports-color": "^3.1.0",
-						"which": "^1.1.1",
-						"wordwrap": "^1.0.0"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "5.0.15",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-							"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-							"dev": true,
-							"requires": {
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "2 || 3",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						}
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"lcid": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-					"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+				}
+			}
+		},
+		"@angular/animations": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.11.tgz",
+			"integrity": "sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/cli": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.7.tgz",
+			"integrity": "sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"@schematics/update": "0.13.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"inquirer": "6.2.1",
+				"npm-package-arg": "6.1.0",
+				"opn": "5.4.0",
+				"pacote": "9.4.0",
+				"semver": "5.6.0",
+				"symbol-observable": "1.2.0"
+			}
+		},
+		"@angular/common": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.11.tgz",
+			"integrity": "sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.11.tgz",
+			"integrity": "sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler-cli": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz",
+			"integrity": "sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==",
+			"dev": true,
+			"requires": {
+				"canonical-path": "1.0.0",
+				"chokidar": "^2.1.1",
+				"convert-source-map": "^1.5.1",
+				"dependency-graph": "^0.7.2",
+				"magic-string": "^0.25.0",
+				"minimist": "^1.2.0",
+				"reflect-metadata": "^0.1.2",
+				"shelljs": "^0.8.1",
+				"source-map": "^0.6.1",
+				"tslib": "^1.9.0",
+				"yargs": "9.0.1"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"invert-kv": "^2.0.0"
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"less": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
-					"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
 					"dev": true,
 					"requires": {
-						"clone": "^2.1.2",
-						"errno": "^0.1.1",
-						"graceful-fs": "^4.1.2",
-						"image-size": "~0.5.0",
-						"mime": "^1.4.1",
-						"mkdirp": "^0.5.0",
-						"promise": "^7.1.1",
-						"request": "^2.83.0",
-						"source-map": "~0.6.0"
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
 					},
 					"dependencies": {
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 							"dev": true,
-							"optional": true
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
 						}
 					}
 				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+				"cross-spawn": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
 					"dev": true,
 					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
+						"lru-cache": "^4.0.1",
+						"shebang-command": "^1.2.0",
+						"which": "^1.2.9"
 					}
 				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+				"execa": {
+					"version": "0.7.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"cross-spawn": "^5.0.1",
+						"get-stream": "^3.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
 					}
 				},
-				"mini-css-extract-plugin": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
-					"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+				"invert-kv": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0",
-						"webpack-sources": "^1.1.0"
+						"number-is-nan": "^1.0.0"
 					}
 				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				"mem": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"mimic-fn": "^1.0.0"
 					}
 				},
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+					"dev": true
+				},
 				"os-locale": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-					"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
 					"dev": true,
 					"requires": {
-						"execa": "^1.0.0",
-						"lcid": "^2.0.0",
-						"mem": "^4.0.0"
+						"execa": "^0.7.0",
+						"lcid": "^1.0.0",
+						"mem": "^1.1.0"
 					}
 				},
-				"parse5": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
 				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+					"dev": true
 				},
-				"raw-loader": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
-					"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+				"yargs": {
+					"version": "9.0.1",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
+					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0"
+						"camelcase": "^4.1.0",
+						"cliui": "^3.2.0",
+						"decamelize": "^1.1.1",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^2.0.0",
+						"read-pkg-up": "^2.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1",
+						"yargs-parser": "^7.0.0"
 					}
 				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"yargs-parser": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
 					"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"
+						"camelcase": "^4.1.0"
 					}
-				},
-				"request": {
-					"version": "2.88.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-					"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"aws-sign2": "~0.7.0",
-						"aws4": "^1.8.0",
-						"caseless": "~0.12.0",
-						"combined-stream": "~1.0.6",
-						"extend": "~3.0.2",
-						"forever-agent": "~0.6.1",
-						"form-data": "~2.3.2",
-						"har-validator": "~5.1.0",
-						"http-signature": "~1.2.0",
-						"is-typedarray": "~1.0.0",
-						"isstream": "~0.1.2",
-						"json-stringify-safe": "~5.0.1",
-						"mime-types": "~2.1.19",
-						"oauth-sign": "~0.9.0",
-						"performance-now": "^2.1.0",
-						"qs": "~6.5.2",
-						"safe-buffer": "^5.1.2",
-						"tough-cookie": "~2.4.3",
-						"tunnel-agent": "^0.6.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"sockjs": {
-					"version": "0.3.19",
-					"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-					"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
-					"dev": true,
-					"requires": {
-						"faye-websocket": "^0.10.0",
-						"uuid": "^3.0.1"
-					}
-				},
-				"sockjs-client": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-					"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.2.5",
-						"eventsource": "^1.0.7",
-						"faye-websocket": "~0.11.1",
-						"inherits": "^2.0.3",
-						"json3": "^3.3.2",
-						"url-parse": "^1.4.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"faye-websocket": {
-							"version": "0.11.1",
-							"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-							"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-							"dev": true,
-							"requires": {
-								"websocket-driver": ">=0.5.1"
-							}
-						}
-					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"spdy": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
-					"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"handle-thing": "^2.0.0",
-						"http-deceiver": "^1.2.7",
-						"select-hose": "^2.0.0",
-						"spdy-transport": "^3.0.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"spdy-transport": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-					"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"detect-node": "^2.0.4",
-						"hpack.js": "^2.1.6",
-						"obuf": "^1.1.2",
-						"readable-stream": "^3.0.6",
-						"wbuf": "^1.7.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"readable-stream": {
-							"version": "3.1.1",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-							"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-							"dev": true,
-							"requires": {
-								"inherits": "^2.0.3",
-								"string_decoder": "^1.1.1",
-								"util-deprecate": "^1.0.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,
+				}
+			}
+		},
+		"@angular/core": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.11.tgz",
+			"integrity": "sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/forms": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.11.tgz",
+			"integrity": "sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/http": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.11.tgz",
+			"integrity": "sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/language-service": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.11.tgz",
+			"integrity": "sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==",
+			"dev": true
+		},
+		"@angular/platform-browser": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.11.tgz",
+			"integrity": "sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/platform-browser-dynamic": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz",
+			"integrity": "sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/pwa": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.7.tgz",
+			"integrity": "sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==",
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"parse5-html-rewriting-stream": "5.1.0",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
 					}
 				},
-				"stylus": {
-					"version": "0.54.5",
-					"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
-					"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
-					"dev": true,
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
 					"requires": {
-						"css-parse": "1.7.x",
-						"debug": "*",
-						"glob": "7.0.x",
-						"mkdirp": "0.5.x",
-						"sax": "0.5.x",
-						"source-map": "0.1.x"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "7.0.6",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-							"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-							"dev": true,
-							"requires": {
-								"fs.realpath": "^1.0.0",
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "^3.0.2",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.1.43",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-							"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
 					}
 				},
-				"stylus-loader": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-					"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
-					"dev": true,
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"requires": {
-						"loader-utils": "^1.0.2",
-						"lodash.clonedeep": "^4.5.0",
-						"when": "~3.6.x"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"supports-color": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"requires": {
-						"has-flag": "^1.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"terser-webpack-plugin": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz",
-					"integrity": "sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==",
-					"dev": true,
-					"requires": {
-						"cacache": "^11.0.2",
-						"find-cache-dir": "^2.0.0",
-						"schema-utils": "^1.0.0",
-						"serialize-javascript": "^1.4.0",
-						"source-map": "^0.6.1",
-						"terser": "^3.8.1",
-						"webpack-sources": "^1.1.0",
-						"worker-farm": "^1.5.2"
-					},
-					"dependencies": {
-						"cacache": {
-							"version": "11.3.2",
-							"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-							"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-							"dev": true,
-							"requires": {
-								"bluebird": "^3.5.3",
-								"chownr": "^1.1.1",
-								"figgy-pudding": "^3.5.1",
-								"glob": "^7.1.3",
-								"graceful-fs": "^4.1.15",
-								"lru-cache": "^5.1.1",
-								"mississippi": "^3.0.0",
-								"mkdirp": "^0.5.1",
-								"move-concurrently": "^1.0.1",
-								"promise-inflight": "^1.0.1",
-								"rimraf": "^2.6.2",
-								"ssri": "^6.0.1",
-								"unique-filename": "^1.1.1",
-								"y18n": "^4.0.0"
-							}
-						},
-						"find-cache-dir": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
-							"integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
-							"dev": true,
-							"requires": {
-								"commondir": "^1.0.1",
-								"make-dir": "^1.0.0",
-								"pkg-dir": "^3.0.0"
-							}
-						},
-						"lru-cache": {
-							"version": "5.1.1",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-							"dev": true,
-							"requires": {
-								"yallist": "^3.0.2"
-							}
-						},
-						"mississippi": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-							"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-							"dev": true,
-							"requires": {
-								"concat-stream": "^1.5.0",
-								"duplexify": "^3.4.2",
-								"end-of-stream": "^1.1.0",
-								"flush-write-stream": "^1.0.0",
-								"from2": "^2.1.0",
-								"parallel-transform": "^1.1.0",
-								"pump": "^3.0.0",
-								"pumpify": "^1.3.3",
-								"stream-each": "^1.1.0",
-								"through2": "^2.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-							"dev": true
-						},
-						"ssri": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-							"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-							"dev": true,
-							"requires": {
-								"figgy-pudding": "^3.5.1"
-							}
-						}
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
+			}
+		},
+		"@angular/router": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.11.tgz",
+			"integrity": "sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/service-worker": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
+			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@babel/code-frame": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.0.0"
+			}
+		},
+		"@babel/generator": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
+			"integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0",
+				"jsesc": "^2.5.1",
+				"lodash": "^4.17.11",
+				"source-map": "^0.5.0",
+				"trim-right": "^1.0.1"
+			},
+			"dependencies": {
+				"jsesc": {
+					"version": "2.5.2",
+					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.0.0",
+				"@babel/template": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+			"integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/highlight": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.0.0",
+				"esutils": "^2.0.2",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"js-tokens": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/parser": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz",
+			"integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==",
+			"dev": true
+		},
+		"@babel/runtime": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
+			"integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+			"dev": true,
+			"requires": {
+				"regenerator-runtime": "^0.13.2"
+			},
+			"dependencies": {
+				"regenerator-runtime": {
+					"version": "0.13.2",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+					"integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/template": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz",
+			"integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
+			"integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/generator": "^7.4.0",
+				"@babel/helper-function-name": "^7.1.0",
+				"@babel/helper-split-export-declaration": "^7.4.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0",
+				"lodash": "^4.17.11"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
 					}
 				},
-				"webpack": {
-					"version": "4.29.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
-					"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+				"globals": {
+					"version": "11.11.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+					"integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/types": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+			"integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2",
+				"lodash": "^4.17.11",
+				"to-fast-properties": "^2.0.0"
+			},
+			"dependencies": {
+				"to-fast-properties": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/compodoc": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.9.tgz",
+			"integrity": "sha512-LFdbF/fO9qOGgdrCHg4irMBrl3sD8ySIlL6XabFAz8QbUdf2+77xOVnZJ/PYdcuI8h8vXo4UGS7MFg0pDR2jsw==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-transformer": "^2.0.0",
+				"chalk": "^2.4.2",
+				"cheerio": "^1.0.0-rc.2",
+				"chokidar": "^2.1.2",
+				"colors": "^1.3.3",
+				"commander": "^2.19.0",
+				"cosmiconfig": "^5.1.0",
+				"fancy-log": "^1.3.3",
+				"findit2": "^2.2.3",
+				"fs-extra": "^7.0.1",
+				"glob": "^7.1.3",
+				"handlebars": "^4.1.0",
+				"html-entities": "^1.2.1",
+				"i18next": "^15.0.4",
+				"inside": "^1.0.0",
+				"json5": "^2.1.0",
+				"live-server": "^1.2.1",
+				"lodash": "^4.17.11",
+				"lunr": "^2.3.6",
+				"marked": "^0.6.1",
+				"minimist": "^1.2.0",
+				"opencollective": "^1.0.3",
+				"os-name": "^3.0.0",
+				"pdfmake": "^0.1.53",
+				"semver": "^5.6.0",
+				"traverse": "^0.6.6",
+				"ts-simple-ast": "12.4.0",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"@webassemblyjs/ast": "1.7.11",
-						"@webassemblyjs/helper-module-context": "1.7.11",
-						"@webassemblyjs/wasm-edit": "1.7.11",
-						"@webassemblyjs/wasm-parser": "1.7.11",
-						"acorn": "^6.0.5",
-						"acorn-dynamic-import": "^4.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"chrome-trace-event": "^1.0.0",
-						"enhanced-resolve": "^4.1.0",
-						"eslint-scope": "^4.0.0",
-						"json-parse-better-errors": "^1.0.2",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"micromatch": "^3.1.8",
-						"mkdirp": "~0.5.0",
-						"neo-async": "^2.5.0",
-						"node-libs-browser": "^2.0.0",
-						"schema-utils": "^0.4.4",
-						"tapable": "^1.1.0",
-						"terser-webpack-plugin": "^1.1.0",
-						"watchpack": "^1.5.0",
-						"webpack-sources": "^1.3.0"
-					},
-					"dependencies": {
-						"schema-utils": {
-							"version": "0.4.7",
-							"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-							"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-							"dev": true,
-							"requires": {
-								"ajv": "^6.1.0",
-								"ajv-keywords": "^3.1.0"
-							}
-						}
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"webpack-dev-middleware": {
-					"version": "3.5.1",
-					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
-					"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+				"cosmiconfig": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.0.tgz",
+					"integrity": "sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==",
 					"dev": true,
 					"requires": {
-						"memory-fs": "~0.4.1",
-						"mime": "^2.3.1",
-						"range-parser": "^1.0.3",
-						"webpack-log": "^2.0.0"
-					},
-					"dependencies": {
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						}
+						"import-fresh": "^2.0.0",
+						"is-directory": "^0.3.1",
+						"js-yaml": "^3.13.0",
+						"parse-json": "^4.0.0"
 					}
 				},
-				"webpack-dev-server": {
-					"version": "3.1.14",
-					"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
-					"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
+				"js-yaml": {
+					"version": "3.13.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+					"integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
 					"dev": true,
 					"requires": {
-						"ansi-html": "0.0.7",
-						"bonjour": "^3.5.0",
-						"chokidar": "^2.0.0",
-						"compression": "^1.5.2",
-						"connect-history-api-fallback": "^1.3.0",
-						"debug": "^3.1.0",
-						"del": "^3.0.0",
-						"express": "^4.16.2",
-						"html-entities": "^1.2.0",
-						"http-proxy-middleware": "~0.18.0",
-						"import-local": "^2.0.0",
-						"internal-ip": "^3.0.1",
-						"ip": "^1.1.5",
-						"killable": "^1.0.0",
-						"loglevel": "^1.4.1",
-						"opn": "^5.1.0",
-						"portfinder": "^1.0.9",
-						"schema-utils": "^1.0.0",
-						"selfsigned": "^1.9.1",
-						"semver": "^5.6.0",
-						"serve-index": "^1.7.2",
-						"sockjs": "0.3.19",
-						"sockjs-client": "1.3.0",
-						"spdy": "^4.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^5.1.0",
-						"url": "^0.11.0",
-						"webpack-dev-middleware": "3.4.0",
-						"webpack-log": "^2.0.0",
-						"yargs": "12.0.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-							"dev": true
-						},
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						},
-						"webpack-dev-middleware": {
-							"version": "3.4.0",
-							"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
-							"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
-							"dev": true,
-							"requires": {
-								"memory-fs": "~0.4.1",
-								"mime": "^2.3.1",
-								"range-parser": "^1.0.3",
-								"webpack-log": "^2.0.0"
-							}
-						}
-					}
-				},
-				"webpack-log": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-					"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-					"dev": true,
-					"requires": {
-						"ansi-colors": "^3.0.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"webpack-subresource-integrity": {
-					"version": "1.1.0-rc.6",
-					"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
-					"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
-					"dev": true,
-					"requires": {
-						"webpack-core": "^0.6.8"
+						"argparse": "^1.0.7",
+						"esprima": "^4.0.0"
 					}
 				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 					"dev": true
 				},
-				"worker-farm": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-					"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
-					"dev": true,
-					"requires": {
-						"errno": "~0.1.7"
-					}
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
 					"dev": true
-				},
-				"yargs": {
-					"version": "12.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
-					"dev": true,
-					"requires": {
-						"cliui": "^4.0.0",
-						"decamelize": "^2.0.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^3.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1 || ^4.0.0",
-						"yargs-parser": "^10.1.0"
-					}
-				},
-				"yargs-parser": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-					"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					}
 				}
 			}
 		},
-		"@angular-devkit/core": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-			"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+		"@compodoc/ngd-core": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
+			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
 			"dev": true,
 			"requires": {
-				"ajv": "6.7.0",
-				"chokidar": "2.0.4",
-				"fast-json-stable-stringify": "2.0.0",
-				"rxjs": "6.3.3",
-				"source-map": "0.7.3"
+				"ansi-colors": "^1.0.1",
+				"fancy-log": "^1.3.2",
+				"typescript": "^2.4.2"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"ansi-colors": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ansi-wrap": "^0.1.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"typescript": {
+					"version": "2.9.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/ngd-transformer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
+			"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-core": "~2.0.0",
+				"dot": "^1.1.1",
+				"fs-extra": "^4.0.1",
+				"viz.js": "^1.8.0"
+			},
+			"dependencies": {
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				}
 			}
 		},
-		"@angular-devkit/schematics": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-			"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+		"@dsherret/to-absolute-glob": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"rxjs": "6.3.3"
+				"is-absolute": "^1.0.0",
+				"is-negated-glob": "^1.0.0"
+			}
+		},
+		"@ionic-native/barcode-scanner": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz",
+			"integrity": "sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/animations": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.3.tgz",
-			"integrity": "sha512-5WoiDnVS2OhGgJ1oepFNF2UcfR4sJj97KRnTmLWQ0S4N4WpXX83CoOQVXvXwfotyb8uNtl4zRi2NuvN/MIuFuA==",
+		"@ionic-native/call-number": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.3.0.tgz",
+			"integrity": "sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/cli": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.0.tgz",
-			"integrity": "sha512-6+NoHsW1MYG7GBHUg71zaWIFeIRps/SVksCmRFCpW0RXqErCQmzf0GZuDTZZ2Yo4RzU01150sVp1R8wEvEZfZQ==",
-			"dev": true,
+		"@ionic-native/camera": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.3.0.tgz",
+			"integrity": "sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==",
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"@schematics/update": "0.13.0",
-				"@yarnpkg/lockfile": "1.1.0",
-				"ini": "1.3.5",
-				"inquirer": "6.2.1",
-				"npm-package-arg": "6.1.0",
-				"opn": "5.4.0",
-				"pacote": "9.4.0",
-				"semver": "5.6.0",
-				"symbol-observable": "1.2.0"
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					}
-				},
-				"@schematics/update": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.0.tgz",
-					"integrity": "sha512-HGpZdIL/0w46UyaxpnIAg6SBwzKfaRixHIEihmgJUqA0DG8GZUixRPr1L0YIWC1EZ81cQ+yWL85XhkKBYR+wQg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"@yarnpkg/lockfile": "1.1.0",
-						"ini": "1.3.5",
-						"pacote": "9.4.0",
-						"rxjs": "6.3.3",
-						"semver": "5.6.0",
-						"semver-intersect": "1.4.0"
-					}
-				},
-				"cacache": {
-					"version": "11.3.2",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"chownr": "^1.1.1",
-						"figgy-pudding": "^3.5.1",
-						"glob": "^7.1.3",
-						"graceful-fs": "^4.1.15",
-						"lru-cache": "^5.1.1",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"move-concurrently": "^1.0.1",
-						"promise-inflight": "^1.0.1",
-						"rimraf": "^2.6.2",
-						"ssri": "^6.0.1",
-						"unique-filename": "^1.1.1",
-						"y18n": "^4.0.0"
-					}
-				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"make-fetch-happen": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
-					"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
-					"dev": true,
-					"requires": {
-						"agentkeepalive": "^3.4.1",
-						"cacache": "^11.0.1",
-						"http-cache-semantics": "^3.8.1",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"mississippi": "^3.0.0",
-						"node-fetch-npm": "^2.0.2",
-						"promise-retry": "^1.1.1",
-						"socks-proxy-agent": "^4.0.0",
-						"ssri": "^6.0.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"mississippi": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-					"dev": true,
-					"requires": {
-						"concat-stream": "^1.5.0",
-						"duplexify": "^3.4.2",
-						"end-of-stream": "^1.1.0",
-						"flush-write-stream": "^1.0.0",
-						"from2": "^2.1.0",
-						"parallel-transform": "^1.1.0",
-						"pump": "^3.0.0",
-						"pumpify": "^1.3.3",
-						"stream-each": "^1.1.0",
-						"through2": "^2.0.0"
-					}
-				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"npm-package-arg": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
-					"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.6.0",
-						"osenv": "^0.1.5",
-						"semver": "^5.5.0",
-						"validate-npm-package-name": "^3.0.0"
-					}
-				},
-				"npm-pick-manifest": {
-					"version": "2.2.3",
-					"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
-					"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1",
-						"npm-package-arg": "^6.0.0",
-						"semver": "^5.4.1"
-					}
-				},
-				"npm-registry-fetch": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
-					"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
-					"dev": true,
-					"requires": {
-						"JSONStream": "^1.3.4",
-						"bluebird": "^3.5.1",
-						"figgy-pudding": "^3.4.1",
-						"lru-cache": "^4.1.3",
-						"make-fetch-happen": "^4.0.1",
-						"npm-package-arg": "^6.1.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"pacote": {
-					"version": "9.4.0",
-					"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
-					"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"cacache": "^11.3.2",
-						"figgy-pudding": "^3.5.1",
-						"get-stream": "^4.1.0",
-						"glob": "^7.1.3",
-						"lru-cache": "^5.1.1",
-						"make-fetch-happen": "^4.0.1",
-						"minimatch": "^3.0.4",
-						"minipass": "^2.3.5",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"normalize-package-data": "^2.4.0",
-						"npm-package-arg": "^6.1.0",
-						"npm-packlist": "^1.1.12",
-						"npm-pick-manifest": "^2.2.3",
-						"npm-registry-fetch": "^3.8.0",
-						"osenv": "^0.1.5",
-						"promise-inflight": "^1.0.1",
-						"promise-retry": "^1.1.1",
-						"protoduck": "^5.0.1",
-						"rimraf": "^2.6.2",
-						"safe-buffer": "^5.1.2",
-						"semver": "^5.6.0",
-						"ssri": "^6.0.1",
-						"tar": "^4.4.8",
-						"unique-filename": "^1.1.1",
-						"which": "^1.3.1"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"ssri": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1"
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
-					}
-				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-					"dev": true
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-					"dev": true
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/common": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.3.tgz",
-			"integrity": "sha512-VZOTZdvkitaKEhkxL6daHxPcKqAFwNJm0U4NFB4LRP9KspsFTE60QFVB63o129PTIH9iOQ2D3HRKSRl4o78ZKg==",
+		"@ionic-native/core": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.3.0.tgz",
+			"integrity": "sha512-oIsBvkB/Q63bjKvHGW7zAFMWSXIwnZ/U962UFyuqrF9dKvNSPI5cz8iPOaqKE+jzb2XhlcGKEbp5qAhTI0BcZQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.3.tgz",
-			"integrity": "sha512-UM6n4MyZkR5+VVjlwhLH8IfqdWBkdFcF5at4ckJXOJ/gkIUq97irbis9pGj1b0TO7MAl8uhF4b68xe5lk8b49g==",
-			"dev": true,
+		"@ionic-native/device": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.3.0.tgz",
+			"integrity": "sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler-cli": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.3.tgz",
-			"integrity": "sha512-31hcfTrU2GW66cvvaS629dNVPfiUrUWPncI28optvmKHBaH0mFqkdYNgabuslsXZV5AeidKMUJvR7GITjtvkQA==",
+		"@ionic-native/dialogs": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.3.0.tgz",
+			"integrity": "sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/geolocation": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.3.0.tgz",
+			"integrity": "sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/globalization": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.3.0.tgz",
+			"integrity": "sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-analytics": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz",
+			"integrity": "sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-maps": {
+			"version": "5.0.0-beta.26",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
+			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			}
+		},
+		"@ionic-native/in-app-browser": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz",
+			"integrity": "sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/intercom": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.3.0.tgz",
+			"integrity": "sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/local-notifications": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz",
+			"integrity": "sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/mixpanel": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz",
+			"integrity": "sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/network": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.3.0.tgz",
+			"integrity": "sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/splash-screen": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz",
+			"integrity": "sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/status-bar": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.3.0.tgz",
+			"integrity": "sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/unique-device-id": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz",
+			"integrity": "sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/vibration": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.3.0.tgz",
+			"integrity": "sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic/angular": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.1.2.tgz",
+			"integrity": "sha512-GVdtpPekPjAYo/3IiRg/EoVRw1/9RwW07ITW6TRorcX1XOPJlrRXVcQyWFTbHRD9TOikgE1XmMQd/+1Lk0TQFw==",
+			"requires": {
+				"@ionic/core": "4.1.2",
+				"tslib": "^1.9.3"
+			}
+		},
+		"@ionic/angular-toolkit": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.5.0.tgz",
+			"integrity": "sha512-KHUu7MHi+s1LKox+EBOSN6HO6Sk79qOmBIMGHQMboPbqHGzb5aqCbTmtwa/BJZ1kytZ+yQ8kEejv8YwvrJIZEQ==",
 			"dev": true,
 			"requires": {
-				"canonical-path": "1.0.0",
-				"chokidar": "^1.4.2",
-				"convert-source-map": "^1.5.1",
-				"dependency-graph": "^0.7.2",
-				"magic-string": "^0.25.0",
-				"minimist": "^1.2.0",
-				"reflect-metadata": "^0.1.2",
-				"shelljs": "^0.8.1",
-				"source-map": "^0.6.1",
+				"@schematics/angular": "^7.0.3",
 				"tslib": "^1.9.0",
-				"yargs": "9.0.1"
+				"typescript": "~3.3.3333",
+				"ws": "^6.1.4"
 			},
 			"dependencies": {
-				"anymatch": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-					"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-					"dev": true,
-					"requires": {
-						"micromatch": "^2.1.5",
-						"normalize-path": "^2.0.0"
-					}
-				},
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+				"typescript": {
+					"version": "3.3.4000",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz",
+					"integrity": "sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==",
 					"dev": true
 				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"chokidar": {
-					"version": "1.7.0",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-					"integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-					"dev": true,
-					"requires": {
-						"anymatch": "^1.3.0",
-						"async-each": "^1.0.0",
-						"fsevents": "^1.0.0",
-						"glob-parent": "^2.0.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^2.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0"
-					}
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+				"ws": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+					"integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
 					"dev": true,
 					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"string-width": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-							"dev": true,
-							"requires": {
-								"code-point-at": "^1.0.0",
-								"is-fullwidth-code-point": "^1.0.0",
-								"strip-ansi": "^3.0.0"
-							}
-						}
+						"async-limiter": "~1.0.0"
 					}
-				},
+				}
+			}
+		},
+		"@ionic/app-scripts": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.3.tgz",
+			"integrity": "sha512-t1kL9NqY/sVLfAIVKfN4VJigPqMWs5euKxig3sjsrakSQ9z4njmbDghzAC4taefIpYxLGMOeWgKwrrxOiLkdWQ==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/build-optimizer": "0.0.35",
+				"autoprefixer": "^7.2.6",
+				"chalk": "^2.4.0",
+				"chokidar": "^2.0.4",
+				"clean-css": "^4.1.11",
+				"cross-spawn": "^5.1.0",
+				"dotenv-webpack": "^1.5.7",
+				"express": "^4.16.3",
+				"fs-extra": "^4.0.2",
+				"glob": "^7.1.2",
+				"json-loader": "^0.5.7",
+				"node-sass": "^4.10.0",
+				"os-name": "^2.0.1",
+				"postcss": "^6.0.21",
+				"proxy-middleware": "^0.15.0",
+				"reflect-metadata": "^0.1.10",
+				"rollup": "0.50.0",
+				"rollup-plugin-commonjs": "8.2.6",
+				"rollup-plugin-node-resolve": "3.0.0",
+				"source-map": "^0.6.1",
+				"tiny-lr": "^1.1.1",
+				"tslint": "^5.8.0",
+				"tslint-eslint-rules": "^4.1.1",
+				"uglify-es": "3.2.2",
+				"webpack": "3.12.0",
+				"ws": "3.3.2",
+				"xml2js": "^0.4.19"
+			},
+			"dependencies": {
+				"@angular-devkit/build-optimizer": {
+					"version": "0.0.35",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
+					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
+					"dev": true,
+					"requires": {
+						"loader-utils": "^1.1.0",
+						"source-map": "^0.5.6",
+						"typescript": "~2.6.1",
+						"webpack-sources": "^1.0.1"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
+					}
+				},
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"acorn-dynamic-import": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+					"dev": true,
+					"requires": {
+						"acorn": "^4.0.3"
+					},
+					"dependencies": {
+						"acorn": {
+							"version": "4.0.13",
+							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+							"dev": true
+						}
+					}
+				},
+				"autoprefixer": {
+					"version": "7.2.6",
+					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+					"dev": true,
+					"requires": {
+						"browserslist": "^2.11.3",
+						"caniuse-lite": "^1.0.30000805",
+						"normalize-range": "^0.1.2",
+						"num2fraction": "^1.2.2",
+						"postcss": "^6.0.17",
+						"postcss-value-parser": "^3.2.3"
+					}
+				},
+				"browserslist": {
+					"version": "2.11.3",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30000792",
+						"electron-to-chromium": "^1.3.30"
+					}
+				},
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+					"dev": true,
+					"requires": {
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
+					},
+					"dependencies": {
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+							"dev": true,
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
+						}
+					}
+				},
+				"commander": {
+					"version": "2.12.2",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
+					"dev": true
+				},
 				"cross-spawn": {
 					"version": "5.1.0",
 					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -2191,6 +1476,18 @@
 						"which": "^1.2.9"
 					}
 				},
+				"enhanced-resolve": {
+					"version": "3.4.1",
+					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"memory-fs": "^0.4.0",
+						"object-assign": "^4.0.1",
+						"tapable": "^0.2.7"
+					}
+				},
 				"execa": {
 					"version": "0.7.0",
 					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
@@ -2206,46 +1503,21 @@
 						"strip-eof": "^1.0.0"
 					}
 				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				},
-				"is-extglob": {
+				"invert-kv": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
 					"dev": true
 				},
 				"is-fullwidth-code-point": {
@@ -2257,36 +1529,26 @@
 						"number-is-nan": "^1.0.0"
 					}
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
+				"json5": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+					"dev": true
 				},
-				"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=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^2.2.0",
-						"pify": "^2.0.0",
-						"strip-bom": "^3.0.0"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
+				"macos-release": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
+					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
+					"dev": true
 				},
 				"mem": {
 					"version": "1.1.0",
@@ -2297,39 +1559,6 @@
 						"mimic-fn": "^1.0.0"
 					}
 				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
 				"os-locale": {
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
@@ -2341,76 +1570,132 @@
 						"mem": "^1.1.0"
 					}
 				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+				"os-name": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
+					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
 					"dev": true,
 					"requires": {
-						"p-limit": "^1.1.0"
+						"macos-release": "^1.0.0",
+						"win-release": "^1.0.0"
 					}
 				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+				"postcss": {
+					"version": "6.0.23",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
 					"dev": true,
 					"requires": {
-						"error-ex": "^1.2.0"
+						"chalk": "^2.4.1",
+						"source-map": "^0.6.1",
+						"supports-color": "^5.4.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"
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+				"tapable": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
+					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
 					"dev": true
 				},
-				"read-pkg": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+				"typescript": {
+					"version": "2.6.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
+					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
+					"dev": true
+				},
+				"uglify-es": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
+					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
 					"dev": true,
 					"requires": {
-						"load-json-file": "^2.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^2.0.0"
+						"commander": "~2.12.1",
+						"source-map": "~0.6.1"
 					}
 				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+				"webpack": {
+					"version": "3.12.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
+					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
 					"dev": true,
 					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
+						"acorn": "^5.0.0",
+						"acorn-dynamic-import": "^2.0.0",
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0",
+						"async": "^2.1.2",
+						"enhanced-resolve": "^3.4.0",
+						"escope": "^3.6.0",
+						"interpret": "^1.0.0",
+						"json-loader": "^0.5.4",
+						"json5": "^0.5.1",
+						"loader-runner": "^2.3.0",
+						"loader-utils": "^1.1.0",
+						"memory-fs": "~0.4.1",
+						"mkdirp": "~0.5.0",
+						"node-libs-browser": "^2.0.0",
+						"source-map": "^0.5.3",
+						"supports-color": "^4.2.1",
+						"tapable": "^0.2.7",
+						"uglifyjs-webpack-plugin": "^0.4.6",
+						"watchpack": "^1.4.0",
+						"webpack-sources": "^1.0.1",
+						"yargs": "^8.0.2"
+					},
+					"dependencies": {
+						"has-flag": {
+							"version": "2.0.0",
+							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+							"dev": true
+						},
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						},
+						"supports-color": {
+							"version": "4.5.0",
+							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+							"dev": true,
+							"requires": {
+								"has-flag": "^2.0.0"
+							}
+						}
 					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
+				"ws": {
+					"version": "3.3.2",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
+					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
 				},
 				"yargs": {
-					"version": "9.0.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
 					"dev": true,
 					"requires": {
 						"camelcase": "^4.1.0",
@@ -2439,543 +1724,361 @@
 				}
 			}
 		},
-		"@angular/core": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.3.tgz",
-			"integrity": "sha512-6Ql+sJJnrsxh8O0/IgIP1GgT4eLOHk+dlBs7zBbjstmLuhaQdY+awO9WKoQow+TiD1Go7FW1J3vZ2PTWXKxqjQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/forms": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.3.tgz",
-			"integrity": "sha512-mZpyonfSmRwSvM6efvwFwkLJkK6wHQrm7X4OhVVu3s9i7BI253eLDY7WIRXFvoxJ/5jWIIarVnd/9UA7GINZGw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/http": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.3.tgz",
-			"integrity": "sha512-wzvBKbO/TcSR3U8AQbsGftH8x1OdAgVGHlfXQPmZL1KjIDHrM1VpnkSvgqIt8coG+4OPfWcNklUCrTdEGwqMqw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/language-service": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.3.tgz",
-			"integrity": "sha512-9FBVYbKaNx4Ap+Suz/2ZFBPca1voinZMOCN8LjXRYnfS2MHLQASQlTlK4qeZcomyRfy0FxWmO9R02S7YJ06cnw==",
-			"dev": true
-		},
-		"@angular/platform-browser": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.3.tgz",
-			"integrity": "sha512-DH0Y2lgEgcrP1I/DUQB/krL7Ob7yL685fu4sRapW17SndTQa2pqSFMBVf+mN3FupTXp7nJHSvlIktzedIk04+g==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/platform-browser-dynamic": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.3.tgz",
-			"integrity": "sha512-M8Kiz5FUhnFybJuk/mgOhBjVbRgKDC4bGWKWH9Z9SXBR2dS/FL3QOJsLIthQcWlHOzSoJdEoPBRhn0R4pyLBSw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/pwa": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.0.tgz",
-			"integrity": "sha512-E1rOMduecaUw6sZfm5u3nFWi2B90SD6NriGjciVTcKCjPmHKeIWmpWGhVdgGEzCbg1Gxj8ZhsvvBjJzfbDPF6g==",
+		"@ionic/cli-framework": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.7.0.tgz",
+			"integrity": "sha512-2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg==",
+			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"parse5-html-rewriting-stream": "5.1.0",
-				"rxjs": "6.3.3"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"inquirer": "^6.0.0",
+				"lodash": "^4.17.5",
+				"log-update": "^2.3.0",
+				"minimist": "^1.2.0",
+				"rimraf": "^2.6.2",
+				"slice-ansi": "^2.0.0",
+				"string-width": "^3.0.0",
+				"strip-ansi": "^5.0.0",
+				"tslib": "^1.9.0",
+				"untildify": "^3.0.2",
+				"wrap-ansi": "^4.0.0",
+				"write-file-atomic": "^2.3.0"
 			},
 			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-					"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"ajv": "6.7.0",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.3.3",
-						"source-map": "0.7.3"
+						"ms": "^2.1.1"
 					}
 				},
-				"@angular-devkit/schematics": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-					"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+				"wrap-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
 					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
 					},
 					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"string-width": {
+							"version": "2.1.1",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+							"dev": true,
 							"requires": {
-								"is-descriptor": "^1.0.0"
+								"is-fullwidth-code-point": "^2.0.0",
+								"strip-ansi": "^4.0.0"
+							}
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
 							}
 						}
 					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+				}
+			}
+		},
+		"@ionic/core": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.1.2.tgz",
+			"integrity": "sha512-QVJYpDAycmXgQL3mWdvjlIgrLEG0wVl9+NGZQATEBCTEsuDHrOw7BO28FKPlFCdfTjVA6HDJnSj1HwOUi3Yp4w==",
+			"requires": {
+				"ionicons": "4.5.5"
+			}
+		},
+		"@ionic/discover": {
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.13.tgz",
+			"integrity": "sha512-9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"netmask": "^1.0.6",
+				"tslib": "^1.9.0",
+				"ws": "^6.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-						}
+						"ms": "^2.1.1"
 					}
 				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@ionic/lab": {
+			"version": "1.0.24",
+			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.24.tgz",
+			"integrity": "sha512-sXUx0MZKC43bZ5ZJ1IRQ+yuvCgNGGJ6QPREI1AeHXZpkZRixrh0w14SLgxEzjxvFgW6ypQkdKlymY0nRoU8Gng==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/utils-fs": "1.2.0",
+				"chalk": "^2.3.0",
+				"express": "^4.16.2",
+				"tslib": "^1.9.0"
+			}
+		},
+		"@ionic/ng-toolkit": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
+			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.1.0",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"rxjs": "~6.2.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"@ionic/cli-framework": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
+					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
+					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"@ionic/utils-fs": "0.0.2",
+						"chalk": "^2.3.0",
+						"debug": "^4.0.0",
+						"inquirer": "^6.0.0",
+						"lodash": "^4.17.5",
+						"minimist": "^1.2.0",
+						"rimraf": "^2.6.2",
+						"slice-ansi": "^1.0.0",
+						"stream-combiner2": "^1.1.1",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^5.0.0",
+						"tree-kill": "1.2.0",
+						"tslib": "^1.9.0",
+						"untildify": "^3.0.2",
+						"wrap-ansi": "^4.0.0",
+						"write-file-atomic": "^2.3.0"
 					}
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"@ionic/utils-fs": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
+					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
+					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"debug": "^4.0.0",
+						"ncp": "^2.0.0",
+						"through2": "^2.0.3",
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+					"dev": true
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
 				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
+					"dev": true,
 					"requires": {
 						"tslib": "^1.9.0"
 					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				"slice-ansi": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-						}
+						"is-fullwidth-code-point": "^2.0.0"
 					}
 				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"strip-ansi": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ansi-regex": "^4.0.0"
 					}
 				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg=="
-				}
-			}
-		},
-		"@angular/router": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.3.tgz",
-			"integrity": "sha512-SH7H2I9WTj1puei4m4g5n0/Cp28HS14q4r8lOgW0gLWuT6Ls7MqH/nDjOMiW924iRR6zjQQs7G+WbhL1jmZc2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/service-worker": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
-			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@babel/code-frame": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.0.0"
-			}
-		},
-		"@babel/generator": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.0.tgz",
-			"integrity": "sha512-dZTwMvTgWfhmibq4V9X+LMf6Bgl7zAodRn9PvcPdhlzFMbvUutx74dbEv7Atz3ToeEpevYEJtAwfxq/bDCzHWg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.3.0",
-				"jsesc": "^2.5.1",
-				"lodash": "^4.17.10",
-				"source-map": "^0.5.0",
-				"trim-right": "^1.0.1"
-			},
-			"dependencies": {
-				"jsesc": {
-					"version": "2.5.2",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+				"tree-kill": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
+					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
 					"dev": true
-				}
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "^7.0.0",
-				"@babel/template": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
-			"integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/highlight": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.0.0",
-				"esutils": "^2.0.2",
-				"js-tokens": "^4.0.0"
-			},
-			"dependencies": {
-				"js-tokens": {
+				},
+				"wrap-ansi": {
 					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-					"dev": true
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
+							}
+						}
+					}
 				}
 			}
 		},
-		"@babel/parser": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.1.tgz",
-			"integrity": "sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA==",
-			"dev": true
-		},
-		"@babel/template": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
-			"integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/parser": "^7.2.2",
-				"@babel/types": "^7.2.2"
-			}
+		"@ionic/pro": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
+			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
 		},
-		"@babel/traverse": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
-			"integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
+		"@ionic/schematics-angular": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
+			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/generator": "^7.2.2",
-				"@babel/helper-function-name": "^7.1.0",
-				"@babel/helper-split-export-declaration": "^7.0.0",
-				"@babel/parser": "^7.2.3",
-				"@babel/types": "^7.2.2",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0",
-				"lodash": "^4.17.10"
+				"@schematics/angular": "0.9.0-beta.3",
+				"lodash": "^4.17.5",
+				"tslib": "^1.9.0",
+				"typescript": "3.0.1"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+				"@angular-devkit/core": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
+					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ajv": "6.5.3",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.2.2",
+						"source-map": "0.7.3"
 					}
 				},
-				"globals": {
-					"version": "11.10.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz",
-					"integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==",
-					"dev": true
+				"@angular-devkit/schematics": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
+					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
+					"dev": true,
+					"requires": {
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"rxjs": "6.2.2"
+					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/types": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.0.tgz",
-			"integrity": "sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw==",
-			"dev": true,
-			"requires": {
-				"esutils": "^2.0.2",
-				"lodash": "^4.17.10",
-				"to-fast-properties": "^2.0.0"
-			},
-			"dependencies": {
-				"to-fast-properties": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-					"dev": true
-				}
-			}
-		},
-		"@compodoc/compodoc": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.7.tgz",
-			"integrity": "sha512-bTqkv75T9b+3OxG517YL+5B0npAG0Q5nOMAk562Idr/fICTTHQ/xzSBsTptZ4QqYmtzRMV1OqOlk74FXfGPZWw==",
-			"dev": true,
-			"requires": {
-				"@compodoc/ngd-transformer": "^2.0.0",
-				"chalk": "^2.4.1",
-				"cheerio": "^1.0.0-rc.2",
-				"chokidar": "^2.0.4",
-				"colors": "^1.3.2",
-				"commander": "2.19.0",
-				"cosmiconfig": "^5.0.7",
-				"fancy-log": "^1.3.2",
-				"findit2": "^2.2.3",
-				"fs-extra": "^7.0.1",
-				"glob": "^7.1.3",
-				"handlebars": "4.0.10",
-				"html-entities": "^1.2.1",
-				"i18next": "^12.1.0",
-				"inside": "^1.0.0",
-				"json5": "^2.1.0",
-				"live-server": "1.2.1",
-				"lodash": "^4.17.11",
-				"lunr": "2.3.5",
-				"marked": "^0.4.0",
-				"opencollective": "^1.0.3",
-				"os-name": "^3.0.0",
-				"traverse": "^0.6.6",
-				"ts-simple-ast": "12.4.0",
-				"uuid": "^3.3.2"
-			},
-			"dependencies": {
-				"@compodoc/ngd-transformer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
-					"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+				"@schematics/angular": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
+					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
 					"dev": true,
 					"requires": {
-						"@compodoc/ngd-core": "~2.0.0",
-						"dot": "^1.1.1",
-						"fs-extra": "^4.0.1",
-						"viz.js": "^1.8.0"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "4.0.3",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-							"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"@angular-devkit/schematics": "0.9.0-beta.3",
+						"typescript": "3.0.1"
 					}
 				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
+				"ajv": {
+					"version": "6.5.3",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
+					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
 				},
 				"base": {
 					"version": "0.11.2",
@@ -3021,31 +2124,10 @@
 						"to-regex": "^3.0.1"
 					}
 				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true,
-					"optional": true
-				},
-				"cheerio": {
-					"version": "1.0.0-rc.2",
-					"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
-					"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
-					"dev": true,
-					"requires": {
-						"css-select": "~1.2.0",
-						"dom-serializer": "~0.1.0",
-						"entities": "~1.1.1",
-						"htmlparser2": "^3.9.1",
-						"lodash": "^4.15.0",
-						"parse5": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"chokidar": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
 					"dev": true,
 					"requires": {
 						"anymatch": "^2.0.0",
@@ -3063,48 +2145,6 @@
 						"upath": "^1.0.5"
 					}
 				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-					"dev": true
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"cosmiconfig": {
-					"version": "5.0.7",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz",
-					"integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^2.0.0",
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0"
-					}
-				},
 				"define-property": {
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -3173,31 +2213,6 @@
 						}
 					}
 				},
-				"dir-glob": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-					"dev": true,
-					"requires": {
-						"arrify": "^1.0.1",
-						"path-type": "^3.0.0"
-					}
-				},
-				"event-stream": {
-					"version": "3.3.4",
-					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-					"dev": true,
-					"requires": {
-						"duplexer": "~0.1.1",
-						"from": "~0",
-						"map-stream": "~0.1.0",
-						"pause-stream": "0.0.11",
-						"split": "0.3",
-						"stream-combiner": "~0.0.4",
-						"through": "~2.3.1"
-					}
-				},
 				"extend-shallow": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
@@ -3207,80 +2222,6 @@
 						"is-extendable": "^0.1.0"
 					}
 				},
-				"faye-websocket": {
-					"version": "0.11.1",
-					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-					"dev": true,
-					"requires": {
-						"websocket-driver": ">=0.5.1"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"globby": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"dir-glob": "2.0.0",
-						"fast-glob": "^2.0.2",
-						"glob": "^7.1.2",
-						"ignore": "^3.3.5",
-						"pify": "^3.0.0",
-						"slash": "^1.0.0"
-					}
-				},
-				"handlebars": {
-					"version": "4.0.10",
-					"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
-					"integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
-					"dev": true,
-					"requires": {
-						"async": "^1.4.0",
-						"optimist": "^0.6.1",
-						"source-map": "^0.4.4",
-						"uglify-js": "^2.6"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.4.4",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-							"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
-					}
-				},
-				"http-auth": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
-					"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
-					"dev": true,
-					"requires": {
-						"apache-crypt": "^1.1.2",
-						"apache-md5": "^1.0.6",
-						"bcryptjs": "^2.3.0",
-						"uuid": "^3.0.0"
-					}
-				},
 				"is-accessor-descriptor": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -3316,98 +2257,13 @@
 					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
 					"dev": true
 				},
-				"live-server": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
-					"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
-					"dev": true,
-					"requires": {
-						"chokidar": "^2.0.4",
-						"colors": "^1.3.3",
-						"connect": "^3.6.6",
-						"cors": "^2.8.5",
-						"event-stream": "3.3.4",
-						"faye-websocket": "0.11.x",
-						"http-auth": "3.1.x",
-						"morgan": "^1.9.1",
-						"object-assign": "^4.1.1",
-						"opn": "^5.4.0",
-						"proxy-middleware": "^0.15.0",
-						"send": "^0.16.2",
-						"serve-index": "^1.9.1"
-					},
-					"dependencies": {
-						"colors": {
-							"version": "1.3.3",
-							"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-							"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-							"dev": true
-						}
-					}
-				},
-				"map-stream": {
-					"version": "0.1.0",
-					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-					"dev": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				},
-				"opn": {
-					"version": "5.4.0",
-					"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-					"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-					"dev": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parse5": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-					"dev": true,
-					"requires": {
-						"@types/node": "*"
-					}
-				},
-				"send": {
-					"version": "0.16.2",
-					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+				"rxjs": {
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
 					"dev": true,
 					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					},
-					"dependencies": {
-						"statuses": {
-							"version": "1.4.0",
-							"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-							"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-							"dev": true
-						}
+						"tslib": "^1.9.0"
 					}
 				},
 				"snapdragon": {
@@ -3424,8 +2280,22 @@
 						"source-map": "^0.5.6",
 						"source-map-resolve": "^0.5.0",
 						"use": "^3.1.0"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
 					}
 				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				},
 				"source-map-resolve": {
 					"version": "0.5.2",
 					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
@@ -3439,2179 +2309,588 @@
 						"urix": "^0.1.0"
 					}
 				},
-				"split": {
-					"version": "0.3.3",
-					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-					"dev": true,
-					"requires": {
-						"through": "2"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+				"typescript": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
 					"dev": true
-				},
-				"stream-combiner": {
-					"version": "0.0.4",
-					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+				}
+			}
+		},
+		"@ionic/storage": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
+			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
+			"requires": {
+				"localforage": "1.7.1",
+				"localforage-cordovasqlitedriver": "1.7.0",
+				"tslib": "^1.7.1"
+			}
+		},
+		"@ionic/utils-array": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-0.0.1.tgz",
+			"integrity": "sha512-gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"duplexer": "~0.1.1"
+						"ms": "^2.1.1"
 					}
 				},
-				"ts-simple-ast": {
-					"version": "12.4.0",
-					"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
-					"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
-					"dev": true,
-					"requires": {
-						"@dsherret/to-absolute-glob": "^2.0.2",
-						"code-block-writer": "^7.2.0",
-						"fs-extra": "^6.0.1",
-						"glob-parent": "^3.1.0",
-						"globby": "^8.0.1",
-						"is-negated-glob": "^1.0.0",
-						"multimatch": "^2.1.0",
-						"object-assign": "^4.1.1",
-						"tslib": "^1.9.0",
-						"typescript": "2.9.1"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-							"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.9.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
-					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
-				},
-				"uglify-js": {
-					"version": "2.8.29",
-					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+				}
+			}
+		},
+		"@ionic/utils-fs": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.2.0.tgz",
+			"integrity": "sha512-31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"fs-extra": "^7.0.1",
+				"through2": "^3.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"source-map": "~0.5.1",
-						"uglify-to-browserify": "~1.0.0",
-						"yargs": "~3.10.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true,
-					"optional": true
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"yargs": {
-					"version": "3.10.0",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"camelcase": "^1.0.2",
-						"cliui": "^2.1.0",
-						"decamelize": "^1.0.0",
-						"window-size": "0.1.0"
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
 		},
-		"@compodoc/ngd-core": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
-			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
+		"@ionic/utils-network": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.8.tgz",
+			"integrity": "sha512-DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg==",
 			"dev": true,
 			"requires": {
-				"ansi-colors": "^1.0.1",
-				"fancy-log": "^1.3.2",
-				"typescript": "^2.4.2"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
 			},
 			"dependencies": {
-				"ansi-colors": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ansi-wrap": "^0.1.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"typescript": {
-					"version": "2.9.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
 		},
-		"@dsherret/to-absolute-glob": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
+		"@ionic/utils-object": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-0.0.1.tgz",
+			"integrity": "sha512-ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ==",
 			"dev": true,
 			"requires": {
-				"is-absolute": "^1.0.0",
-				"is-negated-glob": "^1.0.0"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/barcode-scanner": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.0.0.tgz",
-			"integrity": "sha512-DjTWPZan6s1easv6A6LgI/ZcPQ+HJX2PxZHBuJckwkNxJ+KAWwEZBpEQ5rbyntZyTHLUZLCUrOhgDq4Y/TOI+Q==",
+		"@ionic/utils-process": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-0.1.0.tgz",
+			"integrity": "sha512-CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-terminal": "0.0.1",
+				"debug": "^4.0.0",
+				"lodash": "^4.17.5",
+				"tree-kill": "1.2.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/call-number": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.0.0.tgz",
-			"integrity": "sha512-kzIAMs7+hTRL2A2wO6PyIOVAJYxhBFNDsYyuE5vLmDs1Um74mFq62CFdYhLNpF+/wovbuNG3+u/b1BFToXIUWw==",
+		"@ionic/utils-stream": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-0.0.1.tgz",
+			"integrity": "sha512-IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"stream-combiner2": "^1.1.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/core": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.0.0.tgz",
-			"integrity": "sha512-qtshWPo+CMq9ZoDGcg+1XF1+k2ASm0sLtZsIbXmYo5X82Q9cUhjk95X9BqHnjXHOdIWk4J/D3ot0/vzmMTNdbA==",
+		"@ionic/utils-subprocess": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz",
+			"integrity": "sha512-8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"cross-spawn": "^6.0.5",
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/device": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.0.0.tgz",
-			"integrity": "sha512-Mf8kLO+BbvsdYrDvgkpp2YTX4ygXQLEMrsnqPauibhE8ZGsAZUDmfH7+Mtv1OIN0z0ot0zhEOhsfF7y/QuWRzw==",
+		"@ionic/utils-terminal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz",
+			"integrity": "sha512-xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/dialogs": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.0.0.tgz",
-			"integrity": "sha512-DXhWE9tbEtBmEmbcRD+cmQ42zIGG6NbQCKL/Gs4YsAGrLVBhbhCJx7M/Yk8C2gn2ktczfl4h7KMne/NABbfbqA==",
+		"@mrmlnc/readdir-enhanced": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"call-me-maybe": "^1.0.1",
+				"glob-to-regexp": "^0.3.0"
 			}
 		},
-		"@ionic-native/geolocation": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.0.0.tgz",
-			"integrity": "sha512-gU3GNCEJgh+2KpK0Tg9l85HDMRkUWO9FAszF4UDnqAUihTQGCM0Nl+hpmEQowkM9+Him8FJ83rT82pPmnGERCA==",
+		"@ngtools/webpack": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.7.tgz",
+			"integrity": "sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"enhanced-resolve": "4.1.0",
+				"rxjs": "6.3.3",
+				"tree-kill": "1.2.1",
+				"webpack-sources": "1.3.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/globalization": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.0.0.tgz",
-			"integrity": "sha512-a3JsDwgwvzKyq2tda6FNIXmrVMeaZ9muXl9h1HKcG1ThqWHNGW9Zxmpakv3sO4onUv6KUEaP49rcim/xoeo9BA==",
+		"@ngx-progressbar/core": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.2.tgz",
+			"integrity": "sha512-z0VzsJpgWxoU7wLXviCutXPXDop1Ry/SPOlVOtXHlkUGFAzHs3soDeXpTyigSdBB8Q16Nisow4EVuOKCByp6PQ==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-analytics": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.0.0.tgz",
-			"integrity": "sha512-mYeP9QmHfjjJe3y5uHUz4atfR2EuRCf5TFRCyi+yoCs5WEwC4JbM7k4GxGyx6YY1MHqNDoUrDZu5F0NypqxsKg==",
+		"@ngx-translate/core": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
+			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-maps": {
-			"version": "5.0.0-beta.26",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
-			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+		"@ngx-translate/http-loader": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
+			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/intercom": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.0.0.tgz",
-			"integrity": "sha512-rXk3IEFbT3Ec/kmz53Xrkvicch1CFeL/0dSOKsM5mrIYoUWQJGV2qMP5Clbq7ZdMJ/8q2Bv2gF2b9L/UipAy/w==",
+		"@nodelib/fs.stat": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+			"dev": true
+		},
+		"@schematics/angular": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.7.tgz",
+			"integrity": "sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"typescript": "3.2.4"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+					"requires": {
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
+					}
+				},
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+					"requires": {
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
+					}
+				},
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
 			}
 		},
-		"@ionic-native/local-notifications": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.0.0.tgz",
-			"integrity": "sha512-lKdZ60rJncgCwwVeCYSfhHJGtrFUBqj9FkJpRcLUxeOZSxp9EVCN/ZGoGyeTlOKwunNBaw8a77hBZ7lbriBW6w==",
+		"@schematics/update": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.7.tgz",
+			"integrity": "sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"pacote": "9.4.0",
+				"rxjs": "6.3.3",
+				"semver": "5.6.0",
+				"semver-intersect": "1.4.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/mixpanel": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.0.0.tgz",
-			"integrity": "sha512-SqKHc5yCTJ2qnX1bk7GFcNQCpDzIqzg0+CNWptSkFPBxtais3qw07GYTASaEzQM1kjmPSPD++avkfWmUXT2CXg==",
+		"@types/bson": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.0.tgz",
+			"integrity": "sha512-pq/rqJwJWkbS10crsG5bgnrisL8pML79KlMKQMoQwLUjlPAkrUHMvHJ3oGwE7WHR61Lv/nadMwXVAD2b+fpD8Q==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/network": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.0.0.tgz",
-			"integrity": "sha512-Yb8c+U8GZOhL5qc6LdbzJdwzTclZ9w0QpPH5YTbFXLJOSzhmq+ibN2dzWbmWLjPZuwR0V7K+KrefoJNacFDejw==",
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
+		"@types/d3-color": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",
+			"integrity": "sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==",
+			"dev": true
+		},
+		"@types/geojson": {
+			"version": "7946.0.7",
+			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+			"integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==",
+			"dev": true
+		},
+		"@types/googlemaps": {
+			"version": "3.30.19",
+			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.19.tgz",
+			"integrity": "sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==",
+			"dev": true
+		},
+		"@types/graphql": {
+			"version": "14.2.0",
+			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.2.0.tgz",
+			"integrity": "sha512-lELg5m6eBOmATWyCZl8qULEOvnPIUG6B443yXKj930glXIgwQirIBPp5rthP2amJW0YSzUg2s5sfgba4mRRCNw==",
+			"dev": true
+		},
+		"@types/jasmine": {
+			"version": "3.3.12",
+			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.12.tgz",
+			"integrity": "sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==",
+			"dev": true
+		},
+		"@types/jasminewd2": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
+			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/jasmine": "*"
 			}
 		},
-		"@ionic-native/splash-screen": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.0.0.tgz",
-			"integrity": "sha512-+7QfXPkaosGsR3ohEiL/WJn23NHVDZYvnilYNrOMF7oohnj5ngH46fCNYp1Tpybe5GCV1iP++RzDvE5jghWLZg==",
+		"@types/leaflet": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.3.tgz",
+			"integrity": "sha512-jFRBSsPHi1EwQSwrN0cOJLdPhwOZsRl4IMxvm/2ShLh0YM5GfCtQXCzsrv8RE7DWL+AykXdYSAd9bFLWbZT4CQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/geojson": "*"
 			}
 		},
-		"@ionic-native/status-bar": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.0.0.tgz",
-			"integrity": "sha512-mJfj+VXTOgf9Og0S7QDlT9I8UVI+Wj4kpZUHdQizovA/R0m1HG2hLKtEMy00iDVbOBjRsXGcD6JXCOeyVjg7LA==",
+		"@types/mongodb": {
+			"version": "3.1.22",
+			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.22.tgz",
+			"integrity": "sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/bson": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/unique-device-id": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.0.0.tgz",
-			"integrity": "sha512-yfiQKkkh6N6ypZFBPqu2rDCsdYVUdy7W4ZezD3nCj33FkrNS7Xrdo9H76SQW2c7smXQ+fnSeH7prS//Yyc0KvQ==",
+		"@types/mongoose": {
+			"version": "5.3.24",
+			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.24.tgz",
+			"integrity": "sha512-Txa5C/veUJJG2o1sRbl8z1M7GhPjJz6J3JJQV76eYN0PyI9F2NO3gbVUj059ND5nlbvQjRhXuFLaqN6NH8nMNQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/mongodb": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/vibration": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.0.0.tgz",
-			"integrity": "sha512-XIAfp3oeizseetvnYPAMZ0kK+nyh2i/0Vy0FJkcEGM0fCD36PZkyNpx1Ai1bk3/Ln3nTMZddoBZket1aTXetNA==",
+		"@types/node": {
+			"version": "11.12.1",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-11.12.1.tgz",
+			"integrity": "sha512-sKDlqv6COJrR7ar0+GqqhrXQDzQlMcqMnF2iEU6m9hLo8kxozoAGUazwPyELHlRVmjsbvlnGXjnzyptSXVmceA==",
+			"dev": true
+		},
+		"@types/q": {
+			"version": "0.0.32",
+			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+			"dev": true
+		},
+		"@types/reflect-metadata": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
+			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"reflect-metadata": "*"
 			}
 		},
-		"@ionic/angular": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.0.0.tgz",
-			"integrity": "sha512-kxvlZN5daRql/VRcbB7YWMcmE4jKDgwlPRykzNvmYWFDr9vg1AbXirLHAPtR7BaKWJEN4dJwlibjBEJQw8kVYQ==",
+		"@types/selenium-webdriver": {
+			"version": "3.0.14",
+			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
+			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
+			"dev": true
+		},
+		"@types/socket.io-client": {
+			"version": "1.4.32",
+			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
+			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
+			"dev": true
+		},
+		"@types/source-list-map": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+			"dev": true
+		},
+		"@types/stripe": {
+			"version": "6.25.7",
+			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.25.7.tgz",
+			"integrity": "sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==",
+			"dev": true,
 			"requires": {
-				"@ionic/core": "4.0.0",
-				"tslib": "^1.9.3"
+				"@types/node": "*"
 			}
 		},
-		"@ionic/angular-toolkit": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.3.0.tgz",
-			"integrity": "sha512-GOoAx/cs6Hhl0FiOhZAFPCG3cgz2DbyfYflhWFbi08MLIQD2aCoVg6wIpcBoMHQf4eob5WDDIlbOO0t9LVn3dg==",
+		"@types/swiper": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.2.tgz",
+			"integrity": "sha512-bJzmpMwGaA6elG0/9M3H45Az0IwuuJoUGUXGgH/DVKZOJg3iBtu+djAlBnOXOonAHd5kDsrfdhdxFKOGjzM+Vw==",
+			"dev": true
+		},
+		"@types/uuid": {
+			"version": "3.4.4",
+			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
+			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
 			"dev": true,
 			"requires": {
-				"@schematics/angular": "^7.0.3",
-				"tslib": "^1.9.0",
-				"typescript": "^3.2.4"
+				"@types/node": "*"
+			}
+		},
+		"@types/webpack-sources": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
+			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/source-list-map": "*",
+				"source-map": "^0.6.1"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					},
-					"dependencies": {
-						"typescript": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-							"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-							"dev": true
-						}
-					}
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
 				}
 			}
 		},
-		"@ionic/app-scripts": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.2.tgz",
-			"integrity": "sha512-ZpeAafEboO/xHnmgy61ZOsaMGpoer621YX3q09x+BA2sbcuqOEsMKV91BRZmghoiHlwBB9woxXRyAwuYIAASHw==",
-			"dev": true,
-			"requires": {
-				"@angular-devkit/build-optimizer": "0.0.35",
-				"autoprefixer": "^7.2.6",
-				"chalk": "^2.4.0",
-				"chokidar": "^2.0.4",
-				"clean-css": "^4.1.11",
-				"cross-spawn": "^5.1.0",
-				"dotenv-webpack": "^1.5.7",
-				"express": "^4.16.3",
-				"fs-extra": "^4.0.2",
-				"glob": "^7.1.2",
-				"json-loader": "^0.5.7",
-				"node-sass": "^4.10.0",
-				"os-name": "^2.0.1",
-				"postcss": "^6.0.21",
-				"proxy-middleware": "^0.15.0",
-				"reflect-metadata": "^0.1.10",
-				"rollup": "0.50.0",
-				"rollup-plugin-commonjs": "8.2.6",
-				"rollup-plugin-node-resolve": "3.0.0",
-				"source-map": "^0.6.1",
-				"tiny-lr": "^1.1.1",
-				"tslint": "^5.8.0",
-				"tslint-eslint-rules": "^4.1.1",
-				"uglify-es": "3.2.2",
-				"webpack": "3.12.0",
-				"ws": "3.3.2",
-				"xml2js": "^0.4.19"
-			},
-			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.0.35",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
-					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.1.0",
-						"source-map": "^0.5.6",
-						"typescript": "~2.6.1",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"acorn-dynamic-import": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
-					"dev": true,
-					"requires": {
-						"acorn": "^4.0.3"
-					},
-					"dependencies": {
-						"acorn": {
-							"version": "4.0.13",
-							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-							"dev": true
-						}
-					}
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"autoprefixer": {
-					"version": "7.2.6",
-					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
-					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^2.11.3",
-						"caniuse-lite": "^1.0.30000805",
-						"normalize-range": "^0.1.2",
-						"num2fraction": "^1.2.2",
-						"postcss": "^6.0.17",
-						"postcss-value-parser": "^3.2.3"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"body": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-					"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-					"dev": true,
-					"requires": {
-						"continuable-cache": "^0.3.1",
-						"error": "^7.0.0",
-						"raw-body": "~1.1.0",
-						"safe-json-parse": "~1.0.1"
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"browserslist": {
-					"version": "2.11.3",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30000792",
-						"electron-to-chromium": "^1.3.30"
-					}
-				},
-				"bytes": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-					"dev": true
-				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.12.2",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
-					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^4.0.1",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"enhanced-resolve": {
-					"version": "3.4.1",
-					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"memory-fs": "^0.4.0",
-						"object-assign": "^4.0.1",
-						"tapable": "^0.2.7"
-					}
-				},
-				"execa": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"fs-extra": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"json5": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"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"
-					}
-				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"macos-release": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
-					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
-					"dev": true
-				},
-				"magic-string": {
-					"version": "0.22.5",
-					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
-					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
-					"dev": true,
-					"requires": {
-						"vlq": "^0.2.2"
-					}
-				},
-				"mem": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^1.0.0"
-					}
-				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"os-locale": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-					"dev": true,
-					"requires": {
-						"execa": "^0.7.0",
-						"lcid": "^1.0.0",
-						"mem": "^1.1.0"
-					}
-				},
-				"os-name": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
-					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
-					"dev": true,
-					"requires": {
-						"macos-release": "^1.0.0",
-						"win-release": "^1.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-					"dev": true,
-					"requires": {
-						"p-limit": "^1.1.0"
-					}
-				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.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
-				},
-				"postcss": {
-					"version": "6.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.1",
-						"source-map": "^0.6.1",
-						"supports-color": "^5.4.0"
-					}
-				},
-				"raw-body": {
-					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-					"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-					"dev": true,
-					"requires": {
-						"bytes": "1",
-						"string_decoder": "0.10"
-					}
-				},
-				"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"
-					}
-				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-					"dev": true,
-					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				},
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				},
-				"rollup-plugin-commonjs": {
-					"version": "8.2.6",
-					"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
-					"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.2.1",
-						"estree-walker": "^0.5.0",
-						"magic-string": "^0.22.4",
-						"resolve": "^1.4.0",
-						"rollup-pluginutils": "^2.0.1"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				},
-				"tapable": {
-					"version": "0.2.9",
-					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
-					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
-					"dev": true
-				},
-				"tiny-lr": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-					"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-					"dev": true,
-					"requires": {
-						"body": "^5.1.0",
-						"debug": "^3.1.0",
-						"faye-websocket": "~0.10.0",
-						"livereload-js": "^2.3.0",
-						"object-assign": "^4.1.0",
-						"qs": "^6.4.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.6.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
-					"dev": true
-				},
-				"uglify-es": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
-					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
-					"dev": true,
-					"requires": {
-						"commander": "~2.12.1",
-						"source-map": "~0.6.1"
-					}
-				},
-				"uglifyjs-webpack-plugin": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-					"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
-					"dev": true,
-					"requires": {
-						"source-map": "^0.5.6",
-						"uglify-js": "^2.8.29",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"uglify-js": {
-							"version": "2.8.29",
-							"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-							"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-							"dev": true,
-							"requires": {
-								"source-map": "~0.5.1",
-								"uglify-to-browserify": "~1.0.0",
-								"yargs": "~3.10.0"
-							}
-						},
-						"yargs": {
-							"version": "3.10.0",
-							"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-							"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-							"dev": true,
-							"requires": {
-								"camelcase": "^1.0.2",
-								"cliui": "^2.1.0",
-								"decamelize": "^1.0.0",
-								"window-size": "0.1.0"
-							}
-						}
-					}
-				},
-				"webpack": {
-					"version": "3.12.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
-					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.0.0",
-						"acorn-dynamic-import": "^2.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"async": "^2.1.2",
-						"enhanced-resolve": "^3.4.0",
-						"escope": "^3.6.0",
-						"interpret": "^1.0.0",
-						"json-loader": "^0.5.4",
-						"json5": "^0.5.1",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"mkdirp": "~0.5.0",
-						"node-libs-browser": "^2.0.0",
-						"source-map": "^0.5.3",
-						"supports-color": "^4.2.1",
-						"tapable": "^0.2.7",
-						"uglifyjs-webpack-plugin": "^0.4.6",
-						"watchpack": "^1.4.0",
-						"webpack-sources": "^1.0.1",
-						"yargs": "^8.0.2"
-					},
-					"dependencies": {
-						"has-flag": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-							"dev": true
-						},
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "4.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-							"dev": true,
-							"requires": {
-								"has-flag": "^2.0.0"
-							}
-						}
-					}
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
-				},
-				"win-release": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
-					"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
-					"dev": true,
-					"requires": {
-						"semver": "^5.0.1"
-					}
-				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true
-				},
-				"ws": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
-					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
-				},
-				"yargs": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0",
-						"cliui": "^3.2.0",
-						"decamelize": "^1.1.1",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^2.0.0",
-						"read-pkg-up": "^2.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1",
-						"yargs-parser": "^7.0.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						},
-						"cliui": {
-							"version": "3.2.0",
-							"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-							"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-							"dev": true,
-							"requires": {
-								"string-width": "^1.0.1",
-								"strip-ansi": "^3.0.1",
-								"wrap-ansi": "^2.0.0"
-							},
-							"dependencies": {
-								"string-width": {
-									"version": "1.0.2",
-									"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-									"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-									"dev": true,
-									"requires": {
-										"code-point-at": "^1.0.0",
-										"is-fullwidth-code-point": "^1.0.0",
-										"strip-ansi": "^3.0.0"
-									}
-								}
-							}
-						}
-					}
-				},
-				"yargs-parser": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						}
-					}
-				}
-			}
-		},
-		"@ionic/core": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.0.0.tgz",
-			"integrity": "sha512-/hW4882TyjcJTiNBYpoLGRYxkQhRidSuVjCL2RvfMS8a7FDQoS2dkje5KBGG+O2TCjtyXE5de1A6HvUgvDqjGA==",
-			"requires": {
-				"ionicons": "4.5.5"
-			}
-		},
-		"@ionic/lab": {
-			"version": "1.0.20",
-			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.20.tgz",
-			"integrity": "sha512-srSpTMb22BYk9qbEnyyb04KwBFpauBn5BksPmJnlPq8oAjNdNzZOuO/L95qKO9OqfIxRqFwpRVfzvI0TMWjCig==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/utils-fs": "1.0.0",
-				"chalk": "^2.3.0",
-				"express": "^4.16.2",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "2.6.9",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-							"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/ng-toolkit": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
-			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.1.0",
-				"chalk": "^2.3.0",
-				"debug": "^4.0.0",
-				"rxjs": "~6.2.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
-					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "0.0.2",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^1.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.0",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
-					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"ncp": "^2.0.0",
-						"through2": "^2.0.3",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"slice-ansi": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"tree-kill": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
-					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
-					"dev": true
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/pro": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
-			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
-		},
-		"@ionic/schematics-angular": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
-			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
-			"dev": true,
-			"requires": {
-				"@schematics/angular": "0.9.0-beta.3",
-				"lodash": "^4.17.5",
-				"tslib": "^1.9.0",
-				"typescript": "3.0.1"
-			},
-			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
-					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
-					"dev": true,
-					"requires": {
-						"ajv": "6.5.3",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.2.2",
-						"source-map": "0.7.3"
-					}
-				},
-				"@angular-devkit/schematics": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
-					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"rxjs": "6.2.2"
-					}
-				},
-				"@schematics/angular": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
-					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"@angular-devkit/schematics": "0.9.0-beta.3",
-						"typescript": "3.0.1"
-					}
-				},
-				"ajv": {
-					"version": "6.5.3",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
-					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^2.0.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"typescript": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
-					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
-					"dev": true
-				}
-			}
-		},
-		"@ionic/storage": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
-			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
-			"requires": {
-				"localforage": "1.7.1",
-				"localforage-cordovasqlitedriver": "1.7.0",
-				"tslib": "^1.7.1"
-			}
-		},
-		"@ionic/utils-network": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.6.tgz",
-			"integrity": "sha512-1aHXzL1PPJDdXLwicu5+Zv0QfWIrKxqGvat4A8zruAjm4oLvIOli5DnUb61VqP2ocAhiI3t39jxtBq9Fb/Gl9w==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.0.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@mrmlnc/readdir-enhanced": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-			"dev": true,
-			"requires": {
-				"call-me-maybe": "^1.0.1",
-				"glob-to-regexp": "^0.3.0"
-			}
-		},
-		"@ngx-progressbar/core": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.1.tgz",
-			"integrity": "sha512-IAbpPbv0RHwnLTqr8JpEOR2mDbia8jTyZdG0yWmyiGoVfIisSs/NkzMDph43pLvWl2aaJ+Bd2BJTdM2olYK4MQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/core": {
-			"version": "11.0.1",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
-			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/http-loader": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
-			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-			"dev": true
-		},
-		"@types/bson": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-1.0.11.tgz",
-			"integrity": "sha512-j+UcCWI+FsbI5/FQP/Kj2CXyplWAz39ktHFkXk84h7dNblKRSoNJs95PZFRd96NQGqsPEPgeclqnznWZr14ZDA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/cordova": {
-			"version": "0.0.34",
-			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-		},
-		"@types/d3-color": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.1.tgz",
-			"integrity": "sha512-xwb1tqvYNWllbHuhMFhiXk63Imf+QNq/dJdmbXmr2wQVnwGenCuj3/0IWJ9hdIFQIqzvhT7T37cvx93jtAsDbQ==",
-			"dev": true
-		},
-		"@types/geojson": {
-			"version": "7946.0.5",
-			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.5.tgz",
-			"integrity": "sha512-rLlMXpd3rdlrp0+xsrda/hFfOpIxgqFcRpk005UKbHtcdFK+QXAjhBAPnvO58qF4O1LdDXrcaiJxMgstCIlcaw==",
-			"dev": true
-		},
-		"@types/googlemaps": {
-			"version": "3.30.16",
-			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.16.tgz",
-			"integrity": "sha512-6OZ64ahLzYfzuSr71y4jAHZXiwxjvvEM2bfF2tzjIc9KUZVbO30SkYa8WewTsR8aM5BFz/uBiNlZ14eRLXYS0g==",
-			"dev": true
-		},
-		"@types/graphql": {
-			"version": "14.0.5",
-			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.0.5.tgz",
-			"integrity": "sha512-bwGYLE0SRy5ZraC91dqI2bxbspfm10kyJ2Yjuvk4OjdGznh7fkoWW+xXZHfFydJaqu9syZi099cpiZw3GlPDiA==",
-			"dev": true
-		},
-		"@types/jasmine": {
-			"version": "3.3.8",
-			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.8.tgz",
-			"integrity": "sha512-BaOFpaddRVV8qykJoWHrHtamml880oh0+DIZWbtJgx0pu+KhDF1gER5hSfCIfzyMrbjMuYFnLUfyo1l0JUVU3Q==",
-			"dev": true
-		},
-		"@types/jasminewd2": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
-			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
-			"dev": true,
-			"requires": {
-				"@types/jasmine": "*"
-			}
-		},
-		"@types/leaflet": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.0.tgz",
-			"integrity": "sha512-ZA+g6XyK/00labaNCWhbhahAOwEf9X4v9cAB0ZBwWjGOj5ewPC8qcdN/M2VsIAfP699Yz3+E7zaaClxmRaf4BQ==",
-			"dev": true,
-			"requires": {
-				"@types/geojson": "*"
-			}
-		},
-		"@types/mongodb": {
-			"version": "3.1.19",
-			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.19.tgz",
-			"integrity": "sha512-H54hQEovAhyLrIZOhPNfGyCCDoTqKsjb8GQBy8nptJqfxrYCp5WVcPJf9v0kfTPR72xOhaz9+WcYxOXWwEg1Vg==",
-			"dev": true,
-			"requires": {
-				"@types/bson": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/mongoose": {
-			"version": "5.3.12",
-			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.12.tgz",
-			"integrity": "sha512-dmZv3H9lXWhLY8XrxJNu+pVUecquReR3AtPxVsnPTcTH/T/YTgxE0zeTavNcqaBUD5XXKtlTy+2VhZxDkn/0Jw==",
-			"dev": true,
-			"requires": {
-				"@types/mongodb": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/node": {
-			"version": "10.12.21",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz",
-			"integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==",
-			"dev": true
-		},
-		"@types/q": {
-			"version": "0.0.32",
-			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
-			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
-			"dev": true
-		},
-		"@types/reflect-metadata": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
-			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
-			"dev": true,
-			"requires": {
-				"reflect-metadata": "*"
-			}
-		},
-		"@types/selenium-webdriver": {
-			"version": "3.0.14",
-			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
-			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
-			"dev": true
-		},
-		"@types/socket.io-client": {
-			"version": "1.4.32",
-			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
-			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
-			"dev": true
-		},
-		"@types/source-list-map": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-			"dev": true
-		},
-		"@types/stripe": {
-			"version": "6.19.5",
-			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.19.5.tgz",
-			"integrity": "sha512-NHSloxUEjergjDO3U5ZOJgURP6H9vPlJGWbwdUOCB/r24vMzZevjGfbUiwR0u51Yum9AId/7VG/qcbq5q/Hcng==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/swiper": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.1.tgz",
-			"integrity": "sha512-kG4moYcEEhAZH2l6ges7JyCit1tBMfQvAar6MLfZTfwZ1bvaTJQU8sxKiJavhoA69bc9A+lNYC2bhhEaVbp35w==",
-			"dev": true
-		},
-		"@types/uuid": {
-			"version": "3.4.4",
-			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
-			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/webpack-sources": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
-			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/source-list-map": "*",
-				"source-map": "^0.6.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"@types/zen-observable": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
-			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
-		},
-		"@webassemblyjs/ast": {
-			"version": "1.7.11",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
-			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
+		"@types/yargs": {
+			"version": "12.0.10",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.10.tgz",
+			"integrity": "sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==",
+			"dev": true
+		},
+		"@types/zen-observable": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
+			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
+		},
+		"@webassemblyjs/ast": {
+			"version": "1.7.11",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
+			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
 			"dev": true,
 			"requires": {
 				"@webassemblyjs/helper-module-context": "1.7.11",
@@ -5817,16 +3096,15 @@
 			"version": "1.3.5",
 			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
 			"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-			"dev": true,
 			"requires": {
 				"mime-types": "~2.1.18",
 				"negotiator": "0.6.1"
 			}
 		},
 		"acorn": {
-			"version": "6.0.6",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.6.tgz",
-			"integrity": "sha512-5M3G/A4uBSMIlfJ+h9W125vJvPFH/zirISsW5qfxF5YzEvXJCtolLoQvM5yZft0DvMcUrPGKPOlgEu55I6iUtA==",
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+			"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
 			"dev": true
 		},
 		"acorn-dynamic-import": {
@@ -5835,6 +3113,12 @@
 			"integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
 			"dev": true
 		},
+		"acorn-walk": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+			"integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+			"dev": true
+		},
 		"adm-zip": {
 			"version": "0.4.13",
 			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz",
@@ -5882,9 +3166,9 @@
 			"dev": true
 		},
 		"ajv-keywords": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.3.0.tgz",
-			"integrity": "sha512-CMzN9S62ZOO4sA/mJZIO4S++ZM7KFWzH3PPWkveLhy4OZ9i1/VatgwWMD46w/XbGCBy7Ye0gCk+Za6mmyfKK7g==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+			"integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
 			"dev": true
 		},
 		"align-text": {
@@ -5908,6 +3192,11 @@
 			"resolved": "https://registry.npmjs.org/angular2-logger/-/angular2-logger-0.7.0.tgz",
 			"integrity": "sha512-fB2ucBEKqJ6K+PyQEVKwIZhwcB2NvxPashHJEBGTG5Ex+NhC2xUNDhd1AILX+ZIRi3hz6QEKzbqGAxmusdUCkw=="
 		},
+		"ansi": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+			"integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
+		},
 		"ansi-align": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
@@ -5918,9 +3207,9 @@
 			}
 		},
 		"ansi-colors": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-			"integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+			"integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
 			"dev": true
 		},
 		"ansi-escapes": {
@@ -5953,7 +3242,6 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
 			"requires": {
 				"color-convert": "^1.9.0"
 			}
@@ -6332,102 +3620,121 @@
 			}
 		},
 		"apollo-angular-link-http": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.4.0.tgz",
-			"integrity": "sha512-YMtk4ZmmQ32kvQVnKNhkqk4QQQ+xb5aaq5XVxLv7AX6S7jDfHDLi18Hc25C4c8revM6gLoGV2Xj9ijvyGGbRCg==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz",
+			"integrity": "sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==",
 			"requires": {
-				"apollo-angular-link-http-common": "~1.4.0",
+				"apollo-angular-link-http-common": "~1.5.0",
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-angular-link-http-common": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.4.0.tgz",
-			"integrity": "sha512-VAneRp1YYwaggOKgbMGVSuLMpYroLL6tEgS5WH3iNBg4P7cBcubo3uajWRih7E4pZlzX+bCJ5GNqNDJ6xMFT7Q==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.1.tgz",
+			"integrity": "sha512-uSA7dDZpum9FCocxhrp24mL9EUGYWr2mgW9Tb5uea0eYU3UDmjYSKT/sBSLGQN87P5drXbYrmSj58PtCWmhIMA==",
 			"requires": {
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-cache": {
-			"version": "1.1.25",
-			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.25.tgz",
-			"integrity": "sha512-9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz",
+			"integrity": "sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==",
 			"requires": {
-				"apollo-utilities": "^1.1.2",
+				"apollo-utilities": "^1.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-cache-inmemory": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.2.tgz",
-			"integrity": "sha512-fDVmj5j1e3W+inyuSwjIcMgbQ4edcFgmiKTBMFAEKAq0jg33X7FrbDX8JT2t5Vuf75Mva50JDlt5wXdu7C6WuA==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz",
+			"integrity": "sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==",
 			"requires": {
-				"apollo-cache": "^1.1.25",
-				"apollo-utilities": "^1.1.2",
+				"apollo-cache": "^1.2.1",
+				"apollo-utilities": "^1.2.1",
 				"optimism": "^0.6.9",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-client": {
-			"version": "2.4.12",
-			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.12.tgz",
-			"integrity": "sha512-E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w==",
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz",
+			"integrity": "sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==",
 			"requires": {
 				"@types/zen-observable": "^0.8.0",
-				"apollo-cache": "1.1.25",
+				"apollo-cache": "1.2.1",
 				"apollo-link": "^1.0.0",
 				"apollo-link-dedup": "^1.0.0",
-				"apollo-utilities": "1.1.2",
+				"apollo-utilities": "1.2.1",
 				"symbol-observable": "^1.0.2",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"apollo-link": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.8.tgz",
-			"integrity": "sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==",
+			"version": "1.2.11",
+			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.11.tgz",
+			"integrity": "sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==",
 			"requires": {
-				"zen-observable-ts": "^0.8.15"
+				"apollo-utilities": "^1.2.1",
+				"ts-invariant": "^0.3.2",
+				"tslib": "^1.9.3",
+				"zen-observable-ts": "^0.8.18"
+			},
+			"dependencies": {
+				"ts-invariant": {
+					"version": "0.3.2",
+					"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz",
+					"integrity": "sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==",
+					"requires": {
+						"tslib": "^1.9.3"
+					}
+				}
 			}
 		},
 		"apollo-link-context": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.14.tgz",
-			"integrity": "sha512-l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.17.tgz",
+			"integrity": "sha512-W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-dedup": {
-			"version": "1.0.15",
-			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz",
-			"integrity": "sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==",
+			"version": "1.0.18",
+			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz",
+			"integrity": "sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-ws": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz",
-			"integrity": "sha512-KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz",
+			"integrity": "sha512-0PKgahM2BOcUiI3QSJMYXOoUylWKzar5NTZLgMLEW4K/CczOTzC4CTXvKMjh/cx57Jto/U2xzKRy9BEoNfnK5Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-utilities": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.2.tgz",
-			"integrity": "sha512-EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
+			"integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
 			"requires": {
 				"fast-json-stable-stringify": "^2.0.0",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"app-root-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
-			"integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=",
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+			"integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
 			"dev": true
 		},
 		"append-transform": {
@@ -6492,6 +3799,16 @@
 				"sprintf-js": "~1.0.2"
 			}
 		},
+		"aria-query": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+			"integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7",
+				"commander": "^2.11.0"
+			}
+		},
 		"arr-diff": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -6524,12 +3841,6 @@
 			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
 			"dev": true
 		},
-		"array-slice": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-			"integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-			"dev": true
-		},
 		"array-union": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -6623,10 +3934,69 @@
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
 			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
 		},
+		"ast-transform": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/ast-transform/-/ast-transform-0.0.0.tgz",
+			"integrity": "sha1-dJRAWIh9goPhidlUYAlHvJj+AGI=",
+			"dev": true,
+			"requires": {
+				"escodegen": "~1.2.0",
+				"esprima": "~1.0.4",
+				"through": "~2.3.4"
+			},
+			"dependencies": {
+				"escodegen": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz",
+					"integrity": "sha1-Cd55Z3kcyVi3+Jot220jRRrzJ+E=",
+					"dev": true,
+					"requires": {
+						"esprima": "~1.0.4",
+						"estraverse": "~1.5.0",
+						"esutils": "~1.0.0",
+						"source-map": "~0.1.30"
+					}
+				},
+				"esprima": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+					"integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=",
+					"dev": true
+				},
+				"estraverse": {
+					"version": "1.5.1",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+					"integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
+					"integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
 		"ast-types": {
-			"version": "0.11.7",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz",
-			"integrity": "sha512-2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw==",
+			"version": "0.7.8",
+			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.7.8.tgz",
+			"integrity": "sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=",
+			"dev": true
+		},
+		"ast-types-flow": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+			"integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
 			"dev": true
 		},
 		"astral-regex": {
@@ -6692,6 +4062,15 @@
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
 			"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
 		},
+		"axobject-query": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+			"integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7"
+			}
+		},
 		"babel-code-frame": {
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -6774,6 +4153,12 @@
 				"regenerator-runtime": "^0.10.0"
 			},
 			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				},
 				"regenerator-runtime": {
 					"version": "0.10.5",
 					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
@@ -6790,6 +4175,14 @@
 			"requires": {
 				"core-js": "^2.4.0",
 				"regenerator-runtime": "^0.11.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				}
 			}
 		},
 		"babel-template": {
@@ -6850,15 +4243,70 @@
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
 		},
+		"base": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"requires": {
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"requires": {
+						"is-descriptor": "^1.0.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				}
+			}
+		},
 		"base64-arraybuffer": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
 			"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
 		},
 		"base64-js": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
-			"integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+			"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
 			"dev": true
 		},
 		"base64id": {
@@ -6916,6 +4364,11 @@
 				"tryer": "^1.0.0"
 			}
 		},
+		"big-integer": {
+			"version": "1.6.43",
+			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz",
+			"integrity": "sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg=="
+		},
 		"big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -6960,11 +4413,22 @@
 			"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
 			"dev": true
 		},
+		"body": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+			"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+			"dev": true,
+			"requires": {
+				"continuable-cache": "^0.3.1",
+				"error": "^7.0.0",
+				"raw-body": "~1.1.0",
+				"safe-json-parse": "~1.0.1"
+			}
+		},
 		"body-parser": {
 			"version": "1.18.3",
 			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
 			"integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
-			"dev": true,
 			"requires": {
 				"bytes": "3.0.0",
 				"content-type": "~1.0.4",
@@ -6982,7 +4446,6 @@
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
 					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
-					"dev": true,
 					"requires": {
 						"bytes": "3.0.0",
 						"http-errors": "1.6.3",
@@ -7021,9 +4484,9 @@
 			}
 		},
 		"bootstrap": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.2.1.tgz",
-			"integrity": "sha512-tt/7vIv3Gm2mnd/WeDx36nfGGHleil0Wg8IeB7eMrVkY0fZ5iTaBisSh8oNANc2IBsCc6vCgCNTIM/IEN0+50Q=="
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+			"integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
 		},
 		"boxen": {
 			"version": "1.3.0",
@@ -7040,6 +4503,14 @@
 				"widest-line": "^2.0.0"
 			}
 		},
+		"bplist-parser": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+			"integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+			"requires": {
+				"big-integer": "^1.6.7"
+			}
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -7049,12 +4520,60 @@
 				"concat-map": "0.0.1"
 			}
 		},
+		"braces": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+			"requires": {
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"brfs": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz",
+			"integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==",
+			"dev": true,
+			"requires": {
+				"quote-stream": "^1.0.1",
+				"resolve": "^1.1.5",
+				"static-module": "^2.2.0",
+				"through2": "^2.0.0"
+			}
+		},
 		"brorand": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
 			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
 			"dev": true
 		},
+		"brotli": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz",
+			"integrity": "sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=",
+			"dev": true,
+			"requires": {
+				"base64-js": "^1.1.2"
+			}
+		},
 		"browser-resolve": {
 			"version": "1.11.3",
 			"resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
@@ -7062,6 +4581,14 @@
 			"dev": true,
 			"requires": {
 				"resolve": "1.1.7"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.1.7",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+					"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+					"dev": true
+				}
 			}
 		},
 		"browserify-aes": {
@@ -7101,6 +4628,17 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"browserify-optional": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/browserify-optional/-/browserify-optional-1.0.1.tgz",
+			"integrity": "sha1-HhNyLP3g2F8SFnbCpyztUzoBiGk=",
+			"dev": true,
+			"requires": {
+				"ast-transform": "0.0.0",
+				"ast-types": "^0.7.0",
+				"browser-resolve": "^1.8.1"
+			}
+		},
 		"browserify-rsa": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
@@ -7136,14 +4674,14 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz",
-			"integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==",
+			"version": "4.5.2",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.2.tgz",
+			"integrity": "sha512-zmJVLiKLrzko0iszd/V4SsjTaomFeoVzQGYYOYgRgsbh7WNh95RgDB0CmBdFWYs/3MyFSt69NypjL/h3iaddKQ==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30000929",
-				"electron-to-chromium": "^1.3.103",
-				"node-releases": "^1.1.3"
+				"caniuse-lite": "^1.0.30000951",
+				"electron-to-chromium": "^1.3.116",
+				"node-releases": "^1.1.11"
 			}
 		},
 		"browserstack": {
@@ -7182,6 +4720,12 @@
 			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
 			"dev": true
 		},
+		"buffer-equal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
+			"integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=",
+			"dev": true
+		},
 		"buffer-fill": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
@@ -7226,8 +4770,36 @@
 		"bytes": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-			"dev": true
+			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+		},
+		"cacache": {
+			"version": "10.0.4",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+			"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.1",
+				"chownr": "^1.0.1",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.1.11",
+				"lru-cache": "^4.1.1",
+				"mississippi": "^2.0.0",
+				"mkdirp": "^0.5.1",
+				"move-concurrently": "^1.0.1",
+				"promise-inflight": "^1.0.1",
+				"rimraf": "^2.6.2",
+				"ssri": "^5.2.4",
+				"unique-filename": "^1.1.0",
+				"y18n": "^4.0.0"
+			},
+			"dependencies": {
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
 		},
 		"cache-base": {
 			"version": "1.0.1",
@@ -7252,9 +4824,9 @@
 			"dev": true
 		},
 		"call-number": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/call-number/-/call-number-0.0.2.tgz",
-			"integrity": "sha1-GWnh1XQt42na7Q9EM4wawhKDcP8="
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/call-number/-/call-number-1.0.1.tgz",
+			"integrity": "sha1-v52q5If9alVz+JqjZV++ivA2r9I="
 		},
 		"caller-callsite": {
 			"version": "2.0.0",
@@ -7316,9 +4888,9 @@
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30000933",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000933.tgz",
-			"integrity": "sha512-d3QXv7eFTU40DSedSP81dV/ajcGSKpT+GW+uhtWmLvQm9bPk0KK++7i1e2NSW/CXGZhWFt2mFbFtCJ5I5bMuVA==",
+			"version": "1.0.30000955",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
+			"integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==",
 			"dev": true
 		},
 		"canonical-path": {
@@ -7352,7 +4924,6 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -7363,7 +4934,6 @@
 					"version": "5.5.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
 					"requires": {
 						"has-flag": "^3.0.0"
 					}
@@ -7382,6 +4952,51 @@
 			"integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
 			"dev": true
 		},
+		"cheerio": {
+			"version": "1.0.0-rc.2",
+			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
+			"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
+			"dev": true,
+			"requires": {
+				"css-select": "~1.2.0",
+				"dom-serializer": "~0.1.0",
+				"entities": "~1.1.1",
+				"htmlparser2": "^3.9.1",
+				"lodash": "^4.15.0",
+				"parse5": "^3.0.1"
+			},
+			"dependencies": {
+				"parse5": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+					"dev": true,
+					"requires": {
+						"@types/node": "*"
+					}
+				}
+			}
+		},
+		"chokidar": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+			"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+			"requires": {
+				"anymatch": "^2.0.0",
+				"async-each": "^1.0.0",
+				"braces": "^2.3.0",
+				"fsevents": "^1.2.2",
+				"glob-parent": "^3.1.0",
+				"inherits": "^2.0.1",
+				"is-binary-path": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"lodash.debounce": "^4.0.8",
+				"normalize-path": "^2.1.1",
+				"path-is-absolute": "^1.0.0",
+				"readdirp": "^2.0.0",
+				"upath": "^1.0.5"
+			}
+		},
 		"chownr": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
@@ -7419,12 +5034,6 @@
 			"integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
 			"dev": true
 		},
-		"circular-json": {
-			"version": "0.5.9",
-			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-			"integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
-			"dev": true
-		},
 		"class-utils": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -7484,6 +5093,34 @@
 			"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
 			"dev": true
 		},
+		"cliui": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+			"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^2.1.1",
+				"strip-ansi": "^4.0.0",
+				"wrap-ansi": "^2.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^3.0.0"
+					}
+				}
+			}
+		},
 		"clone": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
@@ -7515,9 +5152,9 @@
 			"dev": true
 		},
 		"code-block-writer": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.2.2.tgz",
-			"integrity": "sha512-8SyXM1bWsMDCzvCoTdnDBhnnUbHntxcba4ApBIO3S3QX0M2Iq0xZCzs6SYdBOGaSUi4drysvrAK15JoXhlpsvQ==",
+			"version": "7.3.0",
+			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.3.0.tgz",
+			"integrity": "sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==",
 			"dev": true
 		},
 		"code-point-at": {
@@ -7526,17 +5163,20 @@
 			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
 		},
 		"codelyzer": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz",
-			"integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.0.0.tgz",
+			"integrity": "sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==",
 			"dev": true,
 			"requires": {
 				"app-root-path": "^2.1.0",
-				"css-selector-tokenizer": "^0.7.0",
+				"aria-query": "^3.0.0",
+				"axobject-query": "^2.0.2",
+				"css-selector-tokenizer": "^0.7.1",
 				"cssauron": "^1.4.0",
+				"damerau-levenshtein": "^1.0.4",
 				"semver-dsl": "^1.0.1",
 				"source-map": "^0.5.7",
-				"sprintf-js": "^1.1.1"
+				"sprintf-js": "^1.1.2"
 			},
 			"dependencies": {
 				"source-map": {
@@ -7566,7 +5206,6 @@
 			"version": "1.9.3",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
 			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
 			"requires": {
 				"color-name": "1.1.3"
 			}
@@ -7574,550 +5213,290 @@
 		"color-name": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
 		"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
-		},
-		"colors": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-			"dev": true
-		},
-		"combine-lists": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-			"integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.5.0"
-			}
-		},
-		"combined-stream": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
-		"commander": {
-			"version": "2.17.1",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-			"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-			"dev": true
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-			"dev": true
-		},
-		"compare-versions": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
-			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
-			"dev": true
-		},
-		"component-bind": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
-		},
-		"component-emitter": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
-		},
-		"component-inherit": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
-		},
-		"compressible": {
-			"version": "2.0.15",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
-			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
-			"dev": true,
-			"requires": {
-				"mime-db": ">= 1.36.0 < 2"
-			},
-			"dependencies": {
-				"mime-db": {
-					"version": "1.37.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
-					"dev": true
-				}
-			}
-		},
-		"compression": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
-			"dev": true,
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.14",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.1",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			}
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"concat-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
-			}
-		},
-		"configstore": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-			"dev": true,
-			"requires": {
-				"dot-prop": "^4.1.0",
-				"graceful-fs": "^4.1.2",
-				"make-dir": "^1.0.0",
-				"unique-string": "^1.0.0",
-				"write-file-atomic": "^2.0.0",
-				"xdg-basedir": "^3.0.0"
-			}
-		},
-		"connect-history-api-fallback": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-			"dev": true
-		},
-		"console-browserify": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-			"dev": true,
-			"requires": {
-				"date-now": "^0.1.4"
-			}
-		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-		},
-		"constants-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-			"dev": true
-		},
-		"content-disposition": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-			"dev": true
-		},
-		"content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
 			"dev": true
 		},
-		"continuable-cache": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+		"colors": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
 			"dev": true
 		},
-		"convert-source-map": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
-			"dev": true,
+		"combined-stream": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
 			"requires": {
-				"safe-buffer": "~5.1.1"
+				"delayed-stream": "~1.0.0"
 			}
 		},
-		"cookie": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+		"commander": {
+			"version": "2.19.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+			"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
 			"dev": true
 		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+		"commondir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
 			"dev": true
 		},
-		"cookiejar": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+		"compare-versions": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
+			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
 			"dev": true
 		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		"component-bind": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
 		},
-		"cordova-android": {
-			"version": "7.1.4",
-			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
-			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
-			"requires": {
-				"abbrev": "*",
-				"android-versions": "1.4.0",
-				"ansi": "*",
-				"balanced-match": "*",
-				"base64-js": "1.2.0",
-				"big-integer": "1.6.32",
-				"bplist-parser": "*",
-				"brace-expansion": "*",
-				"concat-map": "*",
-				"cordova-common": "2.2.5",
-				"cordova-registry-mapper": "*",
-				"elementtree": "0.1.6",
-				"glob": "5.0.15",
-				"inflight": "*",
-				"inherits": "*",
-				"minimatch": "*",
-				"nopt": "3.0.1",
-				"once": "*",
-				"path-is-absolute": "1.0.1",
-				"plist": "2.1.0",
-				"properties-parser": "0.2.3",
-				"q": "1.4.1",
-				"sax": "0.3.5",
-				"semver": "5.5.0",
-				"shelljs": "0.5.3",
-				"underscore": "*",
-				"unorm": "*",
-				"wrappy": "*",
-				"xmlbuilder": "8.2.2",
-				"xmldom": "*"
-			},
-			"dependencies": {
-				"abbrev": {
-					"version": "1.1.1",
-					"bundled": true
-				},
-				"android-versions": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"semver": "^5.4.1"
-					}
-				},
-				"ansi": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"base64-js": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"bundled": true
-				},
-				"cordova-common": {
-					"version": "2.2.5",
-					"bundled": true,
-					"requires": {
-						"ansi": "^0.3.1",
-						"bplist-parser": "^0.1.0",
-						"cordova-registry-mapper": "^1.1.8",
-						"elementtree": "0.1.6",
-						"glob": "^5.0.13",
-						"minimatch": "^3.0.0",
-						"plist": "^2.1.0",
-						"q": "^1.4.1",
-						"shelljs": "^0.5.3",
-						"underscore": "^1.8.3",
-						"unorm": "^1.3.3"
-					}
-				},
-				"cordova-registry-mapper": {
-					"version": "1.1.15",
-					"bundled": true
-				},
-				"elementtree": {
-					"version": "0.1.6",
-					"bundled": true,
-					"requires": {
-						"sax": "0.3.5"
-					}
-				},
-				"glob": {
-					"version": "5.0.15",
-					"bundled": true,
-					"requires": {
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "2 || 3",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"inflight": {
-					"version": "1.0.6",
-					"bundled": true,
-					"requires": {
-						"once": "^1.3.0",
-						"wrappy": "1"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"bundled": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"bundled": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"nopt": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"abbrev": "1"
-					}
-				},
-				"once": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"properties-parser": {
-					"version": "0.2.3",
-					"bundled": true
-				},
-				"q": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"semver": {
-					"version": "5.5.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"underscore": {
-					"version": "1.9.1",
-					"bundled": true
-				},
-				"unorm": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"wrappy": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"xmlbuilder": {
-					"version": "8.2.2",
-					"bundled": true
-				},
-				"xmldom": {
-					"version": "0.1.27",
-					"bundled": true
+		"component-emitter": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+		},
+		"component-inherit": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
+		},
+		"compressible": {
+			"version": "2.0.15",
+			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
+			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
+			"requires": {
+				"mime-db": ">= 1.36.0 < 2"
+			},
+			"dependencies": {
+				"mime-db": {
+					"version": "1.37.0",
+					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
+					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
 				}
 			}
 		},
-		"cordova-android-support-gradle-release": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
-			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+		"compression": {
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
 			"requires": {
-				"semver": "5.1.0",
-				"xml2js": "~0.4.19"
+				"accepts": "~1.3.5",
+				"bytes": "3.0.0",
+				"compressible": "~2.0.14",
+				"debug": "2.6.9",
+				"on-headers": "~1.0.1",
+				"safe-buffer": "5.1.2",
+				"vary": "~1.1.2"
+			}
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+		},
+		"concat-stream": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+			"dev": true,
+			"requires": {
+				"buffer-from": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.2.2",
+				"typedarray": "^0.0.6"
+			}
+		},
+		"configstore": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
+			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+			"dev": true,
+			"requires": {
+				"dot-prop": "^4.1.0",
+				"graceful-fs": "^4.1.2",
+				"make-dir": "^1.0.0",
+				"unique-string": "^1.0.0",
+				"write-file-atomic": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			}
+		},
+		"connect": {
+			"version": "3.6.6",
+			"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+			"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+			"dev": true,
+			"requires": {
+				"debug": "2.6.9",
+				"finalhandler": "1.1.0",
+				"parseurl": "~1.3.2",
+				"utils-merge": "1.0.1"
 			},
 			"dependencies": {
-				"semver": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
-					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				"finalhandler": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"encodeurl": "~1.0.1",
+						"escape-html": "~1.0.3",
+						"on-finished": "~2.3.0",
+						"parseurl": "~1.3.2",
+						"statuses": "~1.3.1",
+						"unpipe": "~1.0.0"
+					}
+				},
+				"statuses": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+					"dev": true
 				}
 			}
 		},
-		"cordova-browser": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-5.0.4.tgz",
-			"integrity": "sha512-EDuG+9NGsaYpNSY6wF0kR34m1m38V+nRglGXxQ609fgMYrMHEYR2lg38nDr1Os4qeF0LJz8UQ7nq7Y+idg6Aig==",
+		"connect-history-api-fallback": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+			"dev": true
+		},
+		"console-browserify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+			"dev": true,
+			"requires": {
+				"date-now": "^0.1.4"
+			}
+		},
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+		},
+		"constants-browserify": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+			"dev": true
+		},
+		"content-disposition": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+		},
+		"content-type": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+		},
+		"continuable-cache": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+			"dev": true
+		},
+		"convert-source-map": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"cookie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+		},
+		"cookie-signature": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+		},
+		"cookiejar": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+			"dev": true
+		},
+		"copy-concurrently": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"fs-write-stream-atomic": "^1.0.8",
+				"iferr": "^0.1.5",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.0"
+			}
+		},
+		"copy-descriptor": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		},
+		"copy-webpack-plugin": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+			"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+			"dev": true,
+			"requires": {
+				"cacache": "^10.0.4",
+				"find-cache-dir": "^1.0.0",
+				"globby": "^7.1.1",
+				"is-glob": "^4.0.0",
+				"loader-utils": "^1.1.0",
+				"minimatch": "^3.0.4",
+				"p-limit": "^1.0.0",
+				"serialize-javascript": "^1.4.0"
+			}
+		},
+		"cordova-android": {
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
+			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
 			"requires": {
 				"abbrev": "*",
-				"accepts": "*",
+				"android-versions": "1.4.0",
 				"ansi": "*",
-				"ansi-regex": "2.1.1",
-				"ansi-styles": "2.2.1",
-				"array-flatten": "1.1.1",
 				"balanced-match": "*",
 				"base64-js": "1.2.0",
-				"big-integer": "*",
-				"body-parser": "1.18.2",
+				"big-integer": "1.6.32",
 				"bplist-parser": "*",
 				"brace-expansion": "*",
-				"bytes": "*",
-				"chalk": "1.1.3",
-				"compressible": "*",
-				"compression": "1.7.2",
 				"concat-map": "*",
-				"content-disposition": "*",
-				"content-type": "*",
-				"cookie": "*",
-				"cookie-signature": "1.0.6",
 				"cordova-common": "2.2.5",
 				"cordova-registry-mapper": "*",
-				"cordova-serve": "2.0.1",
-				"debug": "2.6.9",
-				"depd": "*",
-				"destroy": "*",
-				"ee-first": "*",
 				"elementtree": "0.1.6",
-				"encodeurl": "*",
-				"escape-html": "*",
-				"escape-string-regexp": "*",
-				"etag": "*",
-				"express": "*",
-				"finalhandler": "*",
-				"forwarded": "*",
-				"fresh": "*",
 				"glob": "5.0.15",
-				"has-ansi": "2.0.0",
-				"http-errors": "1.6.3",
-				"iconv-lite": "0.4.19",
 				"inflight": "*",
 				"inherits": "*",
-				"ipaddr.js": "1.6.0",
-				"is-wsl": "*",
-				"media-typer": "*",
-				"merge-descriptors": "*",
-				"methods": "*",
-				"mime": "1.4.1",
-				"mime-db": "1.33.0",
-				"mime-types": "2.1.18",
 				"minimatch": "*",
-				"ms": "2.0.0",
-				"negotiator": "*",
-				"nopt": "3.0.6",
-				"on-finished": "*",
-				"on-headers": "*",
+				"nopt": "3.0.1",
 				"once": "*",
-				"opn": "*",
-				"parseurl": "*",
-				"path-is-absolute": "*",
-				"path-to-regexp": "0.1.7",
+				"path-is-absolute": "1.0.1",
 				"plist": "2.1.0",
-				"proxy-addr": "2.0.3",
-				"q": "*",
-				"qs": "6.5.1",
-				"range-parser": "*",
-				"raw-body": "2.3.2",
-				"safe-buffer": "5.1.1",
+				"properties-parser": "0.2.3",
+				"q": "1.4.1",
 				"sax": "0.3.5",
-				"send": "*",
-				"serve-static": "*",
-				"setprototypeof": "*",
+				"semver": "5.5.0",
 				"shelljs": "0.5.3",
-				"statuses": "1.4.0",
-				"strip-ansi": "3.0.1",
-				"supports-color": "2.0.0",
-				"type-is": "*",
 				"underscore": "*",
 				"unorm": "*",
-				"unpipe": "*",
-				"utils-merge": "*",
-				"vary": "*",
 				"wrappy": "*",
 				"xmlbuilder": "8.2.2",
 				"xmldom": "*"
@@ -8127,30 +5506,17 @@
 					"version": "1.1.1",
 					"bundled": true
 				},
-				"accepts": {
-					"version": "1.3.5",
+				"android-versions": {
+					"version": "1.4.0",
 					"bundled": true,
 					"requires": {
-						"mime-types": "~2.1.18",
-						"negotiator": "0.6.1"
+						"semver": "^5.4.1"
 					}
 				},
 				"ansi": {
 					"version": "0.3.1",
 					"bundled": true
 				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"bundled": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"bundled": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true
@@ -8160,101 +5526,28 @@
 					"bundled": true
 				},
 				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"body-parser": {
-					"version": "1.18.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"content-type": "~1.0.4",
-						"debug": "2.6.9",
-						"depd": "~1.1.1",
-						"http-errors": "~1.6.2",
-						"iconv-lite": "0.4.19",
-						"on-finished": "~2.3.0",
-						"qs": "6.5.1",
-						"raw-body": "2.3.2",
-						"type-is": "~1.6.15"
-					}
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"bytes": {
-					"version": "3.0.0",
-					"bundled": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"bundled": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
+					"version": "1.6.32",
+					"bundled": true
 				},
-				"compressible": {
-					"version": "2.0.14",
+				"bplist-parser": {
+					"version": "0.1.1",
 					"bundled": true,
 					"requires": {
-						"mime-db": ">= 1.34.0 < 2"
-					},
-					"dependencies": {
-						"mime-db": {
-							"version": "1.34.0",
-							"bundled": true
-						}
+						"big-integer": "^1.6.7"
 					}
 				},
-				"compression": {
-					"version": "1.7.2",
+				"brace-expansion": {
+					"version": "1.1.11",
 					"bundled": true,
 					"requires": {
-						"accepts": "~1.3.4",
-						"bytes": "3.0.0",
-						"compressible": "~2.0.13",
-						"debug": "2.6.9",
-						"on-headers": "~1.0.1",
-						"safe-buffer": "5.1.1",
-						"vary": "~1.1.2"
+						"balanced-match": "^1.0.0",
+						"concat-map": "0.0.1"
 					}
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true
 				},
-				"content-disposition": {
-					"version": "0.5.2",
-					"bundled": true
-				},
-				"content-type": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"cookie": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"cookie-signature": {
-					"version": "1.0.6",
-					"bundled": true
-				},
 				"cordova-common": {
 					"version": "2.2.5",
 					"bundled": true,
@@ -8276,36 +5569,6 @@
 					"version": "1.1.15",
 					"bundled": true
 				},
-				"cordova-serve": {
-					"version": "2.0.1",
-					"bundled": true,
-					"requires": {
-						"chalk": "^1.1.1",
-						"compression": "^1.6.0",
-						"express": "^4.13.3",
-						"opn": "^5.3.0",
-						"shelljs": "^0.5.3"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"bundled": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"destroy": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"ee-first": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"elementtree": {
 					"version": "0.1.6",
 					"bundled": true,
@@ -8313,79 +5576,6 @@
 						"sax": "0.3.5"
 					}
 				},
-				"encodeurl": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"escape-html": {
-					"version": "1.0.3",
-					"bundled": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"bundled": true
-				},
-				"etag": {
-					"version": "1.8.1",
-					"bundled": true
-				},
-				"express": {
-					"version": "4.16.3",
-					"bundled": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.2",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.3",
-						"qs": "6.5.1",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.1",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.1",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.4.0",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"forwarded": {
-					"version": "0.1.2",
-					"bundled": true
-				},
-				"fresh": {
-					"version": "0.5.2",
-					"bundled": true
-				},
 				"glob": {
 					"version": "5.0.15",
 					"bundled": true,
@@ -8397,27 +5587,6 @@
 						"path-is-absolute": "^1.0.0"
 					}
 				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"bundled": true,
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"bundled": true
-				},
 				"inflight": {
 					"version": "1.0.6",
 					"bundled": true,
@@ -8430,41 +5599,6 @@
 					"version": "2.0.3",
 					"bundled": true
 				},
-				"ipaddr.js": {
-					"version": "1.6.0",
-					"bundled": true
-				},
-				"is-wsl": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"media-typer": {
-					"version": "0.3.0",
-					"bundled": true
-				},
-				"merge-descriptors": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"methods": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"mime-db": {
-					"version": "1.33.0",
-					"bundled": true
-				},
-				"mime-types": {
-					"version": "2.1.18",
-					"bundled": true,
-					"requires": {
-						"mime-db": "~1.33.0"
-					}
-				},
 				"minimatch": {
 					"version": "3.0.4",
 					"bundled": true,
@@ -8472,32 +5606,13 @@
 						"brace-expansion": "^1.1.7"
 					}
 				},
-				"ms": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"negotiator": {
-					"version": "0.6.1",
-					"bundled": true
-				},
 				"nopt": {
-					"version": "3.0.6",
+					"version": "3.0.1",
 					"bundled": true,
 					"requires": {
 						"abbrev": "1"
 					}
 				},
-				"on-finished": {
-					"version": "2.3.0",
-					"bundled": true,
-					"requires": {
-						"ee-first": "1.1.1"
-					}
-				},
-				"on-headers": {
-					"version": "1.0.1",
-					"bundled": true
-				},
 				"once": {
 					"version": "1.4.0",
 					"bundled": true,
@@ -8505,170 +5620,45 @@
 						"wrappy": "1"
 					}
 				},
-				"opn": {
-					"version": "5.3.0",
-					"bundled": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parseurl": {
-					"version": "1.3.2",
-					"bundled": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"path-to-regexp": {
-					"version": "0.1.7",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"proxy-addr": {
-					"version": "2.0.3",
-					"bundled": true,
-					"requires": {
-						"forwarded": "~0.1.2",
-						"ipaddr.js": "1.6.0"
-					}
-				},
-				"q": {
-					"version": "1.5.1",
-					"bundled": true
-				},
-				"qs": {
-					"version": "6.5.1",
-					"bundled": true
-				},
-				"range-parser": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"raw-body": {
-					"version": "2.3.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"http-errors": "1.6.2",
-						"iconv-lite": "0.4.19",
-						"unpipe": "1.0.0"
-					},
-					"dependencies": {
-						"depd": {
-							"version": "1.1.1",
-							"bundled": true
-						},
-						"http-errors": {
-							"version": "1.6.2",
-							"bundled": true,
-							"requires": {
-								"depd": "1.1.1",
-								"inherits": "2.0.3",
-								"setprototypeof": "1.0.3",
-								"statuses": ">= 1.3.1 < 2"
-							}
-						},
-						"setprototypeof": {
-							"version": "1.0.3",
-							"bundled": true
-						}
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"send": {
-					"version": "0.16.2",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					}
-				},
-				"serve-static": {
-					"version": "1.13.2",
-					"bundled": true,
-					"requires": {
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"parseurl": "~1.3.2",
-						"send": "0.16.2"
-					}
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"statuses": {
-					"version": "1.4.0",
-					"bundled": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
+				"path-is-absolute": {
+					"version": "1.0.1",
 					"bundled": true
 				},
-				"type-is": {
-					"version": "1.6.16",
+				"plist": {
+					"version": "2.1.0",
 					"bundled": true,
 					"requires": {
-						"media-typer": "0.3.0",
-						"mime-types": "~2.1.18"
+						"base64-js": "1.2.0",
+						"xmlbuilder": "8.2.2",
+						"xmldom": "0.1.x"
 					}
 				},
-				"underscore": {
-					"version": "1.9.1",
+				"properties-parser": {
+					"version": "0.2.3",
 					"bundled": true
 				},
-				"unorm": {
+				"q": {
 					"version": "1.4.1",
 					"bundled": true
 				},
-				"unpipe": {
-					"version": "1.0.0",
+				"sax": {
+					"version": "0.3.5",
 					"bundled": true
 				},
-				"utils-merge": {
-					"version": "1.0.1",
+				"semver": {
+					"version": "5.5.0",
 					"bundled": true
 				},
-				"vary": {
-					"version": "1.1.2",
+				"shelljs": {
+					"version": "0.5.3",
+					"bundled": true
+				},
+				"underscore": {
+					"version": "1.9.1",
+					"bundled": true
+				},
+				"unorm": {
+					"version": "1.4.1",
 					"bundled": true
 				},
 				"wrappy": {
@@ -8685,6 +5675,69 @@
 				}
 			}
 		},
+		"cordova-android-support-gradle-release": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
+			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+			"requires": {
+				"semver": "5.1.0",
+				"xml2js": "~0.4.19"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
+					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				}
+			}
+		},
+		"cordova-browser": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-6.0.0.tgz",
+			"integrity": "sha512-G61S7fhnVVJC98lvkGeKCVpfFtoW0a1P1Sg9TK+n03g3yupDMIM7XuecWuJ3KEMRhED4+CEc2hauruAff7oXrw==",
+			"requires": {
+				"cordova-common": "^3.1.0",
+				"cordova-serve": "^3.0.0",
+				"nopt": "^4.0.1",
+				"shelljs": "^0.5.3"
+			},
+			"dependencies": {
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				},
+				"shelljs": {
+					"version": "0.5.3",
+					"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+					"integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
+				}
+			}
+		},
+		"cordova-common": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.1.0.tgz",
+			"integrity": "sha512-J2MM1ioyLlBYdwdXH40OZL4hN7XEBOfurddKYifF4aTkb2PkbeM+KVORt53eyU+8ScA0QmRLuTG0EM55eLms0A==",
+			"requires": {
+				"ansi": "^0.3.1",
+				"bplist-parser": "^0.1.0",
+				"cross-spawn": "^6.0.5",
+				"elementtree": "0.1.7",
+				"endent": "^1.1.1",
+				"fs-extra": "^7.0.0",
+				"glob": "^7.1.2",
+				"minimatch": "^3.0.0",
+				"plist": "^3.0.1",
+				"q": "^1.4.1",
+				"strip-bom": "^3.0.0",
+				"underscore": "^1.8.3",
+				"which": "^1.3.0"
+			}
+		},
 		"cordova-plugin-appavailability": {
 			"version": "0.4.2",
 			"resolved": "https://registry.npmjs.org/cordova-plugin-appavailability/-/cordova-plugin-appavailability-0.4.2.tgz",
@@ -8731,9 +5784,9 @@
 			"integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ=="
 		},
 		"cordova-plugin-ionic-webview": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-3.1.1.tgz",
-			"integrity": "sha512-dVRTvotXa1c63P55ckE/uejVlNOQU+wCLp5KANAFEYW1fxNswWJ6AM/NMNh1q9rGSH/hl9Z3C3rTkgYfdqNqDA=="
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.1.tgz",
+			"integrity": "sha512-rJf7jFQNw7l0U4Y7P6DjxwmO/qQgS7xqiTgwDbNFS4z4+FZ3EZyupll7/cFEDnxGRNMgWsMKDhIABUo5mIDaUQ=="
 		},
 		"cordova-plugin-mixpanel": {
 			"version": "4.5.2",
@@ -8765,10 +5818,22 @@
 			"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
 			"integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q="
 		},
+		"cordova-serve": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-3.0.0.tgz",
+			"integrity": "sha512-h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w==",
+			"requires": {
+				"chalk": "^2.4.1",
+				"compression": "^1.6.0",
+				"express": "^4.13.3",
+				"opn": "^5.3.0",
+				"which": "^1.3.0"
+			}
+		},
 		"core-js": {
-			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
-			"integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ=="
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz",
+			"integrity": "sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ=="
 		},
 		"core-util-is": {
 			"version": "1.0.2",
@@ -8785,6 +5850,18 @@
 				"vary": "^1"
 			}
 		},
+		"cosmiconfig": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+			"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+			"dev": true,
+			"requires": {
+				"is-directory": "^0.3.1",
+				"js-yaml": "^3.9.0",
+				"parse-json": "^4.0.0",
+				"require-from-string": "^2.0.1"
+			}
+		},
 		"cpr": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz",
@@ -8843,6 +5920,28 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"cross-env": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz",
+			"integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.5",
+				"is-windows": "^1.0.0"
+			}
+		},
+		"cross-spawn": {
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"requires": {
+				"nice-try": "^1.0.4",
+				"path-key": "^2.0.1",
+				"semver": "^5.5.0",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			}
+		},
 		"cryptiles": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-4.1.3.tgz",
@@ -8870,6 +5969,12 @@
 				"randomfill": "^1.0.3"
 			}
 		},
+		"crypto-js": {
+			"version": "3.1.9-1",
+			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
+			"integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=",
+			"dev": true
+		},
 		"crypto-random-string": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -8906,9 +6011,9 @@
 			}
 		},
 		"css-what": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz",
-			"integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+			"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
 			"dev": true
 		},
 		"cssauron": {
@@ -8955,6 +6060,12 @@
 				"es5-ext": "^0.10.9"
 			}
 		},
+		"damerau-levenshtein": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
+			"integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=",
+			"dev": true
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -8973,17 +6084,17 @@
 			},
 			"dependencies": {
 				"@types/node": {
-					"version": "8.10.39",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.39.tgz",
-					"integrity": "sha512-rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA==",
+					"version": "8.10.45",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz",
+					"integrity": "sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==",
 					"dev": true
 				}
 			}
 		},
 		"date-format": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-			"integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
+			"integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==",
 			"dev": true
 		},
 		"date-now": {
@@ -9010,11 +6121,15 @@
 			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
 			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
 		},
+		"dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+		},
 		"deep-equal": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-			"dev": true
+			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
 		},
 		"deep-extend": {
 			"version": "0.6.0",
@@ -9036,36 +6151,6 @@
 			"requires": {
 				"execa": "^0.10.0",
 				"ip-regex": "^2.1.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"default-require-extensions": {
@@ -9077,6 +6162,14 @@
 				"strip-bom": "^3.0.0"
 			}
 		},
+		"define-properties": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+			"requires": {
+				"object-keys": "^1.0.12"
+			}
+		},
 		"define-property": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -9119,6 +6212,67 @@
 				}
 			}
 		},
+		"defined": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+			"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+		},
+		"degenerator": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
+			"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+			"dev": true,
+			"requires": {
+				"ast-types": "0.x.x",
+				"escodegen": "1.x.x",
+				"esprima": "3.x.x"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				}
+			}
+		},
+		"del": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+			"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+			"dev": true,
+			"requires": {
+				"globby": "^6.1.0",
+				"is-path-cwd": "^1.0.0",
+				"is-path-in-cwd": "^1.0.0",
+				"p-map": "^1.1.1",
+				"pify": "^3.0.0",
+				"rimraf": "^2.2.8"
+			},
+			"dependencies": {
+				"globby": {
+					"version": "6.1.0",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+					"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"glob": "^7.0.3",
+						"object-assign": "^4.0.1",
+						"pify": "^2.0.0",
+						"pinkie-promise": "^2.0.0"
+					},
+					"dependencies": {
+						"pify": {
+							"version": "2.3.0",
+							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+							"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+							"dev": true
+						}
+					}
+				}
+			}
+		},
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -9132,8 +6286,7 @@
 		"depd": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-			"dev": true
+			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
 		},
 		"dependency-graph": {
 			"version": "0.7.2",
@@ -9154,8 +6307,7 @@
 		"destroy": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-			"dev": true
+			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
 		},
 		"detect-indent": {
 			"version": "4.0.0",
@@ -9172,6 +6324,15 @@
 			"integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
 			"dev": true
 		},
+		"dfa": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/dfa/-/dfa-1.1.0.tgz",
+			"integrity": "sha1-0wIYvRDQMPpCHfPrvIIoVGOjF4E=",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6"
+			}
+		},
 		"di": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -9271,27 +6432,19 @@
 			}
 		},
 		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+			"integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "~1.1.1",
-				"entities": "~1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-					"dev": true
-				}
+				"domelementtype": "^1.3.0",
+				"entities": "^1.1.1"
 			}
 		},
 		"dom7": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.2.tgz",
-			"integrity": "sha512-cGwWtpu7KY3JnbREGqG4EGC/u+1hyLfWVMqrqRjmwiO8d5i4B+0imLZAQ/cJbiXnjbs0pdIUzcUyeI9BbnyKNg==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
+			"integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
 			"requires": {
 				"ssr-window": "^1.0.1"
 			}
@@ -9343,9 +6496,9 @@
 			}
 		},
 		"dotenv": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-			"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
+			"integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==",
 			"dev": true
 		},
 		"dotenv-defaults": {
@@ -9355,6 +6508,14 @@
 			"dev": true,
 			"requires": {
 				"dotenv": "^6.2.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
 			}
 		},
 		"dotenv-webpack": {
@@ -9413,41 +6574,15 @@
 			"dev": true
 		},
 		"duplexify": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
-			"integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
 			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.0.0",
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0",
 				"stream-shift": "^1.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ecc-jsbn": {
@@ -9462,8 +6597,7 @@
 		"ee-first": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-			"dev": true
+			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
 		},
 		"ejs": {
 			"version": "2.6.1",
@@ -9472,16 +6606,15 @@
 			"dev": true
 		},
 		"electron-to-chromium": {
-			"version": "1.3.112",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.112.tgz",
-			"integrity": "sha512-FyVLdiRZnLw2WE5ECtveN0JJ7klyiz/HMfKE1/Rjff3l7pe4vfkYtBlcCqTckvR8E7asjJGh0m9gRPR3Anp/UA==",
+			"version": "1.3.122",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
+			"integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw==",
 			"dev": true
 		},
 		"elementtree": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
 			"integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
-			"dev": true,
 			"requires": {
 				"sax": "1.1.4"
 			},
@@ -9489,8 +6622,7 @@
 				"sax": {
 					"version": "1.1.4",
 					"resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
-					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=",
-					"dev": true
+					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
 				}
 			}
 		},
@@ -9523,8 +6655,7 @@
 		"encodeurl": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-			"dev": true
+			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
 		},
 		"encoding": {
 			"version": "0.1.12",
@@ -9543,6 +6674,16 @@
 				"once": "^1.4.0"
 			}
 		},
+		"endent": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz",
+			"integrity": "sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==",
+			"requires": {
+				"dedent": "^0.7.0",
+				"fast-json-parse": "^1.0.3",
+				"objectorarray": "^1.0.3"
+			}
+		},
 		"engine.io": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
@@ -9579,6 +6720,47 @@
 				}
 			}
 		},
+		"engine.io-client": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+			"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "1.2.1",
+				"component-inherit": "0.0.3",
+				"debug": "~3.1.0",
+				"engine.io-parser": "~2.1.1",
+				"has-cors": "1.1.0",
+				"indexof": "0.0.1",
+				"parseqs": "0.0.5",
+				"parseuri": "0.0.5",
+				"ws": "~3.3.1",
+				"xmlhttprequest-ssl": "~1.5.4",
+				"yeast": "0.1.2"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"ws": {
+					"version": "3.3.3",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
+				}
+			}
+		},
 		"engine.io-parser": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
@@ -9600,42 +6782,6 @@
 				"graceful-fs": "^4.1.2",
 				"memory-fs": "^0.4.0",
 				"tapable": "^1.0.0"
-			},
-			"dependencies": {
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ent": {
@@ -9650,6 +6796,26 @@
 			"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
 			"dev": true
 		},
+		"envalid": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/envalid/-/envalid-4.2.2.tgz",
+			"integrity": "sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.4.1",
+				"dotenv": "^6.2.0",
+				"meant": "^1.0.1",
+				"validator": "^10.11.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
+			}
+		},
 		"err-code": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
@@ -9683,15 +6849,38 @@
 				"is-arrayish": "^0.2.1"
 			}
 		},
+		"es-abstract": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+			"integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+			"requires": {
+				"es-to-primitive": "^1.2.0",
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"is-callable": "^1.1.4",
+				"is-regex": "^1.0.4",
+				"object-keys": "^1.0.12"
+			}
+		},
+		"es-to-primitive": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+			"integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+			"requires": {
+				"is-callable": "^1.1.4",
+				"is-date-object": "^1.0.1",
+				"is-symbol": "^1.0.2"
+			}
+		},
 		"es5-ext": {
-			"version": "0.10.47",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz",
-			"integrity": "sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==",
+			"version": "0.10.49",
+			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz",
+			"integrity": "sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==",
 			"dev": true,
 			"requires": {
 				"es6-iterator": "~2.0.3",
 				"es6-symbol": "~3.1.1",
-				"next-tick": "1"
+				"next-tick": "^1.0.0"
 			}
 		},
 		"es6-iterator": {
@@ -9772,14 +6961,41 @@
 		"escape-html": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-			"dev": true
+			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
 		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
 		},
+		"escodegen": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
+			"integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+			"dev": true,
+			"requires": {
+				"esprima": "^3.1.3",
+				"estraverse": "^4.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"escope": {
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
@@ -9790,38 +7006,22 @@
 				"es6-weak-map": "^2.0.1",
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"eslint-scope": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-			"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
 			"dev": true,
 			"requires": {
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"esprima": {
-			"version": "2.7.3",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-			"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true
 		},
 		"esrecurse": {
@@ -9831,20 +7031,12 @@
 			"dev": true,
 			"requires": {
 				"estraverse": "^4.1.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"estraverse": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-			"integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
 			"dev": true
 		},
 		"estree-walker": {
@@ -9861,610 +7053,347 @@
 		},
 		"etag": {
 			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-			"dev": true
-		},
-		"event-emitter": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-			"dev": true,
-			"requires": {
-				"d": "1",
-				"es5-ext": "~0.10.14"
-			}
-		},
-		"event-stream": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
-			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
-			"requires": {
-				"duplexer": "^0.1.1",
-				"from": "^0.1.7",
-				"map-stream": "0.0.7",
-				"pause-stream": "^0.0.11",
-				"split": "^1.0.1",
-				"stream-combiner": "^0.2.2",
-				"through": "^2.3.8"
-			}
-		},
-		"eventemitter3": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
-		},
-		"events": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
-			"dev": true
-		},
-		"eventsource": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-			"dev": true,
-			"requires": {
-				"original": "^1.0.0"
-			}
-		},
-		"evp_bytestokey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-			"dev": true,
-			"requires": {
-				"md5.js": "^1.3.4",
-				"safe-buffer": "^5.1.1"
-			}
-		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
-		"expand-braces": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-			"integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
-			"dev": true,
-			"requires": {
-				"array-slice": "^0.2.3",
-				"array-unique": "^0.2.1",
-				"braces": "^0.1.2"
-			},
-			"dependencies": {
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-					"integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^0.1.0"
-					}
-				},
-				"expand-range": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-					"integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
-					"dev": true,
-					"requires": {
-						"is-number": "^0.1.1",
-						"repeat-string": "^0.2.2"
-					}
-				},
-				"is-number": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-					"integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-					"dev": true
-				},
-				"repeat-string": {
-					"version": "0.2.2",
-					"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-					"integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
-					"dev": true
-				}
-			}
-		},
-		"expand-range": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
-			"requires": {
-				"fill-range": "^2.1.0"
-			},
-			"dependencies": {
-				"fill-range": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-					"integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-					"dev": true,
-					"requires": {
-						"is-number": "^2.1.0",
-						"isobject": "^2.0.0",
-						"randomatic": "^3.0.0",
-						"repeat-element": "^1.1.2",
-						"repeat-string": "^1.5.2"
-					}
-				},
-				"is-number": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-					"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					}
-				},
-				"isobject": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-					"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-					"dev": true,
-					"requires": {
-						"isarray": "1.0.0"
-					}
-				}
-			}
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-		},
-		"extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
-			}
-		},
-		"external-editor": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
-			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
-			"dev": true,
-			"requires": {
-				"chardet": "^0.7.0",
-				"iconv-lite": "^0.4.24",
-				"tmp": "^0.0.33"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
-			}
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
 		},
-		"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==",
+		"event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
 			"dev": true,
 			"requires": {
-				"ansi-gray": "^0.1.1",
-				"color-support": "^1.1.3",
-				"parse-node-version": "^1.0.0",
-				"time-stamp": "^1.0.0"
+				"d": "1",
+				"es5-ext": "~0.10.14"
 			}
 		},
-		"fast-deep-equal": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		"event-stream": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
+			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
+			"requires": {
+				"duplexer": "^0.1.1",
+				"from": "^0.1.7",
+				"map-stream": "0.0.7",
+				"pause-stream": "^0.0.11",
+				"split": "^1.0.1",
+				"stream-combiner": "^0.2.2",
+				"through": "^2.3.8"
+			}
 		},
-		"fast-glob": {
-			"version": "2.2.6",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
-			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+		"eventemitter3": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
+		},
+		"events": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+			"dev": true
+		},
+		"eventsource": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
 			"dev": true,
-			"requires": {
-				"@mrmlnc/readdir-enhanced": "^2.2.1",
-				"@nodelib/fs.stat": "^1.1.2",
-				"glob-parent": "^3.1.0",
-				"is-glob": "^4.0.0",
-				"merge2": "^1.2.3",
-				"micromatch": "^3.1.10"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-					"dev": true,
-					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+			"requires": {
+				"original": "^1.0.0"
+			}
+		},
+		"evp_bytestokey": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+			"dev": true,
+			"requires": {
+				"md5.js": "^1.3.4",
+				"safe-buffer": "^5.1.1"
+			}
+		},
+		"execa": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+			"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.0",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			}
+		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
+		"expand-brackets": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+			"dev": true,
+			"requires": {
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"is-descriptor": "^0.1.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extendable": "^0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
+				}
+			}
+		},
+		"express": {
+			"version": "4.16.4",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
+			"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+			"requires": {
+				"accepts": "~1.3.5",
+				"array-flatten": "1.1.1",
+				"body-parser": "1.18.3",
+				"content-disposition": "0.5.2",
+				"content-type": "~1.0.4",
+				"cookie": "0.3.1",
+				"cookie-signature": "1.0.6",
+				"debug": "2.6.9",
+				"depd": "~1.1.2",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"finalhandler": "1.1.1",
+				"fresh": "0.5.2",
+				"merge-descriptors": "1.0.1",
+				"methods": "~1.1.2",
+				"on-finished": "~2.3.0",
+				"parseurl": "~1.3.2",
+				"path-to-regexp": "0.1.7",
+				"proxy-addr": "~2.0.4",
+				"qs": "6.5.2",
+				"range-parser": "~1.2.0",
+				"safe-buffer": "5.1.2",
+				"send": "0.16.2",
+				"serve-static": "1.13.2",
+				"setprototypeof": "1.1.0",
+				"statuses": "~1.4.0",
+				"type-is": "~1.6.16",
+				"utils-merge": "1.0.1",
+				"vary": "~1.1.2"
+			},
+			"dependencies": {
+				"array-flatten": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+				}
+			}
+		},
+		"extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		},
+		"extend-shallow": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+			"requires": {
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
+			},
+			"dependencies": {
+				"is-extendable": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"is-plain-object": "^2.0.4"
 					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				}
+			}
+		},
+		"external-editor": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+			"dev": true,
+			"requires": {
+				"chardet": "^0.7.0",
+				"iconv-lite": "^0.4.24",
+				"tmp": "^0.0.33"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"safer-buffer": ">= 2.1.2 < 3"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+				}
+			}
+		},
+		"extglob": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+			"dev": true,
+			"requires": {
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^1.0.0"
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"is-extendable": "^0.1.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
 					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
+		"extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+		},
+		"falafel": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz",
+			"integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.0.0",
+				"foreach": "^2.0.5",
+				"isarray": "0.0.1",
+				"object-keys": "^1.0.6"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				}
 			}
 		},
+		"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": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		},
+		"fast-glob": {
+			"version": "2.2.6",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
+			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+			"dev": true,
+			"requires": {
+				"@mrmlnc/readdir-enhanced": "^2.2.1",
+				"@nodelib/fs.stat": "^1.1.2",
+				"glob-parent": "^3.1.0",
+				"is-glob": "^4.0.0",
+				"merge2": "^1.2.3",
+				"micromatch": "^3.1.10"
+			}
+		},
+		"fast-json-parse": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+			"integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
+		},
 		"fast-json-stable-stringify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -10506,18 +7435,22 @@
 				"escape-string-regexp": "^1.0.5"
 			}
 		},
+		"file-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
+			"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"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==",
 			"dev": true
 		},
-		"filename-regex": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
-		},
 		"fileset": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
@@ -10559,7 +7492,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
 			"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"encodeurl": "~1.0.2",
@@ -10602,58 +7534,38 @@
 			"dev": true
 		},
 		"flush-write-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
 		"follow-redirects": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
-			"integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+			"integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
 			"dev": true,
 			"requires": {
-				"debug": "=3.1.0"
+				"debug": "^3.2.6"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
 					"requires": {
-						"ms": "2.0.0"
+						"ms": "^2.1.1"
 					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
@@ -10662,6 +7574,41 @@
 			"resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
 			"integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
 		},
+		"fontkit": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.8.0.tgz",
+			"integrity": "sha512-EFDRCca7khfQWYu1iFhsqeABpi87f03MBdkT93ZE6YhqCdMzb5Eojb6c4dlJikGv5liuhByyzA7ikpIPTSBWbQ==",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6",
+				"brfs": "^1.4.0",
+				"brotli": "^1.2.0",
+				"browserify-optional": "^1.0.0",
+				"clone": "^1.0.1",
+				"deep-equal": "^1.0.0",
+				"dfa": "^1.0.0",
+				"restructure": "^0.5.3",
+				"tiny-inflate": "^1.0.2",
+				"unicode-properties": "^1.0.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"clone": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+					"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+					"dev": true
+				}
+			}
+		},
+		"for-each": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+			"requires": {
+				"is-callable": "^1.1.3"
+			}
+		},
 		"for-in": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -10675,6 +7622,12 @@
 				"for-in": "^1.0.1"
 			}
 		},
+		"foreach": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+			"dev": true
+		},
 		"forever-agent": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -10699,8 +7652,7 @@
 		"forwarded": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-			"dev": true
+			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
 		},
 		"fragment-cache": {
 			"version": "0.2.1",
@@ -10713,8 +7665,7 @@
 		"fresh": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-			"dev": true
+			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
 		},
 		"from": {
 			"version": "0.1.7",
@@ -10729,32 +7680,6 @@
 			"requires": {
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"fs-access": {
@@ -10770,7 +7695,6 @@
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
 			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"jsonfile": "^4.0.0",
@@ -10785,43 +7709,17 @@
 			"requires": {
 				"minipass": "^2.2.1"
 			}
-		},
-		"fs-write-stream-atomic": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"iferr": "^0.1.5",
-				"imurmurhash": "^0.1.4",
-				"readable-stream": "1 || 2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+		},
+		"fs-write-stream-atomic": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"iferr": "^0.1.5",
+				"imurmurhash": "^0.1.4",
+				"readable-stream": "1 || 2"
 			}
 		},
 		"fs.realpath": {
@@ -10869,12 +7767,14 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
 					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+					"optional": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
@@ -10889,17 +7789,20 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -11016,7 +7919,8 @@
 				"inherits": {
 					"version": "2.0.3",
 					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"optional": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -11028,6 +7932,7 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+					"optional": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -11035,750 +7940,205 @@
 				"isarray": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"optional": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-				},
-				"minipass": {
-					"version": "2.3.5",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-					"requires": {
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.0"
-					}
-				},
-				"minizlib": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-					"optional": true,
-					"requires": {
-						"minipass": "^2.2.1"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"optional": true
-				},
-				"needle": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
-					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
-					"optional": true,
-					"requires": {
-						"debug": "^2.1.2",
-						"iconv-lite": "^0.4.4",
-						"sax": "^1.2.4"
-					}
-				},
-				"node-pre-gyp": {
-					"version": "0.10.3",
-					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
-					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
-					"optional": true,
-					"requires": {
-						"detect-libc": "^1.0.2",
-						"mkdirp": "^0.5.1",
-						"needle": "^2.2.1",
-						"nopt": "^4.0.1",
-						"npm-packlist": "^1.1.6",
-						"npmlog": "^4.0.2",
-						"rc": "^1.2.7",
-						"rimraf": "^2.6.1",
-						"semver": "^5.3.0",
-						"tar": "^4"
-					}
-				},
-				"nopt": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-					"optional": true,
-					"requires": {
-						"abbrev": "1",
-						"osenv": "^0.1.4"
-					}
-				},
-				"npm-bundled": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
-					"optional": true
-				},
-				"npm-packlist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
-					"optional": true,
-					"requires": {
-						"ignore-walk": "^3.0.1",
-						"npm-bundled": "^1.0.1"
-					}
-				},
-				"npmlog": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-					"optional": true,
-					"requires": {
-						"are-we-there-yet": "~1.1.2",
-						"console-control-strings": "~1.1.0",
-						"gauge": "~2.7.3",
-						"set-blocking": "~2.0.0"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"optional": true
-				},
-				"once": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-					"optional": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"optional": true
-				},
-				"osenv": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-					"optional": true,
-					"requires": {
-						"os-homedir": "^1.0.0",
-						"os-tmpdir": "^1.0.0"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"optional": true
-				},
-				"process-nextick-args": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-					"optional": true
-				},
-				"rc": {
-					"version": "1.2.8",
-					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-					"optional": true,
-					"requires": {
-						"deep-extend": "^0.6.0",
-						"ini": "~1.3.0",
-						"minimist": "^1.2.0",
-						"strip-json-comments": "~2.0.1"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-							"optional": true
-						}
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"optional": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"optional": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				},
-				"safer-buffer": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-					"optional": true
-				},
-				"sax": {
-					"version": "1.2.4",
-					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-					"optional": true
-				},
-				"semver": {
-					"version": "5.6.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-					"optional": true
-				},
-				"set-blocking": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"optional": true
 				},
-				"signal-exit": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"optional": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"optional": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"minipass": {
+					"version": "2.3.5",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+					"optional": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"minizlib": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
 					"optional": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"minipass": "^2.2.1"
 					}
 				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"optional": true,
 					"requires": {
-						"ansi-regex": "^2.0.0"
+						"minimist": "0.0.8"
 					}
 				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
 					"optional": true
 				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+				"needle": {
+					"version": "2.2.4",
+					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
+					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
 					"optional": true,
 					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"debug": "^2.1.2",
+						"iconv-lite": "^0.4.4",
+						"sax": "^1.2.4"
 					}
 				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"optional": true
+				"node-pre-gyp": {
+					"version": "0.10.3",
+					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
+					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
+					"optional": true,
+					"requires": {
+						"detect-libc": "^1.0.2",
+						"mkdirp": "^0.5.1",
+						"needle": "^2.2.1",
+						"nopt": "^4.0.1",
+						"npm-packlist": "^1.1.6",
+						"npmlog": "^4.0.2",
+						"rc": "^1.2.7",
+						"rimraf": "^2.6.1",
+						"semver": "^5.3.0",
+						"tar": "^4"
+					}
 				},
-				"wide-align": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"optional": true,
 					"requires": {
-						"string-width": "^1.0.2 || 2"
+						"abbrev": "1",
+						"osenv": "^0.1.4"
 					}
 				},
-				"wrappy": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				"npm-bundled": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
+					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+					"optional": true
 				},
-				"yallist": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-				}
-			}
-		},
-		"ftp": {
-			"version": "0.3.10",
-			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "1.1.x",
-				"xregexp": "2.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
+				"npm-packlist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
+					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+					"optional": true,
+					"requires": {
+						"ignore-walk": "^3.0.1",
+						"npm-bundled": "^1.0.1"
+					}
 				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-					"dev": true,
+				"npmlog": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+					"optional": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.1",
-						"isarray": "0.0.1",
-						"string_decoder": "~0.10.x"
+						"are-we-there-yet": "~1.1.2",
+						"console-control-strings": "~1.1.0",
+						"gauge": "~2.7.3",
+						"set-blocking": "~2.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
+				"number-is-nan": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+					"optional": true
 				},
-				"xregexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
-					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
-					"dev": true
-				}
-			}
-		},
-		"gaze": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-			"requires": {
-				"globule": "^1.0.0"
-			}
-		},
-		"genfun": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-			"dev": true
-		},
-		"get-caller-file": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-		},
-		"get-stdin": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
-		},
-		"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
-		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
-		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
-		"glob": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
-		"glob-base": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
-			"requires": {
-				"glob-parent": "^2.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-					"dev": true,
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"optional": true
+				},
+				"once": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+					"optional": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"wrappy": "1"
 					}
 				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+				"os-homedir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
-		"glob-parent": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-			"requires": {
-				"is-glob": "^3.1.0",
-				"path-dirname": "^1.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+				"osenv": {
+					"version": "0.1.5",
+					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+					"optional": true,
 					"requires": {
-						"is-extglob": "^2.1.0"
+						"os-homedir": "^1.0.0",
+						"os-tmpdir": "^1.0.0"
 					}
-				}
-			}
-		},
-		"glob-to-regexp": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-			"dev": true
-		},
-		"global-dirs": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-			"dev": true,
-			"requires": {
-				"ini": "^1.3.4"
-			}
-		},
-		"globals": {
-			"version": "9.18.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-			"dev": true
-		},
-		"globby": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-			"dev": true,
-			"requires": {
-				"array-union": "^1.0.1",
-				"dir-glob": "^2.0.0",
-				"glob": "^7.1.2",
-				"ignore": "^3.3.5",
-				"pify": "^3.0.0",
-				"slash": "^1.0.0"
-			}
-		},
-		"globule": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
-			"requires": {
-				"glob": "~7.1.1",
-				"lodash": "~4.17.10",
-				"minimatch": "~3.0.2"
-			}
-		},
-		"got": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-			"dev": true,
-			"requires": {
-				"create-error-class": "^3.0.0",
-				"duplexer3": "^0.1.4",
-				"get-stream": "^3.0.0",
-				"is-redirect": "^1.0.0",
-				"is-retry-allowed": "^1.0.0",
-				"is-stream": "^1.0.0",
-				"lowercase-keys": "^1.0.0",
-				"safe-buffer": "^5.0.1",
-				"timed-out": "^4.0.0",
-				"unzip-response": "^2.0.1",
-				"url-parse-lax": "^1.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.1.15",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
-		},
-		"graphql": {
-			"version": "14.1.1",
-			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
-			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
-			"requires": {
-				"iterall": "^1.2.2"
-			}
-		},
-		"graphql-tag": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
-			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
-		},
-		"gzip-size": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
-			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
-			"dev": true,
-			"requires": {
-				"duplexer": "^0.1.1",
-				"pify": "^3.0.0"
-			}
-		},
-		"handle-thing": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
-			"dev": true
-		},
-		"handlebars": {
-			"version": "4.0.12",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
-			"integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
-			"dev": true,
-			"requires": {
-				"async": "^2.5.0",
-				"optimist": "^0.6.1",
-				"source-map": "^0.6.1",
-				"uglify-js": "^3.1.4"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-		},
-		"har-validator": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-			"requires": {
-				"ajv": "^6.5.5",
-				"har-schema": "^2.0.0"
-			}
-		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"requires": {
-				"ansi-regex": "^2.0.0"
-			}
-		},
-		"has-binary2": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-			"requires": {
-				"isarray": "2.0.1"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
-				}
-			}
-		},
-		"has-cors": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
-		},
-		"has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-			"dev": true
-		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
-			}
-		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"optional": true
+				},
+				"process-nextick-args": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+					"optional": true
+				},
+				"rc": {
+					"version": "1.2.8",
+					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+					"optional": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"deep-extend": "^0.6.0",
+						"ini": "~1.3.0",
+						"minimist": "^1.2.0",
+						"strip-json-comments": "~2.0.1"
+					},
+					"dependencies": {
+						"minimist": {
+							"version": "1.2.0",
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+							"optional": true
+						}
 					}
-				}
-			}
-		},
-		"hash-base": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"hash.js": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"minimalistic-assert": "^1.0.1"
-			}
-		},
-		"hmac-drbg": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-			"dev": true,
-			"requires": {
-				"hash.js": "^1.0.3",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.1"
-			}
-		},
-		"hoek": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
-			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
-		},
-		"hoopy": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-			"dev": true
-		},
-		"hosted-git-info": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
-			},
-			"dependencies": {
+				},
 				"readable-stream": {
 					"version": "2.3.6",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"core-util-is": "~1.0.0",
 						"inherits": "~2.0.3",
@@ -11789,490 +8149,696 @@
 						"util-deprecate": "~1.0.1"
 					}
 				},
+				"rimraf": {
+					"version": "2.6.3",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+					"optional": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+				},
+				"safer-buffer": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+					"optional": true
+				},
+				"sax": {
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+					"optional": true
+				},
+				"semver": {
+					"version": "5.6.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+					"optional": true
+				},
+				"set-blocking": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"optional": true
+				},
+				"signal-exit": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+					"optional": true
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+					"optional": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
 				"string_decoder": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"safe-buffer": "~5.1.0"
 					}
-				}
-			}
-		},
-		"html-entities": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-			"dev": true
-		},
-		"htmlparser2": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
-			"integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^1.3.0",
-				"domhandler": "^2.3.0",
-				"domutils": "^1.5.1",
-				"entities": "^1.1.1",
-				"inherits": "^2.0.1",
-				"readable-stream": "^3.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
+						"ansi-regex": "^2.0.0"
 					}
-				}
-			}
-		},
-		"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",
-			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-			"dev": true
-		},
-		"http-errors": {
-			"version": "1.6.3",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-			"dev": true,
-			"requires": {
-				"depd": "~1.1.2",
-				"inherits": "2.0.3",
-				"setprototypeof": "1.1.0",
-				"statuses": ">= 1.4.0 < 2"
-			}
-		},
-		"http-parser-js": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
-			"dev": true
-		},
-		"http-proxy": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
-			"dev": true,
-			"requires": {
-				"eventemitter3": "^3.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
-			}
-		},
-		"http-proxy-agent": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-			"dev": true,
-			"requires": {
-				"agent-base": "4",
-				"debug": "3.1.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
+				},
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+					"optional": true
+				},
+				"tar": {
+					"version": "4.4.8",
+					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+					"optional": true,
+					"requires": {
+						"chownr": "^1.1.1",
+						"fs-minipass": "^1.2.5",
+						"minipass": "^2.3.4",
+						"minizlib": "^1.1.1",
+						"mkdirp": "^0.5.0",
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.2"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"optional": true
+				},
+				"wide-align": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+					"optional": true,
 					"requires": {
-						"ms": "2.0.0"
+						"string-width": "^1.0.2 || 2"
 					}
+				},
+				"wrappy": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				},
+				"yallist": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
 				}
 			}
 		},
-		"http-proxy-middleware": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
-			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+		"ftp": {
+			"version": "0.3.10",
+			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
 			"dev": true,
 			"requires": {
-				"http-proxy": "^1.16.2",
-				"is-glob": "^4.0.0",
-				"lodash": "^4.17.5",
-				"micromatch": "^3.1.9"
+				"readable-stream": "1.1.x",
+				"xregexp": "2.0.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"readable-stream": {
+					"version": "1.1.14",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
+						"isarray": "0.0.1",
+						"string_decoder": "~0.10.x"
 					}
 				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"xregexp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
+					"dev": true
+				}
+			}
+		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+		},
+		"gaze": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+			"requires": {
+				"globule": "^1.0.0"
+			}
+		},
+		"genfun": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+			"dev": true
+		},
+		"get-caller-file": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+		},
+		"get-stdin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+		},
+		"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
+		},
+		"get-uri": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
+			"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
+			"dev": true,
+			"requires": {
+				"data-uri-to-buffer": "2",
+				"debug": "4",
+				"extend": "~3.0.2",
+				"file-uri-to-path": "1",
+				"ftp": "~0.3.10",
+				"readable-stream": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
+				}
+			}
+		},
+		"get-value": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+		},
+		"getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+			"requires": {
+				"assert-plus": "^1.0.0"
+			}
+		},
+		"glob": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+			"requires": {
+				"is-glob": "^3.1.0",
+				"path-dirname": "^1.0.0"
+			},
+			"dependencies": {
+				"is-extglob": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
+				"is-glob": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extglob": "^2.1.0"
 					}
-				},
+				}
+			}
+		},
+		"glob-to-regexp": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+			"dev": true
+		},
+		"global-dirs": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+			"dev": true,
+			"requires": {
+				"ini": "^1.3.4"
+			}
+		},
+		"globals": {
+			"version": "9.18.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+			"dev": true
+		},
+		"globby": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+			"dev": true,
+			"requires": {
+				"array-union": "^1.0.1",
+				"dir-glob": "^2.0.0",
+				"glob": "^7.1.2",
+				"ignore": "^3.3.5",
+				"pify": "^3.0.0",
+				"slash": "^1.0.0"
+			}
+		},
+		"globule": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+			"requires": {
+				"glob": "~7.1.1",
+				"lodash": "~4.17.10",
+				"minimatch": "~3.0.2"
+			}
+		},
+		"got": {
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+			"dev": true,
+			"requires": {
+				"create-error-class": "^3.0.0",
+				"duplexer3": "^0.1.4",
+				"get-stream": "^3.0.0",
+				"is-redirect": "^1.0.0",
+				"is-retry-allowed": "^1.0.0",
+				"is-stream": "^1.0.0",
+				"lowercase-keys": "^1.0.0",
+				"safe-buffer": "^5.0.1",
+				"timed-out": "^4.0.0",
+				"unzip-response": "^2.0.1",
+				"url-parse-lax": "^1.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.1.15",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+		},
+		"graphql": {
+			"version": "14.1.1",
+			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
+			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
+			"requires": {
+				"iterall": "^1.2.2"
+			}
+		},
+		"graphql-tag": {
+			"version": "2.10.1",
+			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
+			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
+		},
+		"gzip-size": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
+			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
+			"dev": true,
+			"requires": {
+				"duplexer": "^0.1.1",
+				"pify": "^3.0.0"
+			}
+		},
+		"handle-thing": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+			"dev": true
+		},
+		"handlebars": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz",
+			"integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==",
+			"dev": true,
+			"requires": {
+				"neo-async": "^2.6.0",
+				"optimist": "^0.6.1",
+				"source-map": "^0.6.1",
+				"uglify-js": "^3.1.4"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"har-schema": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+		},
+		"har-validator": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+			"requires": {
+				"ajv": "^6.5.5",
+				"har-schema": "^2.0.0"
+			}
+		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
+		"has-ansi": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+			"requires": {
+				"ansi-regex": "^2.0.0"
+			}
+		},
+		"has-binary2": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+			"requires": {
+				"isarray": "2.0.1"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+				}
+			}
+		},
+		"has-cors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+		},
+		"has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+		},
+		"has-symbols": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+			"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+		},
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+		},
+		"has-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+			"requires": {
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
+			}
+		},
+		"has-values": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+			"requires": {
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
+			},
+			"dependencies": {
 				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-					"dev": true,
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"is-buffer": "^1.1.5"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				}
+			}
+		},
+		"hash-base": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"hash.js": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.3",
+				"minimalistic-assert": "^1.0.1"
+			}
+		},
+		"hmac-drbg": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+			"dev": true,
+			"requires": {
+				"hash.js": "^1.0.3",
+				"minimalistic-assert": "^1.0.0",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
+		},
+		"hoek": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
+			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
+		},
+		"hoopy": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+			"dev": true
+		},
+		"hosted-git-info": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+		},
+		"hpack.js": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"obuf": "^1.0.0",
+				"readable-stream": "^2.0.1",
+				"wbuf": "^1.1.0"
+			}
+		},
+		"html-entities": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+			"dev": true
+		},
+		"htmlparser2": {
+			"version": "3.10.1",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+			"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^1.3.1",
+				"domhandler": "^2.3.0",
+				"domutils": "^1.5.1",
+				"entities": "^1.1.1",
+				"inherits": "^2.0.1",
+				"readable-stream": "^3.1.1"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				}
+			}
+		},
+		"http-auth": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
+			"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
+			"dev": true,
+			"requires": {
+				"apache-crypt": "^1.1.2",
+				"apache-md5": "^1.0.6",
+				"bcryptjs": "^2.3.0",
+				"uuid": "^3.0.0"
+			}
+		},
+		"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",
+			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+			"dev": true
+		},
+		"http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+			"requires": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			}
+		},
+		"http-parser-js": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
+			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
+			"dev": true
+		},
+		"http-proxy": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+			"dev": true,
+			"requires": {
+				"eventemitter3": "^3.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"http-proxy-agent": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+			"dev": true,
+			"requires": {
+				"agent-base": "4",
+				"debug": "3.1.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ms": "2.0.0"
 					}
 				}
 			}
 		},
+		"http-proxy-middleware": {
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+			"dev": true,
+			"requires": {
+				"http-proxy": "^1.16.2",
+				"is-glob": "^4.0.0",
+				"lodash": "^4.17.5",
+				"micromatch": "^3.1.9"
+			}
+		},
+		"http-signature": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"jsprim": "^1.2.2",
+				"sshpk": "^1.7.0"
+			}
+		},
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -12429,24 +8995,26 @@
 			}
 		},
 		"i18next": {
-			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/i18next/-/i18next-12.1.0.tgz",
-			"integrity": "sha512-AexmwGkKxwKfo5fGeXTWEY4xqzRPigQ1S/0InOUUVziGO54cd4fKyYK8ED1Thx9fd+WA3fRSZ+1iekvFQMbsFw==",
-			"dev": true
+			"version": "15.0.8",
+			"resolved": "https://registry.npmjs.org/i18next/-/i18next-15.0.8.tgz",
+			"integrity": "sha512-ayzNwJ9NHtqEeAG0nQ6yKFbIpZULpDeesjVnfWQaPwbH7Anee8QwRAYPNWHtFCmDZV9FZaKiEbfo1scH8+KSDg==",
+			"dev": true,
+			"requires": {
+				"@babel/runtime": "^7.3.1"
+			}
 		},
 		"iconv-lite": {
 			"version": "0.4.23",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
 			"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-			"dev": true,
 			"requires": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
 		"ieee754": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-			"integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+			"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
 			"dev": true
 		},
 		"iferr": {
@@ -12656,20 +9224,26 @@
 			}
 		},
 		"invert-kv": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-			"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+			"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+			"dev": true
 		},
 		"ionic": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.10.1.tgz",
-			"integrity": "sha512-nqwFQ1Ec3Dtg9EqMQGXO003bNlVZuH+/hKU+asmX+DO5V6Am6E+KHrgBRRzSKqmuF+l5Wk81EvMD8L5tg2sLRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/discover": "1.0.11",
-				"@ionic/utils-fs": "1.0.0",
-				"@ionic/utils-network": "0.0.6",
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.12.0.tgz",
+			"integrity": "sha512-3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/discover": "1.0.13",
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-network": "0.0.8",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
 				"chalk": "^2.3.0",
 				"debug": "^4.0.0",
 				"diff": "^4.0.1",
@@ -12691,325 +9265,34 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/discover": {
-					"version": "1.0.11",
-					"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.11.tgz",
-					"integrity": "sha512-E2CYZsR2noHtUjYceUNP6w1DMYnjPqITyC8Ewiz1iaNWgEntr7xvt1/XbkMlnswn9QKNSItNL6iWY0Q91N+k2A==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"netmask": "^1.0.6",
-						"tslib": "^1.9.0",
-						"ws": "^6.0.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"ci-info": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-					"dev": true
-				},
 				"debug": {
 					"version": "4.1.1",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
 					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"diff": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
-					"dev": true
-				},
-				"get-uri": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
-					"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
-					"dev": true,
-					"requires": {
-						"data-uri-to-buffer": "2",
-						"debug": "4",
-						"extend": "~3.0.2",
-						"file-uri-to-path": "1",
-						"ftp": "~0.3.10",
-						"readable-stream": "3"
-					}
-				},
-				"is-ci": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-					"dev": true,
-					"requires": {
-						"ci-info": "^1.5.0"
-					}
-				},
-				"mime": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"pac-proxy-agent": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
-					"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"get-uri": "^2.0.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"pac-resolver": "^3.0.0",
-						"raw-body": "^2.2.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"proxy-agent": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz",
-					"integrity": "sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"pac-proxy-agent": "^3.0.0",
-						"proxy-from-env": "^1.0.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"qs": {
-					"version": "6.6.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.6.0.tgz",
-					"integrity": "sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"superagent": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
-					"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
-					"dev": true,
-					"requires": {
-						"component-emitter": "^1.2.0",
-						"cookiejar": "^2.1.2",
-						"debug": "^4.1.0",
-						"form-data": "^2.3.3",
-						"formidable": "^1.2.0",
-						"methods": "^1.1.1",
-						"mime": "^2.4.0",
-						"qs": "^6.6.0",
-						"readable-stream": "^3.0.6"
-					}
-				},
-				"superagent-proxy": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
-					"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"proxy-agent": "3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
+				"diff": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+					"dev": true
 				},
-				"update-notifier": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-					"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-					"dev": true,
-					"requires": {
-						"boxen": "^1.2.1",
-						"chalk": "^2.0.1",
-						"configstore": "^3.0.0",
-						"import-lazy": "^2.1.0",
-						"is-ci": "^1.0.10",
-						"is-installed-globally": "^0.1.0",
-						"is-npm": "^1.0.0",
-						"latest-version": "^3.0.0",
-						"semver-diff": "^2.0.0",
-						"xdg-basedir": "^3.0.0"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
@@ -13032,9 +9315,9 @@
 			"dev": true
 		},
 		"ipaddr.js": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
-			"integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=",
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+			"integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
 			"dev": true
 		},
 		"is-absolute": {
@@ -13081,6 +9364,11 @@
 				"builtin-modules": "^1.0.0"
 			}
 		},
+		"is-callable": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+			"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+		},
 		"is-ci": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -13098,6 +9386,11 @@
 				"kind-of": "^3.0.2"
 			}
 		},
+		"is-date-object": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+		},
 		"is-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -13121,21 +9414,6 @@
 			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
 			"dev": true
 		},
-		"is-dotfile": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-			"dev": true
-		},
-		"is-equal-shallow": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
-			"requires": {
-				"is-primitive": "^2.0.0"
-			}
-		},
 		"is-extendable": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -13200,907 +9478,550 @@
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
 			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-			"dev": true
-		},
-		"is-path-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "^1.0.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "^1.0.1"
-			}
-		},
-		"is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"requires": {
-				"isobject": "^3.0.1"
-			}
-		},
-		"is-posix-bracket": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
-		},
-		"is-primitive": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-			"dev": true
-		},
-		"is-redirect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-			"dev": true
-		},
-		"is-relative": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-			"dev": true,
-			"requires": {
-				"is-unc-path": "^1.0.0"
-			}
-		},
-		"is-retry-allowed": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-			"dev": true
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-		},
-		"is-unc-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-			"dev": true,
-			"requires": {
-				"unc-path-regex": "^0.1.2"
-			}
-		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-		},
-		"is-wsl": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-			"dev": true
-		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-		},
-		"isbinaryfile": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-			"dev": true,
-			"requires": {
-				"buffer-alloc": "^1.2.0"
-			}
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-		},
-		"istanbul-instrumenter-loader": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
-			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
-			"dev": true,
-			"requires": {
-				"convert-source-map": "^1.5.0",
-				"istanbul-lib-instrument": "^1.7.3",
-				"loader-utils": "^1.1.0",
-				"schema-utils": "^0.3.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.5.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-					"dev": true,
-					"requires": {
-						"co": "^4.6.0",
-						"fast-deep-equal": "^1.0.0",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.3.0"
-					}
-				},
-				"fast-deep-equal": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-					"dev": true,
-					"requires": {
-						"ajv": "^5.0.0"
-					}
-				}
+				"kind-of": "^3.0.2"
 			}
 		},
-		"istanbul-lib-coverage": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+		"is-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
 			"dev": true
 		},
-		"istanbul-lib-hook": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz",
-			"integrity": "sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==",
-			"dev": true,
-			"requires": {
-				"append-transform": "^1.0.0"
-			}
+		"is-path-cwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+			"dev": true
 		},
-		"istanbul-lib-instrument": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+		"is-path-in-cwd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
 			"dev": true,
 			"requires": {
-				"babel-generator": "^6.18.0",
-				"babel-template": "^6.16.0",
-				"babel-traverse": "^6.18.0",
-				"babel-types": "^6.18.0",
-				"babylon": "^6.18.0",
-				"istanbul-lib-coverage": "^1.2.1",
-				"semver": "^5.3.0"
+				"is-path-inside": "^1.0.0"
 			}
 		},
-		"istanbul-lib-report": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz",
-			"integrity": "sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==",
+		"is-path-inside": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
 			"dev": true,
 			"requires": {
-				"istanbul-lib-coverage": "^2.0.1",
-				"make-dir": "^1.3.0",
-				"supports-color": "^5.4.0"
-			},
-			"dependencies": {
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
+				"path-is-inside": "^1.0.1"
 			}
 		},
-		"istanbul-reports": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.0.1.tgz",
-			"integrity": "sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==",
-			"dev": true,
+		"is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"requires": {
-				"handlebars": "^4.0.11"
+				"isobject": "^3.0.1"
 			}
 		},
-		"iterall": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
-			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		"is-promise": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+			"dev": true
 		},
-		"jasmine": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
-			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+		"is-redirect": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+			"dev": true
+		},
+		"is-regex": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
 			"requires": {
-				"glob": "^7.0.6",
-				"jasmine-core": "~3.3.0"
+				"has": "^1.0.1"
 			}
 		},
-		"jasmine-core": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
-			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
-		},
-		"jasmine-spec-reporter": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+		"is-relative": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
 			"dev": true,
 			"requires": {
-				"colors": "1.1.2"
-			},
-			"dependencies": {
-				"colors": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-					"dev": true
-				}
+				"is-unc-path": "^1.0.0"
 			}
 		},
-		"jasminewd2": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
-			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+		"is-retry-allowed": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
 			"dev": true
 		},
-		"js-base64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
-		},
-		"js-tokens": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-			"dev": true
+		"is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
 		},
-		"js-yaml": {
-			"version": "3.12.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
-			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
-			"dev": true,
+		"is-symbol": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+			"integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
 			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"dependencies": {
-				"esprima": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-					"dev": true
-				}
+				"has-symbols": "^1.0.0"
 			}
 		},
-		"jsbarcode": {
-			"version": "4.0.0-alpha.5",
-			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-4.0.0-alpha.5.tgz",
-			"integrity": "sha512-YVBAjFgNKGzUGmSAmzU1dsNTR5omfwWhvusKR+SRRXcuSg4xT3Wl7hYfovt8eZK2LZyFJviQ+Glt9W6T7caQYw=="
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
 		},
-		"jsesc": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-			"dev": true
+		"is-unc-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+			"dev": true,
+			"requires": {
+				"unc-path-regex": "^0.1.2"
+			}
 		},
-		"json-loader": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-			"dev": true
+		"is-utf8": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
 		},
-		"json-parse-better-errors": {
+		"is-windows": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-			"dev": true
-		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 		},
-		"json3": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-			"dev": true
+		"is-wsl": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
 		},
-		"json5": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
-			"dev": true,
-			"requires": {
-				"minimist": "^1.2.0"
-			}
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 		},
-		"jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+		"isbinaryfile": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.6"
+				"buffer-alloc": "^1.2.0"
 			}
 		},
-		"jsonparse": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-			"dev": true
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
 		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			}
+		"isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
 		},
-		"karma": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.0.tgz",
-			"integrity": "sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==",
-			"dev": true,
-			"requires": {
-				"bluebird": "^3.3.0",
-				"body-parser": "^1.16.1",
-				"chokidar": "^2.0.3",
-				"colors": "^1.1.0",
-				"combine-lists": "^1.0.0",
-				"connect": "^3.6.0",
-				"core-js": "^2.2.0",
-				"di": "^0.0.1",
-				"dom-serialize": "^2.2.0",
-				"expand-braces": "^0.1.1",
-				"flatted": "^2.0.0",
-				"glob": "^7.1.1",
-				"graceful-fs": "^4.1.2",
-				"http-proxy": "^1.13.0",
-				"isbinaryfile": "^3.0.0",
-				"lodash": "^4.17.5",
-				"log4js": "^3.0.0",
-				"mime": "^2.3.1",
-				"minimatch": "^3.0.2",
-				"optimist": "^0.6.1",
-				"qjobs": "^1.1.4",
-				"range-parser": "^1.2.0",
-				"rimraf": "^2.6.0",
-				"safe-buffer": "^5.0.1",
-				"socket.io": "2.1.1",
-				"source-map": "^0.6.1",
-				"tmp": "0.0.33",
-				"useragent": "2.3.0"
+		"isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+		},
+		"istanbul-api": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.1.tgz",
+			"integrity": "sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"compare-versions": "^3.2.1",
+				"fileset": "^2.0.3",
+				"istanbul-lib-coverage": "^2.0.3",
+				"istanbul-lib-hook": "^2.0.3",
+				"istanbul-lib-instrument": "^3.1.0",
+				"istanbul-lib-report": "^2.0.4",
+				"istanbul-lib-source-maps": "^3.0.2",
+				"istanbul-reports": "^2.1.1",
+				"js-yaml": "^3.12.0",
+				"make-dir": "^1.3.0",
+				"minimatch": "^3.0.4",
+				"once": "^1.4.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"engine.io-client": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-					"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+				"istanbul-lib-instrument": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz",
+					"integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==",
 					"dev": true,
 					"requires": {
-						"component-emitter": "1.2.1",
-						"component-inherit": "0.0.3",
-						"debug": "~3.1.0",
-						"engine.io-parser": "~2.1.1",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"ws": "~3.3.1",
-						"xmlhttprequest-ssl": "~1.5.4",
-						"yeast": "0.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
+						"@babel/generator": "^7.0.0",
+						"@babel/parser": "^7.0.0",
+						"@babel/template": "^7.0.0",
+						"@babel/traverse": "^7.0.0",
+						"@babel/types": "^7.0.0",
+						"istanbul-lib-coverage": "^2.0.3",
+						"semver": "^5.5.0"
 					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				}
+			}
+		},
+		"istanbul-instrumenter-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
+			"dev": true,
+			"requires": {
+				"convert-source-map": "^1.5.0",
+				"istanbul-lib-instrument": "^1.7.3",
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^0.3.0"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "5.5.2",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"co": "^4.6.0",
+						"fast-deep-equal": "^1.0.0",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.3.0"
 					}
 				},
-				"finalhandler": {
+				"fast-deep-equal": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
+					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+					"dev": true
+				},
+				"json-schema-traverse": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"schema-utils": {
+					"version": "0.3.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ajv": "^5.0.0"
 					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				}
+			}
+		},
+		"istanbul-lib-coverage": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
+			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+			"dev": true
+		},
+		"istanbul-lib-hook": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz",
+			"integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==",
+			"dev": true,
+			"requires": {
+				"append-transform": "^1.0.0"
+			}
+		},
+		"istanbul-lib-instrument": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
+			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+			"dev": true,
+			"requires": {
+				"babel-generator": "^6.18.0",
+				"babel-template": "^6.16.0",
+				"babel-traverse": "^6.18.0",
+				"babel-types": "^6.18.0",
+				"babylon": "^6.18.0",
+				"istanbul-lib-coverage": "^1.2.1",
+				"semver": "^5.3.0"
+			}
+		},
+		"istanbul-lib-report": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz",
+			"integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==",
+			"dev": true,
+			"requires": {
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"supports-color": "^6.0.0"
+			},
+			"dependencies": {
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-lib-source-maps": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz",
+			"integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"rimraf": "^2.6.2",
+				"source-map": "^0.6.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-reports": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.1.1.tgz",
+			"integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==",
+			"dev": true,
+			"requires": {
+				"handlebars": "^4.1.0"
+			}
+		},
+		"iterall": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
+			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		},
+		"jasmine": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
+			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+			"requires": {
+				"glob": "^7.0.6",
+				"jasmine-core": "~3.3.0"
+			}
+		},
+		"jasmine-core": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
+			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
+		},
+		"jasmine-spec-reporter": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
+			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+			"dev": true,
+			"requires": {
+				"colors": "1.1.2"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+					"dev": true
+				}
+			}
+		},
+		"jasminewd2": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+			"dev": true
+		},
+		"js-base64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
+		},
+		"js-tokens": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.12.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
+			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+					"dev": true
+				}
+			}
+		},
+		"jsbarcode": {
+			"version": "3.11.0",
+			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.0.tgz",
+			"integrity": "sha512-/ozCd7wsa+VIHo9sUc03HneVEQrH7cVWfJolUT/WOW1m8mJ2e3iYZje6C9X3LFHdczlesqFHRpxLtbVsNtjyow=="
+		},
+		"jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		},
+		"jsesc": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+			"dev": true
+		},
+		"json-loader": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+			"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",
+			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+			"dev": true
+		},
+		"json-schema": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
+		"json-stringify-safe": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+		},
+		"json3": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+			"dev": true
+		},
+		"json5": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.0"
+			}
+		},
+		"jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"requires": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"jsonparse": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+			"dev": true
+		},
+		"jsprim": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+			"requires": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.2.3",
+				"verror": "1.10.0"
+			}
+		},
+		"karma": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz",
+			"integrity": "sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.3.0",
+				"body-parser": "^1.16.1",
+				"braces": "^2.3.2",
+				"chokidar": "^2.0.3",
+				"colors": "^1.1.0",
+				"connect": "^3.6.0",
+				"core-js": "^2.2.0",
+				"di": "^0.0.1",
+				"dom-serialize": "^2.2.0",
+				"flatted": "^2.0.0",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.1.2",
+				"http-proxy": "^1.13.0",
+				"isbinaryfile": "^3.0.0",
+				"lodash": "^4.17.11",
+				"log4js": "^4.0.0",
+				"mime": "^2.3.1",
+				"minimatch": "^3.0.2",
+				"optimist": "^0.6.1",
+				"qjobs": "^1.1.4",
+				"range-parser": "^1.2.0",
+				"rimraf": "^2.6.0",
+				"safe-buffer": "^5.0.1",
+				"socket.io": "2.1.1",
+				"source-map": "^0.6.1",
+				"tmp": "0.0.33",
+				"useragent": "2.3.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
 					"dev": true
 				},
-				"log4js": {
-					"version": "3.0.6",
-					"resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
-					"integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
-					"dev": true,
-					"requires": {
-						"circular-json": "^0.5.5",
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"rfdc": "^1.1.2",
-						"streamroller": "0.7.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
 				"mime": {
 					"version": "2.4.0",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
 					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-					"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
-					"dev": true,
-					"requires": {
-						"debug": "~3.1.0",
-						"engine.io": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"socket.io-adapter": "~1.1.0",
-						"socket.io-client": "2.1.1",
-						"socket.io-parser": "~3.2.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io-client": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
-					"dev": true,
-					"requires": {
-						"backo2": "1.0.2",
-						"base64-arraybuffer": "0.1.5",
-						"component-bind": "1.0.0",
-						"component-emitter": "1.2.1",
-						"debug": "~3.1.0",
-						"engine.io-client": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"object-component": "0.0.3",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"socket.io-parser": "~3.2.0",
-						"to-array": "0.1.4"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-					"dev": true
-				},
-				"streamroller": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-					"integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
-					"dev": true,
-					"requires": {
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"mkdirp": "^0.5.1",
-						"readable-stream": "^2.3.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"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"
-					}
-				},
-				"ws": {
-					"version": "3.3.3",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
 				}
 			}
 		},
@@ -14115,90 +10036,13 @@
 			}
 		},
 		"karma-coverage-istanbul-reporter": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz",
-			"integrity": "sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz",
+			"integrity": "sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==",
 			"dev": true,
 			"requires": {
-				"istanbul-api": "^2.0.5",
+				"istanbul-api": "^2.1.1",
 				"minimatch": "^3.0.4"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.6",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"istanbul-api": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.0.6.tgz",
-					"integrity": "sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==",
-					"dev": true,
-					"requires": {
-						"async": "^2.6.1",
-						"compare-versions": "^3.2.1",
-						"fileset": "^2.0.3",
-						"istanbul-lib-coverage": "^2.0.1",
-						"istanbul-lib-hook": "^2.0.1",
-						"istanbul-lib-instrument": "^3.0.0",
-						"istanbul-lib-report": "^2.0.2",
-						"istanbul-lib-source-maps": "^2.0.1",
-						"istanbul-reports": "^2.0.1",
-						"js-yaml": "^3.12.0",
-						"make-dir": "^1.3.0",
-						"once": "^1.4.0"
-					}
-				},
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"istanbul-lib-instrument": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz",
-					"integrity": "sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==",
-					"dev": true,
-					"requires": {
-						"@babel/generator": "^7.0.0",
-						"@babel/parser": "^7.0.0",
-						"@babel/template": "^7.0.0",
-						"@babel/traverse": "^7.0.0",
-						"@babel/types": "^7.0.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"semver": "^5.5.0"
-					}
-				},
-				"istanbul-lib-source-maps": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz",
-					"integrity": "sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"make-dir": "^1.3.0",
-						"rimraf": "^2.6.2",
-						"source-map": "^0.6.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
 			}
 		},
 		"karma-jasmine": {
@@ -14246,20 +10090,6 @@
 			"dev": true,
 			"requires": {
 				"package-json": "^4.0.0"
-			},
-			"dependencies": {
-				"package-json": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-					"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-					"dev": true,
-					"requires": {
-						"got": "^6.7.1",
-						"registry-auth-token": "^3.0.1",
-						"registry-url": "^3.0.3",
-						"semver": "^5.1.0"
-					}
-				}
 			}
 		},
 		"lazy-cache": {
@@ -14269,11 +10099,12 @@
 			"dev": true
 		},
 		"lcid": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+			"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+			"dev": true,
 			"requires": {
-				"invert-kv": "^1.0.0"
+				"invert-kv": "^2.0.0"
 			}
 		},
 		"leek": {
@@ -14300,6 +10131,32 @@
 				}
 			}
 		},
+		"less": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
+			"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+			"dev": true,
+			"requires": {
+				"clone": "^2.1.2",
+				"errno": "^0.1.1",
+				"graceful-fs": "^4.1.2",
+				"image-size": "~0.5.0",
+				"mime": "^1.4.1",
+				"mkdirp": "^0.5.0",
+				"promise": "^7.1.1",
+				"request": "^2.83.0",
+				"source-map": "~0.6.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"less-loader": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
@@ -14339,6 +10196,144 @@
 				"immediate": "~3.0.5"
 			}
 		},
+		"linebreak": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/linebreak/-/linebreak-0.3.0.tgz",
+			"integrity": "sha1-BSZICmLAW9Z58+nZmDDgnGp9DtY=",
+			"dev": true,
+			"requires": {
+				"base64-js": "0.0.8",
+				"brfs": "^1.3.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+					"integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+					"dev": true
+				}
+			}
+		},
+		"live-server": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
+			"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.4",
+				"colors": "^1.3.3",
+				"connect": "^3.6.6",
+				"cors": "^2.8.5",
+				"event-stream": "3.3.4",
+				"faye-websocket": "0.11.x",
+				"http-auth": "3.1.x",
+				"morgan": "^1.9.1",
+				"object-assign": "^4.1.1",
+				"opn": "^6.0.0",
+				"proxy-middleware": "^0.15.0",
+				"send": "^0.16.2",
+				"serve-index": "^1.9.1"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.3.3",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+					"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+					"dev": true
+				},
+				"event-stream": {
+					"version": "3.3.4",
+					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1",
+						"from": "~0",
+						"map-stream": "~0.1.0",
+						"pause-stream": "0.0.11",
+						"split": "0.3",
+						"stream-combiner": "~0.0.4",
+						"through": "~2.3.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"map-stream": {
+					"version": "0.1.0",
+					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+					"dev": true
+				},
+				"mime": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+					"dev": true
+				},
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"dev": true
+				},
+				"opn": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz",
+					"integrity": "sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==",
+					"dev": true,
+					"requires": {
+						"is-wsl": "^1.1.0"
+					}
+				},
+				"send": {
+					"version": "0.16.2",
+					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"depd": "~1.1.2",
+						"destroy": "~1.0.4",
+						"encodeurl": "~1.0.2",
+						"escape-html": "~1.0.3",
+						"etag": "~1.8.1",
+						"fresh": "0.5.2",
+						"http-errors": "~1.6.2",
+						"mime": "1.4.1",
+						"ms": "2.0.0",
+						"on-finished": "~2.3.0",
+						"range-parser": "~1.2.0",
+						"statuses": "~1.4.0"
+					}
+				},
+				"split": {
+					"version": "0.3.3",
+					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+					"dev": true,
+					"requires": {
+						"through": "2"
+					}
+				},
+				"stream-combiner": {
+					"version": "0.0.4",
+					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1"
+					}
+				}
+			}
+		},
 		"livereload-js": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
@@ -14578,6 +10573,36 @@
 				}
 			}
 		},
+		"log4js": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log4js/-/log4js-4.1.0.tgz",
+			"integrity": "sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==",
+			"dev": true,
+			"requires": {
+				"date-format": "^2.0.0",
+				"debug": "^4.1.1",
+				"flatted": "^2.0.0",
+				"rfdc": "^1.1.2",
+				"streamroller": "^1.0.4"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"loglevel": {
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
@@ -14631,24 +10656,24 @@
 			}
 		},
 		"lunr": {
-			"version": "2.3.5",
-			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.5.tgz",
-			"integrity": "sha512-EtnfmHsHJTr3u24sito9JctSxej5Ds0SgUD2Lm+qRHyLgM7BGesFlW14eNh1mil0fV5Muh8gf3dBBXzADlUlzQ==",
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.6.tgz",
+			"integrity": "sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==",
 			"dev": true
 		},
 		"macos-release": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.0.0.tgz",
-			"integrity": "sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.1.0.tgz",
+			"integrity": "sha512-8TCbwvN1mfNxbBv0yBtfyIFMo3m1QsNbKHv7PYIp/abRBKVQBXN7ecu3aeGGgT18VC/Tf397LBDGZF9KBGJFFw==",
 			"dev": true
 		},
 		"magic-string": {
-			"version": "0.25.1",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz",
-			"integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==",
+			"version": "0.25.2",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz",
+			"integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
 			"dev": true,
 			"requires": {
-				"sourcemap-codec": "^1.4.1"
+				"sourcemap-codec": "^1.4.4"
 			}
 		},
 		"make-dir": {
@@ -14666,6 +10691,93 @@
 			"integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
 			"dev": true
 		},
+		"make-fetch-happen": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
+			"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
+			"dev": true,
+			"requires": {
+				"agentkeepalive": "^3.4.1",
+				"cacache": "^11.0.1",
+				"http-cache-semantics": "^3.8.1",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"mississippi": "^3.0.0",
+				"node-fetch-npm": "^2.0.2",
+				"promise-retry": "^1.1.1",
+				"socks-proxy-agent": "^4.0.0",
+				"ssri": "^6.0.0"
+			},
+			"dependencies": {
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+					"dev": true,
+					"requires": {
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
+					},
+					"dependencies": {
+						"lru-cache": {
+							"version": "5.1.1",
+							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+							"dev": true,
+							"requires": {
+								"yallist": "^3.0.2"
+							}
+						}
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
+		},
 		"map-age-cleaner": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -14698,15 +10810,9 @@
 			}
 		},
 		"marked": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz",
-			"integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==",
-			"dev": true
-		},
-		"math-random": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-			"integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz",
+			"integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==",
 			"dev": true
 		},
 		"md5.js": {
@@ -14720,11 +10826,16 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"meant": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz",
+			"integrity": "sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg==",
+			"dev": true
+		},
 		"media-typer": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-			"dev": true
+			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
 		},
 		"mem": {
 			"version": "4.1.0",
@@ -14736,6 +10847,16 @@
 				"p-is-promise": "^2.0.0"
 			}
 		},
+		"memory-fs": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+			"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+			"dev": true,
+			"requires": {
+				"errno": "^0.1.3",
+				"readable-stream": "^2.0.1"
+			}
+		},
 		"meow": {
 			"version": "3.7.0",
 			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -14820,8 +10941,16 @@
 		"merge-descriptors": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-			"dev": true
+			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+		},
+		"merge-source-map": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
+			"integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6"
+			}
 		},
 		"merge2": {
 			"version": "1.2.3",
@@ -14832,8 +10961,36 @@
 		"methods": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-			"dev": true
+			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+		},
+		"micromatch": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"braces": "^2.3.1",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"extglob": "^2.0.4",
+				"fragment-cache": "^0.2.1",
+				"kind-of": "^6.0.2",
+				"nanomatch": "^1.2.9",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.2"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
 		},
 		"miller-rabin": {
 			"version": "4.0.1",
@@ -14877,6 +11034,17 @@
 			"resolved": "https://registry.npmjs.org/mingo/-/mingo-1.3.3.tgz",
 			"integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY="
 		},
+		"mini-css-extract-plugin": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
+			"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0",
+				"webpack-sources": "^1.1.0"
+			}
+		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -15014,6 +11182,20 @@
 				"on-headers": "~1.0.1"
 			}
 		},
+		"move-concurrently": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+			"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"copy-concurrently": "^1.0.0",
+				"fs-write-stream-atomic": "^1.0.8",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.3"
+			}
+		},
 		"ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -15063,6 +11245,33 @@
 			"resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
 			"integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
 		},
+		"nanomatch": {
+			"version": "1.2.13",
+			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"fragment-cache": "^0.2.1",
+				"is-windows": "^1.0.2",
+				"kind-of": "^6.0.2",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
 		"ncp": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
@@ -15072,8 +11281,7 @@
 		"negotiator": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-			"dev": true
+			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
 		},
 		"neo-async": {
 			"version": "2.6.0",
@@ -15153,40 +11361,12 @@
 				"url": "^0.11.0",
 				"util": "^0.11.0",
 				"vm-browserify": "0.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				}
 			}
 		},
 		"node-releases": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.6.tgz",
-			"integrity": "sha512-lODUVHEIZutZx+TDdOk47qLik8FJMXzJ+WnyUGci1MTvTOyzZrz5eVPIIpc5Hb3NfHZGeGHeuwrRYVI1PEITWg==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.12.tgz",
+			"integrity": "sha512-Y+AQ1xdjcgaEzpL65PBEF3fnl1FNKnDh9Zm+AUQLIlyyqtSc4u93jyMN4zrjMzdwKQ10RTr3tgY1x7qpsfF/xg==",
 			"dev": true,
 			"requires": {
 				"semver": "^5.3.0"
@@ -15318,8 +11498,7 @@
 					"requires": {
 						"glob": "^7.0.0",
 						"lodash": "^4.0.0",
-						"scss-tokenizer": "^0.2.3",
-						"yargs": "^7.0.0"
+						"scss-tokenizer": "^0.2.3"
 					}
 				},
 				"semver": {
@@ -15352,6 +11531,18 @@
 				"abbrev": "1"
 			}
 		},
+		"normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
 		"normalize-path": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -15367,21 +11558,58 @@
 			"dev": true
 		},
 		"npm-bundled": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-			"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+			"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
 			"dev": true
 		},
+		"npm-package-arg": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
+			"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.6.0",
+				"osenv": "^0.1.5",
+				"semver": "^5.5.0",
+				"validate-npm-package-name": "^3.0.0"
+			}
+		},
 		"npm-packlist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-			"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+			"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
 			"dev": true,
 			"requires": {
 				"ignore-walk": "^3.0.1",
 				"npm-bundled": "^1.0.1"
 			}
 		},
+		"npm-pick-manifest": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
+			"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+			"dev": true,
+			"requires": {
+				"figgy-pudding": "^3.5.1",
+				"npm-package-arg": "^6.0.0",
+				"semver": "^5.4.1"
+			}
+		},
+		"npm-registry-fetch": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
+			"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
+			"dev": true,
+			"requires": {
+				"JSONStream": "^1.3.4",
+				"bluebird": "^3.5.1",
+				"figgy-pudding": "^3.4.1",
+				"lru-cache": "^4.1.3",
+				"make-fetch-happen": "^4.0.1",
+				"npm-package-arg": "^6.1.0"
+			}
+		},
 		"npm-run-path": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -15497,6 +11725,16 @@
 				}
 			}
 		},
+		"object-inspect": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+			"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+		},
+		"object-keys": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+			"integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+		},
 		"object-visit": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -15505,27 +11743,6 @@
 				"isobject": "^3.0.0"
 			}
 		},
-		"object.omit": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
-			"requires": {
-				"for-own": "^0.1.4",
-				"is-extendable": "^0.1.1"
-			},
-			"dependencies": {
-				"for-own": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-					"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-					"dev": true,
-					"requires": {
-						"for-in": "^1.0.1"
-					}
-				}
-			}
-		},
 		"object.pick": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -15534,6 +11751,14 @@
 				"isobject": "^3.0.1"
 			}
 		},
+		"objectorarray": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz",
+			"integrity": "sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==",
+			"requires": {
+				"tape": "^4.8.0"
+			}
+		},
 		"obuf": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -15544,7 +11769,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
 			"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-			"dev": true,
 			"requires": {
 				"ee-first": "1.1.1"
 			}
@@ -15552,8 +11776,7 @@
 		"on-headers": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-			"dev": true
+			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
 		},
 		"once": {
 			"version": "1.4.0",
@@ -15677,7 +11900,6 @@
 			"version": "5.4.0",
 			"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
 			"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-			"dev": true,
 			"requires": {
 				"is-wsl": "^1.1.0"
 			}
@@ -15748,6 +11970,43 @@
 			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
 		},
+		"os-locale": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+			"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+			"dev": true,
+			"requires": {
+				"execa": "^1.0.0",
+				"lcid": "^2.0.0",
+				"mem": "^4.0.0"
+			},
+			"dependencies": {
+				"execa": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+					"dev": true,
+					"requires": {
+						"cross-spawn": "^6.0.0",
+						"get-stream": "^4.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
+					}
+				},
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+					"dev": true,
+					"requires": {
+						"pump": "^3.0.0"
+					}
+				}
+			}
+		},
 		"os-name": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz",
@@ -15831,6 +12090,51 @@
 			"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
 			"dev": true
 		},
+		"pac-proxy-agent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
+			"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"get-uri": "^2.0.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"pac-resolver": "^3.0.0",
+				"raw-body": "^2.2.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"raw-body": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+					"dev": true,
+					"requires": {
+						"bytes": "3.0.0",
+						"http-errors": "1.6.3",
+						"iconv-lite": "0.4.23",
+						"unpipe": "1.0.0"
+					}
+				}
+			}
+		},
 		"pac-resolver": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz",
@@ -15842,50 +12146,127 @@
 				"ip": "^1.1.5",
 				"netmask": "^1.0.6",
 				"thunkify": "^2.1.2"
+			}
+		},
+		"package-json": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+			"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+			"dev": true,
+			"requires": {
+				"got": "^6.7.1",
+				"registry-auth-token": "^3.0.1",
+				"registry-url": "^3.0.3",
+				"semver": "^5.1.0"
+			}
+		},
+		"pacote": {
+			"version": "9.4.0",
+			"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
+			"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.3",
+				"cacache": "^11.3.2",
+				"figgy-pudding": "^3.5.1",
+				"get-stream": "^4.1.0",
+				"glob": "^7.1.3",
+				"lru-cache": "^5.1.1",
+				"make-fetch-happen": "^4.0.1",
+				"minimatch": "^3.0.4",
+				"minipass": "^2.3.5",
+				"mississippi": "^3.0.0",
+				"mkdirp": "^0.5.1",
+				"normalize-package-data": "^2.4.0",
+				"npm-package-arg": "^6.1.0",
+				"npm-packlist": "^1.1.12",
+				"npm-pick-manifest": "^2.2.3",
+				"npm-registry-fetch": "^3.8.0",
+				"osenv": "^0.1.5",
+				"promise-inflight": "^1.0.1",
+				"promise-retry": "^1.1.1",
+				"protoduck": "^5.0.1",
+				"rimraf": "^2.6.2",
+				"safe-buffer": "^5.1.2",
+				"semver": "^5.6.0",
+				"ssri": "^6.0.1",
+				"tar": "^4.4.8",
+				"unique-filename": "^1.1.1",
+				"which": "^1.3.1"
 			},
 			"dependencies": {
-				"degenerator": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
-					"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"ast-types": "0.x.x",
-						"escodegen": "1.x.x",
-						"esprima": "3.x.x"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.11.0",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
-					"integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
 					"dev": true,
 					"requires": {
-						"esprima": "^3.1.3",
-						"estraverse": "^4.2.0",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.6.1"
+						"pump": "^3.0.0"
 					}
 				},
-				"esprima": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-					"dev": true
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
 				},
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
@@ -15904,38 +12285,12 @@
 				"cyclist": "~0.2.2",
 				"inherits": "^2.0.3",
 				"readable-stream": "^2.1.5"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"parse-asn1": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.3.tgz",
-			"integrity": "sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==",
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+			"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 			"dev": true,
 			"requires": {
 				"asn1.js": "^4.0.0",
@@ -15946,35 +12301,6 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"parse-glob": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
-			"requires": {
-				"glob-base": "^0.3.0",
-				"is-dotfile": "^1.0.0",
-				"is-extglob": "^1.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
 		"parse-json": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -16032,8 +12358,7 @@
 		"parseurl": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-			"dev": true
+			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
 		},
 		"pascalcase": {
 			"version": "0.1.1",
@@ -16075,14 +12400,12 @@
 		"path-parse": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-			"dev": true
+			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
 		},
 		"path-to-regexp": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-			"dev": true
+			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
 		},
 		"path-type": {
 			"version": "3.0.0",
@@ -16114,6 +12437,41 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"pdfkit": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/pdfkit/-/pdfkit-0.9.0.tgz",
+			"integrity": "sha512-j/tJvvoEM7qMiOfodNkz6XRNBvAhVohWP1mUvgg+Xy8X8S3aMBpVGXJGZWNCoCUH2ywLidZSbHyn5mJaqv9umw==",
+			"dev": true,
+			"requires": {
+				"crypto-js": "^3.1.9-1",
+				"fontkit": "^1.0.0",
+				"linebreak": "^0.3.0",
+				"png-js": ">=0.1.0",
+				"saslprep": "1.0.1"
+			}
+		},
+		"pdfmake": {
+			"version": "0.1.54",
+			"resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.1.54.tgz",
+			"integrity": "sha512-HO2FX+czmO+8LpWXQMFQfdUCCKnqwSvSEJExGkUKfsV34DRIV5PZjNg0xWS7ypGrnTY6RTTssWpdreX/pbyeyw==",
+			"dev": true,
+			"requires": {
+				"iconv-lite": "^0.4.24",
+				"linebreak": "^0.3.0",
+				"pdfkit": "^0.9.0"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+					"dev": true,
+					"requires": {
+						"safer-buffer": ">= 2.1.2 < 3"
+					}
+				}
+			}
+		},
 		"performance-now": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -16190,6 +12548,29 @@
 				"semver-compare": "^1.0.0"
 			}
 		},
+		"plist": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
+			"integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+			"requires": {
+				"base64-js": "^1.2.3",
+				"xmlbuilder": "^9.0.7",
+				"xmldom": "0.1.x"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
+				}
+			}
+		},
+		"png-js": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/png-js/-/png-js-0.1.1.tgz",
+			"integrity": "sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=",
+			"dev": true
+		},
 		"pngjs": {
 			"version": "3.3.3",
 			"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.3.tgz",
@@ -16258,20 +12639,6 @@
 			"requires": {
 				"cosmiconfig": "^4.0.0",
 				"import-cwd": "^2.0.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-					"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
-					"dev": true,
-					"requires": {
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0",
-						"require-from-string": "^2.0.1"
-					}
-				}
 			}
 		},
 		"postcss-loader": {
@@ -16304,12 +12671,6 @@
 			"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
 			"dev": true
 		},
-		"preserve": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
-		},
 		"process": {
 			"version": "0.11.10",
 			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -16601,7 +12962,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
 			"integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
-			"dev": true,
 			"requires": {
 				"forwarded": "~0.1.2",
 				"ipaddr.js": "1.8.0"
@@ -16610,7 +12970,39 @@
 				"ipaddr.js": {
 					"version": "1.8.0",
 					"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+				}
+			}
+		},
+		"proxy-agent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.0.tgz",
+			"integrity": "sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"pac-proxy-agent": "^3.0.0",
+				"proxy-from-env": "^1.0.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
@@ -16697,8 +13089,7 @@
 		"q": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-			"dev": true
+			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4="
 		},
 		"qjobs": {
 			"version": "1.2.0",
@@ -16861,40 +13252,26 @@
 			"dev": true
 		},
 		"querystringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
-			"integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+			"integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
 			"dev": true
 		},
-		"randomatic": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-			"integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+		"quote-stream": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
+			"integrity": "sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=",
 			"dev": true,
 			"requires": {
-				"is-number": "^4.0.0",
-				"kind-of": "^6.0.0",
-				"math-random": "^1.0.1"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				}
+				"buffer-equal": "0.0.1",
+				"minimist": "^1.1.3",
+				"through2": "^2.0.0"
 			}
 		},
 		"randombytes": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-			"integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.1.0"
@@ -16913,53 +13290,42 @@
 		"range-parser": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-			"dev": true
+			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
 		},
 		"raw-body": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-			"integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+			"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
 			"dev": true,
 			"requires": {
-				"bytes": "3.0.0",
-				"http-errors": "1.6.2",
-				"iconv-lite": "0.4.19",
-				"unpipe": "1.0.0"
+				"bytes": "1",
+				"string_decoder": "0.10"
 			},
 			"dependencies": {
-				"depd": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-					"integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-					"dev": true
-				},
-				"http-errors": {
-					"version": "1.6.2",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-					"integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-					"dev": true,
-					"requires": {
-						"depd": "1.1.1",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.0.3",
-						"statuses": ">= 1.3.1 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-					"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+				"bytes": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
 					"dev": true
 				},
-				"setprototypeof": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-					"integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
 					"dev": true
 				}
 			}
 		},
+		"raw-loader": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
+			"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"rc": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -16972,21 +13338,125 @@
 				"strip-json-comments": "~2.0.1"
 			}
 		},
-		"read-cache": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+		"read-cache": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+			"dev": true,
+			"requires": {
+				"pify": "^2.3.0"
+			},
+			"dependencies": {
+				"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"
+			},
+			"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"
+					}
+				},
+				"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-up": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+			"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+			"dev": true,
+			"requires": {
+				"find-up": "^2.0.0",
+				"read-pkg": "^2.0.0"
+			},
+			"dependencies": {
+				"find-up": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+					"dev": true,
+					"requires": {
+						"locate-path": "^2.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+					"dev": true,
+					"requires": {
+						"p-locate": "^2.0.0",
+						"path-exists": "^3.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+					"dev": true,
+					"requires": {
+						"p-limit": "^1.1.0"
+					}
+				}
+			}
+		},
+		"readable-stream": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+			"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 			"dev": true,
 			"requires": {
-				"pify": "^2.3.0"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
+				"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"
 			}
 		},
 		"readdirp": {
@@ -17390,15 +13860,6 @@
 			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
 			"dev": true
 		},
-		"regex-cache": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-			"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-			"dev": true,
-			"requires": {
-				"is-equal-shallow": "^0.1.3"
-			}
-		},
 		"regex-not": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -17420,9 +13881,9 @@
 			}
 		},
 		"registry-auth-token": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-			"integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+			"integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
 			"dev": true,
 			"requires": {
 				"rc": "^1.1.6",
@@ -17484,6 +13945,35 @@
 				"is-finite": "^1.0.0"
 			}
 		},
+		"request": {
+			"version": "2.88.0",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+			"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"aws-sign2": "~0.7.0",
+				"aws4": "^1.8.0",
+				"caseless": "~0.12.0",
+				"combined-stream": "~1.0.6",
+				"extend": "~3.0.2",
+				"forever-agent": "~0.6.1",
+				"form-data": "~2.3.2",
+				"har-validator": "~5.1.0",
+				"http-signature": "~1.2.0",
+				"is-typedarray": "~1.0.0",
+				"isstream": "~0.1.2",
+				"json-stringify-safe": "~5.0.1",
+				"mime-types": "~2.1.19",
+				"oauth-sign": "~0.9.0",
+				"performance-now": "^2.1.0",
+				"qs": "~6.5.2",
+				"safe-buffer": "^5.1.2",
+				"tough-cookie": "~2.4.3",
+				"tunnel-agent": "^0.6.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -17507,10 +13997,13 @@
 			"dev": true
 		},
 		"resolve": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-			"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-			"dev": true
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+			"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+			"dev": true,
+			"requires": {
+				"path-parse": "^1.0.6"
+			}
 		},
 		"resolve-cwd": {
 			"version": "2.0.0",
@@ -17542,6 +14035,23 @@
 				"signal-exit": "^3.0.2"
 			}
 		},
+		"restructure": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/restructure/-/restructure-0.5.4.tgz",
+			"integrity": "sha1-9U591WNZD7NP1r9Vh2EJrsyyjeg=",
+			"dev": true,
+			"requires": {
+				"browserify-optional": "^1.0.0"
+			}
+		},
+		"resumer": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+			"integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
+			"requires": {
+				"through": "~2.3.4"
+			}
+		},
 		"ret": {
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -17592,6 +14102,36 @@
 			"integrity": "sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==",
 			"dev": true
 		},
+		"rollup-plugin-commonjs": {
+			"version": "8.2.6",
+			"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
+			"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.2.1",
+				"estree-walker": "^0.5.0",
+				"magic-string": "^0.22.4",
+				"resolve": "^1.4.0",
+				"rollup-pluginutils": "^2.0.1"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				}
+			}
+		},
 		"rollup-plugin-node-resolve": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz",
@@ -17605,94 +14145,20 @@
 			}
 		},
 		"rollup-pluginutils": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz",
-			"integrity": "sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==",
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.5.0.tgz",
+			"integrity": "sha512-9Muh1H+XB5f5ONmKMayUoTYR1EZwHbwJJ9oZLrKT5yuTf/RLIQ5mYIGsrERquVucJmjmaAW0Y7+6Qo1Ep+5w3Q==",
 			"dev": true,
 			"requires": {
-				"estree-walker": "^0.5.2",
-				"micromatch": "^2.3.11"
+				"estree-walker": "^0.6.0",
+				"micromatch": "^3.1.10"
 			},
 			"dependencies": {
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+				"estree-walker": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz",
+					"integrity": "sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==",
 					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
 				}
 			}
 		},
@@ -17781,6 +14247,12 @@
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
+		"saslprep": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.1.tgz",
+			"integrity": "sha512-ntN6SbE3hRqd45PKKadRPgA+xHPWg5lPSj2JWJdJvjTwXDDfkPVtXWvP8jJojvnm+rAsZ2b299C5NwZqq818EA==",
+			"dev": true
+		},
 		"sass-loader": {
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
@@ -17907,7 +14379,6 @@
 			"version": "0.16.2",
 			"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
 			"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"depd": "~1.1.2",
@@ -17927,8 +14398,7 @@
 				"mime": {
 					"version": "1.4.1",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
 				}
 			}
 		},
@@ -17957,7 +14427,6 @@
 			"version": "1.13.2",
 			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
 			"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-			"dev": true,
 			"requires": {
 				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
@@ -18000,8 +14469,7 @@
 		"setprototypeof": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-			"dev": true
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
 		},
 		"sha.js": {
 			"version": "2.4.11",
@@ -18030,6 +14498,12 @@
 				}
 			}
 		},
+		"shallow-copy": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+			"integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=",
+			"dev": true
+		},
 		"shebang-command": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -18082,6 +14556,39 @@
 			"integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==",
 			"dev": true
 		},
+		"snapdragon": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+			"requires": {
+				"base": "^0.11.1",
+				"debug": "^2.2.0",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"map-cache": "^0.2.2",
+				"source-map": "^0.5.6",
+				"source-map-resolve": "^0.5.0",
+				"use": "^3.1.0"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				},
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
 		"snapdragon-node": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
@@ -18141,6 +14648,53 @@
 				"kind-of": "^3.2.0"
 			}
 		},
+		"socket.io": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+			"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+			"dev": true,
+			"requires": {
+				"debug": "~3.1.0",
+				"engine.io": "~3.2.0",
+				"has-binary2": "~1.0.2",
+				"socket.io-adapter": "~1.1.0",
+				"socket.io-client": "2.1.1",
+				"socket.io-parser": "~3.2.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"socket.io-client": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+					"dev": true,
+					"requires": {
+						"backo2": "1.0.2",
+						"base64-arraybuffer": "0.1.5",
+						"component-bind": "1.0.0",
+						"component-emitter": "1.2.1",
+						"debug": "~3.1.0",
+						"engine.io-client": "~3.2.0",
+						"has-binary2": "~1.0.2",
+						"has-cors": "1.1.0",
+						"indexof": "0.0.1",
+						"object-component": "0.0.3",
+						"parseqs": "0.0.5",
+						"parseuri": "0.0.5",
+						"socket.io-parser": "~3.2.0",
+						"to-array": "0.1.4"
+					}
+				}
+			}
+		},
 		"socket.io-adapter": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
@@ -18239,10 +14793,60 @@
 				}
 			}
 		},
+		"sockjs": {
+			"version": "0.3.19",
+			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+			"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+			"dev": true,
+			"requires": {
+				"faye-websocket": "^0.10.0",
+				"uuid": "^3.0.1"
+			}
+		},
+		"sockjs-client": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
+			"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.2.5",
+				"eventsource": "^1.0.7",
+				"faye-websocket": "~0.11.1",
+				"inherits": "^2.0.3",
+				"json3": "^3.3.2",
+				"url-parse": "^1.4.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"socks": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/socks/-/socks-2.2.3.tgz",
-			"integrity": "sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
+			"integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
 			"dev": true,
 			"requires": {
 				"ip": "^1.1.5",
@@ -18250,13 +14854,13 @@
 			}
 		},
 		"socks-proxy-agent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz",
-			"integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+			"integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
 			"dev": true,
 			"requires": {
-				"agent-base": "~4.2.0",
-				"socks": "~2.2.0"
+				"agent-base": "~4.2.1",
+				"socks": "~2.3.2"
 			}
 		},
 		"source-list-map": {
@@ -18280,6 +14884,18 @@
 				"loader-utils": "^1.1.0"
 			}
 		},
+		"source-map-resolve": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+			"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+			"requires": {
+				"atob": "^2.1.1",
+				"decode-uri-component": "^0.2.0",
+				"resolve-url": "^0.2.1",
+				"source-map-url": "^0.4.0",
+				"urix": "^0.1.0"
+			}
+		},
 		"source-map-support": {
 			"version": "0.5.10",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
@@ -18318,29 +14934,101 @@
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-exceptions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
-		},
-		"spdx-expression-parse": {
+		"spdx-exceptions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+		},
+		"spdx-expression-parse": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"requires": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-license-ids": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+		},
+		"spdy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+			"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.0",
+				"handle-thing": "^2.0.0",
+				"http-deceiver": "^1.2.7",
+				"select-hose": "^2.0.0",
+				"spdy-transport": "^3.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"spdy-transport": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+			"dev": true,
 			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
+				"debug": "^4.1.0",
+				"detect-node": "^2.0.4",
+				"hpack.js": "^2.1.6",
+				"obuf": "^1.1.2",
+				"readable-stream": "^3.0.6",
+				"wbuf": "^1.7.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
 			}
 		},
-		"spdx-license-ids": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
-		},
 		"speed-measure-webpack-plugin": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz",
-			"integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
+			"integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
 			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1"
@@ -18363,18 +15051,18 @@
 			}
 		},
 		"split2": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.0.tgz",
-			"integrity": "sha512-ePE1otNQVMnBRyqf3INbZvZwBPGsdBDThgrOWZ6z8zXGNVQNVCSEoOO9aBMTzDN1mXoNSZJ2kHSFH7AA5SPWww==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz",
+			"integrity": "sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==",
 			"dev": true,
 			"requires": {
 				"readable-stream": "^3.0.0"
 			},
 			"dependencies": {
 				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
 						"inherits": "^2.0.3",
@@ -18426,6 +15114,15 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
+		"static-eval": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+			"integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+			"dev": true,
+			"requires": {
+				"escodegen": "^1.8.1"
+			}
+		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -18445,6 +15142,45 @@
 				}
 			}
 		},
+		"static-module": {
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/static-module/-/static-module-2.2.5.tgz",
+			"integrity": "sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==",
+			"dev": true,
+			"requires": {
+				"concat-stream": "~1.6.0",
+				"convert-source-map": "^1.5.1",
+				"duplexer2": "~0.1.4",
+				"escodegen": "~1.9.0",
+				"falafel": "^2.1.0",
+				"has": "^1.0.1",
+				"magic-string": "^0.22.4",
+				"merge-source-map": "1.0.4",
+				"object-inspect": "~1.4.0",
+				"quote-stream": "~1.0.2",
+				"readable-stream": "~2.3.3",
+				"shallow-copy": "~0.0.1",
+				"static-eval": "^2.0.0",
+				"through2": "~2.0.3"
+			},
+			"dependencies": {
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				},
+				"object-inspect": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz",
+					"integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==",
+					"dev": true
+				}
+			}
+		},
 		"stats-webpack-plugin": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz",
@@ -18457,8 +15193,7 @@
 		"statuses": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-			"dev": true
+			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
 		},
 		"stdout-stream": {
 			"version": "1.4.1",
@@ -18500,32 +15235,6 @@
 			"requires": {
 				"inherits": "~2.0.1",
 				"readable-stream": "^2.0.2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"stream-combiner": {
@@ -18594,40 +15303,44 @@
 				"readable-stream": "^2.3.6",
 				"to-arraybuffer": "^1.0.0",
 				"xtend": "^4.0.0"
+			}
+		},
+		"stream-shift": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+			"dev": true
+		},
+		"streamroller": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz",
+			"integrity": "sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"date-format": "^2.0.0",
+				"debug": "^3.1.0",
+				"fs-extra": "^7.0.0",
+				"lodash": "^4.17.10"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"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"
+						"ms": "^2.1.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"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-			"dev": true
-		},
 		"string-template": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
@@ -18658,10 +15371,20 @@
 				}
 			}
 		},
+		"string.prototype.trim": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
+			"integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
+			"requires": {
+				"define-properties": "^1.1.2",
+				"es-abstract": "^1.5.0",
+				"function-bind": "^1.0.2"
+			}
+		},
 		"string_decoder": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
-			"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+			"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"
@@ -18678,8 +15401,7 @@
 		"strip-bom": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-			"dev": true
+			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
 		},
 		"strip-eof": {
 			"version": "1.0.0",
@@ -18701,13 +15423,21 @@
 			"dev": true
 		},
 		"stripe": {
-			"version": "6.23.0",
-			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.23.0.tgz",
-			"integrity": "sha512-o3rkli0B0O05Z6BwdiNpzCxQ16J1YmUlQB2JAjNC2dTwjg3koF74qhWUY0Rbb8Xisd/Wbgi8DODzNpD9JKG/FA==",
+			"version": "6.28.0",
+			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.28.0.tgz",
+			"integrity": "sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==",
 			"requires": {
 				"lodash.isplainobject": "^4.0.6",
-				"qs": "~6.5.1",
-				"safe-buffer": "^5.1.1"
+				"qs": "^6.6.0",
+				"safe-buffer": "^5.1.1",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+				}
 			}
 		},
 		"style-loader": {
@@ -18720,10 +15450,60 @@
 				"schema-utils": "^1.0.0"
 			}
 		},
+		"stylus": {
+			"version": "0.54.5",
+			"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+			"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+			"dev": true,
+			"requires": {
+				"css-parse": "1.7.x",
+				"debug": "*",
+				"glob": "7.0.x",
+				"mkdirp": "0.5.x",
+				"sax": "0.5.x",
+				"source-map": "0.1.x"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.0.6",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+					"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.2",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
+		"stylus-loader": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+			"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"lodash.clonedeep": "^4.5.0",
+				"when": "~3.6.x"
+			}
+		},
 		"subscriptions-transport-ws": {
-			"version": "0.9.15",
-			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz",
-			"integrity": "sha512-f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ==",
+			"version": "0.9.16",
+			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz",
+			"integrity": "sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==",
 			"requires": {
 				"backo2": "^1.0.2",
 				"eventemitter3": "^3.1.0",
@@ -18742,6 +15522,90 @@
 				}
 			}
 		},
+		"superagent": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
+			"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "^1.2.0",
+				"cookiejar": "^2.1.2",
+				"debug": "^4.1.0",
+				"form-data": "^2.3.3",
+				"formidable": "^1.2.0",
+				"methods": "^1.1.1",
+				"mime": "^2.4.0",
+				"qs": "^6.6.0",
+				"readable-stream": "^3.0.6"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
+		},
+		"superagent-proxy": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
+			"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.1.0",
+				"proxy-agent": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"supports-color": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -18752,11 +15616,11 @@
 			}
 		},
 		"swiper": {
-			"version": "4.4.6",
-			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.4.6.tgz",
-			"integrity": "sha512-F9NDtijQt+etiOe6JAEH+Cb+QKzwwFpi08FlOIQv8ALdoQ8tvAX/38a/28E5XxalAkChsHCutwkBCzDxDXTGiA==",
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.0.tgz",
+			"integrity": "sha512-jRCd/CGet9kaHwthHdd/sL/YU8CI157PWLyItnIcn/o/jP4haVky3zTF6f9F3JDpmQIw7jdWihISiYx0/oTHsg==",
 			"requires": {
-				"dom7": "^2.1.2",
+				"dom7": "^2.1.3",
 				"ssr-window": "^1.0.1"
 			}
 		},
@@ -18771,6 +15635,51 @@
 			"integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
 			"dev": true
 		},
+		"tape": {
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/tape/-/tape-4.10.1.tgz",
+			"integrity": "sha512-G0DywYV1jQeY3axeYnXUOt6ktnxS9OPJh97FGR3nrua8lhWi1zPflLxcAHavZ7Jf3qUfY7cxcVIVFa4mY2IY1w==",
+			"requires": {
+				"deep-equal": "~1.0.1",
+				"defined": "~1.0.0",
+				"for-each": "~0.3.3",
+				"function-bind": "~1.1.1",
+				"glob": "~7.1.3",
+				"has": "~1.0.3",
+				"inherits": "~2.0.3",
+				"minimist": "~1.2.0",
+				"object-inspect": "~1.6.0",
+				"resolve": "~1.10.0",
+				"resumer": "~0.0.0",
+				"string.prototype.trim": "~1.1.2",
+				"through": "~2.3.8"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.10.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"tar": {
+			"version": "4.4.8",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+			"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+			"dev": true,
+			"requires": {
+				"chownr": "^1.1.1",
+				"fs-minipass": "^1.2.5",
+				"minipass": "^2.3.4",
+				"minizlib": "^1.1.1",
+				"mkdirp": "^0.5.0",
+				"safe-buffer": "^5.1.2",
+				"yallist": "^3.0.2"
+			}
+		},
 		"term-size": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
@@ -18809,14 +15718,14 @@
 			}
 		},
 		"terser": {
-			"version": "3.16.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-3.16.0.tgz",
-			"integrity": "sha512-Ua8BhyibmsQBFXDZZ3Es7GASB2yFrQJr0jgAlZK1FBLbFarrHoCuMHPCro5MbX4jidcaFGiV+uTc3wxodmGjUg==",
+			"version": "3.17.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+			"integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
 			"dev": true,
 			"requires": {
-				"commander": "~2.17.1",
+				"commander": "^2.19.0",
 				"source-map": "~0.6.1",
-				"source-map-support": "~0.5.9"
+				"source-map-support": "~0.5.10"
 			},
 			"dependencies": {
 				"source-map": {
@@ -18827,853 +15736,993 @@
 				}
 			}
 		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-		},
-		"through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+		"terser-webpack-plugin": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
+			"integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
 			"dev": true,
 			"requires": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+				"cacache": "^11.0.2",
+				"find-cache-dir": "^2.0.0",
+				"schema-utils": "^1.0.0",
+				"serialize-javascript": "^1.4.0",
+				"source-map": "^0.6.1",
+				"terser": "^3.16.1",
+				"webpack-sources": "^1.1.0",
+				"worker-farm": "^1.5.2"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"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"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
-				}
-			}
-		},
-		"thunkify": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
-			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
-			"dev": true
-		},
-		"thunky": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
-			"dev": true
-		},
-		"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.10",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-			"dev": true,
-			"requires": {
-				"setimmediate": "^1.0.4"
-			}
-		},
-		"tmp": {
-			"version": "0.0.33",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "~1.0.2"
-			}
-		},
-		"to-array": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
-		},
-		"to-arraybuffer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-			"dev": true
-		},
-		"to-fast-properties": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-			"dev": true
-		},
-		"to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			}
-		},
-		"to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
-			}
-		},
-		"tough-cookie": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-			"requires": {
-				"psl": "^1.1.24",
-				"punycode": "^1.4.1"
-			}
-		},
-		"traverse": {
-			"version": "0.6.6",
-			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
-			"dev": true
-		},
-		"tree-kill": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
-			"dev": true
-		},
-		"trim-newlines": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
-		},
-		"trim-right": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-			"dev": true
-		},
-		"true-case-path": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-			"requires": {
-				"glob": "^7.1.2"
-			}
-		},
-		"tryer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-			"dev": true
-		},
-		"ts-node": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.2.tgz",
-			"integrity": "sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==",
-			"dev": true,
-			"requires": {
-				"arg": "^4.1.0",
-				"diff": "^3.1.0",
-				"make-error": "^1.1.1",
-				"source-map-support": "^0.5.6",
-				"yn": "^3.0.0"
-			}
-		},
-		"tslib": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-		},
-		"tslint": {
-			"version": "5.12.1",
-			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz",
-			"integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==",
-			"dev": true,
-			"requires": {
-				"babel-code-frame": "^6.22.0",
-				"builtin-modules": "^1.1.1",
-				"chalk": "^2.3.0",
-				"commander": "^2.12.1",
-				"diff": "^3.2.0",
-				"glob": "^7.1.1",
-				"js-yaml": "^3.7.0",
-				"minimatch": "^3.0.4",
-				"resolve": "^1.3.2",
-				"semver": "^5.3.0",
-				"tslib": "^1.8.0",
-				"tsutils": "^2.27.2"
-			},
-			"dependencies": {
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+				},
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
+				},
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+					"dev": true,
+					"requires": {
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"path-parse": "^1.0.6"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
+				},
+				"pkg-dir": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+					"dev": true,
+					"requires": {
+						"find-up": "^3.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
 					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
-		"tslint-eslint-rules": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
-			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
+		"through": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+		},
+		"through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
 			"dev": true,
 			"requires": {
-				"doctrine": "^0.7.2",
-				"tslib": "^1.0.0",
-				"tsutils": "^1.4.0"
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
 			},
 			"dependencies": {
-				"tsutils": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
-					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
-					"dev": true
+				"readable-stream": {
+					"version": "2.3.6",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "~1.0.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"
+					}
 				}
 			}
 		},
-		"tsutils": {
-			"version": "2.29.0",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-			"dev": true,
-			"requires": {
-				"tslib": "^1.8.1"
-			}
-		},
-		"tty-browserify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+		"thunkify": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
+			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
 			"dev": true
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
+		"thunky": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+			"dev": true
 		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		"time-stamp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+			"dev": true
 		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2"
-			}
+		"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
 		},
-		"type-is": {
-			"version": "1.6.16",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+		"timers-browserify": {
+			"version": "2.0.10",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 			"dev": true,
 			"requires": {
-				"media-typer": "0.3.0",
-				"mime-types": "~2.1.18"
+				"setimmediate": "^1.0.4"
 			}
 		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-			"dev": true
-		},
-		"typescript": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
-			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
+		"tiny-inflate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.2.tgz",
+			"integrity": "sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=",
 			"dev": true
 		},
-		"uglify-js": {
-			"version": "3.4.9",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-			"integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+		"tiny-lr": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+			"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"commander": "~2.17.1",
-				"source-map": "~0.6.1"
+				"body": "^5.1.0",
+				"debug": "^3.1.0",
+				"faye-websocket": "~0.10.0",
+				"livereload-js": "^2.3.0",
+				"object-assign": "^4.1.0",
+				"qs": "^6.4.0"
 			},
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"uglify-to-browserify": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+		"tmp": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
 			"dev": true,
-			"optional": true
+			"requires": {
+				"os-tmpdir": "~1.0.2"
+			}
 		},
-		"ultron": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-			"dev": true
+		"to-array": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
 		},
-		"unc-path-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+		"to-arraybuffer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
 			"dev": true
 		},
-		"union-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
-			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^0.4.3"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"set-value": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-extendable": "^0.1.1",
-						"is-plain-object": "^2.0.1",
-						"to-object-path": "^0.3.0"
-					}
-				}
+		"to-fast-properties": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+			"dev": true
+		},
+		"to-object-path": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+			"requires": {
+				"kind-of": "^3.0.2"
 			}
 		},
-		"unique-filename": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-			"dev": true,
+		"to-regex": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
 			"requires": {
-				"unique-slug": "^2.0.0"
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"regex-not": "^1.0.2",
+				"safe-regex": "^1.1.0"
 			}
 		},
-		"unique-slug": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
-			"dev": true,
+		"to-regex-range": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 			"requires": {
-				"imurmurhash": "^0.1.4"
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1"
 			}
 		},
-		"unique-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-			"dev": true,
+		"tough-cookie": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
 			"requires": {
-				"crypto-random-string": "^1.0.0"
+				"psl": "^1.1.24",
+				"punycode": "^1.4.1"
 			}
 		},
-		"universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+		"traverse": {
+			"version": "0.6.6",
+			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
+			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
 			"dev": true
 		},
-		"unix-crypt-td-js": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
-			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+		"tree-kill": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
 			"dev": true
 		},
-		"unpipe": {
+		"trim-newlines": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
+		},
+		"trim-right": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
 			"dev": true
 		},
-		"unset-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+		"true-case-path": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
 			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
-				}
+				"glob": "^7.1.2"
 			}
 		},
-		"untildify": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
-			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
-			"dev": true
-		},
-		"unzip-response": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+		"tryer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
 			"dev": true
 		},
-		"upath": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
-		},
-		"uri-js": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+		"ts-invariant": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz",
+			"integrity": "sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==",
 			"requires": {
-				"punycode": "^2.1.0"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-				}
+				"tslib": "^1.9.3"
 			}
 		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		"ts-node": {
+			"version": "8.0.3",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.3.tgz",
+			"integrity": "sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==",
+			"dev": true,
+			"requires": {
+				"arg": "^4.1.0",
+				"diff": "^3.1.0",
+				"make-error": "^1.1.1",
+				"source-map-support": "^0.5.6",
+				"yn": "^3.0.0"
+			}
 		},
-		"url": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+		"ts-simple-ast": {
+			"version": "12.4.0",
+			"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
+			"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
 			"dev": true,
 			"requires": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
+				"@dsherret/to-absolute-glob": "^2.0.2",
+				"code-block-writer": "^7.2.0",
+				"fs-extra": "^6.0.1",
+				"glob-parent": "^3.1.0",
+				"globby": "^8.0.1",
+				"is-negated-glob": "^1.0.0",
+				"multimatch": "^2.1.0",
+				"object-assign": "^4.1.1",
+				"tslib": "^1.9.0",
+				"typescript": "2.9.1"
 			},
 			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+				"dir-glob": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+					"dev": true,
+					"requires": {
+						"arrify": "^1.0.1",
+						"path-type": "^3.0.0"
+					}
+				},
+				"fs-extra": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+					"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
+					}
+				},
+				"globby": {
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"dir-glob": "2.0.0",
+						"fast-glob": "^2.0.2",
+						"glob": "^7.1.2",
+						"ignore": "^3.3.5",
+						"pify": "^3.0.0",
+						"slash": "^1.0.0"
+					}
+				},
+				"typescript": {
+					"version": "2.9.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
+					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
 					"dev": true
 				}
 			}
 		},
-		"url-parse": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
-			"dev": true,
-			"requires": {
-				"querystringify": "^2.0.0",
-				"requires-port": "^1.0.0"
-			}
+		"tslib": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
 		},
-		"url-parse-lax": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+		"tslint": {
+			"version": "5.14.0",
+			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.14.0.tgz",
+			"integrity": "sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==",
 			"dev": true,
 			"requires": {
-				"prepend-http": "^1.0.1"
+				"babel-code-frame": "^6.22.0",
+				"builtin-modules": "^1.1.1",
+				"chalk": "^2.3.0",
+				"commander": "^2.12.1",
+				"diff": "^3.2.0",
+				"glob": "^7.1.1",
+				"js-yaml": "^3.7.0",
+				"minimatch": "^3.0.4",
+				"mkdirp": "^0.5.1",
+				"resolve": "^1.3.2",
+				"semver": "^5.3.0",
+				"tslib": "^1.8.0",
+				"tsutils": "^2.29.0"
 			}
 		},
-		"use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-		},
-		"useragent": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+		"tslint-eslint-rules": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
+			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
 			"dev": true,
 			"requires": {
-				"lru-cache": "4.1.x",
-				"tmp": "0.0.x"
+				"doctrine": "^0.7.2",
+				"tslib": "^1.0.0",
+				"tsutils": "^1.4.0"
+			},
+			"dependencies": {
+				"tsutils": {
+					"version": "1.9.1",
+					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
+					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
+					"dev": true
+				}
 			}
 		},
-		"util": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+		"tsutils": {
+			"version": "2.29.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
 			"dev": true,
 			"requires": {
-				"inherits": "2.0.3"
+				"tslib": "^1.8.1"
 			}
 		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-		},
-		"utils-merge": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+		"tty-browserify": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
 			"dev": true
 		},
-		"uuid": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-		},
-		"validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+		"tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"validate-npm-package-name": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+		"tweetnacl": {
+			"version": "0.14.5",
+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		},
+		"type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
 			"dev": true,
 			"requires": {
-				"builtins": "^1.0.3"
+				"prelude-ls": "~1.1.2"
 			}
 		},
-		"vary": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-			"dev": true
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+		"type-is": {
+			"version": "1.6.16",
+			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
+				"media-typer": "0.3.0",
+				"mime-types": "~2.1.18"
 			}
 		},
-		"viz.js": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
-			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
-			"dev": true
-		},
-		"vlq": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+		"typedarray": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
 			"dev": true
 		},
-		"vm-browserify": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-			"dev": true,
-			"requires": {
-				"indexof": "0.0.1"
-			}
-		},
-		"void-elements": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-			"dev": true
+		"typescript": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
+			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="
 		},
-		"watchpack": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-			"dev": true,
-			"requires": {
-				"chokidar": "^2.0.2",
-				"graceful-fs": "^4.1.2",
-				"neo-async": "^2.5.0"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+		"uglify-js": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.2.tgz",
+			"integrity": "sha512-imog1WIsi9Yb56yRt5TfYVxGmnWs3WSGU73ieSOlMVFwhJCA9W8fqFFMMj4kgDqiS/80LGdsYnWL7O9UcjEBlg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"commander": "~2.19.0",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
+					"optional": true
+				}
+			}
+		},
+		"uglify-to-browserify": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+			"dev": true,
+			"optional": true
+		},
+		"uglifyjs-webpack-plugin": {
+			"version": "0.4.6",
+			"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+			"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6",
+				"uglify-js": "^2.8.29",
+				"webpack-sources": "^1.0.1"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"cliui": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"center-align": "^0.1.1",
+						"right-align": "^0.1.1",
+						"wordwrap": "0.0.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"uglify-js": {
+					"version": "2.8.29",
+					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"source-map": "~0.5.1",
+						"uglify-to-browserify": "~1.0.0",
+						"yargs": "~3.10.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"wordwrap": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+					"dev": true
+				},
+				"yargs": {
+					"version": "3.10.0",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"camelcase": "^1.0.2",
+						"cliui": "^2.1.0",
+						"decamelize": "^1.0.0",
+						"window-size": "0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				}
+			}
+		},
+		"ultron": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+			"dev": true
+		},
+		"unc-path-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+			"dev": true
+		},
+		"underscore": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+			"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+		},
+		"unicode-properties": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.1.0.tgz",
+			"integrity": "sha1-epbu9J91aC6mnSMV7smsQ//fAME=",
+			"dev": true,
+			"requires": {
+				"brfs": "^1.4.0",
+				"unicode-trie": "^0.3.0"
+			}
+		},
+		"unicode-trie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-0.3.1.tgz",
+			"integrity": "sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=",
+			"dev": true,
+			"requires": {
+				"pako": "^0.2.5",
+				"tiny-inflate": "^1.0.0"
+			},
+			"dependencies": {
+				"pako": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+					"integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
 					"dev": true
+				}
+			}
+		},
+		"union-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+			"requires": {
+				"arr-union": "^3.1.0",
+				"get-value": "^2.0.6",
+				"is-extendable": "^0.1.1",
+				"set-value": "^0.4.3"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
+				"set-value": {
+					"version": "0.4.3",
+					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
 						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
+						"is-extendable": "^0.1.1",
+						"is-plain-object": "^2.0.1",
+						"to-object-path": "^0.3.0"
+					}
+				}
+			}
+		},
+		"unique-filename": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+			"dev": true,
+			"requires": {
+				"unique-slug": "^2.0.0"
+			}
+		},
+		"unique-slug": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+			"dev": true,
+			"requires": {
+				"imurmurhash": "^0.1.4"
+			}
+		},
+		"unique-string": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+			"dev": true,
+			"requires": {
+				"crypto-random-string": "^1.0.0"
+			}
+		},
+		"universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+		},
+		"unix-crypt-td-js": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
+			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+			"dev": true
+		},
+		"unpipe": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+		},
+		"unset-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+			"requires": {
+				"has-value": "^0.3.1",
+				"isobject": "^3.0.0"
+			},
+			"dependencies": {
+				"has-value": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+					"requires": {
+						"get-value": "^2.0.3",
+						"has-values": "^0.1.4",
+						"isobject": "^2.0.0"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "2.1.0",
+							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+							"requires": {
+								"isarray": "1.0.0"
+							}
+						}
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"has-values": {
+					"version": "0.1.4",
+					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+				}
+			}
+		},
+		"untildify": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
+			"dev": true
+		},
+		"unzip-response": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+			"dev": true
+		},
+		"upath": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
+		},
+		"update-notifier": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+			"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+			"dev": true,
+			"requires": {
+				"boxen": "^1.2.1",
+				"chalk": "^2.0.1",
+				"configstore": "^3.0.0",
+				"import-lazy": "^2.1.0",
+				"is-ci": "^1.0.10",
+				"is-installed-globally": "^0.1.0",
+				"is-npm": "^1.0.0",
+				"latest-version": "^3.0.0",
+				"semver-diff": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			},
+			"dependencies": {
+				"ci-info": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+					"dev": true
+				},
+				"is-ci": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ci-info": "^1.5.0"
 					}
 				}
 			}
 		},
+		"uri-js": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+			"requires": {
+				"punycode": "^2.1.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+				}
+			}
+		},
+		"urix": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		},
+		"url": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+			"dev": true,
+			"requires": {
+				"punycode": "1.3.2",
+				"querystring": "0.2.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "1.3.2",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+					"dev": true
+				}
+			}
+		},
+		"url-parse": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
+			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+			"dev": true,
+			"requires": {
+				"querystringify": "^2.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"url-parse-lax": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+			"dev": true,
+			"requires": {
+				"prepend-http": "^1.0.1"
+			}
+		},
+		"use": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+		},
+		"useragent": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "4.1.x",
+				"tmp": "0.0.x"
+			}
+		},
+		"util": {
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+			"dev": true,
+			"requires": {
+				"inherits": "2.0.3"
+			}
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+		},
+		"utils-merge": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+		},
+		"uuid": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+		},
+		"validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"requires": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"validate-npm-package-name": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+			"dev": true,
+			"requires": {
+				"builtins": "^1.0.3"
+			}
+		},
+		"validator": {
+			"version": "10.11.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+			"integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+			"dev": true
+		},
+		"vary": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+		},
+		"verror": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"core-util-is": "1.0.2",
+				"extsprintf": "^1.2.0"
+			}
+		},
+		"viz.js": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
+			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
+			"dev": true
+		},
+		"vlq": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+			"dev": true
+		},
+		"vm-browserify": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+			"dev": true,
+			"requires": {
+				"indexof": "0.0.1"
+			}
+		},
+		"void-elements": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+			"dev": true
+		},
+		"watchpack": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.2",
+				"graceful-fs": "^4.1.2",
+				"neo-async": "^2.5.0"
+			}
+		},
 		"wbuf": {
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
@@ -19767,13 +16816,58 @@
 				}
 			}
 		},
+		"webpack": {
+			"version": "4.29.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
+			"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+			"dev": true,
+			"requires": {
+				"@webassemblyjs/ast": "1.7.11",
+				"@webassemblyjs/helper-module-context": "1.7.11",
+				"@webassemblyjs/wasm-edit": "1.7.11",
+				"@webassemblyjs/wasm-parser": "1.7.11",
+				"acorn": "^6.0.5",
+				"acorn-dynamic-import": "^4.0.0",
+				"ajv": "^6.1.0",
+				"ajv-keywords": "^3.1.0",
+				"chrome-trace-event": "^1.0.0",
+				"enhanced-resolve": "^4.1.0",
+				"eslint-scope": "^4.0.0",
+				"json-parse-better-errors": "^1.0.2",
+				"loader-runner": "^2.3.0",
+				"loader-utils": "^1.1.0",
+				"memory-fs": "~0.4.1",
+				"micromatch": "^3.1.8",
+				"mkdirp": "~0.5.0",
+				"neo-async": "^2.5.0",
+				"node-libs-browser": "^2.0.0",
+				"schema-utils": "^0.4.4",
+				"tapable": "^1.1.0",
+				"terser-webpack-plugin": "^1.1.0",
+				"watchpack": "^1.5.0",
+				"webpack-sources": "^1.3.0"
+			},
+			"dependencies": {
+				"schema-utils": {
+					"version": "0.4.7",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+					"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+					"dev": true,
+					"requires": {
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0"
+					}
+				}
+			}
+		},
 		"webpack-bundle-analyzer": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz",
-			"integrity": "sha512-naLWiRfmtH4UJgtUktRTLw6FdoZJ2RvCR9ePbwM9aRMsS/KjFerkPZG9epEvXRAw5d5oPdrs9+3p+afNjxW8Xw==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz",
+			"integrity": "sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==",
 			"dev": true,
 			"requires": {
-				"acorn": "^5.7.3",
+				"acorn": "^6.0.7",
+				"acorn-walk": "^6.1.1",
 				"bfj": "^6.1.1",
 				"chalk": "^2.4.1",
 				"commander": "^2.18.0",
@@ -19785,93 +16879,176 @@
 				"mkdirp": "^0.5.1",
 				"opener": "^1.5.1",
 				"ws": "^6.0.0"
+			}
+		},
+		"webpack-core": {
+			"version": "0.6.9",
+			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+			"dev": true,
+			"requires": {
+				"source-list-map": "~0.1.7",
+				"source-map": "~0.4.1"
 			},
 			"dependencies": {
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+				"source-list-map": {
+					"version": "0.1.8",
+					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
 					"dev": true
 				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+				"source-map": {
+					"version": "0.4.4",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
 					"dev": true,
 					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
+						"amdefine": ">=0.0.4"
 					}
 				}
 			}
 		},
-		"webpack-core": {
-			"version": "0.6.9",
-			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+		"webpack-dev-middleware": {
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
+			"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+			"dev": true,
+			"requires": {
+				"memory-fs": "~0.4.1",
+				"mime": "^2.3.1",
+				"range-parser": "^1.0.3",
+				"webpack-log": "^2.0.0"
+			},
+			"dependencies": {
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				}
+			}
+		},
+		"webpack-dev-server": {
+			"version": "3.1.14",
+			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
+			"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
 			"dev": true,
 			"requires": {
-				"source-list-map": "~0.1.7",
-				"source-map": "~0.4.1"
+				"ansi-html": "0.0.7",
+				"bonjour": "^3.5.0",
+				"chokidar": "^2.0.0",
+				"compression": "^1.5.2",
+				"connect-history-api-fallback": "^1.3.0",
+				"debug": "^3.1.0",
+				"del": "^3.0.0",
+				"express": "^4.16.2",
+				"html-entities": "^1.2.0",
+				"http-proxy-middleware": "~0.18.0",
+				"import-local": "^2.0.0",
+				"internal-ip": "^3.0.1",
+				"ip": "^1.1.5",
+				"killable": "^1.0.0",
+				"loglevel": "^1.4.1",
+				"opn": "^5.1.0",
+				"portfinder": "^1.0.9",
+				"schema-utils": "^1.0.0",
+				"selfsigned": "^1.9.1",
+				"semver": "^5.6.0",
+				"serve-index": "^1.7.2",
+				"sockjs": "0.3.19",
+				"sockjs-client": "1.3.0",
+				"spdy": "^4.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^5.1.0",
+				"url": "^0.11.0",
+				"webpack-dev-middleware": "3.4.0",
+				"webpack-log": "^2.0.0",
+				"yargs": "12.0.2"
 			},
 			"dependencies": {
-				"source-list-map": {
-					"version": "0.1.8",
-					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"decamelize": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+					"dev": true,
+					"requires": {
+						"xregexp": "4.0.0"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"source-map": {
-					"version": "0.4.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 					"dev": true,
 					"requires": {
-						"amdefine": ">=0.0.4"
+						"has-flag": "^3.0.0"
+					}
+				},
+				"webpack-dev-middleware": {
+					"version": "3.4.0",
+					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
+					"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
+					"dev": true,
+					"requires": {
+						"memory-fs": "~0.4.1",
+						"mime": "^2.3.1",
+						"range-parser": "^1.0.3",
+						"webpack-log": "^2.0.0"
+					}
+				},
+				"yargs": {
+					"version": "12.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
+					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+					"dev": true,
+					"requires": {
+						"cliui": "^4.0.0",
+						"decamelize": "^2.0.0",
+						"find-up": "^3.0.0",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^3.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1 || ^4.0.0",
+						"yargs-parser": "^10.1.0"
 					}
 				}
 			}
 		},
+		"webpack-log": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+			"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^3.0.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"webpack-merge": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
@@ -19899,6 +17076,15 @@
 				}
 			}
 		},
+		"webpack-subresource-integrity": {
+			"version": "1.1.0-rc.6",
+			"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
+			"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
+			"dev": true,
+			"requires": {
+				"webpack-core": "^0.6.8"
+			}
+		},
 		"websocket-driver": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
@@ -19930,9 +17116,10 @@
 			}
 		},
 		"which-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-			"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+			"dev": true
 		},
 		"wide-align": {
 			"version": "1.1.3",
@@ -19951,6 +17138,15 @@
 				"string-width": "^2.1.1"
 			}
 		},
+		"win-release": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
+			"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
+			"dev": true,
+			"requires": {
+				"semver": "^5.0.1"
+			}
+		},
 		"window-or-global": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/window-or-global/-/window-or-global-1.0.1.tgz",
@@ -19969,36 +17165,6 @@
 			"dev": true,
 			"requires": {
 				"execa": "^0.10.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"wordwrap": {
@@ -20007,6 +17173,15 @@
 			"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
 			"dev": true
 		},
+		"worker-farm": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+			"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+			"dev": true,
+			"requires": {
+				"errno": "~0.1.7"
+			}
+		},
 		"wrap-ansi": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -20087,6 +17262,11 @@
 			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
 			"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
 		},
+		"xmldom": {
+			"version": "0.1.27",
+			"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+			"integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+		},
 		"xmlhttprequest-ssl": {
 			"version": "1.5.5",
 			"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
@@ -20116,143 +17296,93 @@
 			"dev": true
 		},
 		"yargs": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-			"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-			"requires": {
-				"camelcase": "^3.0.0",
-				"cliui": "^3.2.0",
-				"decamelize": "^1.1.1",
-				"get-caller-file": "^1.0.1",
-				"os-locale": "^1.4.0",
-				"read-pkg-up": "^1.0.1",
+			"version": "13.2.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
+			"integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+			"dev": true,
+			"requires": {
+				"cliui": "^4.0.0",
+				"find-up": "^3.0.0",
+				"get-caller-file": "^2.0.1",
+				"os-locale": "^3.1.0",
 				"require-directory": "^2.1.1",
-				"require-main-filename": "^1.0.1",
+				"require-main-filename": "^2.0.0",
 				"set-blocking": "^2.0.0",
-				"string-width": "^1.0.2",
-				"which-module": "^1.0.0",
-				"y18n": "^3.2.1",
-				"yargs-parser": "^5.0.0"
+				"string-width": "^3.0.0",
+				"which-module": "^2.0.0",
+				"y18n": "^4.0.0",
+				"yargs-parser": "^13.0.0"
 			},
 			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					}
-				},
-				"find-up": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
 				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
+				"camelcase": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
+					"integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
+					"dev": true
 				},
-				"os-locale": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-					"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-					"requires": {
-						"lcid": "^1.0.0"
-					}
+				"get-caller-file": {
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+					"dev": true
 				},
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"requires": {
-						"pinkie-promise": "^2.0.0"
-					}
+				"require-main-filename": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+					"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+					"dev": true
 				},
-				"path-type": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-					"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-				},
-				"read-pkg": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-					"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"load-json-file": "^1.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^1.0.0"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"read-pkg-up": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-					"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-					"requires": {
-						"find-up": "^1.0.0",
-						"read-pkg": "^1.0.0"
-					}
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"yargs-parser": {
+					"version": "13.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
+					"integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
+					"dev": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"camelcase": "^5.0.0",
+						"decamelize": "^1.2.0"
 					}
 				}
 			}
 		},
 		"yargs-parser": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-			"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+			"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+			"dev": true,
 			"requires": {
-				"camelcase": "^3.0.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				}
+				"camelcase": "^4.1.0"
 			}
 		},
 		"yeast": {
@@ -20272,17 +17402,18 @@
 			"integrity": "sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g=="
 		},
 		"zen-observable-ts": {
-			"version": "0.8.15",
-			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz",
-			"integrity": "sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==",
+			"version": "0.8.18",
+			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz",
+			"integrity": "sha512-q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A==",
 			"requires": {
+				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"zone.js": {
-			"version": "0.8.29",
-			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
-			"integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.9.0.tgz",
+			"integrity": "sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q=="
 		}
 	}
 }

From 8db75c5c27eb4f1c410a026fe85dfc5656a7737a Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:04:12 +0000
Subject: [PATCH 033/382] chore(package): update lockfile
 admin/website-angular/yarn.lock

---
 admin/website-angular/yarn.lock | 91 ++++++++++++++++++++-------------
 1 file changed, 55 insertions(+), 36 deletions(-)

diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index d82a44409..f29b3118e 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -15,6 +15,14 @@
     "@angular-devkit/core" "7.3.1"
     rxjs "6.3.3"
 
+"@angular-devkit/architect@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
+  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
 "@angular-devkit/build-angular@^0.13.1":
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.1.tgz#369febda48dd40e47a4f0077064e792612a8e1c1"
@@ -97,12 +105,23 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.1.tgz#7dc704005b966ea6c1ee62f380120183bb76eee6"
-  integrity sha512-cd7usiasfSgw75INz72/VssrLr9tiVRYfo1TEdvr9ww0GuQbuQpB33xbV8W135eAV8+wzQ3Ce8ohaDHibvj6Yg==
+"@angular-devkit/core@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
   dependencies:
-    "@angular-devkit/core" "7.3.1"
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
+  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
 "@angular/animations@^7.2.4":
@@ -121,16 +140,16 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@^7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.1.tgz#a18acdec84deb03a1fae79cae415bbc8f9c87ffa"
-  integrity sha512-8EvXYRhTqTaTk5PKv7VZxIWJiyG51R9RC9gtpRFx4bbnurqBHdEUxGMmaRsGT8QDbfvVsWnuakE0eeW1CrfZAQ==
+"@angular/cli@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
+  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
   dependencies:
-    "@angular-devkit/architect" "0.13.1"
-    "@angular-devkit/core" "7.3.1"
-    "@angular-devkit/schematics" "7.3.1"
-    "@schematics/angular" "7.3.1"
-    "@schematics/update" "0.13.1"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
+    "@schematics/update" "0.13.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
@@ -1081,22 +1100,22 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@schematics/angular@7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.1.tgz#6fcd7004210fa9305310c3109c084df5c5521776"
-  integrity sha512-0Ne8APPlTAjKg5CSZqluwCuW/5yPjr3ALCWzqwPxN0suE745usThtasBmqrjw0RMIt8nRqRgtg54Z7lCPO9ZFg==
+"@schematics/angular@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
+  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
   dependencies:
-    "@angular-devkit/core" "7.3.1"
-    "@angular-devkit/schematics" "7.3.1"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     typescript "3.2.4"
 
-"@schematics/update@0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.1.tgz#481475aee18b4a9472a06512b2e4d6429af68231"
-  integrity sha512-EHOqolT/d/jRGuVTCUESLpk8JNpuaPlsVHfeK7Kdp/t0wSEnmtOelZX4+leS25lGXDaDUF3138ntjrZR4n6bGw==
+"@schematics/update@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
+  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
   dependencies:
-    "@angular-devkit/core" "7.3.1"
-    "@angular-devkit/schematics" "7.3.1"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -1791,6 +1810,16 @@ ajv@6.7.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@6.9.1, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
+  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@^5.0.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -1801,16 +1830,6 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
-  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"

From 4928a533afd6c7cab49ee1a470ca2bcfd175fdb6 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:15:57 +0000
Subject: [PATCH 034/382] chore(package): update @angular/pwa to version 0.13.7

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 3d778b353..b215dea44 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -59,7 +59,7 @@
 		"@angular/http": "^7.2.10",
 		"@angular/platform-browser": "^7.2.10",
 		"@angular/platform-browser-dynamic": "^7.2.10",
-		"@angular/pwa": "^0.13.6",
+		"@angular/pwa": "^0.13.7",
 		"@angular/router": "~7.2.10",
 		"@angular/service-worker": "^7.2.10",
 		"@ionic-native/barcode-scanner": "^5.3.0",

From 15d0451ebbc39f37079357ba485e49c6133e3d09 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:16:00 +0000
Subject: [PATCH 035/382] chore(package): update @angular/pwa to version 0.13.7

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 3c8c2f2a1..ab7e0a238 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -62,7 +62,7 @@
 		"@angular/http": "^7.2.9",
 		"@angular/platform-browser": "^7.2.9",
 		"@angular/platform-browser-dynamic": "^7.2.9",
-		"@angular/pwa": "^0.13.6",
+		"@angular/pwa": "^0.13.7",
 		"@angular/router": "^7.2.9",
 		"@angular/service-worker": "^7.2.9",
 		"@ionic-native/barcode-scanner": "^5.2.0",

From 57cf4e9779f4cbcb1e01376385e2e0a1760fb8fa Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:16:03 +0000
Subject: [PATCH 036/382] chore(package): update @angular/pwa to version 0.13.7

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 7dd9334e2..596402392 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -59,7 +59,7 @@
 		"@angular/http": "^7.2.10",
 		"@angular/platform-browser": "^7.2.10",
 		"@angular/platform-browser-dynamic": "^7.2.10",
-		"@angular/pwa": "^0.13.6",
+		"@angular/pwa": "^0.13.7",
 		"@angular/router": "^7.2.10",
 		"@angular/service-worker": "^7.2.3",
 		"@ionic-native/barcode-scanner": "^5.3.0",

From 2d80564a874b77a63f69f40917adbb9f9e7bb065 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:16:07 +0000
Subject: [PATCH 037/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18357 +++++++++++---------------
 1 file changed, 7744 insertions(+), 10613 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index a46cfc435..9dc333b9c 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -5,25 +5,27 @@
 	"requires": true,
 	"dependencies": {
 		"@angular-builders/custom-webpack": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.2.0.tgz",
-			"integrity": "sha512-m6K1T7rDofyxxxgRdAHEUfjbvu8G3RL3XKeAieDbbHSRhsptEAgYdBx5BpkW+xrrfgX5TWG6AZaEgfPNlJtbAA==",
+			"version": "7.4.3",
+			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.4.3.tgz",
+			"integrity": "sha512-dizPcKBSdgM8ztVbhOdVxHnfV/FBkTi1ZirsxWaw1B0S0KuPTESnsJaZA15i8Y2l202hCPs5fJfqy5aCoRrs1Q==",
+			"dev": true,
 			"requires": {
 				"lodash": "^4.17.10"
 			}
 		},
 		"@angular-builders/dev-server": {
-			"version": "7.2.1",
-			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.2.1.tgz",
-			"integrity": "sha512-hQZD/aB/jMq4Yf3+lkkGpU8OFAQwZ+S+422P+m2NkZ40+UXLsJpVzDRFMcL0GGObjwTxhxrmw6wFUk+2V5TwIg=="
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.3.1.tgz",
+			"integrity": "sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==",
+			"dev": true
 		},
 		"@angular-devkit/architect": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.0.tgz",
-			"integrity": "sha512-oDBrWlfKh/0t2ag4T8gz9xzPMItxfctinlsHxhw7dPQ+etq1mIcWgQkiKiDrz4l46YiGipBRlC55j+6f37omAA==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.7.tgz",
+			"integrity": "sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
+				"@angular-devkit/core": "7.3.7",
 				"rxjs": "6.3.3"
 			},
 			"dependencies": {
@@ -39,24 +41,23 @@
 			}
 		},
 		"@angular-devkit/build-angular": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.0.tgz",
-			"integrity": "sha512-JjoSXbmwOsuDJxngyChr6aOSZ2qsrvSL1MHwqgXhZswmC/KghBF0aZ7y8Wzr27zDCQ174Axts7+IAk6b+aWIqw==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz",
+			"integrity": "sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/build-optimizer": "0.13.0",
-				"@angular-devkit/build-webpack": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@ngtools/webpack": "7.3.0",
-				"ajv": "6.7.0",
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/build-optimizer": "0.13.7",
+				"@angular-devkit/build-webpack": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@ngtools/webpack": "7.3.7",
+				"ajv": "6.9.1",
 				"autoprefixer": "9.4.6",
 				"circular-dependency-plugin": "5.0.2",
 				"clean-css": "4.2.1",
 				"copy-webpack-plugin": "4.6.0",
 				"file-loader": "3.0.1",
 				"glob": "7.1.3",
-				"istanbul": "0.4.5",
 				"istanbul-instrumenter-loader": "3.0.1",
 				"karma-source-map-support": "1.3.0",
 				"less": "3.9.0",
@@ -77,12 +78,12 @@
 				"semver": "5.6.0",
 				"source-map-loader": "0.2.4",
 				"source-map-support": "0.5.10",
-				"speed-measure-webpack-plugin": "1.3.0",
+				"speed-measure-webpack-plugin": "1.3.1",
 				"stats-webpack-plugin": "0.7.0",
 				"style-loader": "0.23.1",
 				"stylus": "0.54.5",
 				"stylus-loader": "3.0.2",
-				"terser-webpack-plugin": "1.2.1",
+				"terser-webpack-plugin": "1.2.2",
 				"tree-kill": "1.2.1",
 				"webpack": "4.29.0",
 				"webpack-dev-middleware": "3.5.1",
@@ -92,2094 +93,1378 @@
 				"webpack-subresource-integrity": "1.1.0-rc.6"
 			},
 			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.0.tgz",
-					"integrity": "sha512-fhWuzbMVV/UNYE7rHSKutrWTCZle34N5cdtFz6qhK1k/wn7Vmtg9cFOwzx0SPdIlOEn576NB4DS/4UG3B5WCUQ==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "1.2.3",
-						"source-map": "0.5.6",
-						"typescript": "3.2.4",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"@angular-devkit/build-webpack": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.0.tgz",
-					"integrity": "sha512-idtFoSbQ3Y3WqXlDlU7oTPV9TIU1kjLqce0nK1Kst+t40GTc+Q4iUJJ7KsKE3nV6TPyrL1N/IvIF7+hSJnYm8A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/architect": "0.13.0",
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
-					}
-				},
-				"@ngtools/webpack": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.0.tgz",
-					"integrity": "sha512-U/By0Jlwy7nYwrGNtFirTg1aAsEHBL/9DhfFxPI0iu27FWiMttROuN6hmKbbnOmpbiYAVl5qTy3WXPXUIJjG1A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"enhanced-resolve": "4.1.0",
-						"rxjs": "6.3.3",
-						"tree-kill": "1.2.1",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"abbrev": {
-					"version": "1.0.9",
-					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-					"integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
 				"cacache": {
-					"version": "10.0.4",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-					"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"bluebird": "^3.5.1",
-						"chownr": "^1.0.1",
-						"glob": "^7.1.2",
-						"graceful-fs": "^4.1.11",
-						"lru-cache": "^4.1.1",
-						"mississippi": "^2.0.0",
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
 						"mkdirp": "^0.5.1",
 						"move-concurrently": "^1.0.1",
 						"promise-inflight": "^1.0.1",
 						"rimraf": "^2.6.2",
-						"ssri": "^5.2.4",
-						"unique-filename": "^1.1.0",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
 						"y18n": "^4.0.0"
 					}
 				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
 				},
-				"cliui": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 					"dev": true,
 					"requires": {
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"yallist": "^3.0.2"
 					}
 				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
 					}
 				},
-				"copy-webpack-plugin": {
-					"version": "4.6.0",
-					"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
-					"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"cacache": "^10.0.4",
-						"find-cache-dir": "^1.0.0",
-						"globby": "^7.1.1",
-						"is-glob": "^4.0.0",
-						"loader-utils": "^1.1.0",
-						"minimatch": "^3.0.4",
-						"p-limit": "^1.0.0",
-						"serialize-javascript": "^1.4.0"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
 					}
 				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
+				"parse5": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+					"dev": true
 				},
-				"decamelize": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-					"dev": true,
-					"requires": {
-						"xregexp": "4.0.0"
-					}
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
 				},
-				"del": {
+				"pkg-dir": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-					"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
 					"dev": true,
 					"requires": {
-						"globby": "^6.1.0",
-						"is-path-cwd": "^1.0.0",
-						"is-path-in-cwd": "^1.0.0",
-						"p-map": "^1.1.1",
-						"pify": "^3.0.0",
-						"rimraf": "^2.2.8"
-					},
-					"dependencies": {
-						"globby": {
-							"version": "6.1.0",
-							"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-							"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-							"dev": true,
-							"requires": {
-								"array-union": "^1.0.1",
-								"glob": "^7.0.3",
-								"object-assign": "^4.0.1",
-								"pify": "^2.0.0",
-								"pinkie-promise": "^2.0.0"
-							},
-							"dependencies": {
-								"pify": {
-									"version": "2.3.0",
-									"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-									"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-									"dev": true
-								}
-							}
-						}
+						"find-up": "^3.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.8.1",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-					"integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"esprima": "^2.7.1",
-						"estraverse": "^1.9.1",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.2.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.2.0",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-							"integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"tslib": "^1.9.0"
 					}
 				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
 					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
+						"figgy-pudding": "^3.5.1"
 					}
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"terser-webpack-plugin": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz",
+					"integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"file-loader": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
-					"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.0.2",
-						"schema-utils": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
+						"cacache": "^11.0.2",
+						"find-cache-dir": "^2.0.0",
+						"schema-utils": "^1.0.0",
+						"serialize-javascript": "^1.4.0",
+						"source-map": "^0.6.1",
+						"terser": "^3.16.1",
+						"webpack-sources": "^1.1.0",
+						"worker-farm": "^1.5.2"
 					}
 				},
-				"has-flag": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
 					"dev": true
-				},
-				"http-signature": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-					"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+				}
+			}
+		},
+		"@angular-devkit/build-optimizer": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz",
+			"integrity": "sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "1.2.3",
+				"source-map": "0.5.6",
+				"typescript": "3.2.4",
+				"webpack-sources": "1.3.0"
+			}
+		},
+		"@angular-devkit/build-webpack": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz",
+			"integrity": "sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"assert-plus": "^1.0.0",
-						"jsprim": "^1.2.2",
-						"sshpk": "^1.7.0"
+						"tslib": "^1.9.0"
 					}
-				},
-				"invert-kv": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-					"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-					"dev": true
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				}
+			}
+		},
+		"@angular-devkit/core": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+			"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+			"dev": true,
+			"requires": {
+				"ajv": "6.9.1",
+				"chokidar": "2.0.4",
+				"fast-json-stable-stringify": "2.0.0",
+				"rxjs": "6.3.3",
+				"source-map": "0.7.3"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				}
+			}
+		},
+		"@angular-devkit/schematics": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+			"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"tslib": "^1.9.0"
 					}
-				},
-				"istanbul": {
-					"version": "0.4.5",
-					"resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-					"integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-					"dev": true,
-					"requires": {
-						"abbrev": "1.0.x",
-						"async": "1.x",
-						"escodegen": "1.8.x",
-						"esprima": "2.7.x",
-						"glob": "^5.0.15",
-						"handlebars": "^4.0.1",
-						"js-yaml": "3.x",
-						"mkdirp": "0.5.x",
-						"nopt": "3.x",
-						"once": "1.x",
-						"resolve": "1.1.x",
-						"supports-color": "^3.1.0",
-						"which": "^1.1.1",
-						"wordwrap": "^1.0.0"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "5.0.15",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-							"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-							"dev": true,
-							"requires": {
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "2 || 3",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						}
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"lcid": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-					"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+				}
+			}
+		},
+		"@angular/animations": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.11.tgz",
+			"integrity": "sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/cli": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.7.tgz",
+			"integrity": "sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"@schematics/update": "0.13.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"inquirer": "6.2.1",
+				"npm-package-arg": "6.1.0",
+				"opn": "5.4.0",
+				"pacote": "9.4.0",
+				"semver": "5.6.0",
+				"symbol-observable": "1.2.0"
+			}
+		},
+		"@angular/common": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.11.tgz",
+			"integrity": "sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.11.tgz",
+			"integrity": "sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler-cli": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz",
+			"integrity": "sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==",
+			"dev": true,
+			"requires": {
+				"canonical-path": "1.0.0",
+				"chokidar": "^2.1.1",
+				"convert-source-map": "^1.5.1",
+				"dependency-graph": "^0.7.2",
+				"magic-string": "^0.25.0",
+				"minimist": "^1.2.0",
+				"reflect-metadata": "^0.1.2",
+				"shelljs": "^0.8.1",
+				"source-map": "^0.6.1",
+				"tslib": "^1.9.0",
+				"yargs": "9.0.1"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"invert-kv": "^2.0.0"
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"less": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
-					"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
 					"dev": true,
 					"requires": {
-						"clone": "^2.1.2",
-						"errno": "^0.1.1",
-						"graceful-fs": "^4.1.2",
-						"image-size": "~0.5.0",
-						"mime": "^1.4.1",
-						"mkdirp": "^0.5.0",
-						"promise": "^7.1.1",
-						"request": "^2.83.0",
-						"source-map": "~0.6.0"
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
 					},
 					"dependencies": {
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 							"dev": true,
-							"optional": true
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
 						}
 					}
 				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+				"cross-spawn": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
 					"dev": true,
 					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
+						"lru-cache": "^4.0.1",
+						"shebang-command": "^1.2.0",
+						"which": "^1.2.9"
 					}
 				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+				"execa": {
+					"version": "0.7.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"cross-spawn": "^5.0.1",
+						"get-stream": "^3.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
 					}
 				},
-				"mini-css-extract-plugin": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
-					"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+				"invert-kv": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0",
-						"webpack-sources": "^1.1.0"
+						"number-is-nan": "^1.0.0"
 					}
 				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				"mem": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"mimic-fn": "^1.0.0"
 					}
 				},
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+					"dev": true
+				},
 				"os-locale": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-					"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
 					"dev": true,
 					"requires": {
-						"execa": "^1.0.0",
-						"lcid": "^2.0.0",
-						"mem": "^4.0.0"
+						"execa": "^0.7.0",
+						"lcid": "^1.0.0",
+						"mem": "^1.1.0"
 					}
 				},
-				"parse5": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
 				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+					"dev": true
 				},
-				"raw-loader": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
-					"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+				"yargs": {
+					"version": "9.0.1",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
+					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0"
+						"camelcase": "^4.1.0",
+						"cliui": "^3.2.0",
+						"decamelize": "^1.1.1",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^2.0.0",
+						"read-pkg-up": "^2.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1",
+						"yargs-parser": "^7.0.0"
 					}
 				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"yargs-parser": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
 					"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"
+						"camelcase": "^4.1.0"
 					}
-				},
-				"request": {
-					"version": "2.88.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-					"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"aws-sign2": "~0.7.0",
-						"aws4": "^1.8.0",
-						"caseless": "~0.12.0",
-						"combined-stream": "~1.0.6",
-						"extend": "~3.0.2",
-						"forever-agent": "~0.6.1",
-						"form-data": "~2.3.2",
-						"har-validator": "~5.1.0",
-						"http-signature": "~1.2.0",
-						"is-typedarray": "~1.0.0",
-						"isstream": "~0.1.2",
-						"json-stringify-safe": "~5.0.1",
-						"mime-types": "~2.1.19",
-						"oauth-sign": "~0.9.0",
-						"performance-now": "^2.1.0",
-						"qs": "~6.5.2",
-						"safe-buffer": "^5.1.2",
-						"tough-cookie": "~2.4.3",
-						"tunnel-agent": "^0.6.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"sockjs": {
-					"version": "0.3.19",
-					"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-					"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
-					"dev": true,
-					"requires": {
-						"faye-websocket": "^0.10.0",
-						"uuid": "^3.0.1"
-					}
-				},
-				"sockjs-client": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-					"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.2.5",
-						"eventsource": "^1.0.7",
-						"faye-websocket": "~0.11.1",
-						"inherits": "^2.0.3",
-						"json3": "^3.3.2",
-						"url-parse": "^1.4.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"faye-websocket": {
-							"version": "0.11.1",
-							"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-							"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-							"dev": true,
-							"requires": {
-								"websocket-driver": ">=0.5.1"
-							}
-						}
-					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"spdy": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
-					"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"handle-thing": "^2.0.0",
-						"http-deceiver": "^1.2.7",
-						"select-hose": "^2.0.0",
-						"spdy-transport": "^3.0.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"spdy-transport": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-					"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"detect-node": "^2.0.4",
-						"hpack.js": "^2.1.6",
-						"obuf": "^1.1.2",
-						"readable-stream": "^3.0.6",
-						"wbuf": "^1.7.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"readable-stream": {
-							"version": "3.1.1",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-							"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-							"dev": true,
-							"requires": {
-								"inherits": "^2.0.3",
-								"string_decoder": "^1.1.1",
-								"util-deprecate": "^1.0.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,
+				}
+			}
+		},
+		"@angular/core": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.11.tgz",
+			"integrity": "sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/forms": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.11.tgz",
+			"integrity": "sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/http": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.11.tgz",
+			"integrity": "sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/language-service": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.11.tgz",
+			"integrity": "sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==",
+			"dev": true
+		},
+		"@angular/platform-browser": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.11.tgz",
+			"integrity": "sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/platform-browser-dynamic": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz",
+			"integrity": "sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/pwa": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.7.tgz",
+			"integrity": "sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==",
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"parse5-html-rewriting-stream": "5.1.0",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
 					}
 				},
-				"stylus": {
-					"version": "0.54.5",
-					"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
-					"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
-					"dev": true,
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
 					"requires": {
-						"css-parse": "1.7.x",
-						"debug": "*",
-						"glob": "7.0.x",
-						"mkdirp": "0.5.x",
-						"sax": "0.5.x",
-						"source-map": "0.1.x"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "7.0.6",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-							"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-							"dev": true,
-							"requires": {
-								"fs.realpath": "^1.0.0",
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "^3.0.2",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.1.43",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-							"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
 					}
 				},
-				"stylus-loader": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-					"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
-					"dev": true,
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"requires": {
-						"loader-utils": "^1.0.2",
-						"lodash.clonedeep": "^4.5.0",
-						"when": "~3.6.x"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"supports-color": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"requires": {
-						"has-flag": "^1.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"terser-webpack-plugin": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz",
-					"integrity": "sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==",
-					"dev": true,
-					"requires": {
-						"cacache": "^11.0.2",
-						"find-cache-dir": "^2.0.0",
-						"schema-utils": "^1.0.0",
-						"serialize-javascript": "^1.4.0",
-						"source-map": "^0.6.1",
-						"terser": "^3.8.1",
-						"webpack-sources": "^1.1.0",
-						"worker-farm": "^1.5.2"
-					},
-					"dependencies": {
-						"cacache": {
-							"version": "11.3.2",
-							"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-							"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-							"dev": true,
-							"requires": {
-								"bluebird": "^3.5.3",
-								"chownr": "^1.1.1",
-								"figgy-pudding": "^3.5.1",
-								"glob": "^7.1.3",
-								"graceful-fs": "^4.1.15",
-								"lru-cache": "^5.1.1",
-								"mississippi": "^3.0.0",
-								"mkdirp": "^0.5.1",
-								"move-concurrently": "^1.0.1",
-								"promise-inflight": "^1.0.1",
-								"rimraf": "^2.6.2",
-								"ssri": "^6.0.1",
-								"unique-filename": "^1.1.1",
-								"y18n": "^4.0.0"
-							}
-						},
-						"find-cache-dir": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
-							"integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
-							"dev": true,
-							"requires": {
-								"commondir": "^1.0.1",
-								"make-dir": "^1.0.0",
-								"pkg-dir": "^3.0.0"
-							}
-						},
-						"lru-cache": {
-							"version": "5.1.1",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-							"dev": true,
-							"requires": {
-								"yallist": "^3.0.2"
-							}
-						},
-						"mississippi": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-							"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-							"dev": true,
-							"requires": {
-								"concat-stream": "^1.5.0",
-								"duplexify": "^3.4.2",
-								"end-of-stream": "^1.1.0",
-								"flush-write-stream": "^1.0.0",
-								"from2": "^2.1.0",
-								"parallel-transform": "^1.1.0",
-								"pump": "^3.0.0",
-								"pumpify": "^1.3.3",
-								"stream-each": "^1.1.0",
-								"through2": "^2.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-							"dev": true
-						},
-						"ssri": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-							"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-							"dev": true,
-							"requires": {
-								"figgy-pudding": "^3.5.1"
-							}
-						}
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
+			}
+		},
+		"@angular/router": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.11.tgz",
+			"integrity": "sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/service-worker": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
+			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@babel/code-frame": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.0.0"
+			}
+		},
+		"@babel/generator": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
+			"integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0",
+				"jsesc": "^2.5.1",
+				"lodash": "^4.17.11",
+				"source-map": "^0.5.0",
+				"trim-right": "^1.0.1"
+			},
+			"dependencies": {
+				"jsesc": {
+					"version": "2.5.2",
+					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.0.0",
+				"@babel/template": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+			"integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/highlight": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.0.0",
+				"esutils": "^2.0.2",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"js-tokens": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/parser": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz",
+			"integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==",
+			"dev": true
+		},
+		"@babel/runtime": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
+			"integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+			"dev": true,
+			"requires": {
+				"regenerator-runtime": "^0.13.2"
+			},
+			"dependencies": {
+				"regenerator-runtime": {
+					"version": "0.13.2",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+					"integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/template": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz",
+			"integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
+			"integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/generator": "^7.4.0",
+				"@babel/helper-function-name": "^7.1.0",
+				"@babel/helper-split-export-declaration": "^7.4.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0",
+				"lodash": "^4.17.11"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
 					}
 				},
-				"webpack": {
-					"version": "4.29.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
-					"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+				"globals": {
+					"version": "11.11.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+					"integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/types": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+			"integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2",
+				"lodash": "^4.17.11",
+				"to-fast-properties": "^2.0.0"
+			},
+			"dependencies": {
+				"to-fast-properties": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/compodoc": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.9.tgz",
+			"integrity": "sha512-LFdbF/fO9qOGgdrCHg4irMBrl3sD8ySIlL6XabFAz8QbUdf2+77xOVnZJ/PYdcuI8h8vXo4UGS7MFg0pDR2jsw==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-transformer": "^2.0.0",
+				"chalk": "^2.4.2",
+				"cheerio": "^1.0.0-rc.2",
+				"chokidar": "^2.1.2",
+				"colors": "^1.3.3",
+				"commander": "^2.19.0",
+				"cosmiconfig": "^5.1.0",
+				"fancy-log": "^1.3.3",
+				"findit2": "^2.2.3",
+				"fs-extra": "^7.0.1",
+				"glob": "^7.1.3",
+				"handlebars": "^4.1.0",
+				"html-entities": "^1.2.1",
+				"i18next": "^15.0.4",
+				"inside": "^1.0.0",
+				"json5": "^2.1.0",
+				"live-server": "^1.2.1",
+				"lodash": "^4.17.11",
+				"lunr": "^2.3.6",
+				"marked": "^0.6.1",
+				"minimist": "^1.2.0",
+				"opencollective": "^1.0.3",
+				"os-name": "^3.0.0",
+				"pdfmake": "^0.1.53",
+				"semver": "^5.6.0",
+				"traverse": "^0.6.6",
+				"ts-simple-ast": "12.4.0",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"@webassemblyjs/ast": "1.7.11",
-						"@webassemblyjs/helper-module-context": "1.7.11",
-						"@webassemblyjs/wasm-edit": "1.7.11",
-						"@webassemblyjs/wasm-parser": "1.7.11",
-						"acorn": "^6.0.5",
-						"acorn-dynamic-import": "^4.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"chrome-trace-event": "^1.0.0",
-						"enhanced-resolve": "^4.1.0",
-						"eslint-scope": "^4.0.0",
-						"json-parse-better-errors": "^1.0.2",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"micromatch": "^3.1.8",
-						"mkdirp": "~0.5.0",
-						"neo-async": "^2.5.0",
-						"node-libs-browser": "^2.0.0",
-						"schema-utils": "^0.4.4",
-						"tapable": "^1.1.0",
-						"terser-webpack-plugin": "^1.1.0",
-						"watchpack": "^1.5.0",
-						"webpack-sources": "^1.3.0"
-					},
-					"dependencies": {
-						"schema-utils": {
-							"version": "0.4.7",
-							"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-							"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-							"dev": true,
-							"requires": {
-								"ajv": "^6.1.0",
-								"ajv-keywords": "^3.1.0"
-							}
-						}
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"webpack-dev-middleware": {
-					"version": "3.5.1",
-					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
-					"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+				"cosmiconfig": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.0.tgz",
+					"integrity": "sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==",
 					"dev": true,
 					"requires": {
-						"memory-fs": "~0.4.1",
-						"mime": "^2.3.1",
-						"range-parser": "^1.0.3",
-						"webpack-log": "^2.0.0"
-					},
-					"dependencies": {
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						}
+						"import-fresh": "^2.0.0",
+						"is-directory": "^0.3.1",
+						"js-yaml": "^3.13.0",
+						"parse-json": "^4.0.0"
 					}
 				},
-				"webpack-dev-server": {
-					"version": "3.1.14",
-					"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
-					"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
+				"js-yaml": {
+					"version": "3.13.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+					"integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
 					"dev": true,
 					"requires": {
-						"ansi-html": "0.0.7",
-						"bonjour": "^3.5.0",
-						"chokidar": "^2.0.0",
-						"compression": "^1.5.2",
-						"connect-history-api-fallback": "^1.3.0",
-						"debug": "^3.1.0",
-						"del": "^3.0.0",
-						"express": "^4.16.2",
-						"html-entities": "^1.2.0",
-						"http-proxy-middleware": "~0.18.0",
-						"import-local": "^2.0.0",
-						"internal-ip": "^3.0.1",
-						"ip": "^1.1.5",
-						"killable": "^1.0.0",
-						"loglevel": "^1.4.1",
-						"opn": "^5.1.0",
-						"portfinder": "^1.0.9",
-						"schema-utils": "^1.0.0",
-						"selfsigned": "^1.9.1",
-						"semver": "^5.6.0",
-						"serve-index": "^1.7.2",
-						"sockjs": "0.3.19",
-						"sockjs-client": "1.3.0",
-						"spdy": "^4.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^5.1.0",
-						"url": "^0.11.0",
-						"webpack-dev-middleware": "3.4.0",
-						"webpack-log": "^2.0.0",
-						"yargs": "12.0.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-							"dev": true
-						},
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						},
-						"webpack-dev-middleware": {
-							"version": "3.4.0",
-							"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
-							"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
-							"dev": true,
-							"requires": {
-								"memory-fs": "~0.4.1",
-								"mime": "^2.3.1",
-								"range-parser": "^1.0.3",
-								"webpack-log": "^2.0.0"
-							}
-						}
-					}
-				},
-				"webpack-log": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-					"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-					"dev": true,
-					"requires": {
-						"ansi-colors": "^3.0.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"webpack-subresource-integrity": {
-					"version": "1.1.0-rc.6",
-					"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
-					"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
-					"dev": true,
-					"requires": {
-						"webpack-core": "^0.6.8"
+						"argparse": "^1.0.7",
+						"esprima": "^4.0.0"
 					}
 				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 					"dev": true
 				},
-				"worker-farm": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-					"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
-					"dev": true,
-					"requires": {
-						"errno": "~0.1.7"
-					}
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
 					"dev": true
-				},
-				"yargs": {
-					"version": "12.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
-					"dev": true,
-					"requires": {
-						"cliui": "^4.0.0",
-						"decamelize": "^2.0.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^3.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1 || ^4.0.0",
-						"yargs-parser": "^10.1.0"
-					}
-				},
-				"yargs-parser": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-					"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					}
 				}
 			}
 		},
-		"@angular-devkit/core": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-			"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+		"@compodoc/ngd-core": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
+			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
 			"dev": true,
 			"requires": {
-				"ajv": "6.7.0",
-				"chokidar": "2.0.4",
-				"fast-json-stable-stringify": "2.0.0",
-				"rxjs": "6.3.3",
-				"source-map": "0.7.3"
+				"ansi-colors": "^1.0.1",
+				"fancy-log": "^1.3.2",
+				"typescript": "^2.4.2"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"ansi-colors": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ansi-wrap": "^0.1.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"typescript": {
+					"version": "2.9.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/ngd-transformer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
+			"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-core": "~2.0.0",
+				"dot": "^1.1.1",
+				"fs-extra": "^4.0.1",
+				"viz.js": "^1.8.0"
+			},
+			"dependencies": {
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				}
 			}
 		},
-		"@angular-devkit/schematics": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-			"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+		"@dsherret/to-absolute-glob": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"rxjs": "6.3.3"
+				"is-absolute": "^1.0.0",
+				"is-negated-glob": "^1.0.0"
+			}
+		},
+		"@ionic-native/barcode-scanner": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz",
+			"integrity": "sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/animations": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.3.tgz",
-			"integrity": "sha512-5WoiDnVS2OhGgJ1oepFNF2UcfR4sJj97KRnTmLWQ0S4N4WpXX83CoOQVXvXwfotyb8uNtl4zRi2NuvN/MIuFuA==",
+		"@ionic-native/call-number": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.3.0.tgz",
+			"integrity": "sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/cli": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.0.tgz",
-			"integrity": "sha512-6+NoHsW1MYG7GBHUg71zaWIFeIRps/SVksCmRFCpW0RXqErCQmzf0GZuDTZZ2Yo4RzU01150sVp1R8wEvEZfZQ==",
-			"dev": true,
+		"@ionic-native/camera": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.3.0.tgz",
+			"integrity": "sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==",
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"@schematics/update": "0.13.0",
-				"@yarnpkg/lockfile": "1.1.0",
-				"ini": "1.3.5",
-				"inquirer": "6.2.1",
-				"npm-package-arg": "6.1.0",
-				"opn": "5.4.0",
-				"pacote": "9.4.0",
-				"semver": "5.6.0",
-				"symbol-observable": "1.2.0"
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					}
-				},
-				"@schematics/update": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.0.tgz",
-					"integrity": "sha512-HGpZdIL/0w46UyaxpnIAg6SBwzKfaRixHIEihmgJUqA0DG8GZUixRPr1L0YIWC1EZ81cQ+yWL85XhkKBYR+wQg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"@yarnpkg/lockfile": "1.1.0",
-						"ini": "1.3.5",
-						"pacote": "9.4.0",
-						"rxjs": "6.3.3",
-						"semver": "5.6.0",
-						"semver-intersect": "1.4.0"
-					}
-				},
-				"cacache": {
-					"version": "11.3.2",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"chownr": "^1.1.1",
-						"figgy-pudding": "^3.5.1",
-						"glob": "^7.1.3",
-						"graceful-fs": "^4.1.15",
-						"lru-cache": "^5.1.1",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"move-concurrently": "^1.0.1",
-						"promise-inflight": "^1.0.1",
-						"rimraf": "^2.6.2",
-						"ssri": "^6.0.1",
-						"unique-filename": "^1.1.1",
-						"y18n": "^4.0.0"
-					}
-				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"make-fetch-happen": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
-					"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
-					"dev": true,
-					"requires": {
-						"agentkeepalive": "^3.4.1",
-						"cacache": "^11.0.1",
-						"http-cache-semantics": "^3.8.1",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"mississippi": "^3.0.0",
-						"node-fetch-npm": "^2.0.2",
-						"promise-retry": "^1.1.1",
-						"socks-proxy-agent": "^4.0.0",
-						"ssri": "^6.0.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"mississippi": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-					"dev": true,
-					"requires": {
-						"concat-stream": "^1.5.0",
-						"duplexify": "^3.4.2",
-						"end-of-stream": "^1.1.0",
-						"flush-write-stream": "^1.0.0",
-						"from2": "^2.1.0",
-						"parallel-transform": "^1.1.0",
-						"pump": "^3.0.0",
-						"pumpify": "^1.3.3",
-						"stream-each": "^1.1.0",
-						"through2": "^2.0.0"
-					}
-				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"npm-package-arg": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
-					"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.6.0",
-						"osenv": "^0.1.5",
-						"semver": "^5.5.0",
-						"validate-npm-package-name": "^3.0.0"
-					}
-				},
-				"npm-pick-manifest": {
-					"version": "2.2.3",
-					"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
-					"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1",
-						"npm-package-arg": "^6.0.0",
-						"semver": "^5.4.1"
-					}
-				},
-				"npm-registry-fetch": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
-					"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
-					"dev": true,
-					"requires": {
-						"JSONStream": "^1.3.4",
-						"bluebird": "^3.5.1",
-						"figgy-pudding": "^3.4.1",
-						"lru-cache": "^4.1.3",
-						"make-fetch-happen": "^4.0.1",
-						"npm-package-arg": "^6.1.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"pacote": {
-					"version": "9.4.0",
-					"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
-					"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"cacache": "^11.3.2",
-						"figgy-pudding": "^3.5.1",
-						"get-stream": "^4.1.0",
-						"glob": "^7.1.3",
-						"lru-cache": "^5.1.1",
-						"make-fetch-happen": "^4.0.1",
-						"minimatch": "^3.0.4",
-						"minipass": "^2.3.5",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"normalize-package-data": "^2.4.0",
-						"npm-package-arg": "^6.1.0",
-						"npm-packlist": "^1.1.12",
-						"npm-pick-manifest": "^2.2.3",
-						"npm-registry-fetch": "^3.8.0",
-						"osenv": "^0.1.5",
-						"promise-inflight": "^1.0.1",
-						"promise-retry": "^1.1.1",
-						"protoduck": "^5.0.1",
-						"rimraf": "^2.6.2",
-						"safe-buffer": "^5.1.2",
-						"semver": "^5.6.0",
-						"ssri": "^6.0.1",
-						"tar": "^4.4.8",
-						"unique-filename": "^1.1.1",
-						"which": "^1.3.1"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"ssri": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1"
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
-					}
-				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-					"dev": true
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-					"dev": true
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/common": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.3.tgz",
-			"integrity": "sha512-VZOTZdvkitaKEhkxL6daHxPcKqAFwNJm0U4NFB4LRP9KspsFTE60QFVB63o129PTIH9iOQ2D3HRKSRl4o78ZKg==",
+		"@ionic-native/core": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.3.0.tgz",
+			"integrity": "sha512-oIsBvkB/Q63bjKvHGW7zAFMWSXIwnZ/U962UFyuqrF9dKvNSPI5cz8iPOaqKE+jzb2XhlcGKEbp5qAhTI0BcZQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.3.tgz",
-			"integrity": "sha512-UM6n4MyZkR5+VVjlwhLH8IfqdWBkdFcF5at4ckJXOJ/gkIUq97irbis9pGj1b0TO7MAl8uhF4b68xe5lk8b49g==",
-			"dev": true,
+		"@ionic-native/device": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.3.0.tgz",
+			"integrity": "sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler-cli": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.3.tgz",
-			"integrity": "sha512-31hcfTrU2GW66cvvaS629dNVPfiUrUWPncI28optvmKHBaH0mFqkdYNgabuslsXZV5AeidKMUJvR7GITjtvkQA==",
+		"@ionic-native/dialogs": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.3.0.tgz",
+			"integrity": "sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/geolocation": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.3.0.tgz",
+			"integrity": "sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/globalization": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.3.0.tgz",
+			"integrity": "sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-analytics": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz",
+			"integrity": "sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-maps": {
+			"version": "5.0.0-beta.26",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
+			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			}
+		},
+		"@ionic-native/in-app-browser": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz",
+			"integrity": "sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/intercom": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.3.0.tgz",
+			"integrity": "sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/local-notifications": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz",
+			"integrity": "sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/mixpanel": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz",
+			"integrity": "sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/network": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.3.0.tgz",
+			"integrity": "sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/splash-screen": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz",
+			"integrity": "sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/status-bar": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.3.0.tgz",
+			"integrity": "sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/unique-device-id": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz",
+			"integrity": "sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/vibration": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.3.0.tgz",
+			"integrity": "sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic/angular": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.1.2.tgz",
+			"integrity": "sha512-GVdtpPekPjAYo/3IiRg/EoVRw1/9RwW07ITW6TRorcX1XOPJlrRXVcQyWFTbHRD9TOikgE1XmMQd/+1Lk0TQFw==",
+			"requires": {
+				"@ionic/core": "4.1.2",
+				"tslib": "^1.9.3"
+			}
+		},
+		"@ionic/angular-toolkit": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.5.0.tgz",
+			"integrity": "sha512-KHUu7MHi+s1LKox+EBOSN6HO6Sk79qOmBIMGHQMboPbqHGzb5aqCbTmtwa/BJZ1kytZ+yQ8kEejv8YwvrJIZEQ==",
 			"dev": true,
 			"requires": {
-				"canonical-path": "1.0.0",
-				"chokidar": "^1.4.2",
-				"convert-source-map": "^1.5.1",
-				"dependency-graph": "^0.7.2",
-				"magic-string": "^0.25.0",
-				"minimist": "^1.2.0",
-				"reflect-metadata": "^0.1.2",
-				"shelljs": "^0.8.1",
-				"source-map": "^0.6.1",
+				"@schematics/angular": "^7.0.3",
 				"tslib": "^1.9.0",
-				"yargs": "9.0.1"
+				"typescript": "~3.3.3333",
+				"ws": "^6.1.4"
 			},
 			"dependencies": {
-				"anymatch": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-					"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-					"dev": true,
-					"requires": {
-						"micromatch": "^2.1.5",
-						"normalize-path": "^2.0.0"
-					}
-				},
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+				"typescript": {
+					"version": "3.3.4000",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz",
+					"integrity": "sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==",
 					"dev": true
 				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"chokidar": {
-					"version": "1.7.0",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-					"integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-					"dev": true,
-					"requires": {
-						"anymatch": "^1.3.0",
-						"async-each": "^1.0.0",
-						"fsevents": "^1.0.0",
-						"glob-parent": "^2.0.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^2.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0"
-					}
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+				"ws": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+					"integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
 					"dev": true,
 					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"string-width": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-							"dev": true,
-							"requires": {
-								"code-point-at": "^1.0.0",
-								"is-fullwidth-code-point": "^1.0.0",
-								"strip-ansi": "^3.0.0"
-							}
-						}
+						"async-limiter": "~1.0.0"
 					}
-				},
+				}
+			}
+		},
+		"@ionic/app-scripts": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.3.tgz",
+			"integrity": "sha512-t1kL9NqY/sVLfAIVKfN4VJigPqMWs5euKxig3sjsrakSQ9z4njmbDghzAC4taefIpYxLGMOeWgKwrrxOiLkdWQ==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/build-optimizer": "0.0.35",
+				"autoprefixer": "^7.2.6",
+				"chalk": "^2.4.0",
+				"chokidar": "^2.0.4",
+				"clean-css": "^4.1.11",
+				"cross-spawn": "^5.1.0",
+				"dotenv-webpack": "^1.5.7",
+				"express": "^4.16.3",
+				"fs-extra": "^4.0.2",
+				"glob": "^7.1.2",
+				"json-loader": "^0.5.7",
+				"node-sass": "^4.10.0",
+				"os-name": "^2.0.1",
+				"postcss": "^6.0.21",
+				"proxy-middleware": "^0.15.0",
+				"reflect-metadata": "^0.1.10",
+				"rollup": "0.50.0",
+				"rollup-plugin-commonjs": "8.2.6",
+				"rollup-plugin-node-resolve": "3.0.0",
+				"source-map": "^0.6.1",
+				"tiny-lr": "^1.1.1",
+				"tslint": "^5.8.0",
+				"tslint-eslint-rules": "^4.1.1",
+				"uglify-es": "3.2.2",
+				"webpack": "3.12.0",
+				"ws": "3.3.2",
+				"xml2js": "^0.4.19"
+			},
+			"dependencies": {
+				"@angular-devkit/build-optimizer": {
+					"version": "0.0.35",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
+					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
+					"dev": true,
+					"requires": {
+						"loader-utils": "^1.1.0",
+						"source-map": "^0.5.6",
+						"typescript": "~2.6.1",
+						"webpack-sources": "^1.0.1"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
+					}
+				},
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"acorn-dynamic-import": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+					"dev": true,
+					"requires": {
+						"acorn": "^4.0.3"
+					},
+					"dependencies": {
+						"acorn": {
+							"version": "4.0.13",
+							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+							"dev": true
+						}
+					}
+				},
+				"autoprefixer": {
+					"version": "7.2.6",
+					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+					"dev": true,
+					"requires": {
+						"browserslist": "^2.11.3",
+						"caniuse-lite": "^1.0.30000805",
+						"normalize-range": "^0.1.2",
+						"num2fraction": "^1.2.2",
+						"postcss": "^6.0.17",
+						"postcss-value-parser": "^3.2.3"
+					}
+				},
+				"browserslist": {
+					"version": "2.11.3",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30000792",
+						"electron-to-chromium": "^1.3.30"
+					}
+				},
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+					"dev": true,
+					"requires": {
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
+					},
+					"dependencies": {
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+							"dev": true,
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
+						}
+					}
+				},
+				"commander": {
+					"version": "2.12.2",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
+					"dev": true
+				},
 				"cross-spawn": {
 					"version": "5.1.0",
 					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -2191,6 +1476,18 @@
 						"which": "^1.2.9"
 					}
 				},
+				"enhanced-resolve": {
+					"version": "3.4.1",
+					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"memory-fs": "^0.4.0",
+						"object-assign": "^4.0.1",
+						"tapable": "^0.2.7"
+					}
+				},
 				"execa": {
 					"version": "0.7.0",
 					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
@@ -2206,46 +1503,21 @@
 						"strip-eof": "^1.0.0"
 					}
 				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				},
-				"is-extglob": {
+				"invert-kv": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
 					"dev": true
 				},
 				"is-fullwidth-code-point": {
@@ -2257,36 +1529,26 @@
 						"number-is-nan": "^1.0.0"
 					}
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
+				"json5": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+					"dev": true
 				},
-				"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=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^2.2.0",
-						"pify": "^2.0.0",
-						"strip-bom": "^3.0.0"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
+				"macos-release": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
+					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
+					"dev": true
 				},
 				"mem": {
 					"version": "1.1.0",
@@ -2297,39 +1559,6 @@
 						"mimic-fn": "^1.0.0"
 					}
 				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
 				"os-locale": {
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
@@ -2341,76 +1570,132 @@
 						"mem": "^1.1.0"
 					}
 				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+				"os-name": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
+					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
 					"dev": true,
 					"requires": {
-						"p-limit": "^1.1.0"
+						"macos-release": "^1.0.0",
+						"win-release": "^1.0.0"
 					}
 				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+				"postcss": {
+					"version": "6.0.23",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
 					"dev": true,
 					"requires": {
-						"error-ex": "^1.2.0"
+						"chalk": "^2.4.1",
+						"source-map": "^0.6.1",
+						"supports-color": "^5.4.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"
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+				"tapable": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
+					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
 					"dev": true
 				},
-				"read-pkg": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+				"typescript": {
+					"version": "2.6.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
+					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
+					"dev": true
+				},
+				"uglify-es": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
+					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
 					"dev": true,
 					"requires": {
-						"load-json-file": "^2.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^2.0.0"
+						"commander": "~2.12.1",
+						"source-map": "~0.6.1"
 					}
 				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+				"webpack": {
+					"version": "3.12.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
+					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
 					"dev": true,
 					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
+						"acorn": "^5.0.0",
+						"acorn-dynamic-import": "^2.0.0",
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0",
+						"async": "^2.1.2",
+						"enhanced-resolve": "^3.4.0",
+						"escope": "^3.6.0",
+						"interpret": "^1.0.0",
+						"json-loader": "^0.5.4",
+						"json5": "^0.5.1",
+						"loader-runner": "^2.3.0",
+						"loader-utils": "^1.1.0",
+						"memory-fs": "~0.4.1",
+						"mkdirp": "~0.5.0",
+						"node-libs-browser": "^2.0.0",
+						"source-map": "^0.5.3",
+						"supports-color": "^4.2.1",
+						"tapable": "^0.2.7",
+						"uglifyjs-webpack-plugin": "^0.4.6",
+						"watchpack": "^1.4.0",
+						"webpack-sources": "^1.0.1",
+						"yargs": "^8.0.2"
+					},
+					"dependencies": {
+						"has-flag": {
+							"version": "2.0.0",
+							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+							"dev": true
+						},
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						},
+						"supports-color": {
+							"version": "4.5.0",
+							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+							"dev": true,
+							"requires": {
+								"has-flag": "^2.0.0"
+							}
+						}
 					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
+				"ws": {
+					"version": "3.3.2",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
+					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
 				},
 				"yargs": {
-					"version": "9.0.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
 					"dev": true,
 					"requires": {
 						"camelcase": "^4.1.0",
@@ -2439,543 +1724,361 @@
 				}
 			}
 		},
-		"@angular/core": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.3.tgz",
-			"integrity": "sha512-6Ql+sJJnrsxh8O0/IgIP1GgT4eLOHk+dlBs7zBbjstmLuhaQdY+awO9WKoQow+TiD1Go7FW1J3vZ2PTWXKxqjQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/forms": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.3.tgz",
-			"integrity": "sha512-mZpyonfSmRwSvM6efvwFwkLJkK6wHQrm7X4OhVVu3s9i7BI253eLDY7WIRXFvoxJ/5jWIIarVnd/9UA7GINZGw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/http": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.3.tgz",
-			"integrity": "sha512-wzvBKbO/TcSR3U8AQbsGftH8x1OdAgVGHlfXQPmZL1KjIDHrM1VpnkSvgqIt8coG+4OPfWcNklUCrTdEGwqMqw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/language-service": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.3.tgz",
-			"integrity": "sha512-9FBVYbKaNx4Ap+Suz/2ZFBPca1voinZMOCN8LjXRYnfS2MHLQASQlTlK4qeZcomyRfy0FxWmO9R02S7YJ06cnw==",
-			"dev": true
-		},
-		"@angular/platform-browser": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.3.tgz",
-			"integrity": "sha512-DH0Y2lgEgcrP1I/DUQB/krL7Ob7yL685fu4sRapW17SndTQa2pqSFMBVf+mN3FupTXp7nJHSvlIktzedIk04+g==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/platform-browser-dynamic": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.3.tgz",
-			"integrity": "sha512-M8Kiz5FUhnFybJuk/mgOhBjVbRgKDC4bGWKWH9Z9SXBR2dS/FL3QOJsLIthQcWlHOzSoJdEoPBRhn0R4pyLBSw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/pwa": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.0.tgz",
-			"integrity": "sha512-E1rOMduecaUw6sZfm5u3nFWi2B90SD6NriGjciVTcKCjPmHKeIWmpWGhVdgGEzCbg1Gxj8ZhsvvBjJzfbDPF6g==",
+		"@ionic/cli-framework": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.7.0.tgz",
+			"integrity": "sha512-2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg==",
+			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"parse5-html-rewriting-stream": "5.1.0",
-				"rxjs": "6.3.3"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"inquirer": "^6.0.0",
+				"lodash": "^4.17.5",
+				"log-update": "^2.3.0",
+				"minimist": "^1.2.0",
+				"rimraf": "^2.6.2",
+				"slice-ansi": "^2.0.0",
+				"string-width": "^3.0.0",
+				"strip-ansi": "^5.0.0",
+				"tslib": "^1.9.0",
+				"untildify": "^3.0.2",
+				"wrap-ansi": "^4.0.0",
+				"write-file-atomic": "^2.3.0"
 			},
 			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-					"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"ajv": "6.7.0",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.3.3",
-						"source-map": "0.7.3"
+						"ms": "^2.1.1"
 					}
 				},
-				"@angular-devkit/schematics": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-					"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+				"wrap-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
 					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
 					},
 					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"string-width": {
+							"version": "2.1.1",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+							"dev": true,
 							"requires": {
-								"is-descriptor": "^1.0.0"
+								"is-fullwidth-code-point": "^2.0.0",
+								"strip-ansi": "^4.0.0"
+							}
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
 							}
 						}
 					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+				}
+			}
+		},
+		"@ionic/core": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.1.2.tgz",
+			"integrity": "sha512-QVJYpDAycmXgQL3mWdvjlIgrLEG0wVl9+NGZQATEBCTEsuDHrOw7BO28FKPlFCdfTjVA6HDJnSj1HwOUi3Yp4w==",
+			"requires": {
+				"ionicons": "4.5.5"
+			}
+		},
+		"@ionic/discover": {
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.13.tgz",
+			"integrity": "sha512-9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"netmask": "^1.0.6",
+				"tslib": "^1.9.0",
+				"ws": "^6.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-						}
+						"ms": "^2.1.1"
 					}
 				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@ionic/lab": {
+			"version": "1.0.24",
+			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.24.tgz",
+			"integrity": "sha512-sXUx0MZKC43bZ5ZJ1IRQ+yuvCgNGGJ6QPREI1AeHXZpkZRixrh0w14SLgxEzjxvFgW6ypQkdKlymY0nRoU8Gng==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/utils-fs": "1.2.0",
+				"chalk": "^2.3.0",
+				"express": "^4.16.2",
+				"tslib": "^1.9.0"
+			}
+		},
+		"@ionic/ng-toolkit": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
+			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.1.0",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"rxjs": "~6.2.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"@ionic/cli-framework": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
+					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
+					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"@ionic/utils-fs": "0.0.2",
+						"chalk": "^2.3.0",
+						"debug": "^4.0.0",
+						"inquirer": "^6.0.0",
+						"lodash": "^4.17.5",
+						"minimist": "^1.2.0",
+						"rimraf": "^2.6.2",
+						"slice-ansi": "^1.0.0",
+						"stream-combiner2": "^1.1.1",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^5.0.0",
+						"tree-kill": "1.2.0",
+						"tslib": "^1.9.0",
+						"untildify": "^3.0.2",
+						"wrap-ansi": "^4.0.0",
+						"write-file-atomic": "^2.3.0"
 					}
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"@ionic/utils-fs": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
+					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
+					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"debug": "^4.0.0",
+						"ncp": "^2.0.0",
+						"through2": "^2.0.3",
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+					"dev": true
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
 				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
+					"dev": true,
 					"requires": {
 						"tslib": "^1.9.0"
 					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				"slice-ansi": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-						}
+						"is-fullwidth-code-point": "^2.0.0"
 					}
 				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"strip-ansi": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ansi-regex": "^4.0.0"
 					}
 				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg=="
-				}
-			}
-		},
-		"@angular/router": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.3.tgz",
-			"integrity": "sha512-SH7H2I9WTj1puei4m4g5n0/Cp28HS14q4r8lOgW0gLWuT6Ls7MqH/nDjOMiW924iRR6zjQQs7G+WbhL1jmZc2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/service-worker": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
-			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@babel/code-frame": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.0.0"
-			}
-		},
-		"@babel/generator": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.0.tgz",
-			"integrity": "sha512-dZTwMvTgWfhmibq4V9X+LMf6Bgl7zAodRn9PvcPdhlzFMbvUutx74dbEv7Atz3ToeEpevYEJtAwfxq/bDCzHWg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.3.0",
-				"jsesc": "^2.5.1",
-				"lodash": "^4.17.10",
-				"source-map": "^0.5.0",
-				"trim-right": "^1.0.1"
-			},
-			"dependencies": {
-				"jsesc": {
-					"version": "2.5.2",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+				"tree-kill": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
+					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
 					"dev": true
-				}
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "^7.0.0",
-				"@babel/template": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
-			"integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/highlight": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.0.0",
-				"esutils": "^2.0.2",
-				"js-tokens": "^4.0.0"
-			},
-			"dependencies": {
-				"js-tokens": {
+				},
+				"wrap-ansi": {
 					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-					"dev": true
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
+							}
+						}
+					}
 				}
 			}
 		},
-		"@babel/parser": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.1.tgz",
-			"integrity": "sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA==",
-			"dev": true
-		},
-		"@babel/template": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
-			"integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/parser": "^7.2.2",
-				"@babel/types": "^7.2.2"
-			}
+		"@ionic/pro": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
+			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
 		},
-		"@babel/traverse": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
-			"integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
+		"@ionic/schematics-angular": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
+			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/generator": "^7.2.2",
-				"@babel/helper-function-name": "^7.1.0",
-				"@babel/helper-split-export-declaration": "^7.0.0",
-				"@babel/parser": "^7.2.3",
-				"@babel/types": "^7.2.2",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0",
-				"lodash": "^4.17.10"
+				"@schematics/angular": "0.9.0-beta.3",
+				"lodash": "^4.17.5",
+				"tslib": "^1.9.0",
+				"typescript": "3.0.1"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+				"@angular-devkit/core": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
+					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ajv": "6.5.3",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.2.2",
+						"source-map": "0.7.3"
 					}
 				},
-				"globals": {
-					"version": "11.10.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz",
-					"integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==",
-					"dev": true
+				"@angular-devkit/schematics": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
+					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
+					"dev": true,
+					"requires": {
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"rxjs": "6.2.2"
+					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/types": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.0.tgz",
-			"integrity": "sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw==",
-			"dev": true,
-			"requires": {
-				"esutils": "^2.0.2",
-				"lodash": "^4.17.10",
-				"to-fast-properties": "^2.0.0"
-			},
-			"dependencies": {
-				"to-fast-properties": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-					"dev": true
-				}
-			}
-		},
-		"@compodoc/compodoc": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.7.tgz",
-			"integrity": "sha512-bTqkv75T9b+3OxG517YL+5B0npAG0Q5nOMAk562Idr/fICTTHQ/xzSBsTptZ4QqYmtzRMV1OqOlk74FXfGPZWw==",
-			"dev": true,
-			"requires": {
-				"@compodoc/ngd-transformer": "^2.0.0",
-				"chalk": "^2.4.1",
-				"cheerio": "^1.0.0-rc.2",
-				"chokidar": "^2.0.4",
-				"colors": "^1.3.2",
-				"commander": "2.19.0",
-				"cosmiconfig": "^5.0.7",
-				"fancy-log": "^1.3.2",
-				"findit2": "^2.2.3",
-				"fs-extra": "^7.0.1",
-				"glob": "^7.1.3",
-				"handlebars": "4.0.10",
-				"html-entities": "^1.2.1",
-				"i18next": "^12.1.0",
-				"inside": "^1.0.0",
-				"json5": "^2.1.0",
-				"live-server": "1.2.1",
-				"lodash": "^4.17.11",
-				"lunr": "2.3.5",
-				"marked": "^0.4.0",
-				"opencollective": "^1.0.3",
-				"os-name": "^3.0.0",
-				"traverse": "^0.6.6",
-				"ts-simple-ast": "12.4.0",
-				"uuid": "^3.3.2"
-			},
-			"dependencies": {
-				"@compodoc/ngd-transformer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
-					"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+				"@schematics/angular": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
+					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
 					"dev": true,
 					"requires": {
-						"@compodoc/ngd-core": "~2.0.0",
-						"dot": "^1.1.1",
-						"fs-extra": "^4.0.1",
-						"viz.js": "^1.8.0"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "4.0.3",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-							"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"@angular-devkit/schematics": "0.9.0-beta.3",
+						"typescript": "3.0.1"
 					}
 				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
+				"ajv": {
+					"version": "6.5.3",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
+					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
 				},
 				"base": {
 					"version": "0.11.2",
@@ -3021,31 +2124,10 @@
 						"to-regex": "^3.0.1"
 					}
 				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true,
-					"optional": true
-				},
-				"cheerio": {
-					"version": "1.0.0-rc.2",
-					"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
-					"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
-					"dev": true,
-					"requires": {
-						"css-select": "~1.2.0",
-						"dom-serializer": "~0.1.0",
-						"entities": "~1.1.1",
-						"htmlparser2": "^3.9.1",
-						"lodash": "^4.15.0",
-						"parse5": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"chokidar": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
 					"dev": true,
 					"requires": {
 						"anymatch": "^2.0.0",
@@ -3063,48 +2145,6 @@
 						"upath": "^1.0.5"
 					}
 				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-					"dev": true
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"cosmiconfig": {
-					"version": "5.0.7",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz",
-					"integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^2.0.0",
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0"
-					}
-				},
 				"define-property": {
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -3173,31 +2213,6 @@
 						}
 					}
 				},
-				"dir-glob": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-					"dev": true,
-					"requires": {
-						"arrify": "^1.0.1",
-						"path-type": "^3.0.0"
-					}
-				},
-				"event-stream": {
-					"version": "3.3.4",
-					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-					"dev": true,
-					"requires": {
-						"duplexer": "~0.1.1",
-						"from": "~0",
-						"map-stream": "~0.1.0",
-						"pause-stream": "0.0.11",
-						"split": "0.3",
-						"stream-combiner": "~0.0.4",
-						"through": "~2.3.1"
-					}
-				},
 				"extend-shallow": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
@@ -3207,80 +2222,6 @@
 						"is-extendable": "^0.1.0"
 					}
 				},
-				"faye-websocket": {
-					"version": "0.11.1",
-					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-					"dev": true,
-					"requires": {
-						"websocket-driver": ">=0.5.1"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"globby": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"dir-glob": "2.0.0",
-						"fast-glob": "^2.0.2",
-						"glob": "^7.1.2",
-						"ignore": "^3.3.5",
-						"pify": "^3.0.0",
-						"slash": "^1.0.0"
-					}
-				},
-				"handlebars": {
-					"version": "4.0.10",
-					"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
-					"integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
-					"dev": true,
-					"requires": {
-						"async": "^1.4.0",
-						"optimist": "^0.6.1",
-						"source-map": "^0.4.4",
-						"uglify-js": "^2.6"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.4.4",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-							"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
-					}
-				},
-				"http-auth": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
-					"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
-					"dev": true,
-					"requires": {
-						"apache-crypt": "^1.1.2",
-						"apache-md5": "^1.0.6",
-						"bcryptjs": "^2.3.0",
-						"uuid": "^3.0.0"
-					}
-				},
 				"is-accessor-descriptor": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -3316,98 +2257,13 @@
 					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
 					"dev": true
 				},
-				"live-server": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
-					"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
-					"dev": true,
-					"requires": {
-						"chokidar": "^2.0.4",
-						"colors": "^1.3.3",
-						"connect": "^3.6.6",
-						"cors": "^2.8.5",
-						"event-stream": "3.3.4",
-						"faye-websocket": "0.11.x",
-						"http-auth": "3.1.x",
-						"morgan": "^1.9.1",
-						"object-assign": "^4.1.1",
-						"opn": "^5.4.0",
-						"proxy-middleware": "^0.15.0",
-						"send": "^0.16.2",
-						"serve-index": "^1.9.1"
-					},
-					"dependencies": {
-						"colors": {
-							"version": "1.3.3",
-							"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-							"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-							"dev": true
-						}
-					}
-				},
-				"map-stream": {
-					"version": "0.1.0",
-					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-					"dev": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				},
-				"opn": {
-					"version": "5.4.0",
-					"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-					"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-					"dev": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parse5": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-					"dev": true,
-					"requires": {
-						"@types/node": "*"
-					}
-				},
-				"send": {
-					"version": "0.16.2",
-					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+				"rxjs": {
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
 					"dev": true,
 					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					},
-					"dependencies": {
-						"statuses": {
-							"version": "1.4.0",
-							"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-							"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-							"dev": true
-						}
+						"tslib": "^1.9.0"
 					}
 				},
 				"snapdragon": {
@@ -3424,8 +2280,22 @@
 						"source-map": "^0.5.6",
 						"source-map-resolve": "^0.5.0",
 						"use": "^3.1.0"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
 					}
 				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				},
 				"source-map-resolve": {
 					"version": "0.5.2",
 					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
@@ -3439,2179 +2309,588 @@
 						"urix": "^0.1.0"
 					}
 				},
-				"split": {
-					"version": "0.3.3",
-					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-					"dev": true,
-					"requires": {
-						"through": "2"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+				"typescript": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
 					"dev": true
-				},
-				"stream-combiner": {
-					"version": "0.0.4",
-					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+				}
+			}
+		},
+		"@ionic/storage": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
+			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
+			"requires": {
+				"localforage": "1.7.1",
+				"localforage-cordovasqlitedriver": "1.7.0",
+				"tslib": "^1.7.1"
+			}
+		},
+		"@ionic/utils-array": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-0.0.1.tgz",
+			"integrity": "sha512-gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"duplexer": "~0.1.1"
+						"ms": "^2.1.1"
 					}
 				},
-				"ts-simple-ast": {
-					"version": "12.4.0",
-					"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
-					"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
-					"dev": true,
-					"requires": {
-						"@dsherret/to-absolute-glob": "^2.0.2",
-						"code-block-writer": "^7.2.0",
-						"fs-extra": "^6.0.1",
-						"glob-parent": "^3.1.0",
-						"globby": "^8.0.1",
-						"is-negated-glob": "^1.0.0",
-						"multimatch": "^2.1.0",
-						"object-assign": "^4.1.1",
-						"tslib": "^1.9.0",
-						"typescript": "2.9.1"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-							"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.9.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
-					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
-				},
-				"uglify-js": {
-					"version": "2.8.29",
-					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+				}
+			}
+		},
+		"@ionic/utils-fs": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.2.0.tgz",
+			"integrity": "sha512-31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"fs-extra": "^7.0.1",
+				"through2": "^3.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"source-map": "~0.5.1",
-						"uglify-to-browserify": "~1.0.0",
-						"yargs": "~3.10.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true,
-					"optional": true
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"yargs": {
-					"version": "3.10.0",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"camelcase": "^1.0.2",
-						"cliui": "^2.1.0",
-						"decamelize": "^1.0.0",
-						"window-size": "0.1.0"
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
 		},
-		"@compodoc/ngd-core": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
-			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
+		"@ionic/utils-network": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.8.tgz",
+			"integrity": "sha512-DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg==",
 			"dev": true,
 			"requires": {
-				"ansi-colors": "^1.0.1",
-				"fancy-log": "^1.3.2",
-				"typescript": "^2.4.2"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
 			},
 			"dependencies": {
-				"ansi-colors": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ansi-wrap": "^0.1.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"typescript": {
-					"version": "2.9.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
 		},
-		"@dsherret/to-absolute-glob": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
+		"@ionic/utils-object": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-0.0.1.tgz",
+			"integrity": "sha512-ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ==",
 			"dev": true,
 			"requires": {
-				"is-absolute": "^1.0.0",
-				"is-negated-glob": "^1.0.0"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/barcode-scanner": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.0.0.tgz",
-			"integrity": "sha512-DjTWPZan6s1easv6A6LgI/ZcPQ+HJX2PxZHBuJckwkNxJ+KAWwEZBpEQ5rbyntZyTHLUZLCUrOhgDq4Y/TOI+Q==",
+		"@ionic/utils-process": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-0.1.0.tgz",
+			"integrity": "sha512-CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-terminal": "0.0.1",
+				"debug": "^4.0.0",
+				"lodash": "^4.17.5",
+				"tree-kill": "1.2.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/call-number": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.0.0.tgz",
-			"integrity": "sha512-kzIAMs7+hTRL2A2wO6PyIOVAJYxhBFNDsYyuE5vLmDs1Um74mFq62CFdYhLNpF+/wovbuNG3+u/b1BFToXIUWw==",
+		"@ionic/utils-stream": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-0.0.1.tgz",
+			"integrity": "sha512-IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"stream-combiner2": "^1.1.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/core": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.0.0.tgz",
-			"integrity": "sha512-qtshWPo+CMq9ZoDGcg+1XF1+k2ASm0sLtZsIbXmYo5X82Q9cUhjk95X9BqHnjXHOdIWk4J/D3ot0/vzmMTNdbA==",
+		"@ionic/utils-subprocess": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz",
+			"integrity": "sha512-8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"cross-spawn": "^6.0.5",
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/device": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.0.0.tgz",
-			"integrity": "sha512-Mf8kLO+BbvsdYrDvgkpp2YTX4ygXQLEMrsnqPauibhE8ZGsAZUDmfH7+Mtv1OIN0z0ot0zhEOhsfF7y/QuWRzw==",
+		"@ionic/utils-terminal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz",
+			"integrity": "sha512-xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/dialogs": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.0.0.tgz",
-			"integrity": "sha512-DXhWE9tbEtBmEmbcRD+cmQ42zIGG6NbQCKL/Gs4YsAGrLVBhbhCJx7M/Yk8C2gn2ktczfl4h7KMne/NABbfbqA==",
+		"@mrmlnc/readdir-enhanced": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"call-me-maybe": "^1.0.1",
+				"glob-to-regexp": "^0.3.0"
 			}
 		},
-		"@ionic-native/geolocation": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.0.0.tgz",
-			"integrity": "sha512-gU3GNCEJgh+2KpK0Tg9l85HDMRkUWO9FAszF4UDnqAUihTQGCM0Nl+hpmEQowkM9+Him8FJ83rT82pPmnGERCA==",
+		"@ngtools/webpack": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.7.tgz",
+			"integrity": "sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"enhanced-resolve": "4.1.0",
+				"rxjs": "6.3.3",
+				"tree-kill": "1.2.1",
+				"webpack-sources": "1.3.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/globalization": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.0.0.tgz",
-			"integrity": "sha512-a3JsDwgwvzKyq2tda6FNIXmrVMeaZ9muXl9h1HKcG1ThqWHNGW9Zxmpakv3sO4onUv6KUEaP49rcim/xoeo9BA==",
+		"@ngx-progressbar/core": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.2.tgz",
+			"integrity": "sha512-z0VzsJpgWxoU7wLXviCutXPXDop1Ry/SPOlVOtXHlkUGFAzHs3soDeXpTyigSdBB8Q16Nisow4EVuOKCByp6PQ==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-analytics": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.0.0.tgz",
-			"integrity": "sha512-mYeP9QmHfjjJe3y5uHUz4atfR2EuRCf5TFRCyi+yoCs5WEwC4JbM7k4GxGyx6YY1MHqNDoUrDZu5F0NypqxsKg==",
+		"@ngx-translate/core": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
+			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-maps": {
-			"version": "5.0.0-beta.26",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
-			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+		"@ngx-translate/http-loader": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
+			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/intercom": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.0.0.tgz",
-			"integrity": "sha512-rXk3IEFbT3Ec/kmz53Xrkvicch1CFeL/0dSOKsM5mrIYoUWQJGV2qMP5Clbq7ZdMJ/8q2Bv2gF2b9L/UipAy/w==",
+		"@nodelib/fs.stat": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+			"dev": true
+		},
+		"@schematics/angular": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.7.tgz",
+			"integrity": "sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"typescript": "3.2.4"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+					"requires": {
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
+					}
+				},
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+					"requires": {
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
+					}
+				},
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
 			}
 		},
-		"@ionic-native/local-notifications": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.0.0.tgz",
-			"integrity": "sha512-lKdZ60rJncgCwwVeCYSfhHJGtrFUBqj9FkJpRcLUxeOZSxp9EVCN/ZGoGyeTlOKwunNBaw8a77hBZ7lbriBW6w==",
+		"@schematics/update": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.7.tgz",
+			"integrity": "sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"pacote": "9.4.0",
+				"rxjs": "6.3.3",
+				"semver": "5.6.0",
+				"semver-intersect": "1.4.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/mixpanel": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.0.0.tgz",
-			"integrity": "sha512-SqKHc5yCTJ2qnX1bk7GFcNQCpDzIqzg0+CNWptSkFPBxtais3qw07GYTASaEzQM1kjmPSPD++avkfWmUXT2CXg==",
+		"@types/bson": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.0.tgz",
+			"integrity": "sha512-pq/rqJwJWkbS10crsG5bgnrisL8pML79KlMKQMoQwLUjlPAkrUHMvHJ3oGwE7WHR61Lv/nadMwXVAD2b+fpD8Q==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/network": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.0.0.tgz",
-			"integrity": "sha512-Yb8c+U8GZOhL5qc6LdbzJdwzTclZ9w0QpPH5YTbFXLJOSzhmq+ibN2dzWbmWLjPZuwR0V7K+KrefoJNacFDejw==",
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
+		"@types/d3-color": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",
+			"integrity": "sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==",
+			"dev": true
+		},
+		"@types/geojson": {
+			"version": "7946.0.7",
+			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+			"integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==",
+			"dev": true
+		},
+		"@types/googlemaps": {
+			"version": "3.30.19",
+			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.19.tgz",
+			"integrity": "sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==",
+			"dev": true
+		},
+		"@types/graphql": {
+			"version": "14.2.0",
+			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.2.0.tgz",
+			"integrity": "sha512-lELg5m6eBOmATWyCZl8qULEOvnPIUG6B443yXKj930glXIgwQirIBPp5rthP2amJW0YSzUg2s5sfgba4mRRCNw==",
+			"dev": true
+		},
+		"@types/jasmine": {
+			"version": "3.3.12",
+			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.12.tgz",
+			"integrity": "sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==",
+			"dev": true
+		},
+		"@types/jasminewd2": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
+			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/jasmine": "*"
 			}
 		},
-		"@ionic-native/splash-screen": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.0.0.tgz",
-			"integrity": "sha512-+7QfXPkaosGsR3ohEiL/WJn23NHVDZYvnilYNrOMF7oohnj5ngH46fCNYp1Tpybe5GCV1iP++RzDvE5jghWLZg==",
+		"@types/leaflet": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.3.tgz",
+			"integrity": "sha512-jFRBSsPHi1EwQSwrN0cOJLdPhwOZsRl4IMxvm/2ShLh0YM5GfCtQXCzsrv8RE7DWL+AykXdYSAd9bFLWbZT4CQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/geojson": "*"
 			}
 		},
-		"@ionic-native/status-bar": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.0.0.tgz",
-			"integrity": "sha512-mJfj+VXTOgf9Og0S7QDlT9I8UVI+Wj4kpZUHdQizovA/R0m1HG2hLKtEMy00iDVbOBjRsXGcD6JXCOeyVjg7LA==",
+		"@types/mongodb": {
+			"version": "3.1.22",
+			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.22.tgz",
+			"integrity": "sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/bson": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/unique-device-id": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.0.0.tgz",
-			"integrity": "sha512-yfiQKkkh6N6ypZFBPqu2rDCsdYVUdy7W4ZezD3nCj33FkrNS7Xrdo9H76SQW2c7smXQ+fnSeH7prS//Yyc0KvQ==",
+		"@types/mongoose": {
+			"version": "5.3.24",
+			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.24.tgz",
+			"integrity": "sha512-Txa5C/veUJJG2o1sRbl8z1M7GhPjJz6J3JJQV76eYN0PyI9F2NO3gbVUj059ND5nlbvQjRhXuFLaqN6NH8nMNQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/mongodb": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/vibration": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.0.0.tgz",
-			"integrity": "sha512-XIAfp3oeizseetvnYPAMZ0kK+nyh2i/0Vy0FJkcEGM0fCD36PZkyNpx1Ai1bk3/Ln3nTMZddoBZket1aTXetNA==",
+		"@types/node": {
+			"version": "11.12.1",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-11.12.1.tgz",
+			"integrity": "sha512-sKDlqv6COJrR7ar0+GqqhrXQDzQlMcqMnF2iEU6m9hLo8kxozoAGUazwPyELHlRVmjsbvlnGXjnzyptSXVmceA==",
+			"dev": true
+		},
+		"@types/q": {
+			"version": "0.0.32",
+			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+			"dev": true
+		},
+		"@types/reflect-metadata": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
+			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"reflect-metadata": "*"
 			}
 		},
-		"@ionic/angular": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.0.0.tgz",
-			"integrity": "sha512-kxvlZN5daRql/VRcbB7YWMcmE4jKDgwlPRykzNvmYWFDr9vg1AbXirLHAPtR7BaKWJEN4dJwlibjBEJQw8kVYQ==",
+		"@types/selenium-webdriver": {
+			"version": "3.0.14",
+			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
+			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
+			"dev": true
+		},
+		"@types/socket.io-client": {
+			"version": "1.4.32",
+			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
+			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
+			"dev": true
+		},
+		"@types/source-list-map": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+			"dev": true
+		},
+		"@types/stripe": {
+			"version": "6.25.7",
+			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.25.7.tgz",
+			"integrity": "sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==",
+			"dev": true,
 			"requires": {
-				"@ionic/core": "4.0.0",
-				"tslib": "^1.9.3"
+				"@types/node": "*"
 			}
 		},
-		"@ionic/angular-toolkit": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.3.0.tgz",
-			"integrity": "sha512-GOoAx/cs6Hhl0FiOhZAFPCG3cgz2DbyfYflhWFbi08MLIQD2aCoVg6wIpcBoMHQf4eob5WDDIlbOO0t9LVn3dg==",
+		"@types/swiper": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.2.tgz",
+			"integrity": "sha512-bJzmpMwGaA6elG0/9M3H45Az0IwuuJoUGUXGgH/DVKZOJg3iBtu+djAlBnOXOonAHd5kDsrfdhdxFKOGjzM+Vw==",
+			"dev": true
+		},
+		"@types/uuid": {
+			"version": "3.4.4",
+			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
+			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
 			"dev": true,
 			"requires": {
-				"@schematics/angular": "^7.0.3",
-				"tslib": "^1.9.0",
-				"typescript": "^3.2.4"
+				"@types/node": "*"
+			}
+		},
+		"@types/webpack-sources": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
+			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/source-list-map": "*",
+				"source-map": "^0.6.1"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					},
-					"dependencies": {
-						"typescript": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-							"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-							"dev": true
-						}
-					}
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
 				}
 			}
 		},
-		"@ionic/app-scripts": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.2.tgz",
-			"integrity": "sha512-ZpeAafEboO/xHnmgy61ZOsaMGpoer621YX3q09x+BA2sbcuqOEsMKV91BRZmghoiHlwBB9woxXRyAwuYIAASHw==",
-			"dev": true,
-			"requires": {
-				"@angular-devkit/build-optimizer": "0.0.35",
-				"autoprefixer": "^7.2.6",
-				"chalk": "^2.4.0",
-				"chokidar": "^2.0.4",
-				"clean-css": "^4.1.11",
-				"cross-spawn": "^5.1.0",
-				"dotenv-webpack": "^1.5.7",
-				"express": "^4.16.3",
-				"fs-extra": "^4.0.2",
-				"glob": "^7.1.2",
-				"json-loader": "^0.5.7",
-				"node-sass": "^4.10.0",
-				"os-name": "^2.0.1",
-				"postcss": "^6.0.21",
-				"proxy-middleware": "^0.15.0",
-				"reflect-metadata": "^0.1.10",
-				"rollup": "0.50.0",
-				"rollup-plugin-commonjs": "8.2.6",
-				"rollup-plugin-node-resolve": "3.0.0",
-				"source-map": "^0.6.1",
-				"tiny-lr": "^1.1.1",
-				"tslint": "^5.8.0",
-				"tslint-eslint-rules": "^4.1.1",
-				"uglify-es": "3.2.2",
-				"webpack": "3.12.0",
-				"ws": "3.3.2",
-				"xml2js": "^0.4.19"
-			},
-			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.0.35",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
-					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.1.0",
-						"source-map": "^0.5.6",
-						"typescript": "~2.6.1",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"acorn-dynamic-import": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
-					"dev": true,
-					"requires": {
-						"acorn": "^4.0.3"
-					},
-					"dependencies": {
-						"acorn": {
-							"version": "4.0.13",
-							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-							"dev": true
-						}
-					}
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"autoprefixer": {
-					"version": "7.2.6",
-					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
-					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^2.11.3",
-						"caniuse-lite": "^1.0.30000805",
-						"normalize-range": "^0.1.2",
-						"num2fraction": "^1.2.2",
-						"postcss": "^6.0.17",
-						"postcss-value-parser": "^3.2.3"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"body": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-					"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-					"dev": true,
-					"requires": {
-						"continuable-cache": "^0.3.1",
-						"error": "^7.0.0",
-						"raw-body": "~1.1.0",
-						"safe-json-parse": "~1.0.1"
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"browserslist": {
-					"version": "2.11.3",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30000792",
-						"electron-to-chromium": "^1.3.30"
-					}
-				},
-				"bytes": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-					"dev": true
-				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.12.2",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
-					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^4.0.1",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"enhanced-resolve": {
-					"version": "3.4.1",
-					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"memory-fs": "^0.4.0",
-						"object-assign": "^4.0.1",
-						"tapable": "^0.2.7"
-					}
-				},
-				"execa": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"fs-extra": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"json5": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"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"
-					}
-				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"macos-release": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
-					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
-					"dev": true
-				},
-				"magic-string": {
-					"version": "0.22.5",
-					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
-					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
-					"dev": true,
-					"requires": {
-						"vlq": "^0.2.2"
-					}
-				},
-				"mem": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^1.0.0"
-					}
-				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"os-locale": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-					"dev": true,
-					"requires": {
-						"execa": "^0.7.0",
-						"lcid": "^1.0.0",
-						"mem": "^1.1.0"
-					}
-				},
-				"os-name": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
-					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
-					"dev": true,
-					"requires": {
-						"macos-release": "^1.0.0",
-						"win-release": "^1.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-					"dev": true,
-					"requires": {
-						"p-limit": "^1.1.0"
-					}
-				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.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
-				},
-				"postcss": {
-					"version": "6.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.1",
-						"source-map": "^0.6.1",
-						"supports-color": "^5.4.0"
-					}
-				},
-				"raw-body": {
-					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-					"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-					"dev": true,
-					"requires": {
-						"bytes": "1",
-						"string_decoder": "0.10"
-					}
-				},
-				"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"
-					}
-				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-					"dev": true,
-					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				},
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				},
-				"rollup-plugin-commonjs": {
-					"version": "8.2.6",
-					"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
-					"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.2.1",
-						"estree-walker": "^0.5.0",
-						"magic-string": "^0.22.4",
-						"resolve": "^1.4.0",
-						"rollup-pluginutils": "^2.0.1"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				},
-				"tapable": {
-					"version": "0.2.9",
-					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
-					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
-					"dev": true
-				},
-				"tiny-lr": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-					"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-					"dev": true,
-					"requires": {
-						"body": "^5.1.0",
-						"debug": "^3.1.0",
-						"faye-websocket": "~0.10.0",
-						"livereload-js": "^2.3.0",
-						"object-assign": "^4.1.0",
-						"qs": "^6.4.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.6.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
-					"dev": true
-				},
-				"uglify-es": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
-					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
-					"dev": true,
-					"requires": {
-						"commander": "~2.12.1",
-						"source-map": "~0.6.1"
-					}
-				},
-				"uglifyjs-webpack-plugin": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-					"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
-					"dev": true,
-					"requires": {
-						"source-map": "^0.5.6",
-						"uglify-js": "^2.8.29",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"uglify-js": {
-							"version": "2.8.29",
-							"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-							"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-							"dev": true,
-							"requires": {
-								"source-map": "~0.5.1",
-								"uglify-to-browserify": "~1.0.0",
-								"yargs": "~3.10.0"
-							}
-						},
-						"yargs": {
-							"version": "3.10.0",
-							"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-							"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-							"dev": true,
-							"requires": {
-								"camelcase": "^1.0.2",
-								"cliui": "^2.1.0",
-								"decamelize": "^1.0.0",
-								"window-size": "0.1.0"
-							}
-						}
-					}
-				},
-				"webpack": {
-					"version": "3.12.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
-					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.0.0",
-						"acorn-dynamic-import": "^2.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"async": "^2.1.2",
-						"enhanced-resolve": "^3.4.0",
-						"escope": "^3.6.0",
-						"interpret": "^1.0.0",
-						"json-loader": "^0.5.4",
-						"json5": "^0.5.1",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"mkdirp": "~0.5.0",
-						"node-libs-browser": "^2.0.0",
-						"source-map": "^0.5.3",
-						"supports-color": "^4.2.1",
-						"tapable": "^0.2.7",
-						"uglifyjs-webpack-plugin": "^0.4.6",
-						"watchpack": "^1.4.0",
-						"webpack-sources": "^1.0.1",
-						"yargs": "^8.0.2"
-					},
-					"dependencies": {
-						"has-flag": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-							"dev": true
-						},
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "4.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-							"dev": true,
-							"requires": {
-								"has-flag": "^2.0.0"
-							}
-						}
-					}
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
-				},
-				"win-release": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
-					"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
-					"dev": true,
-					"requires": {
-						"semver": "^5.0.1"
-					}
-				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true
-				},
-				"ws": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
-					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
-				},
-				"yargs": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0",
-						"cliui": "^3.2.0",
-						"decamelize": "^1.1.1",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^2.0.0",
-						"read-pkg-up": "^2.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1",
-						"yargs-parser": "^7.0.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						},
-						"cliui": {
-							"version": "3.2.0",
-							"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-							"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-							"dev": true,
-							"requires": {
-								"string-width": "^1.0.1",
-								"strip-ansi": "^3.0.1",
-								"wrap-ansi": "^2.0.0"
-							},
-							"dependencies": {
-								"string-width": {
-									"version": "1.0.2",
-									"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-									"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-									"dev": true,
-									"requires": {
-										"code-point-at": "^1.0.0",
-										"is-fullwidth-code-point": "^1.0.0",
-										"strip-ansi": "^3.0.0"
-									}
-								}
-							}
-						}
-					}
-				},
-				"yargs-parser": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						}
-					}
-				}
-			}
-		},
-		"@ionic/core": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.0.0.tgz",
-			"integrity": "sha512-/hW4882TyjcJTiNBYpoLGRYxkQhRidSuVjCL2RvfMS8a7FDQoS2dkje5KBGG+O2TCjtyXE5de1A6HvUgvDqjGA==",
-			"requires": {
-				"ionicons": "4.5.5"
-			}
-		},
-		"@ionic/lab": {
-			"version": "1.0.20",
-			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.20.tgz",
-			"integrity": "sha512-srSpTMb22BYk9qbEnyyb04KwBFpauBn5BksPmJnlPq8oAjNdNzZOuO/L95qKO9OqfIxRqFwpRVfzvI0TMWjCig==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/utils-fs": "1.0.0",
-				"chalk": "^2.3.0",
-				"express": "^4.16.2",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "2.6.9",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-							"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/ng-toolkit": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
-			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.1.0",
-				"chalk": "^2.3.0",
-				"debug": "^4.0.0",
-				"rxjs": "~6.2.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
-					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "0.0.2",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^1.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.0",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
-					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"ncp": "^2.0.0",
-						"through2": "^2.0.3",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"slice-ansi": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"tree-kill": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
-					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
-					"dev": true
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/pro": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
-			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
-		},
-		"@ionic/schematics-angular": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
-			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
-			"dev": true,
-			"requires": {
-				"@schematics/angular": "0.9.0-beta.3",
-				"lodash": "^4.17.5",
-				"tslib": "^1.9.0",
-				"typescript": "3.0.1"
-			},
-			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
-					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
-					"dev": true,
-					"requires": {
-						"ajv": "6.5.3",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.2.2",
-						"source-map": "0.7.3"
-					}
-				},
-				"@angular-devkit/schematics": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
-					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"rxjs": "6.2.2"
-					}
-				},
-				"@schematics/angular": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
-					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"@angular-devkit/schematics": "0.9.0-beta.3",
-						"typescript": "3.0.1"
-					}
-				},
-				"ajv": {
-					"version": "6.5.3",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
-					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^2.0.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"typescript": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
-					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
-					"dev": true
-				}
-			}
-		},
-		"@ionic/storage": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
-			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
-			"requires": {
-				"localforage": "1.7.1",
-				"localforage-cordovasqlitedriver": "1.7.0",
-				"tslib": "^1.7.1"
-			}
-		},
-		"@ionic/utils-network": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.6.tgz",
-			"integrity": "sha512-1aHXzL1PPJDdXLwicu5+Zv0QfWIrKxqGvat4A8zruAjm4oLvIOli5DnUb61VqP2ocAhiI3t39jxtBq9Fb/Gl9w==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.0.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@mrmlnc/readdir-enhanced": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-			"dev": true,
-			"requires": {
-				"call-me-maybe": "^1.0.1",
-				"glob-to-regexp": "^0.3.0"
-			}
-		},
-		"@ngx-progressbar/core": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.1.tgz",
-			"integrity": "sha512-IAbpPbv0RHwnLTqr8JpEOR2mDbia8jTyZdG0yWmyiGoVfIisSs/NkzMDph43pLvWl2aaJ+Bd2BJTdM2olYK4MQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/core": {
-			"version": "11.0.1",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
-			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/http-loader": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
-			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-			"dev": true
-		},
-		"@types/bson": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-1.0.11.tgz",
-			"integrity": "sha512-j+UcCWI+FsbI5/FQP/Kj2CXyplWAz39ktHFkXk84h7dNblKRSoNJs95PZFRd96NQGqsPEPgeclqnznWZr14ZDA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/cordova": {
-			"version": "0.0.34",
-			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-		},
-		"@types/d3-color": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.1.tgz",
-			"integrity": "sha512-xwb1tqvYNWllbHuhMFhiXk63Imf+QNq/dJdmbXmr2wQVnwGenCuj3/0IWJ9hdIFQIqzvhT7T37cvx93jtAsDbQ==",
-			"dev": true
-		},
-		"@types/geojson": {
-			"version": "7946.0.5",
-			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.5.tgz",
-			"integrity": "sha512-rLlMXpd3rdlrp0+xsrda/hFfOpIxgqFcRpk005UKbHtcdFK+QXAjhBAPnvO58qF4O1LdDXrcaiJxMgstCIlcaw==",
-			"dev": true
-		},
-		"@types/googlemaps": {
-			"version": "3.30.16",
-			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.16.tgz",
-			"integrity": "sha512-6OZ64ahLzYfzuSr71y4jAHZXiwxjvvEM2bfF2tzjIc9KUZVbO30SkYa8WewTsR8aM5BFz/uBiNlZ14eRLXYS0g==",
-			"dev": true
-		},
-		"@types/graphql": {
-			"version": "14.0.5",
-			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.0.5.tgz",
-			"integrity": "sha512-bwGYLE0SRy5ZraC91dqI2bxbspfm10kyJ2Yjuvk4OjdGznh7fkoWW+xXZHfFydJaqu9syZi099cpiZw3GlPDiA==",
-			"dev": true
-		},
-		"@types/jasmine": {
-			"version": "3.3.8",
-			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.8.tgz",
-			"integrity": "sha512-BaOFpaddRVV8qykJoWHrHtamml880oh0+DIZWbtJgx0pu+KhDF1gER5hSfCIfzyMrbjMuYFnLUfyo1l0JUVU3Q==",
-			"dev": true
-		},
-		"@types/jasminewd2": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
-			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
-			"dev": true,
-			"requires": {
-				"@types/jasmine": "*"
-			}
-		},
-		"@types/leaflet": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.0.tgz",
-			"integrity": "sha512-ZA+g6XyK/00labaNCWhbhahAOwEf9X4v9cAB0ZBwWjGOj5ewPC8qcdN/M2VsIAfP699Yz3+E7zaaClxmRaf4BQ==",
-			"dev": true,
-			"requires": {
-				"@types/geojson": "*"
-			}
-		},
-		"@types/mongodb": {
-			"version": "3.1.19",
-			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.19.tgz",
-			"integrity": "sha512-H54hQEovAhyLrIZOhPNfGyCCDoTqKsjb8GQBy8nptJqfxrYCp5WVcPJf9v0kfTPR72xOhaz9+WcYxOXWwEg1Vg==",
-			"dev": true,
-			"requires": {
-				"@types/bson": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/mongoose": {
-			"version": "5.3.12",
-			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.12.tgz",
-			"integrity": "sha512-dmZv3H9lXWhLY8XrxJNu+pVUecquReR3AtPxVsnPTcTH/T/YTgxE0zeTavNcqaBUD5XXKtlTy+2VhZxDkn/0Jw==",
-			"dev": true,
-			"requires": {
-				"@types/mongodb": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/node": {
-			"version": "10.12.21",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz",
-			"integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==",
-			"dev": true
-		},
-		"@types/q": {
-			"version": "0.0.32",
-			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
-			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
-			"dev": true
-		},
-		"@types/reflect-metadata": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
-			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
-			"dev": true,
-			"requires": {
-				"reflect-metadata": "*"
-			}
-		},
-		"@types/selenium-webdriver": {
-			"version": "3.0.14",
-			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
-			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
-			"dev": true
-		},
-		"@types/socket.io-client": {
-			"version": "1.4.32",
-			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
-			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
-			"dev": true
-		},
-		"@types/source-list-map": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-			"dev": true
-		},
-		"@types/stripe": {
-			"version": "6.19.5",
-			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.19.5.tgz",
-			"integrity": "sha512-NHSloxUEjergjDO3U5ZOJgURP6H9vPlJGWbwdUOCB/r24vMzZevjGfbUiwR0u51Yum9AId/7VG/qcbq5q/Hcng==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/swiper": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.1.tgz",
-			"integrity": "sha512-kG4moYcEEhAZH2l6ges7JyCit1tBMfQvAar6MLfZTfwZ1bvaTJQU8sxKiJavhoA69bc9A+lNYC2bhhEaVbp35w==",
-			"dev": true
-		},
-		"@types/uuid": {
-			"version": "3.4.4",
-			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
-			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/webpack-sources": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
-			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/source-list-map": "*",
-				"source-map": "^0.6.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"@types/zen-observable": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
-			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
-		},
-		"@webassemblyjs/ast": {
-			"version": "1.7.11",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
-			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
+		"@types/yargs": {
+			"version": "12.0.10",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.10.tgz",
+			"integrity": "sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==",
+			"dev": true
+		},
+		"@types/zen-observable": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
+			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
+		},
+		"@webassemblyjs/ast": {
+			"version": "1.7.11",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
+			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
 			"dev": true,
 			"requires": {
 				"@webassemblyjs/helper-module-context": "1.7.11",
@@ -5817,16 +3096,15 @@
 			"version": "1.3.5",
 			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
 			"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-			"dev": true,
 			"requires": {
 				"mime-types": "~2.1.18",
 				"negotiator": "0.6.1"
 			}
 		},
 		"acorn": {
-			"version": "6.0.6",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.6.tgz",
-			"integrity": "sha512-5M3G/A4uBSMIlfJ+h9W125vJvPFH/zirISsW5qfxF5YzEvXJCtolLoQvM5yZft0DvMcUrPGKPOlgEu55I6iUtA==",
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+			"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
 			"dev": true
 		},
 		"acorn-dynamic-import": {
@@ -5835,6 +3113,12 @@
 			"integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
 			"dev": true
 		},
+		"acorn-walk": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+			"integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+			"dev": true
+		},
 		"adm-zip": {
 			"version": "0.4.13",
 			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz",
@@ -5882,9 +3166,9 @@
 			"dev": true
 		},
 		"ajv-keywords": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.3.0.tgz",
-			"integrity": "sha512-CMzN9S62ZOO4sA/mJZIO4S++ZM7KFWzH3PPWkveLhy4OZ9i1/VatgwWMD46w/XbGCBy7Ye0gCk+Za6mmyfKK7g==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+			"integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
 			"dev": true
 		},
 		"align-text": {
@@ -5908,6 +3192,11 @@
 			"resolved": "https://registry.npmjs.org/angular2-logger/-/angular2-logger-0.7.0.tgz",
 			"integrity": "sha512-fB2ucBEKqJ6K+PyQEVKwIZhwcB2NvxPashHJEBGTG5Ex+NhC2xUNDhd1AILX+ZIRi3hz6QEKzbqGAxmusdUCkw=="
 		},
+		"ansi": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+			"integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
+		},
 		"ansi-align": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
@@ -5918,9 +3207,9 @@
 			}
 		},
 		"ansi-colors": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-			"integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+			"integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
 			"dev": true
 		},
 		"ansi-escapes": {
@@ -5953,7 +3242,6 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
 			"requires": {
 				"color-convert": "^1.9.0"
 			}
@@ -6332,102 +3620,121 @@
 			}
 		},
 		"apollo-angular-link-http": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.4.0.tgz",
-			"integrity": "sha512-YMtk4ZmmQ32kvQVnKNhkqk4QQQ+xb5aaq5XVxLv7AX6S7jDfHDLi18Hc25C4c8revM6gLoGV2Xj9ijvyGGbRCg==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz",
+			"integrity": "sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==",
 			"requires": {
-				"apollo-angular-link-http-common": "~1.4.0",
+				"apollo-angular-link-http-common": "~1.5.0",
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-angular-link-http-common": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.4.0.tgz",
-			"integrity": "sha512-VAneRp1YYwaggOKgbMGVSuLMpYroLL6tEgS5WH3iNBg4P7cBcubo3uajWRih7E4pZlzX+bCJ5GNqNDJ6xMFT7Q==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.1.tgz",
+			"integrity": "sha512-uSA7dDZpum9FCocxhrp24mL9EUGYWr2mgW9Tb5uea0eYU3UDmjYSKT/sBSLGQN87P5drXbYrmSj58PtCWmhIMA==",
 			"requires": {
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-cache": {
-			"version": "1.1.25",
-			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.25.tgz",
-			"integrity": "sha512-9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz",
+			"integrity": "sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==",
 			"requires": {
-				"apollo-utilities": "^1.1.2",
+				"apollo-utilities": "^1.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-cache-inmemory": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.2.tgz",
-			"integrity": "sha512-fDVmj5j1e3W+inyuSwjIcMgbQ4edcFgmiKTBMFAEKAq0jg33X7FrbDX8JT2t5Vuf75Mva50JDlt5wXdu7C6WuA==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz",
+			"integrity": "sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==",
 			"requires": {
-				"apollo-cache": "^1.1.25",
-				"apollo-utilities": "^1.1.2",
+				"apollo-cache": "^1.2.1",
+				"apollo-utilities": "^1.2.1",
 				"optimism": "^0.6.9",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-client": {
-			"version": "2.4.12",
-			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.12.tgz",
-			"integrity": "sha512-E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w==",
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz",
+			"integrity": "sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==",
 			"requires": {
 				"@types/zen-observable": "^0.8.0",
-				"apollo-cache": "1.1.25",
+				"apollo-cache": "1.2.1",
 				"apollo-link": "^1.0.0",
 				"apollo-link-dedup": "^1.0.0",
-				"apollo-utilities": "1.1.2",
+				"apollo-utilities": "1.2.1",
 				"symbol-observable": "^1.0.2",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"apollo-link": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.8.tgz",
-			"integrity": "sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==",
+			"version": "1.2.11",
+			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.11.tgz",
+			"integrity": "sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==",
 			"requires": {
-				"zen-observable-ts": "^0.8.15"
+				"apollo-utilities": "^1.2.1",
+				"ts-invariant": "^0.3.2",
+				"tslib": "^1.9.3",
+				"zen-observable-ts": "^0.8.18"
+			},
+			"dependencies": {
+				"ts-invariant": {
+					"version": "0.3.2",
+					"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz",
+					"integrity": "sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==",
+					"requires": {
+						"tslib": "^1.9.3"
+					}
+				}
 			}
 		},
 		"apollo-link-context": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.14.tgz",
-			"integrity": "sha512-l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.17.tgz",
+			"integrity": "sha512-W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-dedup": {
-			"version": "1.0.15",
-			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz",
-			"integrity": "sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==",
+			"version": "1.0.18",
+			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz",
+			"integrity": "sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-ws": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz",
-			"integrity": "sha512-KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz",
+			"integrity": "sha512-0PKgahM2BOcUiI3QSJMYXOoUylWKzar5NTZLgMLEW4K/CczOTzC4CTXvKMjh/cx57Jto/U2xzKRy9BEoNfnK5Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-utilities": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.2.tgz",
-			"integrity": "sha512-EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
+			"integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
 			"requires": {
 				"fast-json-stable-stringify": "^2.0.0",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"app-root-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
-			"integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=",
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+			"integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
 			"dev": true
 		},
 		"append-transform": {
@@ -6492,6 +3799,16 @@
 				"sprintf-js": "~1.0.2"
 			}
 		},
+		"aria-query": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+			"integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7",
+				"commander": "^2.11.0"
+			}
+		},
 		"arr-diff": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -6524,12 +3841,6 @@
 			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
 			"dev": true
 		},
-		"array-slice": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-			"integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-			"dev": true
-		},
 		"array-union": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -6623,10 +3934,69 @@
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
 			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
 		},
+		"ast-transform": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/ast-transform/-/ast-transform-0.0.0.tgz",
+			"integrity": "sha1-dJRAWIh9goPhidlUYAlHvJj+AGI=",
+			"dev": true,
+			"requires": {
+				"escodegen": "~1.2.0",
+				"esprima": "~1.0.4",
+				"through": "~2.3.4"
+			},
+			"dependencies": {
+				"escodegen": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz",
+					"integrity": "sha1-Cd55Z3kcyVi3+Jot220jRRrzJ+E=",
+					"dev": true,
+					"requires": {
+						"esprima": "~1.0.4",
+						"estraverse": "~1.5.0",
+						"esutils": "~1.0.0",
+						"source-map": "~0.1.30"
+					}
+				},
+				"esprima": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+					"integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=",
+					"dev": true
+				},
+				"estraverse": {
+					"version": "1.5.1",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+					"integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
+					"integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
 		"ast-types": {
-			"version": "0.11.7",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz",
-			"integrity": "sha512-2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw==",
+			"version": "0.7.8",
+			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.7.8.tgz",
+			"integrity": "sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=",
+			"dev": true
+		},
+		"ast-types-flow": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+			"integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
 			"dev": true
 		},
 		"astral-regex": {
@@ -6692,6 +4062,15 @@
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
 			"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
 		},
+		"axobject-query": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+			"integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7"
+			}
+		},
 		"babel-code-frame": {
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -6774,6 +4153,12 @@
 				"regenerator-runtime": "^0.10.0"
 			},
 			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				},
 				"regenerator-runtime": {
 					"version": "0.10.5",
 					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
@@ -6790,6 +4175,14 @@
 			"requires": {
 				"core-js": "^2.4.0",
 				"regenerator-runtime": "^0.11.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				}
 			}
 		},
 		"babel-template": {
@@ -6850,15 +4243,70 @@
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
 		},
+		"base": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"requires": {
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"requires": {
+						"is-descriptor": "^1.0.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				}
+			}
+		},
 		"base64-arraybuffer": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
 			"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
 		},
 		"base64-js": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
-			"integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+			"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
 			"dev": true
 		},
 		"base64id": {
@@ -6916,6 +4364,11 @@
 				"tryer": "^1.0.0"
 			}
 		},
+		"big-integer": {
+			"version": "1.6.43",
+			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz",
+			"integrity": "sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg=="
+		},
 		"big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -6960,11 +4413,22 @@
 			"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
 			"dev": true
 		},
+		"body": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+			"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+			"dev": true,
+			"requires": {
+				"continuable-cache": "^0.3.1",
+				"error": "^7.0.0",
+				"raw-body": "~1.1.0",
+				"safe-json-parse": "~1.0.1"
+			}
+		},
 		"body-parser": {
 			"version": "1.18.3",
 			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
 			"integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
-			"dev": true,
 			"requires": {
 				"bytes": "3.0.0",
 				"content-type": "~1.0.4",
@@ -6982,7 +4446,6 @@
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
 					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
-					"dev": true,
 					"requires": {
 						"bytes": "3.0.0",
 						"http-errors": "1.6.3",
@@ -7021,9 +4484,9 @@
 			}
 		},
 		"bootstrap": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.2.1.tgz",
-			"integrity": "sha512-tt/7vIv3Gm2mnd/WeDx36nfGGHleil0Wg8IeB7eMrVkY0fZ5iTaBisSh8oNANc2IBsCc6vCgCNTIM/IEN0+50Q=="
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+			"integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
 		},
 		"boxen": {
 			"version": "1.3.0",
@@ -7040,6 +4503,14 @@
 				"widest-line": "^2.0.0"
 			}
 		},
+		"bplist-parser": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+			"integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+			"requires": {
+				"big-integer": "^1.6.7"
+			}
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -7049,12 +4520,60 @@
 				"concat-map": "0.0.1"
 			}
 		},
+		"braces": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+			"requires": {
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"brfs": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz",
+			"integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==",
+			"dev": true,
+			"requires": {
+				"quote-stream": "^1.0.1",
+				"resolve": "^1.1.5",
+				"static-module": "^2.2.0",
+				"through2": "^2.0.0"
+			}
+		},
 		"brorand": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
 			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
 			"dev": true
 		},
+		"brotli": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz",
+			"integrity": "sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=",
+			"dev": true,
+			"requires": {
+				"base64-js": "^1.1.2"
+			}
+		},
 		"browser-resolve": {
 			"version": "1.11.3",
 			"resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
@@ -7062,6 +4581,14 @@
 			"dev": true,
 			"requires": {
 				"resolve": "1.1.7"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.1.7",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+					"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+					"dev": true
+				}
 			}
 		},
 		"browserify-aes": {
@@ -7101,6 +4628,17 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"browserify-optional": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/browserify-optional/-/browserify-optional-1.0.1.tgz",
+			"integrity": "sha1-HhNyLP3g2F8SFnbCpyztUzoBiGk=",
+			"dev": true,
+			"requires": {
+				"ast-transform": "0.0.0",
+				"ast-types": "^0.7.0",
+				"browser-resolve": "^1.8.1"
+			}
+		},
 		"browserify-rsa": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
@@ -7136,14 +4674,14 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz",
-			"integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==",
+			"version": "4.5.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.3.tgz",
+			"integrity": "sha512-Tx/Jtrmh6vFg24AelzLwCaCq1IUJiMDM1x/LPzqbmbktF8Zo7F9ONUpOWsFK6TtdON95mSMaQUWqi0ilc8xM6g==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30000929",
-				"electron-to-chromium": "^1.3.103",
-				"node-releases": "^1.1.3"
+				"caniuse-lite": "^1.0.30000955",
+				"electron-to-chromium": "^1.3.122",
+				"node-releases": "^1.1.12"
 			}
 		},
 		"browserstack": {
@@ -7182,6 +4720,12 @@
 			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
 			"dev": true
 		},
+		"buffer-equal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
+			"integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=",
+			"dev": true
+		},
 		"buffer-fill": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
@@ -7226,8 +4770,36 @@
 		"bytes": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-			"dev": true
+			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+		},
+		"cacache": {
+			"version": "10.0.4",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+			"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.1",
+				"chownr": "^1.0.1",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.1.11",
+				"lru-cache": "^4.1.1",
+				"mississippi": "^2.0.0",
+				"mkdirp": "^0.5.1",
+				"move-concurrently": "^1.0.1",
+				"promise-inflight": "^1.0.1",
+				"rimraf": "^2.6.2",
+				"ssri": "^5.2.4",
+				"unique-filename": "^1.1.0",
+				"y18n": "^4.0.0"
+			},
+			"dependencies": {
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
 		},
 		"cache-base": {
 			"version": "1.0.1",
@@ -7252,9 +4824,9 @@
 			"dev": true
 		},
 		"call-number": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/call-number/-/call-number-0.0.2.tgz",
-			"integrity": "sha1-GWnh1XQt42na7Q9EM4wawhKDcP8="
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/call-number/-/call-number-1.0.1.tgz",
+			"integrity": "sha1-v52q5If9alVz+JqjZV++ivA2r9I="
 		},
 		"caller-callsite": {
 			"version": "2.0.0",
@@ -7316,9 +4888,9 @@
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30000933",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000933.tgz",
-			"integrity": "sha512-d3QXv7eFTU40DSedSP81dV/ajcGSKpT+GW+uhtWmLvQm9bPk0KK++7i1e2NSW/CXGZhWFt2mFbFtCJ5I5bMuVA==",
+			"version": "1.0.30000955",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
+			"integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==",
 			"dev": true
 		},
 		"canonical-path": {
@@ -7352,7 +4924,6 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -7363,7 +4934,6 @@
 					"version": "5.5.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
 					"requires": {
 						"has-flag": "^3.0.0"
 					}
@@ -7382,6 +4952,51 @@
 			"integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
 			"dev": true
 		},
+		"cheerio": {
+			"version": "1.0.0-rc.2",
+			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
+			"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
+			"dev": true,
+			"requires": {
+				"css-select": "~1.2.0",
+				"dom-serializer": "~0.1.0",
+				"entities": "~1.1.1",
+				"htmlparser2": "^3.9.1",
+				"lodash": "^4.15.0",
+				"parse5": "^3.0.1"
+			},
+			"dependencies": {
+				"parse5": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+					"dev": true,
+					"requires": {
+						"@types/node": "*"
+					}
+				}
+			}
+		},
+		"chokidar": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+			"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+			"requires": {
+				"anymatch": "^2.0.0",
+				"async-each": "^1.0.0",
+				"braces": "^2.3.0",
+				"fsevents": "^1.2.2",
+				"glob-parent": "^3.1.0",
+				"inherits": "^2.0.1",
+				"is-binary-path": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"lodash.debounce": "^4.0.8",
+				"normalize-path": "^2.1.1",
+				"path-is-absolute": "^1.0.0",
+				"readdirp": "^2.0.0",
+				"upath": "^1.0.5"
+			}
+		},
 		"chownr": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
@@ -7419,12 +5034,6 @@
 			"integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
 			"dev": true
 		},
-		"circular-json": {
-			"version": "0.5.9",
-			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-			"integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
-			"dev": true
-		},
 		"class-utils": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -7484,6 +5093,34 @@
 			"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
 			"dev": true
 		},
+		"cliui": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+			"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^2.1.1",
+				"strip-ansi": "^4.0.0",
+				"wrap-ansi": "^2.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^3.0.0"
+					}
+				}
+			}
+		},
 		"clone": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
@@ -7515,9 +5152,9 @@
 			"dev": true
 		},
 		"code-block-writer": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.2.2.tgz",
-			"integrity": "sha512-8SyXM1bWsMDCzvCoTdnDBhnnUbHntxcba4ApBIO3S3QX0M2Iq0xZCzs6SYdBOGaSUi4drysvrAK15JoXhlpsvQ==",
+			"version": "7.3.0",
+			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.3.0.tgz",
+			"integrity": "sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==",
 			"dev": true
 		},
 		"code-point-at": {
@@ -7526,17 +5163,20 @@
 			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
 		},
 		"codelyzer": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz",
-			"integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.0.0.tgz",
+			"integrity": "sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==",
 			"dev": true,
 			"requires": {
 				"app-root-path": "^2.1.0",
-				"css-selector-tokenizer": "^0.7.0",
+				"aria-query": "^3.0.0",
+				"axobject-query": "^2.0.2",
+				"css-selector-tokenizer": "^0.7.1",
 				"cssauron": "^1.4.0",
+				"damerau-levenshtein": "^1.0.4",
 				"semver-dsl": "^1.0.1",
 				"source-map": "^0.5.7",
-				"sprintf-js": "^1.1.1"
+				"sprintf-js": "^1.1.2"
 			},
 			"dependencies": {
 				"source-map": {
@@ -7566,7 +5206,6 @@
 			"version": "1.9.3",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
 			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
 			"requires": {
 				"color-name": "1.1.3"
 			}
@@ -7574,550 +5213,290 @@
 		"color-name": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
 		"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
-		},
-		"colors": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-			"dev": true
-		},
-		"combine-lists": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-			"integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.5.0"
-			}
-		},
-		"combined-stream": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
-		"commander": {
-			"version": "2.17.1",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-			"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-			"dev": true
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-			"dev": true
-		},
-		"compare-versions": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
-			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
-			"dev": true
-		},
-		"component-bind": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
-		},
-		"component-emitter": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
-		},
-		"component-inherit": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
-		},
-		"compressible": {
-			"version": "2.0.15",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
-			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
-			"dev": true,
-			"requires": {
-				"mime-db": ">= 1.36.0 < 2"
-			},
-			"dependencies": {
-				"mime-db": {
-					"version": "1.37.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
-					"dev": true
-				}
-			}
-		},
-		"compression": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
-			"dev": true,
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.14",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.1",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			}
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"concat-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
-			}
-		},
-		"configstore": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-			"dev": true,
-			"requires": {
-				"dot-prop": "^4.1.0",
-				"graceful-fs": "^4.1.2",
-				"make-dir": "^1.0.0",
-				"unique-string": "^1.0.0",
-				"write-file-atomic": "^2.0.0",
-				"xdg-basedir": "^3.0.0"
-			}
-		},
-		"connect-history-api-fallback": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-			"dev": true
-		},
-		"console-browserify": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-			"dev": true,
-			"requires": {
-				"date-now": "^0.1.4"
-			}
-		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-		},
-		"constants-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-			"dev": true
-		},
-		"content-disposition": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-			"dev": true
-		},
-		"content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
 			"dev": true
 		},
-		"continuable-cache": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+		"colors": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
 			"dev": true
 		},
-		"convert-source-map": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
-			"dev": true,
+		"combined-stream": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
 			"requires": {
-				"safe-buffer": "~5.1.1"
+				"delayed-stream": "~1.0.0"
 			}
 		},
-		"cookie": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+		"commander": {
+			"version": "2.19.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+			"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
 			"dev": true
 		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+		"commondir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
 			"dev": true
 		},
-		"cookiejar": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+		"compare-versions": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
+			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
 			"dev": true
 		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		"component-bind": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
 		},
-		"cordova-android": {
-			"version": "7.1.4",
-			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
-			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
-			"requires": {
-				"abbrev": "*",
-				"android-versions": "1.4.0",
-				"ansi": "*",
-				"balanced-match": "*",
-				"base64-js": "1.2.0",
-				"big-integer": "1.6.32",
-				"bplist-parser": "*",
-				"brace-expansion": "*",
-				"concat-map": "*",
-				"cordova-common": "2.2.5",
-				"cordova-registry-mapper": "*",
-				"elementtree": "0.1.6",
-				"glob": "5.0.15",
-				"inflight": "*",
-				"inherits": "*",
-				"minimatch": "*",
-				"nopt": "3.0.1",
-				"once": "*",
-				"path-is-absolute": "1.0.1",
-				"plist": "2.1.0",
-				"properties-parser": "0.2.3",
-				"q": "1.4.1",
-				"sax": "0.3.5",
-				"semver": "5.5.0",
-				"shelljs": "0.5.3",
-				"underscore": "*",
-				"unorm": "*",
-				"wrappy": "*",
-				"xmlbuilder": "8.2.2",
-				"xmldom": "*"
-			},
-			"dependencies": {
-				"abbrev": {
-					"version": "1.1.1",
-					"bundled": true
-				},
-				"android-versions": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"semver": "^5.4.1"
-					}
-				},
-				"ansi": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"base64-js": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"bundled": true
-				},
-				"cordova-common": {
-					"version": "2.2.5",
-					"bundled": true,
-					"requires": {
-						"ansi": "^0.3.1",
-						"bplist-parser": "^0.1.0",
-						"cordova-registry-mapper": "^1.1.8",
-						"elementtree": "0.1.6",
-						"glob": "^5.0.13",
-						"minimatch": "^3.0.0",
-						"plist": "^2.1.0",
-						"q": "^1.4.1",
-						"shelljs": "^0.5.3",
-						"underscore": "^1.8.3",
-						"unorm": "^1.3.3"
-					}
-				},
-				"cordova-registry-mapper": {
-					"version": "1.1.15",
-					"bundled": true
-				},
-				"elementtree": {
-					"version": "0.1.6",
-					"bundled": true,
-					"requires": {
-						"sax": "0.3.5"
-					}
-				},
-				"glob": {
-					"version": "5.0.15",
-					"bundled": true,
-					"requires": {
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "2 || 3",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"inflight": {
-					"version": "1.0.6",
-					"bundled": true,
-					"requires": {
-						"once": "^1.3.0",
-						"wrappy": "1"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"bundled": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"bundled": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"nopt": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"abbrev": "1"
-					}
-				},
-				"once": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"properties-parser": {
-					"version": "0.2.3",
-					"bundled": true
-				},
-				"q": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"semver": {
-					"version": "5.5.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"underscore": {
-					"version": "1.9.1",
-					"bundled": true
-				},
-				"unorm": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"wrappy": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"xmlbuilder": {
-					"version": "8.2.2",
-					"bundled": true
-				},
-				"xmldom": {
-					"version": "0.1.27",
-					"bundled": true
+		"component-emitter": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+		},
+		"component-inherit": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
+		},
+		"compressible": {
+			"version": "2.0.15",
+			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
+			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
+			"requires": {
+				"mime-db": ">= 1.36.0 < 2"
+			},
+			"dependencies": {
+				"mime-db": {
+					"version": "1.37.0",
+					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
+					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
 				}
 			}
 		},
-		"cordova-android-support-gradle-release": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
-			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+		"compression": {
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
 			"requires": {
-				"semver": "5.1.0",
-				"xml2js": "~0.4.19"
+				"accepts": "~1.3.5",
+				"bytes": "3.0.0",
+				"compressible": "~2.0.14",
+				"debug": "2.6.9",
+				"on-headers": "~1.0.1",
+				"safe-buffer": "5.1.2",
+				"vary": "~1.1.2"
+			}
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+		},
+		"concat-stream": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+			"dev": true,
+			"requires": {
+				"buffer-from": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.2.2",
+				"typedarray": "^0.0.6"
+			}
+		},
+		"configstore": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
+			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+			"dev": true,
+			"requires": {
+				"dot-prop": "^4.1.0",
+				"graceful-fs": "^4.1.2",
+				"make-dir": "^1.0.0",
+				"unique-string": "^1.0.0",
+				"write-file-atomic": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			}
+		},
+		"connect": {
+			"version": "3.6.6",
+			"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+			"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+			"dev": true,
+			"requires": {
+				"debug": "2.6.9",
+				"finalhandler": "1.1.0",
+				"parseurl": "~1.3.2",
+				"utils-merge": "1.0.1"
 			},
 			"dependencies": {
-				"semver": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
-					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				"finalhandler": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"encodeurl": "~1.0.1",
+						"escape-html": "~1.0.3",
+						"on-finished": "~2.3.0",
+						"parseurl": "~1.3.2",
+						"statuses": "~1.3.1",
+						"unpipe": "~1.0.0"
+					}
+				},
+				"statuses": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+					"dev": true
 				}
 			}
 		},
-		"cordova-browser": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-5.0.4.tgz",
-			"integrity": "sha512-EDuG+9NGsaYpNSY6wF0kR34m1m38V+nRglGXxQ609fgMYrMHEYR2lg38nDr1Os4qeF0LJz8UQ7nq7Y+idg6Aig==",
+		"connect-history-api-fallback": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+			"dev": true
+		},
+		"console-browserify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+			"dev": true,
+			"requires": {
+				"date-now": "^0.1.4"
+			}
+		},
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+		},
+		"constants-browserify": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+			"dev": true
+		},
+		"content-disposition": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+		},
+		"content-type": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+		},
+		"continuable-cache": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+			"dev": true
+		},
+		"convert-source-map": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"cookie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+		},
+		"cookie-signature": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+		},
+		"cookiejar": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+			"dev": true
+		},
+		"copy-concurrently": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"fs-write-stream-atomic": "^1.0.8",
+				"iferr": "^0.1.5",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.0"
+			}
+		},
+		"copy-descriptor": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		},
+		"copy-webpack-plugin": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+			"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+			"dev": true,
+			"requires": {
+				"cacache": "^10.0.4",
+				"find-cache-dir": "^1.0.0",
+				"globby": "^7.1.1",
+				"is-glob": "^4.0.0",
+				"loader-utils": "^1.1.0",
+				"minimatch": "^3.0.4",
+				"p-limit": "^1.0.0",
+				"serialize-javascript": "^1.4.0"
+			}
+		},
+		"cordova-android": {
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
+			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
 			"requires": {
 				"abbrev": "*",
-				"accepts": "*",
+				"android-versions": "1.4.0",
 				"ansi": "*",
-				"ansi-regex": "2.1.1",
-				"ansi-styles": "2.2.1",
-				"array-flatten": "1.1.1",
 				"balanced-match": "*",
 				"base64-js": "1.2.0",
-				"big-integer": "*",
-				"body-parser": "1.18.2",
+				"big-integer": "1.6.32",
 				"bplist-parser": "*",
 				"brace-expansion": "*",
-				"bytes": "*",
-				"chalk": "1.1.3",
-				"compressible": "*",
-				"compression": "1.7.2",
 				"concat-map": "*",
-				"content-disposition": "*",
-				"content-type": "*",
-				"cookie": "*",
-				"cookie-signature": "1.0.6",
 				"cordova-common": "2.2.5",
 				"cordova-registry-mapper": "*",
-				"cordova-serve": "2.0.1",
-				"debug": "2.6.9",
-				"depd": "*",
-				"destroy": "*",
-				"ee-first": "*",
 				"elementtree": "0.1.6",
-				"encodeurl": "*",
-				"escape-html": "*",
-				"escape-string-regexp": "*",
-				"etag": "*",
-				"express": "*",
-				"finalhandler": "*",
-				"forwarded": "*",
-				"fresh": "*",
 				"glob": "5.0.15",
-				"has-ansi": "2.0.0",
-				"http-errors": "1.6.3",
-				"iconv-lite": "0.4.19",
 				"inflight": "*",
 				"inherits": "*",
-				"ipaddr.js": "1.6.0",
-				"is-wsl": "*",
-				"media-typer": "*",
-				"merge-descriptors": "*",
-				"methods": "*",
-				"mime": "1.4.1",
-				"mime-db": "1.33.0",
-				"mime-types": "2.1.18",
 				"minimatch": "*",
-				"ms": "2.0.0",
-				"negotiator": "*",
-				"nopt": "3.0.6",
-				"on-finished": "*",
-				"on-headers": "*",
+				"nopt": "3.0.1",
 				"once": "*",
-				"opn": "*",
-				"parseurl": "*",
-				"path-is-absolute": "*",
-				"path-to-regexp": "0.1.7",
+				"path-is-absolute": "1.0.1",
 				"plist": "2.1.0",
-				"proxy-addr": "2.0.3",
-				"q": "*",
-				"qs": "6.5.1",
-				"range-parser": "*",
-				"raw-body": "2.3.2",
-				"safe-buffer": "5.1.1",
+				"properties-parser": "0.2.3",
+				"q": "1.4.1",
 				"sax": "0.3.5",
-				"send": "*",
-				"serve-static": "*",
-				"setprototypeof": "*",
+				"semver": "5.5.0",
 				"shelljs": "0.5.3",
-				"statuses": "1.4.0",
-				"strip-ansi": "3.0.1",
-				"supports-color": "2.0.0",
-				"type-is": "*",
 				"underscore": "*",
 				"unorm": "*",
-				"unpipe": "*",
-				"utils-merge": "*",
-				"vary": "*",
 				"wrappy": "*",
 				"xmlbuilder": "8.2.2",
 				"xmldom": "*"
@@ -8127,30 +5506,17 @@
 					"version": "1.1.1",
 					"bundled": true
 				},
-				"accepts": {
-					"version": "1.3.5",
+				"android-versions": {
+					"version": "1.4.0",
 					"bundled": true,
 					"requires": {
-						"mime-types": "~2.1.18",
-						"negotiator": "0.6.1"
+						"semver": "^5.4.1"
 					}
 				},
 				"ansi": {
 					"version": "0.3.1",
 					"bundled": true
 				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"bundled": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"bundled": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true
@@ -8160,101 +5526,28 @@
 					"bundled": true
 				},
 				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"body-parser": {
-					"version": "1.18.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"content-type": "~1.0.4",
-						"debug": "2.6.9",
-						"depd": "~1.1.1",
-						"http-errors": "~1.6.2",
-						"iconv-lite": "0.4.19",
-						"on-finished": "~2.3.0",
-						"qs": "6.5.1",
-						"raw-body": "2.3.2",
-						"type-is": "~1.6.15"
-					}
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"bytes": {
-					"version": "3.0.0",
-					"bundled": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"bundled": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
+					"version": "1.6.32",
+					"bundled": true
 				},
-				"compressible": {
-					"version": "2.0.14",
+				"bplist-parser": {
+					"version": "0.1.1",
 					"bundled": true,
 					"requires": {
-						"mime-db": ">= 1.34.0 < 2"
-					},
-					"dependencies": {
-						"mime-db": {
-							"version": "1.34.0",
-							"bundled": true
-						}
+						"big-integer": "^1.6.7"
 					}
 				},
-				"compression": {
-					"version": "1.7.2",
+				"brace-expansion": {
+					"version": "1.1.11",
 					"bundled": true,
 					"requires": {
-						"accepts": "~1.3.4",
-						"bytes": "3.0.0",
-						"compressible": "~2.0.13",
-						"debug": "2.6.9",
-						"on-headers": "~1.0.1",
-						"safe-buffer": "5.1.1",
-						"vary": "~1.1.2"
+						"balanced-match": "^1.0.0",
+						"concat-map": "0.0.1"
 					}
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true
 				},
-				"content-disposition": {
-					"version": "0.5.2",
-					"bundled": true
-				},
-				"content-type": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"cookie": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"cookie-signature": {
-					"version": "1.0.6",
-					"bundled": true
-				},
 				"cordova-common": {
 					"version": "2.2.5",
 					"bundled": true,
@@ -8276,36 +5569,6 @@
 					"version": "1.1.15",
 					"bundled": true
 				},
-				"cordova-serve": {
-					"version": "2.0.1",
-					"bundled": true,
-					"requires": {
-						"chalk": "^1.1.1",
-						"compression": "^1.6.0",
-						"express": "^4.13.3",
-						"opn": "^5.3.0",
-						"shelljs": "^0.5.3"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"bundled": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"destroy": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"ee-first": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"elementtree": {
 					"version": "0.1.6",
 					"bundled": true,
@@ -8313,79 +5576,6 @@
 						"sax": "0.3.5"
 					}
 				},
-				"encodeurl": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"escape-html": {
-					"version": "1.0.3",
-					"bundled": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"bundled": true
-				},
-				"etag": {
-					"version": "1.8.1",
-					"bundled": true
-				},
-				"express": {
-					"version": "4.16.3",
-					"bundled": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.2",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.3",
-						"qs": "6.5.1",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.1",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.1",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.4.0",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"forwarded": {
-					"version": "0.1.2",
-					"bundled": true
-				},
-				"fresh": {
-					"version": "0.5.2",
-					"bundled": true
-				},
 				"glob": {
 					"version": "5.0.15",
 					"bundled": true,
@@ -8397,27 +5587,6 @@
 						"path-is-absolute": "^1.0.0"
 					}
 				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"bundled": true,
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"bundled": true
-				},
 				"inflight": {
 					"version": "1.0.6",
 					"bundled": true,
@@ -8430,41 +5599,6 @@
 					"version": "2.0.3",
 					"bundled": true
 				},
-				"ipaddr.js": {
-					"version": "1.6.0",
-					"bundled": true
-				},
-				"is-wsl": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"media-typer": {
-					"version": "0.3.0",
-					"bundled": true
-				},
-				"merge-descriptors": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"methods": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"mime-db": {
-					"version": "1.33.0",
-					"bundled": true
-				},
-				"mime-types": {
-					"version": "2.1.18",
-					"bundled": true,
-					"requires": {
-						"mime-db": "~1.33.0"
-					}
-				},
 				"minimatch": {
 					"version": "3.0.4",
 					"bundled": true,
@@ -8472,32 +5606,13 @@
 						"brace-expansion": "^1.1.7"
 					}
 				},
-				"ms": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"negotiator": {
-					"version": "0.6.1",
-					"bundled": true
-				},
 				"nopt": {
-					"version": "3.0.6",
+					"version": "3.0.1",
 					"bundled": true,
 					"requires": {
 						"abbrev": "1"
 					}
 				},
-				"on-finished": {
-					"version": "2.3.0",
-					"bundled": true,
-					"requires": {
-						"ee-first": "1.1.1"
-					}
-				},
-				"on-headers": {
-					"version": "1.0.1",
-					"bundled": true
-				},
 				"once": {
 					"version": "1.4.0",
 					"bundled": true,
@@ -8505,170 +5620,45 @@
 						"wrappy": "1"
 					}
 				},
-				"opn": {
-					"version": "5.3.0",
-					"bundled": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parseurl": {
-					"version": "1.3.2",
-					"bundled": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"path-to-regexp": {
-					"version": "0.1.7",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"proxy-addr": {
-					"version": "2.0.3",
-					"bundled": true,
-					"requires": {
-						"forwarded": "~0.1.2",
-						"ipaddr.js": "1.6.0"
-					}
-				},
-				"q": {
-					"version": "1.5.1",
-					"bundled": true
-				},
-				"qs": {
-					"version": "6.5.1",
-					"bundled": true
-				},
-				"range-parser": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"raw-body": {
-					"version": "2.3.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"http-errors": "1.6.2",
-						"iconv-lite": "0.4.19",
-						"unpipe": "1.0.0"
-					},
-					"dependencies": {
-						"depd": {
-							"version": "1.1.1",
-							"bundled": true
-						},
-						"http-errors": {
-							"version": "1.6.2",
-							"bundled": true,
-							"requires": {
-								"depd": "1.1.1",
-								"inherits": "2.0.3",
-								"setprototypeof": "1.0.3",
-								"statuses": ">= 1.3.1 < 2"
-							}
-						},
-						"setprototypeof": {
-							"version": "1.0.3",
-							"bundled": true
-						}
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"send": {
-					"version": "0.16.2",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					}
-				},
-				"serve-static": {
-					"version": "1.13.2",
-					"bundled": true,
-					"requires": {
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"parseurl": "~1.3.2",
-						"send": "0.16.2"
-					}
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"statuses": {
-					"version": "1.4.0",
-					"bundled": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
+				"path-is-absolute": {
+					"version": "1.0.1",
 					"bundled": true
 				},
-				"type-is": {
-					"version": "1.6.16",
+				"plist": {
+					"version": "2.1.0",
 					"bundled": true,
 					"requires": {
-						"media-typer": "0.3.0",
-						"mime-types": "~2.1.18"
+						"base64-js": "1.2.0",
+						"xmlbuilder": "8.2.2",
+						"xmldom": "0.1.x"
 					}
 				},
-				"underscore": {
-					"version": "1.9.1",
+				"properties-parser": {
+					"version": "0.2.3",
 					"bundled": true
 				},
-				"unorm": {
+				"q": {
 					"version": "1.4.1",
 					"bundled": true
 				},
-				"unpipe": {
-					"version": "1.0.0",
+				"sax": {
+					"version": "0.3.5",
 					"bundled": true
 				},
-				"utils-merge": {
-					"version": "1.0.1",
+				"semver": {
+					"version": "5.5.0",
 					"bundled": true
 				},
-				"vary": {
-					"version": "1.1.2",
+				"shelljs": {
+					"version": "0.5.3",
+					"bundled": true
+				},
+				"underscore": {
+					"version": "1.9.1",
+					"bundled": true
+				},
+				"unorm": {
+					"version": "1.4.1",
 					"bundled": true
 				},
 				"wrappy": {
@@ -8685,6 +5675,69 @@
 				}
 			}
 		},
+		"cordova-android-support-gradle-release": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
+			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+			"requires": {
+				"semver": "5.1.0",
+				"xml2js": "~0.4.19"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
+					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				}
+			}
+		},
+		"cordova-browser": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-6.0.0.tgz",
+			"integrity": "sha512-G61S7fhnVVJC98lvkGeKCVpfFtoW0a1P1Sg9TK+n03g3yupDMIM7XuecWuJ3KEMRhED4+CEc2hauruAff7oXrw==",
+			"requires": {
+				"cordova-common": "^3.1.0",
+				"cordova-serve": "^3.0.0",
+				"nopt": "^4.0.1",
+				"shelljs": "^0.5.3"
+			},
+			"dependencies": {
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				},
+				"shelljs": {
+					"version": "0.5.3",
+					"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+					"integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
+				}
+			}
+		},
+		"cordova-common": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.1.0.tgz",
+			"integrity": "sha512-J2MM1ioyLlBYdwdXH40OZL4hN7XEBOfurddKYifF4aTkb2PkbeM+KVORt53eyU+8ScA0QmRLuTG0EM55eLms0A==",
+			"requires": {
+				"ansi": "^0.3.1",
+				"bplist-parser": "^0.1.0",
+				"cross-spawn": "^6.0.5",
+				"elementtree": "0.1.7",
+				"endent": "^1.1.1",
+				"fs-extra": "^7.0.0",
+				"glob": "^7.1.2",
+				"minimatch": "^3.0.0",
+				"plist": "^3.0.1",
+				"q": "^1.4.1",
+				"strip-bom": "^3.0.0",
+				"underscore": "^1.8.3",
+				"which": "^1.3.0"
+			}
+		},
 		"cordova-plugin-appavailability": {
 			"version": "0.4.2",
 			"resolved": "https://registry.npmjs.org/cordova-plugin-appavailability/-/cordova-plugin-appavailability-0.4.2.tgz",
@@ -8731,9 +5784,9 @@
 			"integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ=="
 		},
 		"cordova-plugin-ionic-webview": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-3.1.1.tgz",
-			"integrity": "sha512-dVRTvotXa1c63P55ckE/uejVlNOQU+wCLp5KANAFEYW1fxNswWJ6AM/NMNh1q9rGSH/hl9Z3C3rTkgYfdqNqDA=="
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.1.tgz",
+			"integrity": "sha512-rJf7jFQNw7l0U4Y7P6DjxwmO/qQgS7xqiTgwDbNFS4z4+FZ3EZyupll7/cFEDnxGRNMgWsMKDhIABUo5mIDaUQ=="
 		},
 		"cordova-plugin-mixpanel": {
 			"version": "4.5.2",
@@ -8765,10 +5818,22 @@
 			"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
 			"integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q="
 		},
+		"cordova-serve": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-3.0.0.tgz",
+			"integrity": "sha512-h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w==",
+			"requires": {
+				"chalk": "^2.4.1",
+				"compression": "^1.6.0",
+				"express": "^4.13.3",
+				"opn": "^5.3.0",
+				"which": "^1.3.0"
+			}
+		},
 		"core-js": {
-			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
-			"integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ=="
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz",
+			"integrity": "sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ=="
 		},
 		"core-util-is": {
 			"version": "1.0.2",
@@ -8785,6 +5850,18 @@
 				"vary": "^1"
 			}
 		},
+		"cosmiconfig": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+			"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+			"dev": true,
+			"requires": {
+				"is-directory": "^0.3.1",
+				"js-yaml": "^3.9.0",
+				"parse-json": "^4.0.0",
+				"require-from-string": "^2.0.1"
+			}
+		},
 		"cpr": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz",
@@ -8843,6 +5920,28 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"cross-env": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz",
+			"integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.5",
+				"is-windows": "^1.0.0"
+			}
+		},
+		"cross-spawn": {
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"requires": {
+				"nice-try": "^1.0.4",
+				"path-key": "^2.0.1",
+				"semver": "^5.5.0",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			}
+		},
 		"cryptiles": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-4.1.3.tgz",
@@ -8870,6 +5969,12 @@
 				"randomfill": "^1.0.3"
 			}
 		},
+		"crypto-js": {
+			"version": "3.1.9-1",
+			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
+			"integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=",
+			"dev": true
+		},
 		"crypto-random-string": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -8906,9 +6011,9 @@
 			}
 		},
 		"css-what": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz",
-			"integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+			"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
 			"dev": true
 		},
 		"cssauron": {
@@ -8955,6 +6060,12 @@
 				"es5-ext": "^0.10.9"
 			}
 		},
+		"damerau-levenshtein": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
+			"integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=",
+			"dev": true
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -8973,17 +6084,17 @@
 			},
 			"dependencies": {
 				"@types/node": {
-					"version": "8.10.39",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.39.tgz",
-					"integrity": "sha512-rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA==",
+					"version": "8.10.45",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz",
+					"integrity": "sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==",
 					"dev": true
 				}
 			}
 		},
 		"date-format": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-			"integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
+			"integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==",
 			"dev": true
 		},
 		"date-now": {
@@ -9010,11 +6121,15 @@
 			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
 			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
 		},
+		"dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+		},
 		"deep-equal": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-			"dev": true
+			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
 		},
 		"deep-extend": {
 			"version": "0.6.0",
@@ -9036,36 +6151,6 @@
 			"requires": {
 				"execa": "^0.10.0",
 				"ip-regex": "^2.1.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"default-require-extensions": {
@@ -9077,6 +6162,14 @@
 				"strip-bom": "^3.0.0"
 			}
 		},
+		"define-properties": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+			"requires": {
+				"object-keys": "^1.0.12"
+			}
+		},
 		"define-property": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -9119,6 +6212,67 @@
 				}
 			}
 		},
+		"defined": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+			"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+		},
+		"degenerator": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
+			"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+			"dev": true,
+			"requires": {
+				"ast-types": "0.x.x",
+				"escodegen": "1.x.x",
+				"esprima": "3.x.x"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				}
+			}
+		},
+		"del": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+			"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+			"dev": true,
+			"requires": {
+				"globby": "^6.1.0",
+				"is-path-cwd": "^1.0.0",
+				"is-path-in-cwd": "^1.0.0",
+				"p-map": "^1.1.1",
+				"pify": "^3.0.0",
+				"rimraf": "^2.2.8"
+			},
+			"dependencies": {
+				"globby": {
+					"version": "6.1.0",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+					"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"glob": "^7.0.3",
+						"object-assign": "^4.0.1",
+						"pify": "^2.0.0",
+						"pinkie-promise": "^2.0.0"
+					},
+					"dependencies": {
+						"pify": {
+							"version": "2.3.0",
+							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+							"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+							"dev": true
+						}
+					}
+				}
+			}
+		},
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -9132,8 +6286,7 @@
 		"depd": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-			"dev": true
+			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
 		},
 		"dependency-graph": {
 			"version": "0.7.2",
@@ -9154,8 +6307,7 @@
 		"destroy": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-			"dev": true
+			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
 		},
 		"detect-indent": {
 			"version": "4.0.0",
@@ -9172,6 +6324,15 @@
 			"integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
 			"dev": true
 		},
+		"dfa": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/dfa/-/dfa-1.1.0.tgz",
+			"integrity": "sha1-0wIYvRDQMPpCHfPrvIIoVGOjF4E=",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6"
+			}
+		},
 		"di": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -9271,27 +6432,19 @@
 			}
 		},
 		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+			"integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "~1.1.1",
-				"entities": "~1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-					"dev": true
-				}
+				"domelementtype": "^1.3.0",
+				"entities": "^1.1.1"
 			}
 		},
 		"dom7": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.2.tgz",
-			"integrity": "sha512-cGwWtpu7KY3JnbREGqG4EGC/u+1hyLfWVMqrqRjmwiO8d5i4B+0imLZAQ/cJbiXnjbs0pdIUzcUyeI9BbnyKNg==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
+			"integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
 			"requires": {
 				"ssr-window": "^1.0.1"
 			}
@@ -9343,9 +6496,9 @@
 			}
 		},
 		"dotenv": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-			"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
+			"integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==",
 			"dev": true
 		},
 		"dotenv-defaults": {
@@ -9355,6 +6508,14 @@
 			"dev": true,
 			"requires": {
 				"dotenv": "^6.2.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
 			}
 		},
 		"dotenv-webpack": {
@@ -9413,41 +6574,15 @@
 			"dev": true
 		},
 		"duplexify": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
-			"integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
 			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.0.0",
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0",
 				"stream-shift": "^1.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ecc-jsbn": {
@@ -9462,8 +6597,7 @@
 		"ee-first": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-			"dev": true
+			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
 		},
 		"ejs": {
 			"version": "2.6.1",
@@ -9472,16 +6606,15 @@
 			"dev": true
 		},
 		"electron-to-chromium": {
-			"version": "1.3.112",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.112.tgz",
-			"integrity": "sha512-FyVLdiRZnLw2WE5ECtveN0JJ7klyiz/HMfKE1/Rjff3l7pe4vfkYtBlcCqTckvR8E7asjJGh0m9gRPR3Anp/UA==",
+			"version": "1.3.122",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
+			"integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw==",
 			"dev": true
 		},
 		"elementtree": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
 			"integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
-			"dev": true,
 			"requires": {
 				"sax": "1.1.4"
 			},
@@ -9489,8 +6622,7 @@
 				"sax": {
 					"version": "1.1.4",
 					"resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
-					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=",
-					"dev": true
+					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
 				}
 			}
 		},
@@ -9523,8 +6655,7 @@
 		"encodeurl": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-			"dev": true
+			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
 		},
 		"encoding": {
 			"version": "0.1.12",
@@ -9543,6 +6674,16 @@
 				"once": "^1.4.0"
 			}
 		},
+		"endent": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz",
+			"integrity": "sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==",
+			"requires": {
+				"dedent": "^0.7.0",
+				"fast-json-parse": "^1.0.3",
+				"objectorarray": "^1.0.3"
+			}
+		},
 		"engine.io": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
@@ -9579,6 +6720,47 @@
 				}
 			}
 		},
+		"engine.io-client": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+			"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "1.2.1",
+				"component-inherit": "0.0.3",
+				"debug": "~3.1.0",
+				"engine.io-parser": "~2.1.1",
+				"has-cors": "1.1.0",
+				"indexof": "0.0.1",
+				"parseqs": "0.0.5",
+				"parseuri": "0.0.5",
+				"ws": "~3.3.1",
+				"xmlhttprequest-ssl": "~1.5.4",
+				"yeast": "0.1.2"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"ws": {
+					"version": "3.3.3",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
+				}
+			}
+		},
 		"engine.io-parser": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
@@ -9600,42 +6782,6 @@
 				"graceful-fs": "^4.1.2",
 				"memory-fs": "^0.4.0",
 				"tapable": "^1.0.0"
-			},
-			"dependencies": {
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ent": {
@@ -9650,6 +6796,26 @@
 			"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
 			"dev": true
 		},
+		"envalid": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/envalid/-/envalid-4.2.2.tgz",
+			"integrity": "sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.4.1",
+				"dotenv": "^6.2.0",
+				"meant": "^1.0.1",
+				"validator": "^10.11.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
+			}
+		},
 		"err-code": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
@@ -9683,15 +6849,38 @@
 				"is-arrayish": "^0.2.1"
 			}
 		},
+		"es-abstract": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+			"integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+			"requires": {
+				"es-to-primitive": "^1.2.0",
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"is-callable": "^1.1.4",
+				"is-regex": "^1.0.4",
+				"object-keys": "^1.0.12"
+			}
+		},
+		"es-to-primitive": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+			"integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+			"requires": {
+				"is-callable": "^1.1.4",
+				"is-date-object": "^1.0.1",
+				"is-symbol": "^1.0.2"
+			}
+		},
 		"es5-ext": {
-			"version": "0.10.47",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz",
-			"integrity": "sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==",
+			"version": "0.10.49",
+			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz",
+			"integrity": "sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==",
 			"dev": true,
 			"requires": {
 				"es6-iterator": "~2.0.3",
 				"es6-symbol": "~3.1.1",
-				"next-tick": "1"
+				"next-tick": "^1.0.0"
 			}
 		},
 		"es6-iterator": {
@@ -9772,14 +6961,41 @@
 		"escape-html": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-			"dev": true
+			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
 		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
 		},
+		"escodegen": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
+			"integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+			"dev": true,
+			"requires": {
+				"esprima": "^3.1.3",
+				"estraverse": "^4.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"escope": {
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
@@ -9790,38 +7006,22 @@
 				"es6-weak-map": "^2.0.1",
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"eslint-scope": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-			"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
 			"dev": true,
 			"requires": {
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"esprima": {
-			"version": "2.7.3",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-			"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true
 		},
 		"esrecurse": {
@@ -9831,20 +7031,12 @@
 			"dev": true,
 			"requires": {
 				"estraverse": "^4.1.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"estraverse": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-			"integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
 			"dev": true
 		},
 		"estree-walker": {
@@ -9861,610 +7053,347 @@
 		},
 		"etag": {
 			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-			"dev": true
-		},
-		"event-emitter": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-			"dev": true,
-			"requires": {
-				"d": "1",
-				"es5-ext": "~0.10.14"
-			}
-		},
-		"event-stream": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
-			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
-			"requires": {
-				"duplexer": "^0.1.1",
-				"from": "^0.1.7",
-				"map-stream": "0.0.7",
-				"pause-stream": "^0.0.11",
-				"split": "^1.0.1",
-				"stream-combiner": "^0.2.2",
-				"through": "^2.3.8"
-			}
-		},
-		"eventemitter3": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
-		},
-		"events": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
-			"dev": true
-		},
-		"eventsource": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-			"dev": true,
-			"requires": {
-				"original": "^1.0.0"
-			}
-		},
-		"evp_bytestokey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-			"dev": true,
-			"requires": {
-				"md5.js": "^1.3.4",
-				"safe-buffer": "^5.1.1"
-			}
-		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
-		"expand-braces": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-			"integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
-			"dev": true,
-			"requires": {
-				"array-slice": "^0.2.3",
-				"array-unique": "^0.2.1",
-				"braces": "^0.1.2"
-			},
-			"dependencies": {
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-					"integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^0.1.0"
-					}
-				},
-				"expand-range": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-					"integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
-					"dev": true,
-					"requires": {
-						"is-number": "^0.1.1",
-						"repeat-string": "^0.2.2"
-					}
-				},
-				"is-number": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-					"integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-					"dev": true
-				},
-				"repeat-string": {
-					"version": "0.2.2",
-					"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-					"integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
-					"dev": true
-				}
-			}
-		},
-		"expand-range": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
-			"requires": {
-				"fill-range": "^2.1.0"
-			},
-			"dependencies": {
-				"fill-range": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-					"integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-					"dev": true,
-					"requires": {
-						"is-number": "^2.1.0",
-						"isobject": "^2.0.0",
-						"randomatic": "^3.0.0",
-						"repeat-element": "^1.1.2",
-						"repeat-string": "^1.5.2"
-					}
-				},
-				"is-number": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-					"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					}
-				},
-				"isobject": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-					"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-					"dev": true,
-					"requires": {
-						"isarray": "1.0.0"
-					}
-				}
-			}
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-		},
-		"extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
-			}
-		},
-		"external-editor": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
-			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
-			"dev": true,
-			"requires": {
-				"chardet": "^0.7.0",
-				"iconv-lite": "^0.4.24",
-				"tmp": "^0.0.33"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
-			}
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
 		},
-		"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==",
+		"event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
 			"dev": true,
 			"requires": {
-				"ansi-gray": "^0.1.1",
-				"color-support": "^1.1.3",
-				"parse-node-version": "^1.0.0",
-				"time-stamp": "^1.0.0"
+				"d": "1",
+				"es5-ext": "~0.10.14"
 			}
 		},
-		"fast-deep-equal": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		"event-stream": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
+			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
+			"requires": {
+				"duplexer": "^0.1.1",
+				"from": "^0.1.7",
+				"map-stream": "0.0.7",
+				"pause-stream": "^0.0.11",
+				"split": "^1.0.1",
+				"stream-combiner": "^0.2.2",
+				"through": "^2.3.8"
+			}
 		},
-		"fast-glob": {
-			"version": "2.2.6",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
-			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+		"eventemitter3": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
+		},
+		"events": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+			"dev": true
+		},
+		"eventsource": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
 			"dev": true,
-			"requires": {
-				"@mrmlnc/readdir-enhanced": "^2.2.1",
-				"@nodelib/fs.stat": "^1.1.2",
-				"glob-parent": "^3.1.0",
-				"is-glob": "^4.0.0",
-				"merge2": "^1.2.3",
-				"micromatch": "^3.1.10"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-					"dev": true,
-					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+			"requires": {
+				"original": "^1.0.0"
+			}
+		},
+		"evp_bytestokey": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+			"dev": true,
+			"requires": {
+				"md5.js": "^1.3.4",
+				"safe-buffer": "^5.1.1"
+			}
+		},
+		"execa": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+			"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.0",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			}
+		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
+		"expand-brackets": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+			"dev": true,
+			"requires": {
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"is-descriptor": "^0.1.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extendable": "^0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
+				}
+			}
+		},
+		"express": {
+			"version": "4.16.4",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
+			"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+			"requires": {
+				"accepts": "~1.3.5",
+				"array-flatten": "1.1.1",
+				"body-parser": "1.18.3",
+				"content-disposition": "0.5.2",
+				"content-type": "~1.0.4",
+				"cookie": "0.3.1",
+				"cookie-signature": "1.0.6",
+				"debug": "2.6.9",
+				"depd": "~1.1.2",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"finalhandler": "1.1.1",
+				"fresh": "0.5.2",
+				"merge-descriptors": "1.0.1",
+				"methods": "~1.1.2",
+				"on-finished": "~2.3.0",
+				"parseurl": "~1.3.2",
+				"path-to-regexp": "0.1.7",
+				"proxy-addr": "~2.0.4",
+				"qs": "6.5.2",
+				"range-parser": "~1.2.0",
+				"safe-buffer": "5.1.2",
+				"send": "0.16.2",
+				"serve-static": "1.13.2",
+				"setprototypeof": "1.1.0",
+				"statuses": "~1.4.0",
+				"type-is": "~1.6.16",
+				"utils-merge": "1.0.1",
+				"vary": "~1.1.2"
+			},
+			"dependencies": {
+				"array-flatten": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+				}
+			}
+		},
+		"extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		},
+		"extend-shallow": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+			"requires": {
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
+			},
+			"dependencies": {
+				"is-extendable": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"is-plain-object": "^2.0.4"
 					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				}
+			}
+		},
+		"external-editor": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+			"dev": true,
+			"requires": {
+				"chardet": "^0.7.0",
+				"iconv-lite": "^0.4.24",
+				"tmp": "^0.0.33"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"safer-buffer": ">= 2.1.2 < 3"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+				}
+			}
+		},
+		"extglob": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+			"dev": true,
+			"requires": {
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^1.0.0"
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"is-extendable": "^0.1.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
 					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
+		"extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+		},
+		"falafel": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz",
+			"integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.0.0",
+				"foreach": "^2.0.5",
+				"isarray": "0.0.1",
+				"object-keys": "^1.0.6"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				}
 			}
 		},
+		"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": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		},
+		"fast-glob": {
+			"version": "2.2.6",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
+			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+			"dev": true,
+			"requires": {
+				"@mrmlnc/readdir-enhanced": "^2.2.1",
+				"@nodelib/fs.stat": "^1.1.2",
+				"glob-parent": "^3.1.0",
+				"is-glob": "^4.0.0",
+				"merge2": "^1.2.3",
+				"micromatch": "^3.1.10"
+			}
+		},
+		"fast-json-parse": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+			"integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
+		},
 		"fast-json-stable-stringify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -10506,18 +7435,22 @@
 				"escape-string-regexp": "^1.0.5"
 			}
 		},
+		"file-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
+			"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"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==",
 			"dev": true
 		},
-		"filename-regex": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
-		},
 		"fileset": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
@@ -10559,7 +7492,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
 			"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"encodeurl": "~1.0.2",
@@ -10602,58 +7534,38 @@
 			"dev": true
 		},
 		"flush-write-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
 		"follow-redirects": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
-			"integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+			"integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
 			"dev": true,
 			"requires": {
-				"debug": "=3.1.0"
+				"debug": "^3.2.6"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
 					"requires": {
-						"ms": "2.0.0"
+						"ms": "^2.1.1"
 					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
@@ -10662,6 +7574,41 @@
 			"resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
 			"integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
 		},
+		"fontkit": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.8.0.tgz",
+			"integrity": "sha512-EFDRCca7khfQWYu1iFhsqeABpi87f03MBdkT93ZE6YhqCdMzb5Eojb6c4dlJikGv5liuhByyzA7ikpIPTSBWbQ==",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6",
+				"brfs": "^1.4.0",
+				"brotli": "^1.2.0",
+				"browserify-optional": "^1.0.0",
+				"clone": "^1.0.1",
+				"deep-equal": "^1.0.0",
+				"dfa": "^1.0.0",
+				"restructure": "^0.5.3",
+				"tiny-inflate": "^1.0.2",
+				"unicode-properties": "^1.0.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"clone": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+					"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+					"dev": true
+				}
+			}
+		},
+		"for-each": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+			"requires": {
+				"is-callable": "^1.1.3"
+			}
+		},
 		"for-in": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -10675,6 +7622,12 @@
 				"for-in": "^1.0.1"
 			}
 		},
+		"foreach": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+			"dev": true
+		},
 		"forever-agent": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -10699,8 +7652,7 @@
 		"forwarded": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-			"dev": true
+			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
 		},
 		"fragment-cache": {
 			"version": "0.2.1",
@@ -10713,8 +7665,7 @@
 		"fresh": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-			"dev": true
+			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
 		},
 		"from": {
 			"version": "0.1.7",
@@ -10729,32 +7680,6 @@
 			"requires": {
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"fs-access": {
@@ -10770,7 +7695,6 @@
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
 			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"jsonfile": "^4.0.0",
@@ -10785,43 +7709,17 @@
 			"requires": {
 				"minipass": "^2.2.1"
 			}
-		},
-		"fs-write-stream-atomic": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"iferr": "^0.1.5",
-				"imurmurhash": "^0.1.4",
-				"readable-stream": "1 || 2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+		},
+		"fs-write-stream-atomic": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"iferr": "^0.1.5",
+				"imurmurhash": "^0.1.4",
+				"readable-stream": "1 || 2"
 			}
 		},
 		"fs.realpath": {
@@ -10869,12 +7767,14 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
 					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+					"optional": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
@@ -10889,17 +7789,20 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -11016,7 +7919,8 @@
 				"inherits": {
 					"version": "2.0.3",
 					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"optional": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -11028,6 +7932,7 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+					"optional": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -11035,750 +7940,205 @@
 				"isarray": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"optional": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-				},
-				"minipass": {
-					"version": "2.3.5",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-					"requires": {
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.0"
-					}
-				},
-				"minizlib": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-					"optional": true,
-					"requires": {
-						"minipass": "^2.2.1"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"optional": true
-				},
-				"needle": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
-					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
-					"optional": true,
-					"requires": {
-						"debug": "^2.1.2",
-						"iconv-lite": "^0.4.4",
-						"sax": "^1.2.4"
-					}
-				},
-				"node-pre-gyp": {
-					"version": "0.10.3",
-					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
-					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
-					"optional": true,
-					"requires": {
-						"detect-libc": "^1.0.2",
-						"mkdirp": "^0.5.1",
-						"needle": "^2.2.1",
-						"nopt": "^4.0.1",
-						"npm-packlist": "^1.1.6",
-						"npmlog": "^4.0.2",
-						"rc": "^1.2.7",
-						"rimraf": "^2.6.1",
-						"semver": "^5.3.0",
-						"tar": "^4"
-					}
-				},
-				"nopt": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-					"optional": true,
-					"requires": {
-						"abbrev": "1",
-						"osenv": "^0.1.4"
-					}
-				},
-				"npm-bundled": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
-					"optional": true
-				},
-				"npm-packlist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
-					"optional": true,
-					"requires": {
-						"ignore-walk": "^3.0.1",
-						"npm-bundled": "^1.0.1"
-					}
-				},
-				"npmlog": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-					"optional": true,
-					"requires": {
-						"are-we-there-yet": "~1.1.2",
-						"console-control-strings": "~1.1.0",
-						"gauge": "~2.7.3",
-						"set-blocking": "~2.0.0"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"optional": true
-				},
-				"once": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-					"optional": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"optional": true
-				},
-				"osenv": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-					"optional": true,
-					"requires": {
-						"os-homedir": "^1.0.0",
-						"os-tmpdir": "^1.0.0"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"optional": true
-				},
-				"process-nextick-args": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-					"optional": true
-				},
-				"rc": {
-					"version": "1.2.8",
-					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-					"optional": true,
-					"requires": {
-						"deep-extend": "^0.6.0",
-						"ini": "~1.3.0",
-						"minimist": "^1.2.0",
-						"strip-json-comments": "~2.0.1"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-							"optional": true
-						}
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"optional": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"optional": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				},
-				"safer-buffer": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-					"optional": true
-				},
-				"sax": {
-					"version": "1.2.4",
-					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-					"optional": true
-				},
-				"semver": {
-					"version": "5.6.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-					"optional": true
-				},
-				"set-blocking": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"optional": true
 				},
-				"signal-exit": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"optional": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"optional": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"minipass": {
+					"version": "2.3.5",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+					"optional": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"minizlib": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
 					"optional": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"minipass": "^2.2.1"
 					}
 				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"optional": true,
 					"requires": {
-						"ansi-regex": "^2.0.0"
+						"minimist": "0.0.8"
 					}
 				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
 					"optional": true
 				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+				"needle": {
+					"version": "2.2.4",
+					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
+					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
 					"optional": true,
 					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"debug": "^2.1.2",
+						"iconv-lite": "^0.4.4",
+						"sax": "^1.2.4"
 					}
 				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"optional": true
+				"node-pre-gyp": {
+					"version": "0.10.3",
+					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
+					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
+					"optional": true,
+					"requires": {
+						"detect-libc": "^1.0.2",
+						"mkdirp": "^0.5.1",
+						"needle": "^2.2.1",
+						"nopt": "^4.0.1",
+						"npm-packlist": "^1.1.6",
+						"npmlog": "^4.0.2",
+						"rc": "^1.2.7",
+						"rimraf": "^2.6.1",
+						"semver": "^5.3.0",
+						"tar": "^4"
+					}
 				},
-				"wide-align": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"optional": true,
 					"requires": {
-						"string-width": "^1.0.2 || 2"
+						"abbrev": "1",
+						"osenv": "^0.1.4"
 					}
 				},
-				"wrappy": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				"npm-bundled": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
+					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+					"optional": true
 				},
-				"yallist": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-				}
-			}
-		},
-		"ftp": {
-			"version": "0.3.10",
-			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "1.1.x",
-				"xregexp": "2.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
+				"npm-packlist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
+					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+					"optional": true,
+					"requires": {
+						"ignore-walk": "^3.0.1",
+						"npm-bundled": "^1.0.1"
+					}
 				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-					"dev": true,
+				"npmlog": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+					"optional": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.1",
-						"isarray": "0.0.1",
-						"string_decoder": "~0.10.x"
+						"are-we-there-yet": "~1.1.2",
+						"console-control-strings": "~1.1.0",
+						"gauge": "~2.7.3",
+						"set-blocking": "~2.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
+				"number-is-nan": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+					"optional": true
 				},
-				"xregexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
-					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
-					"dev": true
-				}
-			}
-		},
-		"gaze": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-			"requires": {
-				"globule": "^1.0.0"
-			}
-		},
-		"genfun": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-			"dev": true
-		},
-		"get-caller-file": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-		},
-		"get-stdin": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
-		},
-		"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
-		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
-		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
-		"glob": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
-		"glob-base": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
-			"requires": {
-				"glob-parent": "^2.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-					"dev": true,
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"optional": true
+				},
+				"once": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+					"optional": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"wrappy": "1"
 					}
 				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+				"os-homedir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
-		"glob-parent": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-			"requires": {
-				"is-glob": "^3.1.0",
-				"path-dirname": "^1.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+				"osenv": {
+					"version": "0.1.5",
+					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+					"optional": true,
 					"requires": {
-						"is-extglob": "^2.1.0"
+						"os-homedir": "^1.0.0",
+						"os-tmpdir": "^1.0.0"
 					}
-				}
-			}
-		},
-		"glob-to-regexp": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-			"dev": true
-		},
-		"global-dirs": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-			"dev": true,
-			"requires": {
-				"ini": "^1.3.4"
-			}
-		},
-		"globals": {
-			"version": "9.18.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-			"dev": true
-		},
-		"globby": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-			"dev": true,
-			"requires": {
-				"array-union": "^1.0.1",
-				"dir-glob": "^2.0.0",
-				"glob": "^7.1.2",
-				"ignore": "^3.3.5",
-				"pify": "^3.0.0",
-				"slash": "^1.0.0"
-			}
-		},
-		"globule": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
-			"requires": {
-				"glob": "~7.1.1",
-				"lodash": "~4.17.10",
-				"minimatch": "~3.0.2"
-			}
-		},
-		"got": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-			"dev": true,
-			"requires": {
-				"create-error-class": "^3.0.0",
-				"duplexer3": "^0.1.4",
-				"get-stream": "^3.0.0",
-				"is-redirect": "^1.0.0",
-				"is-retry-allowed": "^1.0.0",
-				"is-stream": "^1.0.0",
-				"lowercase-keys": "^1.0.0",
-				"safe-buffer": "^5.0.1",
-				"timed-out": "^4.0.0",
-				"unzip-response": "^2.0.1",
-				"url-parse-lax": "^1.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.1.15",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
-		},
-		"graphql": {
-			"version": "14.1.1",
-			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
-			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
-			"requires": {
-				"iterall": "^1.2.2"
-			}
-		},
-		"graphql-tag": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
-			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
-		},
-		"gzip-size": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
-			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
-			"dev": true,
-			"requires": {
-				"duplexer": "^0.1.1",
-				"pify": "^3.0.0"
-			}
-		},
-		"handle-thing": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
-			"dev": true
-		},
-		"handlebars": {
-			"version": "4.0.12",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
-			"integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
-			"dev": true,
-			"requires": {
-				"async": "^2.5.0",
-				"optimist": "^0.6.1",
-				"source-map": "^0.6.1",
-				"uglify-js": "^3.1.4"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-		},
-		"har-validator": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-			"requires": {
-				"ajv": "^6.5.5",
-				"har-schema": "^2.0.0"
-			}
-		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"requires": {
-				"ansi-regex": "^2.0.0"
-			}
-		},
-		"has-binary2": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-			"requires": {
-				"isarray": "2.0.1"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
-				}
-			}
-		},
-		"has-cors": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
-		},
-		"has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-			"dev": true
-		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
-			}
-		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"optional": true
+				},
+				"process-nextick-args": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+					"optional": true
+				},
+				"rc": {
+					"version": "1.2.8",
+					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+					"optional": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"deep-extend": "^0.6.0",
+						"ini": "~1.3.0",
+						"minimist": "^1.2.0",
+						"strip-json-comments": "~2.0.1"
+					},
+					"dependencies": {
+						"minimist": {
+							"version": "1.2.0",
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+							"optional": true
+						}
 					}
-				}
-			}
-		},
-		"hash-base": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"hash.js": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"minimalistic-assert": "^1.0.1"
-			}
-		},
-		"hmac-drbg": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-			"dev": true,
-			"requires": {
-				"hash.js": "^1.0.3",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.1"
-			}
-		},
-		"hoek": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
-			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
-		},
-		"hoopy": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-			"dev": true
-		},
-		"hosted-git-info": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
-			},
-			"dependencies": {
+				},
 				"readable-stream": {
 					"version": "2.3.6",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"core-util-is": "~1.0.0",
 						"inherits": "~2.0.3",
@@ -11789,490 +8149,696 @@
 						"util-deprecate": "~1.0.1"
 					}
 				},
+				"rimraf": {
+					"version": "2.6.3",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+					"optional": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+				},
+				"safer-buffer": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+					"optional": true
+				},
+				"sax": {
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+					"optional": true
+				},
+				"semver": {
+					"version": "5.6.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+					"optional": true
+				},
+				"set-blocking": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"optional": true
+				},
+				"signal-exit": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+					"optional": true
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+					"optional": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
 				"string_decoder": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"safe-buffer": "~5.1.0"
 					}
-				}
-			}
-		},
-		"html-entities": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-			"dev": true
-		},
-		"htmlparser2": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
-			"integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^1.3.0",
-				"domhandler": "^2.3.0",
-				"domutils": "^1.5.1",
-				"entities": "^1.1.1",
-				"inherits": "^2.0.1",
-				"readable-stream": "^3.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
+						"ansi-regex": "^2.0.0"
 					}
-				}
-			}
-		},
-		"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",
-			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-			"dev": true
-		},
-		"http-errors": {
-			"version": "1.6.3",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-			"dev": true,
-			"requires": {
-				"depd": "~1.1.2",
-				"inherits": "2.0.3",
-				"setprototypeof": "1.1.0",
-				"statuses": ">= 1.4.0 < 2"
-			}
-		},
-		"http-parser-js": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
-			"dev": true
-		},
-		"http-proxy": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
-			"dev": true,
-			"requires": {
-				"eventemitter3": "^3.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
-			}
-		},
-		"http-proxy-agent": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-			"dev": true,
-			"requires": {
-				"agent-base": "4",
-				"debug": "3.1.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
+				},
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+					"optional": true
+				},
+				"tar": {
+					"version": "4.4.8",
+					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+					"optional": true,
+					"requires": {
+						"chownr": "^1.1.1",
+						"fs-minipass": "^1.2.5",
+						"minipass": "^2.3.4",
+						"minizlib": "^1.1.1",
+						"mkdirp": "^0.5.0",
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.2"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"optional": true
+				},
+				"wide-align": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+					"optional": true,
 					"requires": {
-						"ms": "2.0.0"
+						"string-width": "^1.0.2 || 2"
 					}
+				},
+				"wrappy": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				},
+				"yallist": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
 				}
 			}
 		},
-		"http-proxy-middleware": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
-			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+		"ftp": {
+			"version": "0.3.10",
+			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
 			"dev": true,
 			"requires": {
-				"http-proxy": "^1.16.2",
-				"is-glob": "^4.0.0",
-				"lodash": "^4.17.5",
-				"micromatch": "^3.1.9"
+				"readable-stream": "1.1.x",
+				"xregexp": "2.0.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"readable-stream": {
+					"version": "1.1.14",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
+						"isarray": "0.0.1",
+						"string_decoder": "~0.10.x"
 					}
 				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"xregexp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
+					"dev": true
+				}
+			}
+		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+		},
+		"gaze": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+			"requires": {
+				"globule": "^1.0.0"
+			}
+		},
+		"genfun": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+			"dev": true
+		},
+		"get-caller-file": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+		},
+		"get-stdin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+		},
+		"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
+		},
+		"get-uri": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
+			"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
+			"dev": true,
+			"requires": {
+				"data-uri-to-buffer": "2",
+				"debug": "4",
+				"extend": "~3.0.2",
+				"file-uri-to-path": "1",
+				"ftp": "~0.3.10",
+				"readable-stream": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
+				}
+			}
+		},
+		"get-value": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+		},
+		"getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+			"requires": {
+				"assert-plus": "^1.0.0"
+			}
+		},
+		"glob": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+			"requires": {
+				"is-glob": "^3.1.0",
+				"path-dirname": "^1.0.0"
+			},
+			"dependencies": {
+				"is-extglob": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
+				"is-glob": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extglob": "^2.1.0"
 					}
-				},
+				}
+			}
+		},
+		"glob-to-regexp": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+			"dev": true
+		},
+		"global-dirs": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+			"dev": true,
+			"requires": {
+				"ini": "^1.3.4"
+			}
+		},
+		"globals": {
+			"version": "9.18.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+			"dev": true
+		},
+		"globby": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+			"dev": true,
+			"requires": {
+				"array-union": "^1.0.1",
+				"dir-glob": "^2.0.0",
+				"glob": "^7.1.2",
+				"ignore": "^3.3.5",
+				"pify": "^3.0.0",
+				"slash": "^1.0.0"
+			}
+		},
+		"globule": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+			"requires": {
+				"glob": "~7.1.1",
+				"lodash": "~4.17.10",
+				"minimatch": "~3.0.2"
+			}
+		},
+		"got": {
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+			"dev": true,
+			"requires": {
+				"create-error-class": "^3.0.0",
+				"duplexer3": "^0.1.4",
+				"get-stream": "^3.0.0",
+				"is-redirect": "^1.0.0",
+				"is-retry-allowed": "^1.0.0",
+				"is-stream": "^1.0.0",
+				"lowercase-keys": "^1.0.0",
+				"safe-buffer": "^5.0.1",
+				"timed-out": "^4.0.0",
+				"unzip-response": "^2.0.1",
+				"url-parse-lax": "^1.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.1.15",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+		},
+		"graphql": {
+			"version": "14.1.1",
+			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
+			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
+			"requires": {
+				"iterall": "^1.2.2"
+			}
+		},
+		"graphql-tag": {
+			"version": "2.10.1",
+			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
+			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
+		},
+		"gzip-size": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
+			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
+			"dev": true,
+			"requires": {
+				"duplexer": "^0.1.1",
+				"pify": "^3.0.0"
+			}
+		},
+		"handle-thing": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+			"dev": true
+		},
+		"handlebars": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz",
+			"integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==",
+			"dev": true,
+			"requires": {
+				"neo-async": "^2.6.0",
+				"optimist": "^0.6.1",
+				"source-map": "^0.6.1",
+				"uglify-js": "^3.1.4"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"har-schema": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+		},
+		"har-validator": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+			"requires": {
+				"ajv": "^6.5.5",
+				"har-schema": "^2.0.0"
+			}
+		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
+		"has-ansi": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+			"requires": {
+				"ansi-regex": "^2.0.0"
+			}
+		},
+		"has-binary2": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+			"requires": {
+				"isarray": "2.0.1"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+				}
+			}
+		},
+		"has-cors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+		},
+		"has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+		},
+		"has-symbols": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+			"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+		},
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+		},
+		"has-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+			"requires": {
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
+			}
+		},
+		"has-values": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+			"requires": {
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
+			},
+			"dependencies": {
 				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-					"dev": true,
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"is-buffer": "^1.1.5"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				}
+			}
+		},
+		"hash-base": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"hash.js": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.3",
+				"minimalistic-assert": "^1.0.1"
+			}
+		},
+		"hmac-drbg": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+			"dev": true,
+			"requires": {
+				"hash.js": "^1.0.3",
+				"minimalistic-assert": "^1.0.0",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
+		},
+		"hoek": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
+			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
+		},
+		"hoopy": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+			"dev": true
+		},
+		"hosted-git-info": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+		},
+		"hpack.js": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"obuf": "^1.0.0",
+				"readable-stream": "^2.0.1",
+				"wbuf": "^1.1.0"
+			}
+		},
+		"html-entities": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+			"dev": true
+		},
+		"htmlparser2": {
+			"version": "3.10.1",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+			"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^1.3.1",
+				"domhandler": "^2.3.0",
+				"domutils": "^1.5.1",
+				"entities": "^1.1.1",
+				"inherits": "^2.0.1",
+				"readable-stream": "^3.1.1"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				}
+			}
+		},
+		"http-auth": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
+			"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
+			"dev": true,
+			"requires": {
+				"apache-crypt": "^1.1.2",
+				"apache-md5": "^1.0.6",
+				"bcryptjs": "^2.3.0",
+				"uuid": "^3.0.0"
+			}
+		},
+		"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",
+			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+			"dev": true
+		},
+		"http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+			"requires": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			}
+		},
+		"http-parser-js": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
+			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
+			"dev": true
+		},
+		"http-proxy": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+			"dev": true,
+			"requires": {
+				"eventemitter3": "^3.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"http-proxy-agent": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+			"dev": true,
+			"requires": {
+				"agent-base": "4",
+				"debug": "3.1.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ms": "2.0.0"
 					}
 				}
 			}
 		},
+		"http-proxy-middleware": {
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+			"dev": true,
+			"requires": {
+				"http-proxy": "^1.16.2",
+				"is-glob": "^4.0.0",
+				"lodash": "^4.17.5",
+				"micromatch": "^3.1.9"
+			}
+		},
+		"http-signature": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"jsprim": "^1.2.2",
+				"sshpk": "^1.7.0"
+			}
+		},
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -12429,24 +8995,26 @@
 			}
 		},
 		"i18next": {
-			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/i18next/-/i18next-12.1.0.tgz",
-			"integrity": "sha512-AexmwGkKxwKfo5fGeXTWEY4xqzRPigQ1S/0InOUUVziGO54cd4fKyYK8ED1Thx9fd+WA3fRSZ+1iekvFQMbsFw==",
-			"dev": true
+			"version": "15.0.8",
+			"resolved": "https://registry.npmjs.org/i18next/-/i18next-15.0.8.tgz",
+			"integrity": "sha512-ayzNwJ9NHtqEeAG0nQ6yKFbIpZULpDeesjVnfWQaPwbH7Anee8QwRAYPNWHtFCmDZV9FZaKiEbfo1scH8+KSDg==",
+			"dev": true,
+			"requires": {
+				"@babel/runtime": "^7.3.1"
+			}
 		},
 		"iconv-lite": {
 			"version": "0.4.23",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
 			"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-			"dev": true,
 			"requires": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
 		"ieee754": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-			"integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+			"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
 			"dev": true
 		},
 		"iferr": {
@@ -12656,20 +9224,26 @@
 			}
 		},
 		"invert-kv": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-			"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+			"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+			"dev": true
 		},
 		"ionic": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.10.1.tgz",
-			"integrity": "sha512-nqwFQ1Ec3Dtg9EqMQGXO003bNlVZuH+/hKU+asmX+DO5V6Am6E+KHrgBRRzSKqmuF+l5Wk81EvMD8L5tg2sLRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/discover": "1.0.11",
-				"@ionic/utils-fs": "1.0.0",
-				"@ionic/utils-network": "0.0.6",
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.12.0.tgz",
+			"integrity": "sha512-3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/discover": "1.0.13",
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-network": "0.0.8",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
 				"chalk": "^2.3.0",
 				"debug": "^4.0.0",
 				"diff": "^4.0.1",
@@ -12691,325 +9265,34 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/discover": {
-					"version": "1.0.11",
-					"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.11.tgz",
-					"integrity": "sha512-E2CYZsR2noHtUjYceUNP6w1DMYnjPqITyC8Ewiz1iaNWgEntr7xvt1/XbkMlnswn9QKNSItNL6iWY0Q91N+k2A==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"netmask": "^1.0.6",
-						"tslib": "^1.9.0",
-						"ws": "^6.0.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"ci-info": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-					"dev": true
-				},
 				"debug": {
 					"version": "4.1.1",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
 					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"diff": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
-					"dev": true
-				},
-				"get-uri": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
-					"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
-					"dev": true,
-					"requires": {
-						"data-uri-to-buffer": "2",
-						"debug": "4",
-						"extend": "~3.0.2",
-						"file-uri-to-path": "1",
-						"ftp": "~0.3.10",
-						"readable-stream": "3"
-					}
-				},
-				"is-ci": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-					"dev": true,
-					"requires": {
-						"ci-info": "^1.5.0"
-					}
-				},
-				"mime": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"pac-proxy-agent": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
-					"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"get-uri": "^2.0.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"pac-resolver": "^3.0.0",
-						"raw-body": "^2.2.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"proxy-agent": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz",
-					"integrity": "sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"pac-proxy-agent": "^3.0.0",
-						"proxy-from-env": "^1.0.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"qs": {
-					"version": "6.6.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.6.0.tgz",
-					"integrity": "sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"superagent": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
-					"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
-					"dev": true,
-					"requires": {
-						"component-emitter": "^1.2.0",
-						"cookiejar": "^2.1.2",
-						"debug": "^4.1.0",
-						"form-data": "^2.3.3",
-						"formidable": "^1.2.0",
-						"methods": "^1.1.1",
-						"mime": "^2.4.0",
-						"qs": "^6.6.0",
-						"readable-stream": "^3.0.6"
-					}
-				},
-				"superagent-proxy": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
-					"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"proxy-agent": "3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
+				"diff": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+					"dev": true
 				},
-				"update-notifier": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-					"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-					"dev": true,
-					"requires": {
-						"boxen": "^1.2.1",
-						"chalk": "^2.0.1",
-						"configstore": "^3.0.0",
-						"import-lazy": "^2.1.0",
-						"is-ci": "^1.0.10",
-						"is-installed-globally": "^0.1.0",
-						"is-npm": "^1.0.0",
-						"latest-version": "^3.0.0",
-						"semver-diff": "^2.0.0",
-						"xdg-basedir": "^3.0.0"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
@@ -13032,9 +9315,9 @@
 			"dev": true
 		},
 		"ipaddr.js": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
-			"integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=",
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+			"integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
 			"dev": true
 		},
 		"is-absolute": {
@@ -13081,6 +9364,11 @@
 				"builtin-modules": "^1.0.0"
 			}
 		},
+		"is-callable": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+			"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+		},
 		"is-ci": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -13098,6 +9386,11 @@
 				"kind-of": "^3.0.2"
 			}
 		},
+		"is-date-object": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+		},
 		"is-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -13121,21 +9414,6 @@
 			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
 			"dev": true
 		},
-		"is-dotfile": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-			"dev": true
-		},
-		"is-equal-shallow": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
-			"requires": {
-				"is-primitive": "^2.0.0"
-			}
-		},
 		"is-extendable": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -13200,907 +9478,550 @@
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
 			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-			"dev": true
-		},
-		"is-path-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "^1.0.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "^1.0.1"
-			}
-		},
-		"is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"requires": {
-				"isobject": "^3.0.1"
-			}
-		},
-		"is-posix-bracket": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
-		},
-		"is-primitive": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-			"dev": true
-		},
-		"is-redirect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-			"dev": true
-		},
-		"is-relative": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-			"dev": true,
-			"requires": {
-				"is-unc-path": "^1.0.0"
-			}
-		},
-		"is-retry-allowed": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-			"dev": true
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-		},
-		"is-unc-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-			"dev": true,
-			"requires": {
-				"unc-path-regex": "^0.1.2"
-			}
-		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-		},
-		"is-wsl": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-			"dev": true
-		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-		},
-		"isbinaryfile": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-			"dev": true,
-			"requires": {
-				"buffer-alloc": "^1.2.0"
-			}
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-		},
-		"istanbul-instrumenter-loader": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
-			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
-			"dev": true,
-			"requires": {
-				"convert-source-map": "^1.5.0",
-				"istanbul-lib-instrument": "^1.7.3",
-				"loader-utils": "^1.1.0",
-				"schema-utils": "^0.3.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.5.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-					"dev": true,
-					"requires": {
-						"co": "^4.6.0",
-						"fast-deep-equal": "^1.0.0",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.3.0"
-					}
-				},
-				"fast-deep-equal": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-					"dev": true,
-					"requires": {
-						"ajv": "^5.0.0"
-					}
-				}
+				"kind-of": "^3.0.2"
 			}
 		},
-		"istanbul-lib-coverage": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+		"is-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
 			"dev": true
 		},
-		"istanbul-lib-hook": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz",
-			"integrity": "sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==",
-			"dev": true,
-			"requires": {
-				"append-transform": "^1.0.0"
-			}
+		"is-path-cwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+			"dev": true
 		},
-		"istanbul-lib-instrument": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+		"is-path-in-cwd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
 			"dev": true,
 			"requires": {
-				"babel-generator": "^6.18.0",
-				"babel-template": "^6.16.0",
-				"babel-traverse": "^6.18.0",
-				"babel-types": "^6.18.0",
-				"babylon": "^6.18.0",
-				"istanbul-lib-coverage": "^1.2.1",
-				"semver": "^5.3.0"
+				"is-path-inside": "^1.0.0"
 			}
 		},
-		"istanbul-lib-report": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz",
-			"integrity": "sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==",
+		"is-path-inside": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
 			"dev": true,
 			"requires": {
-				"istanbul-lib-coverage": "^2.0.1",
-				"make-dir": "^1.3.0",
-				"supports-color": "^5.4.0"
-			},
-			"dependencies": {
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
+				"path-is-inside": "^1.0.1"
 			}
 		},
-		"istanbul-reports": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.0.1.tgz",
-			"integrity": "sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==",
-			"dev": true,
+		"is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"requires": {
-				"handlebars": "^4.0.11"
+				"isobject": "^3.0.1"
 			}
 		},
-		"iterall": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
-			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		"is-promise": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+			"dev": true
 		},
-		"jasmine": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
-			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+		"is-redirect": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+			"dev": true
+		},
+		"is-regex": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
 			"requires": {
-				"glob": "^7.0.6",
-				"jasmine-core": "~3.3.0"
+				"has": "^1.0.1"
 			}
 		},
-		"jasmine-core": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
-			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
-		},
-		"jasmine-spec-reporter": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+		"is-relative": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
 			"dev": true,
 			"requires": {
-				"colors": "1.1.2"
-			},
-			"dependencies": {
-				"colors": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-					"dev": true
-				}
+				"is-unc-path": "^1.0.0"
 			}
 		},
-		"jasminewd2": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
-			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+		"is-retry-allowed": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
 			"dev": true
 		},
-		"js-base64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
-		},
-		"js-tokens": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-			"dev": true
+		"is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
 		},
-		"js-yaml": {
-			"version": "3.12.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
-			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
-			"dev": true,
+		"is-symbol": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+			"integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
 			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"dependencies": {
-				"esprima": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-					"dev": true
-				}
+				"has-symbols": "^1.0.0"
 			}
 		},
-		"jsbarcode": {
-			"version": "4.0.0-alpha.5",
-			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-4.0.0-alpha.5.tgz",
-			"integrity": "sha512-YVBAjFgNKGzUGmSAmzU1dsNTR5omfwWhvusKR+SRRXcuSg4xT3Wl7hYfovt8eZK2LZyFJviQ+Glt9W6T7caQYw=="
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
 		},
-		"jsesc": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-			"dev": true
+		"is-unc-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+			"dev": true,
+			"requires": {
+				"unc-path-regex": "^0.1.2"
+			}
 		},
-		"json-loader": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-			"dev": true
+		"is-utf8": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
 		},
-		"json-parse-better-errors": {
+		"is-windows": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-			"dev": true
-		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 		},
-		"json3": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-			"dev": true
+		"is-wsl": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
 		},
-		"json5": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
-			"dev": true,
-			"requires": {
-				"minimist": "^1.2.0"
-			}
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 		},
-		"jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+		"isbinaryfile": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.6"
+				"buffer-alloc": "^1.2.0"
 			}
 		},
-		"jsonparse": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-			"dev": true
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
 		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			}
+		"isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
 		},
-		"karma": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.0.tgz",
-			"integrity": "sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==",
-			"dev": true,
-			"requires": {
-				"bluebird": "^3.3.0",
-				"body-parser": "^1.16.1",
-				"chokidar": "^2.0.3",
-				"colors": "^1.1.0",
-				"combine-lists": "^1.0.0",
-				"connect": "^3.6.0",
-				"core-js": "^2.2.0",
-				"di": "^0.0.1",
-				"dom-serialize": "^2.2.0",
-				"expand-braces": "^0.1.1",
-				"flatted": "^2.0.0",
-				"glob": "^7.1.1",
-				"graceful-fs": "^4.1.2",
-				"http-proxy": "^1.13.0",
-				"isbinaryfile": "^3.0.0",
-				"lodash": "^4.17.5",
-				"log4js": "^3.0.0",
-				"mime": "^2.3.1",
-				"minimatch": "^3.0.2",
-				"optimist": "^0.6.1",
-				"qjobs": "^1.1.4",
-				"range-parser": "^1.2.0",
-				"rimraf": "^2.6.0",
-				"safe-buffer": "^5.0.1",
-				"socket.io": "2.1.1",
-				"source-map": "^0.6.1",
-				"tmp": "0.0.33",
-				"useragent": "2.3.0"
+		"isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+		},
+		"istanbul-api": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.1.tgz",
+			"integrity": "sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"compare-versions": "^3.2.1",
+				"fileset": "^2.0.3",
+				"istanbul-lib-coverage": "^2.0.3",
+				"istanbul-lib-hook": "^2.0.3",
+				"istanbul-lib-instrument": "^3.1.0",
+				"istanbul-lib-report": "^2.0.4",
+				"istanbul-lib-source-maps": "^3.0.2",
+				"istanbul-reports": "^2.1.1",
+				"js-yaml": "^3.12.0",
+				"make-dir": "^1.3.0",
+				"minimatch": "^3.0.4",
+				"once": "^1.4.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"engine.io-client": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-					"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+				"istanbul-lib-instrument": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz",
+					"integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==",
 					"dev": true,
 					"requires": {
-						"component-emitter": "1.2.1",
-						"component-inherit": "0.0.3",
-						"debug": "~3.1.0",
-						"engine.io-parser": "~2.1.1",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"ws": "~3.3.1",
-						"xmlhttprequest-ssl": "~1.5.4",
-						"yeast": "0.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
+						"@babel/generator": "^7.0.0",
+						"@babel/parser": "^7.0.0",
+						"@babel/template": "^7.0.0",
+						"@babel/traverse": "^7.0.0",
+						"@babel/types": "^7.0.0",
+						"istanbul-lib-coverage": "^2.0.3",
+						"semver": "^5.5.0"
 					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				}
+			}
+		},
+		"istanbul-instrumenter-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
+			"dev": true,
+			"requires": {
+				"convert-source-map": "^1.5.0",
+				"istanbul-lib-instrument": "^1.7.3",
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^0.3.0"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "5.5.2",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"co": "^4.6.0",
+						"fast-deep-equal": "^1.0.0",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.3.0"
 					}
 				},
-				"finalhandler": {
+				"fast-deep-equal": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
+					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+					"dev": true
+				},
+				"json-schema-traverse": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"schema-utils": {
+					"version": "0.3.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ajv": "^5.0.0"
 					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				}
+			}
+		},
+		"istanbul-lib-coverage": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
+			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+			"dev": true
+		},
+		"istanbul-lib-hook": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz",
+			"integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==",
+			"dev": true,
+			"requires": {
+				"append-transform": "^1.0.0"
+			}
+		},
+		"istanbul-lib-instrument": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
+			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+			"dev": true,
+			"requires": {
+				"babel-generator": "^6.18.0",
+				"babel-template": "^6.16.0",
+				"babel-traverse": "^6.18.0",
+				"babel-types": "^6.18.0",
+				"babylon": "^6.18.0",
+				"istanbul-lib-coverage": "^1.2.1",
+				"semver": "^5.3.0"
+			}
+		},
+		"istanbul-lib-report": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz",
+			"integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==",
+			"dev": true,
+			"requires": {
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"supports-color": "^6.0.0"
+			},
+			"dependencies": {
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-lib-source-maps": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz",
+			"integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"rimraf": "^2.6.2",
+				"source-map": "^0.6.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-reports": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.1.1.tgz",
+			"integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==",
+			"dev": true,
+			"requires": {
+				"handlebars": "^4.1.0"
+			}
+		},
+		"iterall": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
+			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		},
+		"jasmine": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
+			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+			"requires": {
+				"glob": "^7.0.6",
+				"jasmine-core": "~3.3.0"
+			}
+		},
+		"jasmine-core": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
+			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
+		},
+		"jasmine-spec-reporter": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
+			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+			"dev": true,
+			"requires": {
+				"colors": "1.1.2"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+					"dev": true
+				}
+			}
+		},
+		"jasminewd2": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+			"dev": true
+		},
+		"js-base64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
+		},
+		"js-tokens": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.12.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
+			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+					"dev": true
+				}
+			}
+		},
+		"jsbarcode": {
+			"version": "3.11.0",
+			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.0.tgz",
+			"integrity": "sha512-/ozCd7wsa+VIHo9sUc03HneVEQrH7cVWfJolUT/WOW1m8mJ2e3iYZje6C9X3LFHdczlesqFHRpxLtbVsNtjyow=="
+		},
+		"jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		},
+		"jsesc": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+			"dev": true
+		},
+		"json-loader": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+			"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",
+			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+			"dev": true
+		},
+		"json-schema": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
+		"json-stringify-safe": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+		},
+		"json3": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+			"dev": true
+		},
+		"json5": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.0"
+			}
+		},
+		"jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"requires": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"jsonparse": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+			"dev": true
+		},
+		"jsprim": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+			"requires": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.2.3",
+				"verror": "1.10.0"
+			}
+		},
+		"karma": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz",
+			"integrity": "sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.3.0",
+				"body-parser": "^1.16.1",
+				"braces": "^2.3.2",
+				"chokidar": "^2.0.3",
+				"colors": "^1.1.0",
+				"connect": "^3.6.0",
+				"core-js": "^2.2.0",
+				"di": "^0.0.1",
+				"dom-serialize": "^2.2.0",
+				"flatted": "^2.0.0",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.1.2",
+				"http-proxy": "^1.13.0",
+				"isbinaryfile": "^3.0.0",
+				"lodash": "^4.17.11",
+				"log4js": "^4.0.0",
+				"mime": "^2.3.1",
+				"minimatch": "^3.0.2",
+				"optimist": "^0.6.1",
+				"qjobs": "^1.1.4",
+				"range-parser": "^1.2.0",
+				"rimraf": "^2.6.0",
+				"safe-buffer": "^5.0.1",
+				"socket.io": "2.1.1",
+				"source-map": "^0.6.1",
+				"tmp": "0.0.33",
+				"useragent": "2.3.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
 					"dev": true
 				},
-				"log4js": {
-					"version": "3.0.6",
-					"resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
-					"integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
-					"dev": true,
-					"requires": {
-						"circular-json": "^0.5.5",
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"rfdc": "^1.1.2",
-						"streamroller": "0.7.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
 				"mime": {
 					"version": "2.4.0",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
 					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-					"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
-					"dev": true,
-					"requires": {
-						"debug": "~3.1.0",
-						"engine.io": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"socket.io-adapter": "~1.1.0",
-						"socket.io-client": "2.1.1",
-						"socket.io-parser": "~3.2.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io-client": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
-					"dev": true,
-					"requires": {
-						"backo2": "1.0.2",
-						"base64-arraybuffer": "0.1.5",
-						"component-bind": "1.0.0",
-						"component-emitter": "1.2.1",
-						"debug": "~3.1.0",
-						"engine.io-client": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"object-component": "0.0.3",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"socket.io-parser": "~3.2.0",
-						"to-array": "0.1.4"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-					"dev": true
-				},
-				"streamroller": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-					"integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
-					"dev": true,
-					"requires": {
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"mkdirp": "^0.5.1",
-						"readable-stream": "^2.3.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"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"
-					}
-				},
-				"ws": {
-					"version": "3.3.3",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
 				}
 			}
 		},
@@ -14115,90 +10036,13 @@
 			}
 		},
 		"karma-coverage-istanbul-reporter": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz",
-			"integrity": "sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz",
+			"integrity": "sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==",
 			"dev": true,
 			"requires": {
-				"istanbul-api": "^2.0.5",
+				"istanbul-api": "^2.1.1",
 				"minimatch": "^3.0.4"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.6",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"istanbul-api": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.0.6.tgz",
-					"integrity": "sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==",
-					"dev": true,
-					"requires": {
-						"async": "^2.6.1",
-						"compare-versions": "^3.2.1",
-						"fileset": "^2.0.3",
-						"istanbul-lib-coverage": "^2.0.1",
-						"istanbul-lib-hook": "^2.0.1",
-						"istanbul-lib-instrument": "^3.0.0",
-						"istanbul-lib-report": "^2.0.2",
-						"istanbul-lib-source-maps": "^2.0.1",
-						"istanbul-reports": "^2.0.1",
-						"js-yaml": "^3.12.0",
-						"make-dir": "^1.3.0",
-						"once": "^1.4.0"
-					}
-				},
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"istanbul-lib-instrument": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz",
-					"integrity": "sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==",
-					"dev": true,
-					"requires": {
-						"@babel/generator": "^7.0.0",
-						"@babel/parser": "^7.0.0",
-						"@babel/template": "^7.0.0",
-						"@babel/traverse": "^7.0.0",
-						"@babel/types": "^7.0.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"semver": "^5.5.0"
-					}
-				},
-				"istanbul-lib-source-maps": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz",
-					"integrity": "sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"make-dir": "^1.3.0",
-						"rimraf": "^2.6.2",
-						"source-map": "^0.6.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
 			}
 		},
 		"karma-jasmine": {
@@ -14246,20 +10090,6 @@
 			"dev": true,
 			"requires": {
 				"package-json": "^4.0.0"
-			},
-			"dependencies": {
-				"package-json": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-					"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-					"dev": true,
-					"requires": {
-						"got": "^6.7.1",
-						"registry-auth-token": "^3.0.1",
-						"registry-url": "^3.0.3",
-						"semver": "^5.1.0"
-					}
-				}
 			}
 		},
 		"lazy-cache": {
@@ -14269,11 +10099,12 @@
 			"dev": true
 		},
 		"lcid": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+			"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+			"dev": true,
 			"requires": {
-				"invert-kv": "^1.0.0"
+				"invert-kv": "^2.0.0"
 			}
 		},
 		"leek": {
@@ -14300,6 +10131,32 @@
 				}
 			}
 		},
+		"less": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
+			"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+			"dev": true,
+			"requires": {
+				"clone": "^2.1.2",
+				"errno": "^0.1.1",
+				"graceful-fs": "^4.1.2",
+				"image-size": "~0.5.0",
+				"mime": "^1.4.1",
+				"mkdirp": "^0.5.0",
+				"promise": "^7.1.1",
+				"request": "^2.83.0",
+				"source-map": "~0.6.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"less-loader": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
@@ -14339,6 +10196,144 @@
 				"immediate": "~3.0.5"
 			}
 		},
+		"linebreak": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/linebreak/-/linebreak-0.3.0.tgz",
+			"integrity": "sha1-BSZICmLAW9Z58+nZmDDgnGp9DtY=",
+			"dev": true,
+			"requires": {
+				"base64-js": "0.0.8",
+				"brfs": "^1.3.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+					"integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+					"dev": true
+				}
+			}
+		},
+		"live-server": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
+			"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.4",
+				"colors": "^1.3.3",
+				"connect": "^3.6.6",
+				"cors": "^2.8.5",
+				"event-stream": "3.3.4",
+				"faye-websocket": "0.11.x",
+				"http-auth": "3.1.x",
+				"morgan": "^1.9.1",
+				"object-assign": "^4.1.1",
+				"opn": "^6.0.0",
+				"proxy-middleware": "^0.15.0",
+				"send": "^0.16.2",
+				"serve-index": "^1.9.1"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.3.3",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+					"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+					"dev": true
+				},
+				"event-stream": {
+					"version": "3.3.4",
+					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1",
+						"from": "~0",
+						"map-stream": "~0.1.0",
+						"pause-stream": "0.0.11",
+						"split": "0.3",
+						"stream-combiner": "~0.0.4",
+						"through": "~2.3.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"map-stream": {
+					"version": "0.1.0",
+					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+					"dev": true
+				},
+				"mime": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+					"dev": true
+				},
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"dev": true
+				},
+				"opn": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz",
+					"integrity": "sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==",
+					"dev": true,
+					"requires": {
+						"is-wsl": "^1.1.0"
+					}
+				},
+				"send": {
+					"version": "0.16.2",
+					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"depd": "~1.1.2",
+						"destroy": "~1.0.4",
+						"encodeurl": "~1.0.2",
+						"escape-html": "~1.0.3",
+						"etag": "~1.8.1",
+						"fresh": "0.5.2",
+						"http-errors": "~1.6.2",
+						"mime": "1.4.1",
+						"ms": "2.0.0",
+						"on-finished": "~2.3.0",
+						"range-parser": "~1.2.0",
+						"statuses": "~1.4.0"
+					}
+				},
+				"split": {
+					"version": "0.3.3",
+					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+					"dev": true,
+					"requires": {
+						"through": "2"
+					}
+				},
+				"stream-combiner": {
+					"version": "0.0.4",
+					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1"
+					}
+				}
+			}
+		},
 		"livereload-js": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
@@ -14578,6 +10573,36 @@
 				}
 			}
 		},
+		"log4js": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log4js/-/log4js-4.1.0.tgz",
+			"integrity": "sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==",
+			"dev": true,
+			"requires": {
+				"date-format": "^2.0.0",
+				"debug": "^4.1.1",
+				"flatted": "^2.0.0",
+				"rfdc": "^1.1.2",
+				"streamroller": "^1.0.4"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"loglevel": {
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
@@ -14631,24 +10656,24 @@
 			}
 		},
 		"lunr": {
-			"version": "2.3.5",
-			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.5.tgz",
-			"integrity": "sha512-EtnfmHsHJTr3u24sito9JctSxej5Ds0SgUD2Lm+qRHyLgM7BGesFlW14eNh1mil0fV5Muh8gf3dBBXzADlUlzQ==",
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.6.tgz",
+			"integrity": "sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==",
 			"dev": true
 		},
 		"macos-release": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.0.0.tgz",
-			"integrity": "sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.1.0.tgz",
+			"integrity": "sha512-8TCbwvN1mfNxbBv0yBtfyIFMo3m1QsNbKHv7PYIp/abRBKVQBXN7ecu3aeGGgT18VC/Tf397LBDGZF9KBGJFFw==",
 			"dev": true
 		},
 		"magic-string": {
-			"version": "0.25.1",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz",
-			"integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==",
+			"version": "0.25.2",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz",
+			"integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
 			"dev": true,
 			"requires": {
-				"sourcemap-codec": "^1.4.1"
+				"sourcemap-codec": "^1.4.4"
 			}
 		},
 		"make-dir": {
@@ -14666,6 +10691,93 @@
 			"integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
 			"dev": true
 		},
+		"make-fetch-happen": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
+			"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
+			"dev": true,
+			"requires": {
+				"agentkeepalive": "^3.4.1",
+				"cacache": "^11.0.1",
+				"http-cache-semantics": "^3.8.1",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"mississippi": "^3.0.0",
+				"node-fetch-npm": "^2.0.2",
+				"promise-retry": "^1.1.1",
+				"socks-proxy-agent": "^4.0.0",
+				"ssri": "^6.0.0"
+			},
+			"dependencies": {
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+					"dev": true,
+					"requires": {
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
+					},
+					"dependencies": {
+						"lru-cache": {
+							"version": "5.1.1",
+							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+							"dev": true,
+							"requires": {
+								"yallist": "^3.0.2"
+							}
+						}
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
+		},
 		"map-age-cleaner": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -14698,15 +10810,9 @@
 			}
 		},
 		"marked": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz",
-			"integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==",
-			"dev": true
-		},
-		"math-random": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-			"integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz",
+			"integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==",
 			"dev": true
 		},
 		"md5.js": {
@@ -14720,11 +10826,16 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"meant": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz",
+			"integrity": "sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg==",
+			"dev": true
+		},
 		"media-typer": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-			"dev": true
+			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
 		},
 		"mem": {
 			"version": "4.1.0",
@@ -14736,6 +10847,16 @@
 				"p-is-promise": "^2.0.0"
 			}
 		},
+		"memory-fs": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+			"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+			"dev": true,
+			"requires": {
+				"errno": "^0.1.3",
+				"readable-stream": "^2.0.1"
+			}
+		},
 		"meow": {
 			"version": "3.7.0",
 			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -14820,8 +10941,16 @@
 		"merge-descriptors": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-			"dev": true
+			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+		},
+		"merge-source-map": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
+			"integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6"
+			}
 		},
 		"merge2": {
 			"version": "1.2.3",
@@ -14832,8 +10961,36 @@
 		"methods": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-			"dev": true
+			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+		},
+		"micromatch": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"braces": "^2.3.1",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"extglob": "^2.0.4",
+				"fragment-cache": "^0.2.1",
+				"kind-of": "^6.0.2",
+				"nanomatch": "^1.2.9",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.2"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
 		},
 		"miller-rabin": {
 			"version": "4.0.1",
@@ -14877,6 +11034,17 @@
 			"resolved": "https://registry.npmjs.org/mingo/-/mingo-1.3.3.tgz",
 			"integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY="
 		},
+		"mini-css-extract-plugin": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
+			"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0",
+				"webpack-sources": "^1.1.0"
+			}
+		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -15014,6 +11182,20 @@
 				"on-headers": "~1.0.1"
 			}
 		},
+		"move-concurrently": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+			"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"copy-concurrently": "^1.0.0",
+				"fs-write-stream-atomic": "^1.0.8",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.3"
+			}
+		},
 		"ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -15063,6 +11245,33 @@
 			"resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
 			"integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
 		},
+		"nanomatch": {
+			"version": "1.2.13",
+			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"fragment-cache": "^0.2.1",
+				"is-windows": "^1.0.2",
+				"kind-of": "^6.0.2",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
 		"ncp": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
@@ -15072,8 +11281,7 @@
 		"negotiator": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-			"dev": true
+			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
 		},
 		"neo-async": {
 			"version": "2.6.0",
@@ -15153,40 +11361,12 @@
 				"url": "^0.11.0",
 				"util": "^0.11.0",
 				"vm-browserify": "0.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				}
 			}
 		},
 		"node-releases": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.6.tgz",
-			"integrity": "sha512-lODUVHEIZutZx+TDdOk47qLik8FJMXzJ+WnyUGci1MTvTOyzZrz5eVPIIpc5Hb3NfHZGeGHeuwrRYVI1PEITWg==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.12.tgz",
+			"integrity": "sha512-Y+AQ1xdjcgaEzpL65PBEF3fnl1FNKnDh9Zm+AUQLIlyyqtSc4u93jyMN4zrjMzdwKQ10RTr3tgY1x7qpsfF/xg==",
 			"dev": true,
 			"requires": {
 				"semver": "^5.3.0"
@@ -15318,8 +11498,7 @@
 					"requires": {
 						"glob": "^7.0.0",
 						"lodash": "^4.0.0",
-						"scss-tokenizer": "^0.2.3",
-						"yargs": "^7.0.0"
+						"scss-tokenizer": "^0.2.3"
 					}
 				},
 				"semver": {
@@ -15352,6 +11531,18 @@
 				"abbrev": "1"
 			}
 		},
+		"normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
 		"normalize-path": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -15367,21 +11558,58 @@
 			"dev": true
 		},
 		"npm-bundled": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-			"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+			"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
 			"dev": true
 		},
+		"npm-package-arg": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
+			"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.6.0",
+				"osenv": "^0.1.5",
+				"semver": "^5.5.0",
+				"validate-npm-package-name": "^3.0.0"
+			}
+		},
 		"npm-packlist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-			"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+			"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
 			"dev": true,
 			"requires": {
 				"ignore-walk": "^3.0.1",
 				"npm-bundled": "^1.0.1"
 			}
 		},
+		"npm-pick-manifest": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
+			"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+			"dev": true,
+			"requires": {
+				"figgy-pudding": "^3.5.1",
+				"npm-package-arg": "^6.0.0",
+				"semver": "^5.4.1"
+			}
+		},
+		"npm-registry-fetch": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
+			"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
+			"dev": true,
+			"requires": {
+				"JSONStream": "^1.3.4",
+				"bluebird": "^3.5.1",
+				"figgy-pudding": "^3.4.1",
+				"lru-cache": "^4.1.3",
+				"make-fetch-happen": "^4.0.1",
+				"npm-package-arg": "^6.1.0"
+			}
+		},
 		"npm-run-path": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -15497,6 +11725,16 @@
 				}
 			}
 		},
+		"object-inspect": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+			"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+		},
+		"object-keys": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+			"integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+		},
 		"object-visit": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -15505,27 +11743,6 @@
 				"isobject": "^3.0.0"
 			}
 		},
-		"object.omit": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
-			"requires": {
-				"for-own": "^0.1.4",
-				"is-extendable": "^0.1.1"
-			},
-			"dependencies": {
-				"for-own": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-					"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-					"dev": true,
-					"requires": {
-						"for-in": "^1.0.1"
-					}
-				}
-			}
-		},
 		"object.pick": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -15534,6 +11751,14 @@
 				"isobject": "^3.0.1"
 			}
 		},
+		"objectorarray": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz",
+			"integrity": "sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==",
+			"requires": {
+				"tape": "^4.8.0"
+			}
+		},
 		"obuf": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -15544,7 +11769,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
 			"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-			"dev": true,
 			"requires": {
 				"ee-first": "1.1.1"
 			}
@@ -15552,8 +11776,7 @@
 		"on-headers": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-			"dev": true
+			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
 		},
 		"once": {
 			"version": "1.4.0",
@@ -15677,7 +11900,6 @@
 			"version": "5.4.0",
 			"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
 			"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-			"dev": true,
 			"requires": {
 				"is-wsl": "^1.1.0"
 			}
@@ -15748,6 +11970,43 @@
 			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
 		},
+		"os-locale": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+			"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+			"dev": true,
+			"requires": {
+				"execa": "^1.0.0",
+				"lcid": "^2.0.0",
+				"mem": "^4.0.0"
+			},
+			"dependencies": {
+				"execa": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+					"dev": true,
+					"requires": {
+						"cross-spawn": "^6.0.0",
+						"get-stream": "^4.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
+					}
+				},
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+					"dev": true,
+					"requires": {
+						"pump": "^3.0.0"
+					}
+				}
+			}
+		},
 		"os-name": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz",
@@ -15831,6 +12090,51 @@
 			"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
 			"dev": true
 		},
+		"pac-proxy-agent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
+			"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"get-uri": "^2.0.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"pac-resolver": "^3.0.0",
+				"raw-body": "^2.2.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"raw-body": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+					"dev": true,
+					"requires": {
+						"bytes": "3.0.0",
+						"http-errors": "1.6.3",
+						"iconv-lite": "0.4.23",
+						"unpipe": "1.0.0"
+					}
+				}
+			}
+		},
 		"pac-resolver": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz",
@@ -15842,50 +12146,127 @@
 				"ip": "^1.1.5",
 				"netmask": "^1.0.6",
 				"thunkify": "^2.1.2"
+			}
+		},
+		"package-json": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+			"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+			"dev": true,
+			"requires": {
+				"got": "^6.7.1",
+				"registry-auth-token": "^3.0.1",
+				"registry-url": "^3.0.3",
+				"semver": "^5.1.0"
+			}
+		},
+		"pacote": {
+			"version": "9.4.0",
+			"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
+			"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.3",
+				"cacache": "^11.3.2",
+				"figgy-pudding": "^3.5.1",
+				"get-stream": "^4.1.0",
+				"glob": "^7.1.3",
+				"lru-cache": "^5.1.1",
+				"make-fetch-happen": "^4.0.1",
+				"minimatch": "^3.0.4",
+				"minipass": "^2.3.5",
+				"mississippi": "^3.0.0",
+				"mkdirp": "^0.5.1",
+				"normalize-package-data": "^2.4.0",
+				"npm-package-arg": "^6.1.0",
+				"npm-packlist": "^1.1.12",
+				"npm-pick-manifest": "^2.2.3",
+				"npm-registry-fetch": "^3.8.0",
+				"osenv": "^0.1.5",
+				"promise-inflight": "^1.0.1",
+				"promise-retry": "^1.1.1",
+				"protoduck": "^5.0.1",
+				"rimraf": "^2.6.2",
+				"safe-buffer": "^5.1.2",
+				"semver": "^5.6.0",
+				"ssri": "^6.0.1",
+				"tar": "^4.4.8",
+				"unique-filename": "^1.1.1",
+				"which": "^1.3.1"
 			},
 			"dependencies": {
-				"degenerator": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
-					"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"ast-types": "0.x.x",
-						"escodegen": "1.x.x",
-						"esprima": "3.x.x"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.11.0",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
-					"integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
 					"dev": true,
 					"requires": {
-						"esprima": "^3.1.3",
-						"estraverse": "^4.2.0",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.6.1"
+						"pump": "^3.0.0"
 					}
 				},
-				"esprima": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-					"dev": true
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
 				},
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
@@ -15904,38 +12285,12 @@
 				"cyclist": "~0.2.2",
 				"inherits": "^2.0.3",
 				"readable-stream": "^2.1.5"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"parse-asn1": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.3.tgz",
-			"integrity": "sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==",
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+			"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 			"dev": true,
 			"requires": {
 				"asn1.js": "^4.0.0",
@@ -15946,35 +12301,6 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"parse-glob": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
-			"requires": {
-				"glob-base": "^0.3.0",
-				"is-dotfile": "^1.0.0",
-				"is-extglob": "^1.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
 		"parse-json": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -16032,8 +12358,7 @@
 		"parseurl": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-			"dev": true
+			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
 		},
 		"pascalcase": {
 			"version": "0.1.1",
@@ -16075,14 +12400,12 @@
 		"path-parse": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-			"dev": true
+			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
 		},
 		"path-to-regexp": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-			"dev": true
+			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
 		},
 		"path-type": {
 			"version": "3.0.0",
@@ -16114,6 +12437,41 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"pdfkit": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/pdfkit/-/pdfkit-0.9.0.tgz",
+			"integrity": "sha512-j/tJvvoEM7qMiOfodNkz6XRNBvAhVohWP1mUvgg+Xy8X8S3aMBpVGXJGZWNCoCUH2ywLidZSbHyn5mJaqv9umw==",
+			"dev": true,
+			"requires": {
+				"crypto-js": "^3.1.9-1",
+				"fontkit": "^1.0.0",
+				"linebreak": "^0.3.0",
+				"png-js": ">=0.1.0",
+				"saslprep": "1.0.1"
+			}
+		},
+		"pdfmake": {
+			"version": "0.1.54",
+			"resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.1.54.tgz",
+			"integrity": "sha512-HO2FX+czmO+8LpWXQMFQfdUCCKnqwSvSEJExGkUKfsV34DRIV5PZjNg0xWS7ypGrnTY6RTTssWpdreX/pbyeyw==",
+			"dev": true,
+			"requires": {
+				"iconv-lite": "^0.4.24",
+				"linebreak": "^0.3.0",
+				"pdfkit": "^0.9.0"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+					"dev": true,
+					"requires": {
+						"safer-buffer": ">= 2.1.2 < 3"
+					}
+				}
+			}
+		},
 		"performance-now": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -16190,6 +12548,29 @@
 				"semver-compare": "^1.0.0"
 			}
 		},
+		"plist": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
+			"integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+			"requires": {
+				"base64-js": "^1.2.3",
+				"xmlbuilder": "^9.0.7",
+				"xmldom": "0.1.x"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
+				}
+			}
+		},
+		"png-js": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/png-js/-/png-js-0.1.1.tgz",
+			"integrity": "sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=",
+			"dev": true
+		},
 		"pngjs": {
 			"version": "3.3.3",
 			"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.3.tgz",
@@ -16258,20 +12639,6 @@
 			"requires": {
 				"cosmiconfig": "^4.0.0",
 				"import-cwd": "^2.0.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-					"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
-					"dev": true,
-					"requires": {
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0",
-						"require-from-string": "^2.0.1"
-					}
-				}
 			}
 		},
 		"postcss-loader": {
@@ -16304,12 +12671,6 @@
 			"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
 			"dev": true
 		},
-		"preserve": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
-		},
 		"process": {
 			"version": "0.11.10",
 			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -16601,7 +12962,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
 			"integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
-			"dev": true,
 			"requires": {
 				"forwarded": "~0.1.2",
 				"ipaddr.js": "1.8.0"
@@ -16610,7 +12970,39 @@
 				"ipaddr.js": {
 					"version": "1.8.0",
 					"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+				}
+			}
+		},
+		"proxy-agent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.0.tgz",
+			"integrity": "sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"pac-proxy-agent": "^3.0.0",
+				"proxy-from-env": "^1.0.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
@@ -16697,8 +13089,7 @@
 		"q": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-			"dev": true
+			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4="
 		},
 		"qjobs": {
 			"version": "1.2.0",
@@ -16861,40 +13252,26 @@
 			"dev": true
 		},
 		"querystringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
-			"integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+			"integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
 			"dev": true
 		},
-		"randomatic": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-			"integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+		"quote-stream": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
+			"integrity": "sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=",
 			"dev": true,
 			"requires": {
-				"is-number": "^4.0.0",
-				"kind-of": "^6.0.0",
-				"math-random": "^1.0.1"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				}
+				"buffer-equal": "0.0.1",
+				"minimist": "^1.1.3",
+				"through2": "^2.0.0"
 			}
 		},
 		"randombytes": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-			"integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.1.0"
@@ -16913,53 +13290,42 @@
 		"range-parser": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-			"dev": true
+			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
 		},
 		"raw-body": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-			"integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+			"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
 			"dev": true,
 			"requires": {
-				"bytes": "3.0.0",
-				"http-errors": "1.6.2",
-				"iconv-lite": "0.4.19",
-				"unpipe": "1.0.0"
+				"bytes": "1",
+				"string_decoder": "0.10"
 			},
 			"dependencies": {
-				"depd": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-					"integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-					"dev": true
-				},
-				"http-errors": {
-					"version": "1.6.2",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-					"integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-					"dev": true,
-					"requires": {
-						"depd": "1.1.1",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.0.3",
-						"statuses": ">= 1.3.1 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-					"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+				"bytes": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
 					"dev": true
 				},
-				"setprototypeof": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-					"integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
 					"dev": true
 				}
 			}
 		},
+		"raw-loader": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
+			"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"rc": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -16972,21 +13338,125 @@
 				"strip-json-comments": "~2.0.1"
 			}
 		},
-		"read-cache": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+		"read-cache": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+			"dev": true,
+			"requires": {
+				"pify": "^2.3.0"
+			},
+			"dependencies": {
+				"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"
+			},
+			"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"
+					}
+				},
+				"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-up": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+			"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+			"dev": true,
+			"requires": {
+				"find-up": "^2.0.0",
+				"read-pkg": "^2.0.0"
+			},
+			"dependencies": {
+				"find-up": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+					"dev": true,
+					"requires": {
+						"locate-path": "^2.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+					"dev": true,
+					"requires": {
+						"p-locate": "^2.0.0",
+						"path-exists": "^3.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+					"dev": true,
+					"requires": {
+						"p-limit": "^1.1.0"
+					}
+				}
+			}
+		},
+		"readable-stream": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+			"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 			"dev": true,
 			"requires": {
-				"pify": "^2.3.0"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
+				"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"
 			}
 		},
 		"readdirp": {
@@ -17390,15 +13860,6 @@
 			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
 			"dev": true
 		},
-		"regex-cache": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-			"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-			"dev": true,
-			"requires": {
-				"is-equal-shallow": "^0.1.3"
-			}
-		},
 		"regex-not": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -17420,9 +13881,9 @@
 			}
 		},
 		"registry-auth-token": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-			"integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+			"integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
 			"dev": true,
 			"requires": {
 				"rc": "^1.1.6",
@@ -17484,6 +13945,35 @@
 				"is-finite": "^1.0.0"
 			}
 		},
+		"request": {
+			"version": "2.88.0",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+			"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"aws-sign2": "~0.7.0",
+				"aws4": "^1.8.0",
+				"caseless": "~0.12.0",
+				"combined-stream": "~1.0.6",
+				"extend": "~3.0.2",
+				"forever-agent": "~0.6.1",
+				"form-data": "~2.3.2",
+				"har-validator": "~5.1.0",
+				"http-signature": "~1.2.0",
+				"is-typedarray": "~1.0.0",
+				"isstream": "~0.1.2",
+				"json-stringify-safe": "~5.0.1",
+				"mime-types": "~2.1.19",
+				"oauth-sign": "~0.9.0",
+				"performance-now": "^2.1.0",
+				"qs": "~6.5.2",
+				"safe-buffer": "^5.1.2",
+				"tough-cookie": "~2.4.3",
+				"tunnel-agent": "^0.6.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -17507,10 +13997,13 @@
 			"dev": true
 		},
 		"resolve": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-			"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-			"dev": true
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+			"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+			"dev": true,
+			"requires": {
+				"path-parse": "^1.0.6"
+			}
 		},
 		"resolve-cwd": {
 			"version": "2.0.0",
@@ -17542,6 +14035,23 @@
 				"signal-exit": "^3.0.2"
 			}
 		},
+		"restructure": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/restructure/-/restructure-0.5.4.tgz",
+			"integrity": "sha1-9U591WNZD7NP1r9Vh2EJrsyyjeg=",
+			"dev": true,
+			"requires": {
+				"browserify-optional": "^1.0.0"
+			}
+		},
+		"resumer": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+			"integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
+			"requires": {
+				"through": "~2.3.4"
+			}
+		},
 		"ret": {
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -17592,6 +14102,36 @@
 			"integrity": "sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==",
 			"dev": true
 		},
+		"rollup-plugin-commonjs": {
+			"version": "8.2.6",
+			"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
+			"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.2.1",
+				"estree-walker": "^0.5.0",
+				"magic-string": "^0.22.4",
+				"resolve": "^1.4.0",
+				"rollup-pluginutils": "^2.0.1"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				}
+			}
+		},
 		"rollup-plugin-node-resolve": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz",
@@ -17605,94 +14145,20 @@
 			}
 		},
 		"rollup-pluginutils": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz",
-			"integrity": "sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==",
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.5.0.tgz",
+			"integrity": "sha512-9Muh1H+XB5f5ONmKMayUoTYR1EZwHbwJJ9oZLrKT5yuTf/RLIQ5mYIGsrERquVucJmjmaAW0Y7+6Qo1Ep+5w3Q==",
 			"dev": true,
 			"requires": {
-				"estree-walker": "^0.5.2",
-				"micromatch": "^2.3.11"
+				"estree-walker": "^0.6.0",
+				"micromatch": "^3.1.10"
 			},
 			"dependencies": {
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+				"estree-walker": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz",
+					"integrity": "sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==",
 					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
 				}
 			}
 		},
@@ -17781,6 +14247,12 @@
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
+		"saslprep": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.1.tgz",
+			"integrity": "sha512-ntN6SbE3hRqd45PKKadRPgA+xHPWg5lPSj2JWJdJvjTwXDDfkPVtXWvP8jJojvnm+rAsZ2b299C5NwZqq818EA==",
+			"dev": true
+		},
 		"sass-loader": {
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
@@ -17907,7 +14379,6 @@
 			"version": "0.16.2",
 			"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
 			"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"depd": "~1.1.2",
@@ -17927,8 +14398,7 @@
 				"mime": {
 					"version": "1.4.1",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
 				}
 			}
 		},
@@ -17957,7 +14427,6 @@
 			"version": "1.13.2",
 			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
 			"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-			"dev": true,
 			"requires": {
 				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
@@ -18000,8 +14469,7 @@
 		"setprototypeof": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-			"dev": true
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
 		},
 		"sha.js": {
 			"version": "2.4.11",
@@ -18030,6 +14498,12 @@
 				}
 			}
 		},
+		"shallow-copy": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+			"integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=",
+			"dev": true
+		},
 		"shebang-command": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -18082,6 +14556,39 @@
 			"integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==",
 			"dev": true
 		},
+		"snapdragon": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+			"requires": {
+				"base": "^0.11.1",
+				"debug": "^2.2.0",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"map-cache": "^0.2.2",
+				"source-map": "^0.5.6",
+				"source-map-resolve": "^0.5.0",
+				"use": "^3.1.0"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				},
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
 		"snapdragon-node": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
@@ -18141,6 +14648,53 @@
 				"kind-of": "^3.2.0"
 			}
 		},
+		"socket.io": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+			"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+			"dev": true,
+			"requires": {
+				"debug": "~3.1.0",
+				"engine.io": "~3.2.0",
+				"has-binary2": "~1.0.2",
+				"socket.io-adapter": "~1.1.0",
+				"socket.io-client": "2.1.1",
+				"socket.io-parser": "~3.2.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"socket.io-client": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+					"dev": true,
+					"requires": {
+						"backo2": "1.0.2",
+						"base64-arraybuffer": "0.1.5",
+						"component-bind": "1.0.0",
+						"component-emitter": "1.2.1",
+						"debug": "~3.1.0",
+						"engine.io-client": "~3.2.0",
+						"has-binary2": "~1.0.2",
+						"has-cors": "1.1.0",
+						"indexof": "0.0.1",
+						"object-component": "0.0.3",
+						"parseqs": "0.0.5",
+						"parseuri": "0.0.5",
+						"socket.io-parser": "~3.2.0",
+						"to-array": "0.1.4"
+					}
+				}
+			}
+		},
 		"socket.io-adapter": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
@@ -18239,10 +14793,60 @@
 				}
 			}
 		},
+		"sockjs": {
+			"version": "0.3.19",
+			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+			"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+			"dev": true,
+			"requires": {
+				"faye-websocket": "^0.10.0",
+				"uuid": "^3.0.1"
+			}
+		},
+		"sockjs-client": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
+			"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.2.5",
+				"eventsource": "^1.0.7",
+				"faye-websocket": "~0.11.1",
+				"inherits": "^2.0.3",
+				"json3": "^3.3.2",
+				"url-parse": "^1.4.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"socks": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/socks/-/socks-2.2.3.tgz",
-			"integrity": "sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
+			"integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
 			"dev": true,
 			"requires": {
 				"ip": "^1.1.5",
@@ -18250,13 +14854,13 @@
 			}
 		},
 		"socks-proxy-agent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz",
-			"integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+			"integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
 			"dev": true,
 			"requires": {
-				"agent-base": "~4.2.0",
-				"socks": "~2.2.0"
+				"agent-base": "~4.2.1",
+				"socks": "~2.3.2"
 			}
 		},
 		"source-list-map": {
@@ -18280,6 +14884,18 @@
 				"loader-utils": "^1.1.0"
 			}
 		},
+		"source-map-resolve": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+			"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+			"requires": {
+				"atob": "^2.1.1",
+				"decode-uri-component": "^0.2.0",
+				"resolve-url": "^0.2.1",
+				"source-map-url": "^0.4.0",
+				"urix": "^0.1.0"
+			}
+		},
 		"source-map-support": {
 			"version": "0.5.10",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
@@ -18318,29 +14934,101 @@
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-exceptions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
-		},
-		"spdx-expression-parse": {
+		"spdx-exceptions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+		},
+		"spdx-expression-parse": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"requires": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-license-ids": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+		},
+		"spdy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+			"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.0",
+				"handle-thing": "^2.0.0",
+				"http-deceiver": "^1.2.7",
+				"select-hose": "^2.0.0",
+				"spdy-transport": "^3.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"spdy-transport": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+			"dev": true,
 			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
+				"debug": "^4.1.0",
+				"detect-node": "^2.0.4",
+				"hpack.js": "^2.1.6",
+				"obuf": "^1.1.2",
+				"readable-stream": "^3.0.6",
+				"wbuf": "^1.7.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
 			}
 		},
-		"spdx-license-ids": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
-		},
 		"speed-measure-webpack-plugin": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz",
-			"integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
+			"integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
 			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1"
@@ -18363,18 +15051,18 @@
 			}
 		},
 		"split2": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.0.tgz",
-			"integrity": "sha512-ePE1otNQVMnBRyqf3INbZvZwBPGsdBDThgrOWZ6z8zXGNVQNVCSEoOO9aBMTzDN1mXoNSZJ2kHSFH7AA5SPWww==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz",
+			"integrity": "sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==",
 			"dev": true,
 			"requires": {
 				"readable-stream": "^3.0.0"
 			},
 			"dependencies": {
 				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
 						"inherits": "^2.0.3",
@@ -18426,6 +15114,15 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
+		"static-eval": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+			"integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+			"dev": true,
+			"requires": {
+				"escodegen": "^1.8.1"
+			}
+		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -18445,6 +15142,45 @@
 				}
 			}
 		},
+		"static-module": {
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/static-module/-/static-module-2.2.5.tgz",
+			"integrity": "sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==",
+			"dev": true,
+			"requires": {
+				"concat-stream": "~1.6.0",
+				"convert-source-map": "^1.5.1",
+				"duplexer2": "~0.1.4",
+				"escodegen": "~1.9.0",
+				"falafel": "^2.1.0",
+				"has": "^1.0.1",
+				"magic-string": "^0.22.4",
+				"merge-source-map": "1.0.4",
+				"object-inspect": "~1.4.0",
+				"quote-stream": "~1.0.2",
+				"readable-stream": "~2.3.3",
+				"shallow-copy": "~0.0.1",
+				"static-eval": "^2.0.0",
+				"through2": "~2.0.3"
+			},
+			"dependencies": {
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				},
+				"object-inspect": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz",
+					"integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==",
+					"dev": true
+				}
+			}
+		},
 		"stats-webpack-plugin": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz",
@@ -18457,8 +15193,7 @@
 		"statuses": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-			"dev": true
+			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
 		},
 		"stdout-stream": {
 			"version": "1.4.1",
@@ -18500,32 +15235,6 @@
 			"requires": {
 				"inherits": "~2.0.1",
 				"readable-stream": "^2.0.2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"stream-combiner": {
@@ -18594,40 +15303,44 @@
 				"readable-stream": "^2.3.6",
 				"to-arraybuffer": "^1.0.0",
 				"xtend": "^4.0.0"
+			}
+		},
+		"stream-shift": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+			"dev": true
+		},
+		"streamroller": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz",
+			"integrity": "sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"date-format": "^2.0.0",
+				"debug": "^3.1.0",
+				"fs-extra": "^7.0.0",
+				"lodash": "^4.17.10"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"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"
+						"ms": "^2.1.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"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-			"dev": true
-		},
 		"string-template": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
@@ -18658,10 +15371,20 @@
 				}
 			}
 		},
+		"string.prototype.trim": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
+			"integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
+			"requires": {
+				"define-properties": "^1.1.2",
+				"es-abstract": "^1.5.0",
+				"function-bind": "^1.0.2"
+			}
+		},
 		"string_decoder": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
-			"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+			"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"
@@ -18678,8 +15401,7 @@
 		"strip-bom": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-			"dev": true
+			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
 		},
 		"strip-eof": {
 			"version": "1.0.0",
@@ -18701,13 +15423,21 @@
 			"dev": true
 		},
 		"stripe": {
-			"version": "6.23.0",
-			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.23.0.tgz",
-			"integrity": "sha512-o3rkli0B0O05Z6BwdiNpzCxQ16J1YmUlQB2JAjNC2dTwjg3koF74qhWUY0Rbb8Xisd/Wbgi8DODzNpD9JKG/FA==",
+			"version": "6.28.0",
+			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.28.0.tgz",
+			"integrity": "sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==",
 			"requires": {
 				"lodash.isplainobject": "^4.0.6",
-				"qs": "~6.5.1",
-				"safe-buffer": "^5.1.1"
+				"qs": "^6.6.0",
+				"safe-buffer": "^5.1.1",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+				}
 			}
 		},
 		"style-loader": {
@@ -18720,10 +15450,60 @@
 				"schema-utils": "^1.0.0"
 			}
 		},
+		"stylus": {
+			"version": "0.54.5",
+			"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+			"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+			"dev": true,
+			"requires": {
+				"css-parse": "1.7.x",
+				"debug": "*",
+				"glob": "7.0.x",
+				"mkdirp": "0.5.x",
+				"sax": "0.5.x",
+				"source-map": "0.1.x"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.0.6",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+					"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.2",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
+		"stylus-loader": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+			"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"lodash.clonedeep": "^4.5.0",
+				"when": "~3.6.x"
+			}
+		},
 		"subscriptions-transport-ws": {
-			"version": "0.9.15",
-			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz",
-			"integrity": "sha512-f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ==",
+			"version": "0.9.16",
+			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz",
+			"integrity": "sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==",
 			"requires": {
 				"backo2": "^1.0.2",
 				"eventemitter3": "^3.1.0",
@@ -18742,6 +15522,90 @@
 				}
 			}
 		},
+		"superagent": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
+			"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "^1.2.0",
+				"cookiejar": "^2.1.2",
+				"debug": "^4.1.0",
+				"form-data": "^2.3.3",
+				"formidable": "^1.2.0",
+				"methods": "^1.1.1",
+				"mime": "^2.4.0",
+				"qs": "^6.6.0",
+				"readable-stream": "^3.0.6"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
+		},
+		"superagent-proxy": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
+			"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.1.0",
+				"proxy-agent": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"supports-color": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -18752,11 +15616,11 @@
 			}
 		},
 		"swiper": {
-			"version": "4.4.6",
-			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.4.6.tgz",
-			"integrity": "sha512-F9NDtijQt+etiOe6JAEH+Cb+QKzwwFpi08FlOIQv8ALdoQ8tvAX/38a/28E5XxalAkChsHCutwkBCzDxDXTGiA==",
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.0.tgz",
+			"integrity": "sha512-jRCd/CGet9kaHwthHdd/sL/YU8CI157PWLyItnIcn/o/jP4haVky3zTF6f9F3JDpmQIw7jdWihISiYx0/oTHsg==",
 			"requires": {
-				"dom7": "^2.1.2",
+				"dom7": "^2.1.3",
 				"ssr-window": "^1.0.1"
 			}
 		},
@@ -18771,6 +15635,51 @@
 			"integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
 			"dev": true
 		},
+		"tape": {
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/tape/-/tape-4.10.1.tgz",
+			"integrity": "sha512-G0DywYV1jQeY3axeYnXUOt6ktnxS9OPJh97FGR3nrua8lhWi1zPflLxcAHavZ7Jf3qUfY7cxcVIVFa4mY2IY1w==",
+			"requires": {
+				"deep-equal": "~1.0.1",
+				"defined": "~1.0.0",
+				"for-each": "~0.3.3",
+				"function-bind": "~1.1.1",
+				"glob": "~7.1.3",
+				"has": "~1.0.3",
+				"inherits": "~2.0.3",
+				"minimist": "~1.2.0",
+				"object-inspect": "~1.6.0",
+				"resolve": "~1.10.0",
+				"resumer": "~0.0.0",
+				"string.prototype.trim": "~1.1.2",
+				"through": "~2.3.8"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.10.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"tar": {
+			"version": "4.4.8",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+			"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+			"dev": true,
+			"requires": {
+				"chownr": "^1.1.1",
+				"fs-minipass": "^1.2.5",
+				"minipass": "^2.3.4",
+				"minizlib": "^1.1.1",
+				"mkdirp": "^0.5.0",
+				"safe-buffer": "^5.1.2",
+				"yallist": "^3.0.2"
+			}
+		},
 		"term-size": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
@@ -18809,14 +15718,14 @@
 			}
 		},
 		"terser": {
-			"version": "3.16.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-3.16.0.tgz",
-			"integrity": "sha512-Ua8BhyibmsQBFXDZZ3Es7GASB2yFrQJr0jgAlZK1FBLbFarrHoCuMHPCro5MbX4jidcaFGiV+uTc3wxodmGjUg==",
+			"version": "3.17.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+			"integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
 			"dev": true,
 			"requires": {
-				"commander": "~2.17.1",
+				"commander": "^2.19.0",
 				"source-map": "~0.6.1",
-				"source-map-support": "~0.5.9"
+				"source-map-support": "~0.5.10"
 			},
 			"dependencies": {
 				"source-map": {
@@ -18827,853 +15736,993 @@
 				}
 			}
 		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-		},
-		"through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+		"terser-webpack-plugin": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
+			"integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
 			"dev": true,
 			"requires": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+				"cacache": "^11.0.2",
+				"find-cache-dir": "^2.0.0",
+				"schema-utils": "^1.0.0",
+				"serialize-javascript": "^1.4.0",
+				"source-map": "^0.6.1",
+				"terser": "^3.16.1",
+				"webpack-sources": "^1.1.0",
+				"worker-farm": "^1.5.2"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"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"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
-				}
-			}
-		},
-		"thunkify": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
-			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
-			"dev": true
-		},
-		"thunky": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
-			"dev": true
-		},
-		"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.10",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-			"dev": true,
-			"requires": {
-				"setimmediate": "^1.0.4"
-			}
-		},
-		"tmp": {
-			"version": "0.0.33",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "~1.0.2"
-			}
-		},
-		"to-array": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
-		},
-		"to-arraybuffer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-			"dev": true
-		},
-		"to-fast-properties": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-			"dev": true
-		},
-		"to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			}
-		},
-		"to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
-			}
-		},
-		"tough-cookie": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-			"requires": {
-				"psl": "^1.1.24",
-				"punycode": "^1.4.1"
-			}
-		},
-		"traverse": {
-			"version": "0.6.6",
-			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
-			"dev": true
-		},
-		"tree-kill": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
-			"dev": true
-		},
-		"trim-newlines": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
-		},
-		"trim-right": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-			"dev": true
-		},
-		"true-case-path": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-			"requires": {
-				"glob": "^7.1.2"
-			}
-		},
-		"tryer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-			"dev": true
-		},
-		"ts-node": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.2.tgz",
-			"integrity": "sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==",
-			"dev": true,
-			"requires": {
-				"arg": "^4.1.0",
-				"diff": "^3.1.0",
-				"make-error": "^1.1.1",
-				"source-map-support": "^0.5.6",
-				"yn": "^3.0.0"
-			}
-		},
-		"tslib": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-		},
-		"tslint": {
-			"version": "5.12.1",
-			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz",
-			"integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==",
-			"dev": true,
-			"requires": {
-				"babel-code-frame": "^6.22.0",
-				"builtin-modules": "^1.1.1",
-				"chalk": "^2.3.0",
-				"commander": "^2.12.1",
-				"diff": "^3.2.0",
-				"glob": "^7.1.1",
-				"js-yaml": "^3.7.0",
-				"minimatch": "^3.0.4",
-				"resolve": "^1.3.2",
-				"semver": "^5.3.0",
-				"tslib": "^1.8.0",
-				"tsutils": "^2.27.2"
-			},
-			"dependencies": {
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+				},
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
+				},
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+					"dev": true,
+					"requires": {
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"path-parse": "^1.0.6"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
+				},
+				"pkg-dir": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+					"dev": true,
+					"requires": {
+						"find-up": "^3.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
 					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
-		"tslint-eslint-rules": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
-			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
+		"through": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+		},
+		"through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
 			"dev": true,
 			"requires": {
-				"doctrine": "^0.7.2",
-				"tslib": "^1.0.0",
-				"tsutils": "^1.4.0"
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
 			},
 			"dependencies": {
-				"tsutils": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
-					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
-					"dev": true
+				"readable-stream": {
+					"version": "2.3.6",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "~1.0.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"
+					}
 				}
 			}
 		},
-		"tsutils": {
-			"version": "2.29.0",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-			"dev": true,
-			"requires": {
-				"tslib": "^1.8.1"
-			}
-		},
-		"tty-browserify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+		"thunkify": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
+			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
 			"dev": true
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
+		"thunky": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+			"dev": true
 		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		"time-stamp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+			"dev": true
 		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2"
-			}
+		"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
 		},
-		"type-is": {
-			"version": "1.6.16",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+		"timers-browserify": {
+			"version": "2.0.10",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 			"dev": true,
 			"requires": {
-				"media-typer": "0.3.0",
-				"mime-types": "~2.1.18"
+				"setimmediate": "^1.0.4"
 			}
 		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-			"dev": true
-		},
-		"typescript": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
-			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
+		"tiny-inflate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.2.tgz",
+			"integrity": "sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=",
 			"dev": true
 		},
-		"uglify-js": {
-			"version": "3.4.9",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-			"integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+		"tiny-lr": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+			"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"commander": "~2.17.1",
-				"source-map": "~0.6.1"
+				"body": "^5.1.0",
+				"debug": "^3.1.0",
+				"faye-websocket": "~0.10.0",
+				"livereload-js": "^2.3.0",
+				"object-assign": "^4.1.0",
+				"qs": "^6.4.0"
 			},
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"uglify-to-browserify": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+		"tmp": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
 			"dev": true,
-			"optional": true
+			"requires": {
+				"os-tmpdir": "~1.0.2"
+			}
 		},
-		"ultron": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-			"dev": true
+		"to-array": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
 		},
-		"unc-path-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+		"to-arraybuffer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
 			"dev": true
 		},
-		"union-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
-			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^0.4.3"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"set-value": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-extendable": "^0.1.1",
-						"is-plain-object": "^2.0.1",
-						"to-object-path": "^0.3.0"
-					}
-				}
+		"to-fast-properties": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+			"dev": true
+		},
+		"to-object-path": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+			"requires": {
+				"kind-of": "^3.0.2"
 			}
 		},
-		"unique-filename": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-			"dev": true,
+		"to-regex": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
 			"requires": {
-				"unique-slug": "^2.0.0"
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"regex-not": "^1.0.2",
+				"safe-regex": "^1.1.0"
 			}
 		},
-		"unique-slug": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
-			"dev": true,
+		"to-regex-range": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 			"requires": {
-				"imurmurhash": "^0.1.4"
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1"
 			}
 		},
-		"unique-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-			"dev": true,
+		"tough-cookie": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
 			"requires": {
-				"crypto-random-string": "^1.0.0"
+				"psl": "^1.1.24",
+				"punycode": "^1.4.1"
 			}
 		},
-		"universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+		"traverse": {
+			"version": "0.6.6",
+			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
+			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
 			"dev": true
 		},
-		"unix-crypt-td-js": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
-			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+		"tree-kill": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
 			"dev": true
 		},
-		"unpipe": {
+		"trim-newlines": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
+		},
+		"trim-right": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
 			"dev": true
 		},
-		"unset-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+		"true-case-path": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
 			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
-				}
+				"glob": "^7.1.2"
 			}
 		},
-		"untildify": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
-			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
-			"dev": true
-		},
-		"unzip-response": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+		"tryer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
 			"dev": true
 		},
-		"upath": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
-		},
-		"uri-js": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+		"ts-invariant": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz",
+			"integrity": "sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==",
 			"requires": {
-				"punycode": "^2.1.0"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-				}
+				"tslib": "^1.9.3"
 			}
 		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		"ts-node": {
+			"version": "8.0.3",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.3.tgz",
+			"integrity": "sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==",
+			"dev": true,
+			"requires": {
+				"arg": "^4.1.0",
+				"diff": "^3.1.0",
+				"make-error": "^1.1.1",
+				"source-map-support": "^0.5.6",
+				"yn": "^3.0.0"
+			}
 		},
-		"url": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+		"ts-simple-ast": {
+			"version": "12.4.0",
+			"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
+			"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
 			"dev": true,
 			"requires": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
+				"@dsherret/to-absolute-glob": "^2.0.2",
+				"code-block-writer": "^7.2.0",
+				"fs-extra": "^6.0.1",
+				"glob-parent": "^3.1.0",
+				"globby": "^8.0.1",
+				"is-negated-glob": "^1.0.0",
+				"multimatch": "^2.1.0",
+				"object-assign": "^4.1.1",
+				"tslib": "^1.9.0",
+				"typescript": "2.9.1"
 			},
 			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+				"dir-glob": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+					"dev": true,
+					"requires": {
+						"arrify": "^1.0.1",
+						"path-type": "^3.0.0"
+					}
+				},
+				"fs-extra": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+					"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
+					}
+				},
+				"globby": {
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"dir-glob": "2.0.0",
+						"fast-glob": "^2.0.2",
+						"glob": "^7.1.2",
+						"ignore": "^3.3.5",
+						"pify": "^3.0.0",
+						"slash": "^1.0.0"
+					}
+				},
+				"typescript": {
+					"version": "2.9.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
+					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
 					"dev": true
 				}
 			}
 		},
-		"url-parse": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
-			"dev": true,
-			"requires": {
-				"querystringify": "^2.0.0",
-				"requires-port": "^1.0.0"
-			}
+		"tslib": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
 		},
-		"url-parse-lax": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+		"tslint": {
+			"version": "5.14.0",
+			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.14.0.tgz",
+			"integrity": "sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==",
 			"dev": true,
 			"requires": {
-				"prepend-http": "^1.0.1"
+				"babel-code-frame": "^6.22.0",
+				"builtin-modules": "^1.1.1",
+				"chalk": "^2.3.0",
+				"commander": "^2.12.1",
+				"diff": "^3.2.0",
+				"glob": "^7.1.1",
+				"js-yaml": "^3.7.0",
+				"minimatch": "^3.0.4",
+				"mkdirp": "^0.5.1",
+				"resolve": "^1.3.2",
+				"semver": "^5.3.0",
+				"tslib": "^1.8.0",
+				"tsutils": "^2.29.0"
 			}
 		},
-		"use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-		},
-		"useragent": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+		"tslint-eslint-rules": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
+			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
 			"dev": true,
 			"requires": {
-				"lru-cache": "4.1.x",
-				"tmp": "0.0.x"
+				"doctrine": "^0.7.2",
+				"tslib": "^1.0.0",
+				"tsutils": "^1.4.0"
+			},
+			"dependencies": {
+				"tsutils": {
+					"version": "1.9.1",
+					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
+					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
+					"dev": true
+				}
 			}
 		},
-		"util": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+		"tsutils": {
+			"version": "2.29.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
 			"dev": true,
 			"requires": {
-				"inherits": "2.0.3"
+				"tslib": "^1.8.1"
 			}
 		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-		},
-		"utils-merge": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+		"tty-browserify": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
 			"dev": true
 		},
-		"uuid": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-		},
-		"validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+		"tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"validate-npm-package-name": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+		"tweetnacl": {
+			"version": "0.14.5",
+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		},
+		"type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
 			"dev": true,
 			"requires": {
-				"builtins": "^1.0.3"
+				"prelude-ls": "~1.1.2"
 			}
 		},
-		"vary": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-			"dev": true
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+		"type-is": {
+			"version": "1.6.16",
+			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
+				"media-typer": "0.3.0",
+				"mime-types": "~2.1.18"
 			}
 		},
-		"viz.js": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
-			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
-			"dev": true
-		},
-		"vlq": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+		"typedarray": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
 			"dev": true
 		},
-		"vm-browserify": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-			"dev": true,
-			"requires": {
-				"indexof": "0.0.1"
-			}
-		},
-		"void-elements": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-			"dev": true
+		"typescript": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
+			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="
 		},
-		"watchpack": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-			"dev": true,
-			"requires": {
-				"chokidar": "^2.0.2",
-				"graceful-fs": "^4.1.2",
-				"neo-async": "^2.5.0"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+		"uglify-js": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.2.tgz",
+			"integrity": "sha512-imog1WIsi9Yb56yRt5TfYVxGmnWs3WSGU73ieSOlMVFwhJCA9W8fqFFMMj4kgDqiS/80LGdsYnWL7O9UcjEBlg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"commander": "~2.19.0",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
+					"optional": true
+				}
+			}
+		},
+		"uglify-to-browserify": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+			"dev": true,
+			"optional": true
+		},
+		"uglifyjs-webpack-plugin": {
+			"version": "0.4.6",
+			"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+			"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6",
+				"uglify-js": "^2.8.29",
+				"webpack-sources": "^1.0.1"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"cliui": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"center-align": "^0.1.1",
+						"right-align": "^0.1.1",
+						"wordwrap": "0.0.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"uglify-js": {
+					"version": "2.8.29",
+					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"source-map": "~0.5.1",
+						"uglify-to-browserify": "~1.0.0",
+						"yargs": "~3.10.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"wordwrap": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+					"dev": true
+				},
+				"yargs": {
+					"version": "3.10.0",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"camelcase": "^1.0.2",
+						"cliui": "^2.1.0",
+						"decamelize": "^1.0.0",
+						"window-size": "0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				}
+			}
+		},
+		"ultron": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+			"dev": true
+		},
+		"unc-path-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+			"dev": true
+		},
+		"underscore": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+			"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+		},
+		"unicode-properties": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.1.0.tgz",
+			"integrity": "sha1-epbu9J91aC6mnSMV7smsQ//fAME=",
+			"dev": true,
+			"requires": {
+				"brfs": "^1.4.0",
+				"unicode-trie": "^0.3.0"
+			}
+		},
+		"unicode-trie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-0.3.1.tgz",
+			"integrity": "sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=",
+			"dev": true,
+			"requires": {
+				"pako": "^0.2.5",
+				"tiny-inflate": "^1.0.0"
+			},
+			"dependencies": {
+				"pako": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+					"integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
 					"dev": true
+				}
+			}
+		},
+		"union-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+			"requires": {
+				"arr-union": "^3.1.0",
+				"get-value": "^2.0.6",
+				"is-extendable": "^0.1.1",
+				"set-value": "^0.4.3"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
+				"set-value": {
+					"version": "0.4.3",
+					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
 						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
+						"is-extendable": "^0.1.1",
+						"is-plain-object": "^2.0.1",
+						"to-object-path": "^0.3.0"
+					}
+				}
+			}
+		},
+		"unique-filename": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+			"dev": true,
+			"requires": {
+				"unique-slug": "^2.0.0"
+			}
+		},
+		"unique-slug": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+			"dev": true,
+			"requires": {
+				"imurmurhash": "^0.1.4"
+			}
+		},
+		"unique-string": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+			"dev": true,
+			"requires": {
+				"crypto-random-string": "^1.0.0"
+			}
+		},
+		"universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+		},
+		"unix-crypt-td-js": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
+			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+			"dev": true
+		},
+		"unpipe": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+		},
+		"unset-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+			"requires": {
+				"has-value": "^0.3.1",
+				"isobject": "^3.0.0"
+			},
+			"dependencies": {
+				"has-value": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+					"requires": {
+						"get-value": "^2.0.3",
+						"has-values": "^0.1.4",
+						"isobject": "^2.0.0"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "2.1.0",
+							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+							"requires": {
+								"isarray": "1.0.0"
+							}
+						}
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"has-values": {
+					"version": "0.1.4",
+					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+				}
+			}
+		},
+		"untildify": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
+			"dev": true
+		},
+		"unzip-response": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+			"dev": true
+		},
+		"upath": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
+		},
+		"update-notifier": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+			"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+			"dev": true,
+			"requires": {
+				"boxen": "^1.2.1",
+				"chalk": "^2.0.1",
+				"configstore": "^3.0.0",
+				"import-lazy": "^2.1.0",
+				"is-ci": "^1.0.10",
+				"is-installed-globally": "^0.1.0",
+				"is-npm": "^1.0.0",
+				"latest-version": "^3.0.0",
+				"semver-diff": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			},
+			"dependencies": {
+				"ci-info": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+					"dev": true
+				},
+				"is-ci": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ci-info": "^1.5.0"
 					}
 				}
 			}
 		},
+		"uri-js": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+			"requires": {
+				"punycode": "^2.1.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+				}
+			}
+		},
+		"urix": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		},
+		"url": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+			"dev": true,
+			"requires": {
+				"punycode": "1.3.2",
+				"querystring": "0.2.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "1.3.2",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+					"dev": true
+				}
+			}
+		},
+		"url-parse": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
+			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+			"dev": true,
+			"requires": {
+				"querystringify": "^2.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"url-parse-lax": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+			"dev": true,
+			"requires": {
+				"prepend-http": "^1.0.1"
+			}
+		},
+		"use": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+		},
+		"useragent": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "4.1.x",
+				"tmp": "0.0.x"
+			}
+		},
+		"util": {
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+			"dev": true,
+			"requires": {
+				"inherits": "2.0.3"
+			}
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+		},
+		"utils-merge": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+		},
+		"uuid": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+		},
+		"validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"requires": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"validate-npm-package-name": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+			"dev": true,
+			"requires": {
+				"builtins": "^1.0.3"
+			}
+		},
+		"validator": {
+			"version": "10.11.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+			"integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+			"dev": true
+		},
+		"vary": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+		},
+		"verror": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"core-util-is": "1.0.2",
+				"extsprintf": "^1.2.0"
+			}
+		},
+		"viz.js": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
+			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
+			"dev": true
+		},
+		"vlq": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+			"dev": true
+		},
+		"vm-browserify": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+			"dev": true,
+			"requires": {
+				"indexof": "0.0.1"
+			}
+		},
+		"void-elements": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+			"dev": true
+		},
+		"watchpack": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.2",
+				"graceful-fs": "^4.1.2",
+				"neo-async": "^2.5.0"
+			}
+		},
 		"wbuf": {
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
@@ -19767,13 +16816,58 @@
 				}
 			}
 		},
+		"webpack": {
+			"version": "4.29.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
+			"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+			"dev": true,
+			"requires": {
+				"@webassemblyjs/ast": "1.7.11",
+				"@webassemblyjs/helper-module-context": "1.7.11",
+				"@webassemblyjs/wasm-edit": "1.7.11",
+				"@webassemblyjs/wasm-parser": "1.7.11",
+				"acorn": "^6.0.5",
+				"acorn-dynamic-import": "^4.0.0",
+				"ajv": "^6.1.0",
+				"ajv-keywords": "^3.1.0",
+				"chrome-trace-event": "^1.0.0",
+				"enhanced-resolve": "^4.1.0",
+				"eslint-scope": "^4.0.0",
+				"json-parse-better-errors": "^1.0.2",
+				"loader-runner": "^2.3.0",
+				"loader-utils": "^1.1.0",
+				"memory-fs": "~0.4.1",
+				"micromatch": "^3.1.8",
+				"mkdirp": "~0.5.0",
+				"neo-async": "^2.5.0",
+				"node-libs-browser": "^2.0.0",
+				"schema-utils": "^0.4.4",
+				"tapable": "^1.1.0",
+				"terser-webpack-plugin": "^1.1.0",
+				"watchpack": "^1.5.0",
+				"webpack-sources": "^1.3.0"
+			},
+			"dependencies": {
+				"schema-utils": {
+					"version": "0.4.7",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+					"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+					"dev": true,
+					"requires": {
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0"
+					}
+				}
+			}
+		},
 		"webpack-bundle-analyzer": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz",
-			"integrity": "sha512-naLWiRfmtH4UJgtUktRTLw6FdoZJ2RvCR9ePbwM9aRMsS/KjFerkPZG9epEvXRAw5d5oPdrs9+3p+afNjxW8Xw==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz",
+			"integrity": "sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==",
 			"dev": true,
 			"requires": {
-				"acorn": "^5.7.3",
+				"acorn": "^6.0.7",
+				"acorn-walk": "^6.1.1",
 				"bfj": "^6.1.1",
 				"chalk": "^2.4.1",
 				"commander": "^2.18.0",
@@ -19785,93 +16879,176 @@
 				"mkdirp": "^0.5.1",
 				"opener": "^1.5.1",
 				"ws": "^6.0.0"
+			}
+		},
+		"webpack-core": {
+			"version": "0.6.9",
+			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+			"dev": true,
+			"requires": {
+				"source-list-map": "~0.1.7",
+				"source-map": "~0.4.1"
 			},
 			"dependencies": {
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+				"source-list-map": {
+					"version": "0.1.8",
+					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
 					"dev": true
 				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+				"source-map": {
+					"version": "0.4.4",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
 					"dev": true,
 					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
+						"amdefine": ">=0.0.4"
 					}
 				}
 			}
 		},
-		"webpack-core": {
-			"version": "0.6.9",
-			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+		"webpack-dev-middleware": {
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
+			"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+			"dev": true,
+			"requires": {
+				"memory-fs": "~0.4.1",
+				"mime": "^2.3.1",
+				"range-parser": "^1.0.3",
+				"webpack-log": "^2.0.0"
+			},
+			"dependencies": {
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				}
+			}
+		},
+		"webpack-dev-server": {
+			"version": "3.1.14",
+			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
+			"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
 			"dev": true,
 			"requires": {
-				"source-list-map": "~0.1.7",
-				"source-map": "~0.4.1"
+				"ansi-html": "0.0.7",
+				"bonjour": "^3.5.0",
+				"chokidar": "^2.0.0",
+				"compression": "^1.5.2",
+				"connect-history-api-fallback": "^1.3.0",
+				"debug": "^3.1.0",
+				"del": "^3.0.0",
+				"express": "^4.16.2",
+				"html-entities": "^1.2.0",
+				"http-proxy-middleware": "~0.18.0",
+				"import-local": "^2.0.0",
+				"internal-ip": "^3.0.1",
+				"ip": "^1.1.5",
+				"killable": "^1.0.0",
+				"loglevel": "^1.4.1",
+				"opn": "^5.1.0",
+				"portfinder": "^1.0.9",
+				"schema-utils": "^1.0.0",
+				"selfsigned": "^1.9.1",
+				"semver": "^5.6.0",
+				"serve-index": "^1.7.2",
+				"sockjs": "0.3.19",
+				"sockjs-client": "1.3.0",
+				"spdy": "^4.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^5.1.0",
+				"url": "^0.11.0",
+				"webpack-dev-middleware": "3.4.0",
+				"webpack-log": "^2.0.0",
+				"yargs": "12.0.2"
 			},
 			"dependencies": {
-				"source-list-map": {
-					"version": "0.1.8",
-					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"decamelize": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+					"dev": true,
+					"requires": {
+						"xregexp": "4.0.0"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"source-map": {
-					"version": "0.4.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 					"dev": true,
 					"requires": {
-						"amdefine": ">=0.0.4"
+						"has-flag": "^3.0.0"
+					}
+				},
+				"webpack-dev-middleware": {
+					"version": "3.4.0",
+					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
+					"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
+					"dev": true,
+					"requires": {
+						"memory-fs": "~0.4.1",
+						"mime": "^2.3.1",
+						"range-parser": "^1.0.3",
+						"webpack-log": "^2.0.0"
+					}
+				},
+				"yargs": {
+					"version": "12.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
+					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+					"dev": true,
+					"requires": {
+						"cliui": "^4.0.0",
+						"decamelize": "^2.0.0",
+						"find-up": "^3.0.0",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^3.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1 || ^4.0.0",
+						"yargs-parser": "^10.1.0"
 					}
 				}
 			}
 		},
+		"webpack-log": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+			"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^3.0.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"webpack-merge": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
@@ -19899,6 +17076,15 @@
 				}
 			}
 		},
+		"webpack-subresource-integrity": {
+			"version": "1.1.0-rc.6",
+			"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
+			"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
+			"dev": true,
+			"requires": {
+				"webpack-core": "^0.6.8"
+			}
+		},
 		"websocket-driver": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
@@ -19930,9 +17116,10 @@
 			}
 		},
 		"which-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-			"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+			"dev": true
 		},
 		"wide-align": {
 			"version": "1.1.3",
@@ -19951,6 +17138,15 @@
 				"string-width": "^2.1.1"
 			}
 		},
+		"win-release": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
+			"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
+			"dev": true,
+			"requires": {
+				"semver": "^5.0.1"
+			}
+		},
 		"window-or-global": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/window-or-global/-/window-or-global-1.0.1.tgz",
@@ -19969,36 +17165,6 @@
 			"dev": true,
 			"requires": {
 				"execa": "^0.10.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"wordwrap": {
@@ -20007,6 +17173,15 @@
 			"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
 			"dev": true
 		},
+		"worker-farm": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+			"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+			"dev": true,
+			"requires": {
+				"errno": "~0.1.7"
+			}
+		},
 		"wrap-ansi": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -20087,6 +17262,11 @@
 			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
 			"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
 		},
+		"xmldom": {
+			"version": "0.1.27",
+			"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+			"integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+		},
 		"xmlhttprequest-ssl": {
 			"version": "1.5.5",
 			"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
@@ -20116,143 +17296,93 @@
 			"dev": true
 		},
 		"yargs": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-			"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-			"requires": {
-				"camelcase": "^3.0.0",
-				"cliui": "^3.2.0",
-				"decamelize": "^1.1.1",
-				"get-caller-file": "^1.0.1",
-				"os-locale": "^1.4.0",
-				"read-pkg-up": "^1.0.1",
+			"version": "13.2.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
+			"integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+			"dev": true,
+			"requires": {
+				"cliui": "^4.0.0",
+				"find-up": "^3.0.0",
+				"get-caller-file": "^2.0.1",
+				"os-locale": "^3.1.0",
 				"require-directory": "^2.1.1",
-				"require-main-filename": "^1.0.1",
+				"require-main-filename": "^2.0.0",
 				"set-blocking": "^2.0.0",
-				"string-width": "^1.0.2",
-				"which-module": "^1.0.0",
-				"y18n": "^3.2.1",
-				"yargs-parser": "^5.0.0"
+				"string-width": "^3.0.0",
+				"which-module": "^2.0.0",
+				"y18n": "^4.0.0",
+				"yargs-parser": "^13.0.0"
 			},
 			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					}
-				},
-				"find-up": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
 				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
+				"camelcase": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
+					"integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
+					"dev": true
 				},
-				"os-locale": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-					"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-					"requires": {
-						"lcid": "^1.0.0"
-					}
+				"get-caller-file": {
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+					"dev": true
 				},
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"requires": {
-						"pinkie-promise": "^2.0.0"
-					}
+				"require-main-filename": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+					"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+					"dev": true
 				},
-				"path-type": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-					"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-				},
-				"read-pkg": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-					"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"load-json-file": "^1.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^1.0.0"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"read-pkg-up": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-					"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-					"requires": {
-						"find-up": "^1.0.0",
-						"read-pkg": "^1.0.0"
-					}
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"yargs-parser": {
+					"version": "13.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
+					"integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
+					"dev": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"camelcase": "^5.0.0",
+						"decamelize": "^1.2.0"
 					}
 				}
 			}
 		},
 		"yargs-parser": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-			"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+			"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+			"dev": true,
 			"requires": {
-				"camelcase": "^3.0.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				}
+				"camelcase": "^4.1.0"
 			}
 		},
 		"yeast": {
@@ -20272,17 +17402,18 @@
 			"integrity": "sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g=="
 		},
 		"zen-observable-ts": {
-			"version": "0.8.15",
-			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz",
-			"integrity": "sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==",
+			"version": "0.8.18",
+			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz",
+			"integrity": "sha512-q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A==",
 			"requires": {
+				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"zone.js": {
-			"version": "0.8.29",
-			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
-			"integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.9.0.tgz",
+			"integrity": "sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q=="
 		}
 	}
 }

From 0f8a6e4077c46878f5dab9d520ddd2d8b1dc7edf Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:16:10 +0000
Subject: [PATCH 038/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 42 +++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 0d790856b..5358d45c9 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -135,6 +135,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
@@ -159,6 +170,14 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
+"@angular-devkit/schematics@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
+  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
 "@angular/animations@^7.2.9":
   version "7.2.9"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.9.tgz#1bfacb76dfd80656e28edb4efdfd3154e56f1c29"
@@ -256,14 +275,14 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.6.tgz#0aee0960e3110782744076f68c3154cf6cd17b8d"
-  integrity sha512-2bo8oMliGWr1oaI2UM+54ru9zMcwWcDxJNxD9JE6fA/ar60kZdp/ojmoI5MCME2kqSpy26eZdYYczhB51BQz3A==
+"@angular/pwa@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
+  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    "@schematics/angular" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
@@ -894,6 +913,15 @@
     "@angular-devkit/schematics" "7.3.6"
     typescript "3.2.4"
 
+"@schematics/angular@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
+  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    typescript "3.2.4"
+
 "@schematics/angular@^7.0.3":
   version "7.3.4"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.4.tgz#ba36efdd5474b793eb693d47772f998e6bd6043e"

From 6581bf8944ba5dc9b46e1c10975307a57106ffe6 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:16:14 +0000
Subject: [PATCH 039/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 75 ++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index f6366e309..69bce5e27 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -135,6 +135,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
@@ -159,6 +170,14 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
+"@angular-devkit/schematics@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
+  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
 "@angular/animations@^7.2.10":
   version "7.2.10"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.10.tgz#a651c9526bc0c2860eca424d73d7cd87fee5793b"
@@ -256,14 +275,14 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.6.tgz#0aee0960e3110782744076f68c3154cf6cd17b8d"
-  integrity sha512-2bo8oMliGWr1oaI2UM+54ru9zMcwWcDxJNxD9JE6fA/ar60kZdp/ojmoI5MCME2kqSpy26eZdYYczhB51BQz3A==
+"@angular/pwa@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
+  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    "@schematics/angular" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
@@ -877,6 +896,15 @@
     "@angular-devkit/schematics" "7.3.6"
     typescript "3.2.4"
 
+"@schematics/angular@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
+  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    typescript "3.2.4"
+
 "@schematics/angular@^7.0.3":
   version "7.3.3"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.3.tgz#aaa63331365bf67b1b908cc18cfc5d7097ec8377"
@@ -1226,7 +1254,7 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@*, abbrev@1:
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
@@ -1444,7 +1472,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
-ansi@*, ansi@^0.3.1:
+ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
 
@@ -1913,7 +1941,7 @@ backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
 
-balanced-match@*, balanced-match@^1.0.0:
+balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
@@ -2121,13 +2149,13 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@*, bplist-parser@^0.1.0:
+bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@*, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
@@ -2864,7 +2892,7 @@ compression@^1.5.2, compression@^1.6.0:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@*, concat-map@0.0.1:
+concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
@@ -3175,7 +3203,7 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
 
@@ -5762,14 +5790,14 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
-inflight@*, inflight@^1.0.4:
+inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -7301,7 +7329,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -7906,7 +7934,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -10945,7 +10973,7 @@ unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
-underscore@*, underscore@^1.8.3:
+underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
 
@@ -11008,11 +11036,6 @@ unix-crypt-td-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
 
-unorm@*:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
-  integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
-
 unorm@^1.3.3:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.4.1.tgz#364200d5f13646ca8bcd44490271335614792300"
@@ -11515,7 +11538,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@*, wrappy@1:
+wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
@@ -11594,7 +11617,7 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
 
-xmldom@*, xmldom@0.1.x:
+xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
 

From 3a10d669a4e805a669ae9462c0d927b15bf42e60 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:32:06 +0000
Subject: [PATCH 040/382] chore(package): update @angular-devkit/architect to
 version 0.13.7

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 3d778b353..27c60e30d 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -157,7 +157,7 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "~0.13.6",
+		"@angular-devkit/architect": "~0.13.7",
 		"@angular-devkit/build-angular": "~0.13.6",
 		"@angular-devkit/core": "~7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",

From df47acffd63c6bb1aa0c6902194188b2a055566c Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:32:09 +0000
Subject: [PATCH 041/382] chore(package): update @angular-devkit/architect to
 version 0.13.7

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 3c8c2f2a1..ce6b83bd0 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -170,7 +170,7 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "^0.13.6",
+		"@angular-devkit/architect": "^0.13.7",
 		"@angular-devkit/build-angular": "^0.13.6",
 		"@angular-devkit/core": "^7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",

From 94038bd0102fe3c91f668d40aa758af12cd0a223 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:32:12 +0000
Subject: [PATCH 042/382] chore(package): update @angular-devkit/architect to
 version 0.13.7

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 7dd9334e2..37126f3cc 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -145,7 +145,7 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "~0.13.6",
+		"@angular-devkit/architect": "~0.13.7",
 		"@angular-devkit/build-angular": "~0.13.6",
 		"@angular-devkit/core": "~7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",

From 8fbf3398faa2fa147fe4fcc73ec676ca70d8a6fc Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:32:16 +0000
Subject: [PATCH 043/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18357 +++++++++++---------------
 1 file changed, 7744 insertions(+), 10613 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index a46cfc435..9dc333b9c 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -5,25 +5,27 @@
 	"requires": true,
 	"dependencies": {
 		"@angular-builders/custom-webpack": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.2.0.tgz",
-			"integrity": "sha512-m6K1T7rDofyxxxgRdAHEUfjbvu8G3RL3XKeAieDbbHSRhsptEAgYdBx5BpkW+xrrfgX5TWG6AZaEgfPNlJtbAA==",
+			"version": "7.4.3",
+			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.4.3.tgz",
+			"integrity": "sha512-dizPcKBSdgM8ztVbhOdVxHnfV/FBkTi1ZirsxWaw1B0S0KuPTESnsJaZA15i8Y2l202hCPs5fJfqy5aCoRrs1Q==",
+			"dev": true,
 			"requires": {
 				"lodash": "^4.17.10"
 			}
 		},
 		"@angular-builders/dev-server": {
-			"version": "7.2.1",
-			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.2.1.tgz",
-			"integrity": "sha512-hQZD/aB/jMq4Yf3+lkkGpU8OFAQwZ+S+422P+m2NkZ40+UXLsJpVzDRFMcL0GGObjwTxhxrmw6wFUk+2V5TwIg=="
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.3.1.tgz",
+			"integrity": "sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==",
+			"dev": true
 		},
 		"@angular-devkit/architect": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.0.tgz",
-			"integrity": "sha512-oDBrWlfKh/0t2ag4T8gz9xzPMItxfctinlsHxhw7dPQ+etq1mIcWgQkiKiDrz4l46YiGipBRlC55j+6f37omAA==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.7.tgz",
+			"integrity": "sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
+				"@angular-devkit/core": "7.3.7",
 				"rxjs": "6.3.3"
 			},
 			"dependencies": {
@@ -39,24 +41,23 @@
 			}
 		},
 		"@angular-devkit/build-angular": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.0.tgz",
-			"integrity": "sha512-JjoSXbmwOsuDJxngyChr6aOSZ2qsrvSL1MHwqgXhZswmC/KghBF0aZ7y8Wzr27zDCQ174Axts7+IAk6b+aWIqw==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz",
+			"integrity": "sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/build-optimizer": "0.13.0",
-				"@angular-devkit/build-webpack": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@ngtools/webpack": "7.3.0",
-				"ajv": "6.7.0",
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/build-optimizer": "0.13.7",
+				"@angular-devkit/build-webpack": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@ngtools/webpack": "7.3.7",
+				"ajv": "6.9.1",
 				"autoprefixer": "9.4.6",
 				"circular-dependency-plugin": "5.0.2",
 				"clean-css": "4.2.1",
 				"copy-webpack-plugin": "4.6.0",
 				"file-loader": "3.0.1",
 				"glob": "7.1.3",
-				"istanbul": "0.4.5",
 				"istanbul-instrumenter-loader": "3.0.1",
 				"karma-source-map-support": "1.3.0",
 				"less": "3.9.0",
@@ -77,12 +78,12 @@
 				"semver": "5.6.0",
 				"source-map-loader": "0.2.4",
 				"source-map-support": "0.5.10",
-				"speed-measure-webpack-plugin": "1.3.0",
+				"speed-measure-webpack-plugin": "1.3.1",
 				"stats-webpack-plugin": "0.7.0",
 				"style-loader": "0.23.1",
 				"stylus": "0.54.5",
 				"stylus-loader": "3.0.2",
-				"terser-webpack-plugin": "1.2.1",
+				"terser-webpack-plugin": "1.2.2",
 				"tree-kill": "1.2.1",
 				"webpack": "4.29.0",
 				"webpack-dev-middleware": "3.5.1",
@@ -92,2094 +93,1378 @@
 				"webpack-subresource-integrity": "1.1.0-rc.6"
 			},
 			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.0.tgz",
-					"integrity": "sha512-fhWuzbMVV/UNYE7rHSKutrWTCZle34N5cdtFz6qhK1k/wn7Vmtg9cFOwzx0SPdIlOEn576NB4DS/4UG3B5WCUQ==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "1.2.3",
-						"source-map": "0.5.6",
-						"typescript": "3.2.4",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"@angular-devkit/build-webpack": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.0.tgz",
-					"integrity": "sha512-idtFoSbQ3Y3WqXlDlU7oTPV9TIU1kjLqce0nK1Kst+t40GTc+Q4iUJJ7KsKE3nV6TPyrL1N/IvIF7+hSJnYm8A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/architect": "0.13.0",
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
-					}
-				},
-				"@ngtools/webpack": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.0.tgz",
-					"integrity": "sha512-U/By0Jlwy7nYwrGNtFirTg1aAsEHBL/9DhfFxPI0iu27FWiMttROuN6hmKbbnOmpbiYAVl5qTy3WXPXUIJjG1A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"enhanced-resolve": "4.1.0",
-						"rxjs": "6.3.3",
-						"tree-kill": "1.2.1",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"abbrev": {
-					"version": "1.0.9",
-					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-					"integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
 				"cacache": {
-					"version": "10.0.4",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-					"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"bluebird": "^3.5.1",
-						"chownr": "^1.0.1",
-						"glob": "^7.1.2",
-						"graceful-fs": "^4.1.11",
-						"lru-cache": "^4.1.1",
-						"mississippi": "^2.0.0",
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
 						"mkdirp": "^0.5.1",
 						"move-concurrently": "^1.0.1",
 						"promise-inflight": "^1.0.1",
 						"rimraf": "^2.6.2",
-						"ssri": "^5.2.4",
-						"unique-filename": "^1.1.0",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
 						"y18n": "^4.0.0"
 					}
 				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
 				},
-				"cliui": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 					"dev": true,
 					"requires": {
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"yallist": "^3.0.2"
 					}
 				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
 					}
 				},
-				"copy-webpack-plugin": {
-					"version": "4.6.0",
-					"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
-					"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"cacache": "^10.0.4",
-						"find-cache-dir": "^1.0.0",
-						"globby": "^7.1.1",
-						"is-glob": "^4.0.0",
-						"loader-utils": "^1.1.0",
-						"minimatch": "^3.0.4",
-						"p-limit": "^1.0.0",
-						"serialize-javascript": "^1.4.0"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
 					}
 				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
+				"parse5": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+					"dev": true
 				},
-				"decamelize": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-					"dev": true,
-					"requires": {
-						"xregexp": "4.0.0"
-					}
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
 				},
-				"del": {
+				"pkg-dir": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-					"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
 					"dev": true,
 					"requires": {
-						"globby": "^6.1.0",
-						"is-path-cwd": "^1.0.0",
-						"is-path-in-cwd": "^1.0.0",
-						"p-map": "^1.1.1",
-						"pify": "^3.0.0",
-						"rimraf": "^2.2.8"
-					},
-					"dependencies": {
-						"globby": {
-							"version": "6.1.0",
-							"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-							"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-							"dev": true,
-							"requires": {
-								"array-union": "^1.0.1",
-								"glob": "^7.0.3",
-								"object-assign": "^4.0.1",
-								"pify": "^2.0.0",
-								"pinkie-promise": "^2.0.0"
-							},
-							"dependencies": {
-								"pify": {
-									"version": "2.3.0",
-									"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-									"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-									"dev": true
-								}
-							}
-						}
+						"find-up": "^3.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.8.1",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-					"integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"esprima": "^2.7.1",
-						"estraverse": "^1.9.1",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.2.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.2.0",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-							"integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"tslib": "^1.9.0"
 					}
 				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
 					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
+						"figgy-pudding": "^3.5.1"
 					}
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"terser-webpack-plugin": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz",
+					"integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"file-loader": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
-					"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.0.2",
-						"schema-utils": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
+						"cacache": "^11.0.2",
+						"find-cache-dir": "^2.0.0",
+						"schema-utils": "^1.0.0",
+						"serialize-javascript": "^1.4.0",
+						"source-map": "^0.6.1",
+						"terser": "^3.16.1",
+						"webpack-sources": "^1.1.0",
+						"worker-farm": "^1.5.2"
 					}
 				},
-				"has-flag": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
 					"dev": true
-				},
-				"http-signature": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-					"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+				}
+			}
+		},
+		"@angular-devkit/build-optimizer": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz",
+			"integrity": "sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "1.2.3",
+				"source-map": "0.5.6",
+				"typescript": "3.2.4",
+				"webpack-sources": "1.3.0"
+			}
+		},
+		"@angular-devkit/build-webpack": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz",
+			"integrity": "sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"assert-plus": "^1.0.0",
-						"jsprim": "^1.2.2",
-						"sshpk": "^1.7.0"
+						"tslib": "^1.9.0"
 					}
-				},
-				"invert-kv": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-					"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-					"dev": true
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				}
+			}
+		},
+		"@angular-devkit/core": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+			"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+			"dev": true,
+			"requires": {
+				"ajv": "6.9.1",
+				"chokidar": "2.0.4",
+				"fast-json-stable-stringify": "2.0.0",
+				"rxjs": "6.3.3",
+				"source-map": "0.7.3"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				}
+			}
+		},
+		"@angular-devkit/schematics": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+			"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"tslib": "^1.9.0"
 					}
-				},
-				"istanbul": {
-					"version": "0.4.5",
-					"resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-					"integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-					"dev": true,
-					"requires": {
-						"abbrev": "1.0.x",
-						"async": "1.x",
-						"escodegen": "1.8.x",
-						"esprima": "2.7.x",
-						"glob": "^5.0.15",
-						"handlebars": "^4.0.1",
-						"js-yaml": "3.x",
-						"mkdirp": "0.5.x",
-						"nopt": "3.x",
-						"once": "1.x",
-						"resolve": "1.1.x",
-						"supports-color": "^3.1.0",
-						"which": "^1.1.1",
-						"wordwrap": "^1.0.0"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "5.0.15",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-							"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-							"dev": true,
-							"requires": {
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "2 || 3",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						}
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"lcid": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-					"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+				}
+			}
+		},
+		"@angular/animations": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.11.tgz",
+			"integrity": "sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/cli": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.7.tgz",
+			"integrity": "sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"@schematics/update": "0.13.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"inquirer": "6.2.1",
+				"npm-package-arg": "6.1.0",
+				"opn": "5.4.0",
+				"pacote": "9.4.0",
+				"semver": "5.6.0",
+				"symbol-observable": "1.2.0"
+			}
+		},
+		"@angular/common": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.11.tgz",
+			"integrity": "sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.11.tgz",
+			"integrity": "sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler-cli": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz",
+			"integrity": "sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==",
+			"dev": true,
+			"requires": {
+				"canonical-path": "1.0.0",
+				"chokidar": "^2.1.1",
+				"convert-source-map": "^1.5.1",
+				"dependency-graph": "^0.7.2",
+				"magic-string": "^0.25.0",
+				"minimist": "^1.2.0",
+				"reflect-metadata": "^0.1.2",
+				"shelljs": "^0.8.1",
+				"source-map": "^0.6.1",
+				"tslib": "^1.9.0",
+				"yargs": "9.0.1"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"invert-kv": "^2.0.0"
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"less": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
-					"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
 					"dev": true,
 					"requires": {
-						"clone": "^2.1.2",
-						"errno": "^0.1.1",
-						"graceful-fs": "^4.1.2",
-						"image-size": "~0.5.0",
-						"mime": "^1.4.1",
-						"mkdirp": "^0.5.0",
-						"promise": "^7.1.1",
-						"request": "^2.83.0",
-						"source-map": "~0.6.0"
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
 					},
 					"dependencies": {
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 							"dev": true,
-							"optional": true
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
 						}
 					}
 				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+				"cross-spawn": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
 					"dev": true,
 					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
+						"lru-cache": "^4.0.1",
+						"shebang-command": "^1.2.0",
+						"which": "^1.2.9"
 					}
 				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+				"execa": {
+					"version": "0.7.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"cross-spawn": "^5.0.1",
+						"get-stream": "^3.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
 					}
 				},
-				"mini-css-extract-plugin": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
-					"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+				"invert-kv": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0",
-						"webpack-sources": "^1.1.0"
+						"number-is-nan": "^1.0.0"
 					}
 				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				"mem": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"mimic-fn": "^1.0.0"
 					}
 				},
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+					"dev": true
+				},
 				"os-locale": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-					"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
 					"dev": true,
 					"requires": {
-						"execa": "^1.0.0",
-						"lcid": "^2.0.0",
-						"mem": "^4.0.0"
+						"execa": "^0.7.0",
+						"lcid": "^1.0.0",
+						"mem": "^1.1.0"
 					}
 				},
-				"parse5": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
 				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+					"dev": true
 				},
-				"raw-loader": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
-					"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+				"yargs": {
+					"version": "9.0.1",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
+					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0"
+						"camelcase": "^4.1.0",
+						"cliui": "^3.2.0",
+						"decamelize": "^1.1.1",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^2.0.0",
+						"read-pkg-up": "^2.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1",
+						"yargs-parser": "^7.0.0"
 					}
 				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"yargs-parser": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
 					"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"
+						"camelcase": "^4.1.0"
 					}
-				},
-				"request": {
-					"version": "2.88.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-					"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"aws-sign2": "~0.7.0",
-						"aws4": "^1.8.0",
-						"caseless": "~0.12.0",
-						"combined-stream": "~1.0.6",
-						"extend": "~3.0.2",
-						"forever-agent": "~0.6.1",
-						"form-data": "~2.3.2",
-						"har-validator": "~5.1.0",
-						"http-signature": "~1.2.0",
-						"is-typedarray": "~1.0.0",
-						"isstream": "~0.1.2",
-						"json-stringify-safe": "~5.0.1",
-						"mime-types": "~2.1.19",
-						"oauth-sign": "~0.9.0",
-						"performance-now": "^2.1.0",
-						"qs": "~6.5.2",
-						"safe-buffer": "^5.1.2",
-						"tough-cookie": "~2.4.3",
-						"tunnel-agent": "^0.6.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"sockjs": {
-					"version": "0.3.19",
-					"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-					"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
-					"dev": true,
-					"requires": {
-						"faye-websocket": "^0.10.0",
-						"uuid": "^3.0.1"
-					}
-				},
-				"sockjs-client": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-					"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.2.5",
-						"eventsource": "^1.0.7",
-						"faye-websocket": "~0.11.1",
-						"inherits": "^2.0.3",
-						"json3": "^3.3.2",
-						"url-parse": "^1.4.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"faye-websocket": {
-							"version": "0.11.1",
-							"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-							"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-							"dev": true,
-							"requires": {
-								"websocket-driver": ">=0.5.1"
-							}
-						}
-					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"spdy": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
-					"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"handle-thing": "^2.0.0",
-						"http-deceiver": "^1.2.7",
-						"select-hose": "^2.0.0",
-						"spdy-transport": "^3.0.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"spdy-transport": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-					"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"detect-node": "^2.0.4",
-						"hpack.js": "^2.1.6",
-						"obuf": "^1.1.2",
-						"readable-stream": "^3.0.6",
-						"wbuf": "^1.7.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"readable-stream": {
-							"version": "3.1.1",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-							"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-							"dev": true,
-							"requires": {
-								"inherits": "^2.0.3",
-								"string_decoder": "^1.1.1",
-								"util-deprecate": "^1.0.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,
+				}
+			}
+		},
+		"@angular/core": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.11.tgz",
+			"integrity": "sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/forms": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.11.tgz",
+			"integrity": "sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/http": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.11.tgz",
+			"integrity": "sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/language-service": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.11.tgz",
+			"integrity": "sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==",
+			"dev": true
+		},
+		"@angular/platform-browser": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.11.tgz",
+			"integrity": "sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/platform-browser-dynamic": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz",
+			"integrity": "sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/pwa": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.7.tgz",
+			"integrity": "sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==",
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"parse5-html-rewriting-stream": "5.1.0",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
 					}
 				},
-				"stylus": {
-					"version": "0.54.5",
-					"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
-					"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
-					"dev": true,
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
 					"requires": {
-						"css-parse": "1.7.x",
-						"debug": "*",
-						"glob": "7.0.x",
-						"mkdirp": "0.5.x",
-						"sax": "0.5.x",
-						"source-map": "0.1.x"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "7.0.6",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-							"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-							"dev": true,
-							"requires": {
-								"fs.realpath": "^1.0.0",
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "^3.0.2",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.1.43",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-							"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
 					}
 				},
-				"stylus-loader": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-					"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
-					"dev": true,
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"requires": {
-						"loader-utils": "^1.0.2",
-						"lodash.clonedeep": "^4.5.0",
-						"when": "~3.6.x"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"supports-color": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"requires": {
-						"has-flag": "^1.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"terser-webpack-plugin": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz",
-					"integrity": "sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==",
-					"dev": true,
-					"requires": {
-						"cacache": "^11.0.2",
-						"find-cache-dir": "^2.0.0",
-						"schema-utils": "^1.0.0",
-						"serialize-javascript": "^1.4.0",
-						"source-map": "^0.6.1",
-						"terser": "^3.8.1",
-						"webpack-sources": "^1.1.0",
-						"worker-farm": "^1.5.2"
-					},
-					"dependencies": {
-						"cacache": {
-							"version": "11.3.2",
-							"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-							"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-							"dev": true,
-							"requires": {
-								"bluebird": "^3.5.3",
-								"chownr": "^1.1.1",
-								"figgy-pudding": "^3.5.1",
-								"glob": "^7.1.3",
-								"graceful-fs": "^4.1.15",
-								"lru-cache": "^5.1.1",
-								"mississippi": "^3.0.0",
-								"mkdirp": "^0.5.1",
-								"move-concurrently": "^1.0.1",
-								"promise-inflight": "^1.0.1",
-								"rimraf": "^2.6.2",
-								"ssri": "^6.0.1",
-								"unique-filename": "^1.1.1",
-								"y18n": "^4.0.0"
-							}
-						},
-						"find-cache-dir": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
-							"integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
-							"dev": true,
-							"requires": {
-								"commondir": "^1.0.1",
-								"make-dir": "^1.0.0",
-								"pkg-dir": "^3.0.0"
-							}
-						},
-						"lru-cache": {
-							"version": "5.1.1",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-							"dev": true,
-							"requires": {
-								"yallist": "^3.0.2"
-							}
-						},
-						"mississippi": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-							"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-							"dev": true,
-							"requires": {
-								"concat-stream": "^1.5.0",
-								"duplexify": "^3.4.2",
-								"end-of-stream": "^1.1.0",
-								"flush-write-stream": "^1.0.0",
-								"from2": "^2.1.0",
-								"parallel-transform": "^1.1.0",
-								"pump": "^3.0.0",
-								"pumpify": "^1.3.3",
-								"stream-each": "^1.1.0",
-								"through2": "^2.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-							"dev": true
-						},
-						"ssri": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-							"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-							"dev": true,
-							"requires": {
-								"figgy-pudding": "^3.5.1"
-							}
-						}
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
+			}
+		},
+		"@angular/router": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.11.tgz",
+			"integrity": "sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/service-worker": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
+			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@babel/code-frame": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.0.0"
+			}
+		},
+		"@babel/generator": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
+			"integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0",
+				"jsesc": "^2.5.1",
+				"lodash": "^4.17.11",
+				"source-map": "^0.5.0",
+				"trim-right": "^1.0.1"
+			},
+			"dependencies": {
+				"jsesc": {
+					"version": "2.5.2",
+					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.0.0",
+				"@babel/template": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+			"integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/highlight": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.0.0",
+				"esutils": "^2.0.2",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"js-tokens": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/parser": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz",
+			"integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==",
+			"dev": true
+		},
+		"@babel/runtime": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
+			"integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+			"dev": true,
+			"requires": {
+				"regenerator-runtime": "^0.13.2"
+			},
+			"dependencies": {
+				"regenerator-runtime": {
+					"version": "0.13.2",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+					"integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/template": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz",
+			"integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
+			"integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/generator": "^7.4.0",
+				"@babel/helper-function-name": "^7.1.0",
+				"@babel/helper-split-export-declaration": "^7.4.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0",
+				"lodash": "^4.17.11"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
 					}
 				},
-				"webpack": {
-					"version": "4.29.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
-					"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+				"globals": {
+					"version": "11.11.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+					"integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/types": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+			"integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2",
+				"lodash": "^4.17.11",
+				"to-fast-properties": "^2.0.0"
+			},
+			"dependencies": {
+				"to-fast-properties": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/compodoc": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.9.tgz",
+			"integrity": "sha512-LFdbF/fO9qOGgdrCHg4irMBrl3sD8ySIlL6XabFAz8QbUdf2+77xOVnZJ/PYdcuI8h8vXo4UGS7MFg0pDR2jsw==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-transformer": "^2.0.0",
+				"chalk": "^2.4.2",
+				"cheerio": "^1.0.0-rc.2",
+				"chokidar": "^2.1.2",
+				"colors": "^1.3.3",
+				"commander": "^2.19.0",
+				"cosmiconfig": "^5.1.0",
+				"fancy-log": "^1.3.3",
+				"findit2": "^2.2.3",
+				"fs-extra": "^7.0.1",
+				"glob": "^7.1.3",
+				"handlebars": "^4.1.0",
+				"html-entities": "^1.2.1",
+				"i18next": "^15.0.4",
+				"inside": "^1.0.0",
+				"json5": "^2.1.0",
+				"live-server": "^1.2.1",
+				"lodash": "^4.17.11",
+				"lunr": "^2.3.6",
+				"marked": "^0.6.1",
+				"minimist": "^1.2.0",
+				"opencollective": "^1.0.3",
+				"os-name": "^3.0.0",
+				"pdfmake": "^0.1.53",
+				"semver": "^5.6.0",
+				"traverse": "^0.6.6",
+				"ts-simple-ast": "12.4.0",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"@webassemblyjs/ast": "1.7.11",
-						"@webassemblyjs/helper-module-context": "1.7.11",
-						"@webassemblyjs/wasm-edit": "1.7.11",
-						"@webassemblyjs/wasm-parser": "1.7.11",
-						"acorn": "^6.0.5",
-						"acorn-dynamic-import": "^4.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"chrome-trace-event": "^1.0.0",
-						"enhanced-resolve": "^4.1.0",
-						"eslint-scope": "^4.0.0",
-						"json-parse-better-errors": "^1.0.2",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"micromatch": "^3.1.8",
-						"mkdirp": "~0.5.0",
-						"neo-async": "^2.5.0",
-						"node-libs-browser": "^2.0.0",
-						"schema-utils": "^0.4.4",
-						"tapable": "^1.1.0",
-						"terser-webpack-plugin": "^1.1.0",
-						"watchpack": "^1.5.0",
-						"webpack-sources": "^1.3.0"
-					},
-					"dependencies": {
-						"schema-utils": {
-							"version": "0.4.7",
-							"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-							"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-							"dev": true,
-							"requires": {
-								"ajv": "^6.1.0",
-								"ajv-keywords": "^3.1.0"
-							}
-						}
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"webpack-dev-middleware": {
-					"version": "3.5.1",
-					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
-					"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+				"cosmiconfig": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.0.tgz",
+					"integrity": "sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==",
 					"dev": true,
 					"requires": {
-						"memory-fs": "~0.4.1",
-						"mime": "^2.3.1",
-						"range-parser": "^1.0.3",
-						"webpack-log": "^2.0.0"
-					},
-					"dependencies": {
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						}
+						"import-fresh": "^2.0.0",
+						"is-directory": "^0.3.1",
+						"js-yaml": "^3.13.0",
+						"parse-json": "^4.0.0"
 					}
 				},
-				"webpack-dev-server": {
-					"version": "3.1.14",
-					"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
-					"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
+				"js-yaml": {
+					"version": "3.13.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+					"integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
 					"dev": true,
 					"requires": {
-						"ansi-html": "0.0.7",
-						"bonjour": "^3.5.0",
-						"chokidar": "^2.0.0",
-						"compression": "^1.5.2",
-						"connect-history-api-fallback": "^1.3.0",
-						"debug": "^3.1.0",
-						"del": "^3.0.0",
-						"express": "^4.16.2",
-						"html-entities": "^1.2.0",
-						"http-proxy-middleware": "~0.18.0",
-						"import-local": "^2.0.0",
-						"internal-ip": "^3.0.1",
-						"ip": "^1.1.5",
-						"killable": "^1.0.0",
-						"loglevel": "^1.4.1",
-						"opn": "^5.1.0",
-						"portfinder": "^1.0.9",
-						"schema-utils": "^1.0.0",
-						"selfsigned": "^1.9.1",
-						"semver": "^5.6.0",
-						"serve-index": "^1.7.2",
-						"sockjs": "0.3.19",
-						"sockjs-client": "1.3.0",
-						"spdy": "^4.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^5.1.0",
-						"url": "^0.11.0",
-						"webpack-dev-middleware": "3.4.0",
-						"webpack-log": "^2.0.0",
-						"yargs": "12.0.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-							"dev": true
-						},
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						},
-						"webpack-dev-middleware": {
-							"version": "3.4.0",
-							"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
-							"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
-							"dev": true,
-							"requires": {
-								"memory-fs": "~0.4.1",
-								"mime": "^2.3.1",
-								"range-parser": "^1.0.3",
-								"webpack-log": "^2.0.0"
-							}
-						}
-					}
-				},
-				"webpack-log": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-					"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-					"dev": true,
-					"requires": {
-						"ansi-colors": "^3.0.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"webpack-subresource-integrity": {
-					"version": "1.1.0-rc.6",
-					"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
-					"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
-					"dev": true,
-					"requires": {
-						"webpack-core": "^0.6.8"
+						"argparse": "^1.0.7",
+						"esprima": "^4.0.0"
 					}
 				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 					"dev": true
 				},
-				"worker-farm": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-					"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
-					"dev": true,
-					"requires": {
-						"errno": "~0.1.7"
-					}
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
 					"dev": true
-				},
-				"yargs": {
-					"version": "12.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
-					"dev": true,
-					"requires": {
-						"cliui": "^4.0.0",
-						"decamelize": "^2.0.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^3.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1 || ^4.0.0",
-						"yargs-parser": "^10.1.0"
-					}
-				},
-				"yargs-parser": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-					"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					}
 				}
 			}
 		},
-		"@angular-devkit/core": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-			"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+		"@compodoc/ngd-core": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
+			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
 			"dev": true,
 			"requires": {
-				"ajv": "6.7.0",
-				"chokidar": "2.0.4",
-				"fast-json-stable-stringify": "2.0.0",
-				"rxjs": "6.3.3",
-				"source-map": "0.7.3"
+				"ansi-colors": "^1.0.1",
+				"fancy-log": "^1.3.2",
+				"typescript": "^2.4.2"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"ansi-colors": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ansi-wrap": "^0.1.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"typescript": {
+					"version": "2.9.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/ngd-transformer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
+			"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-core": "~2.0.0",
+				"dot": "^1.1.1",
+				"fs-extra": "^4.0.1",
+				"viz.js": "^1.8.0"
+			},
+			"dependencies": {
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				}
 			}
 		},
-		"@angular-devkit/schematics": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-			"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+		"@dsherret/to-absolute-glob": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"rxjs": "6.3.3"
+				"is-absolute": "^1.0.0",
+				"is-negated-glob": "^1.0.0"
+			}
+		},
+		"@ionic-native/barcode-scanner": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz",
+			"integrity": "sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/animations": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.3.tgz",
-			"integrity": "sha512-5WoiDnVS2OhGgJ1oepFNF2UcfR4sJj97KRnTmLWQ0S4N4WpXX83CoOQVXvXwfotyb8uNtl4zRi2NuvN/MIuFuA==",
+		"@ionic-native/call-number": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.3.0.tgz",
+			"integrity": "sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/cli": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.0.tgz",
-			"integrity": "sha512-6+NoHsW1MYG7GBHUg71zaWIFeIRps/SVksCmRFCpW0RXqErCQmzf0GZuDTZZ2Yo4RzU01150sVp1R8wEvEZfZQ==",
-			"dev": true,
+		"@ionic-native/camera": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.3.0.tgz",
+			"integrity": "sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==",
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"@schematics/update": "0.13.0",
-				"@yarnpkg/lockfile": "1.1.0",
-				"ini": "1.3.5",
-				"inquirer": "6.2.1",
-				"npm-package-arg": "6.1.0",
-				"opn": "5.4.0",
-				"pacote": "9.4.0",
-				"semver": "5.6.0",
-				"symbol-observable": "1.2.0"
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					}
-				},
-				"@schematics/update": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.0.tgz",
-					"integrity": "sha512-HGpZdIL/0w46UyaxpnIAg6SBwzKfaRixHIEihmgJUqA0DG8GZUixRPr1L0YIWC1EZ81cQ+yWL85XhkKBYR+wQg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"@yarnpkg/lockfile": "1.1.0",
-						"ini": "1.3.5",
-						"pacote": "9.4.0",
-						"rxjs": "6.3.3",
-						"semver": "5.6.0",
-						"semver-intersect": "1.4.0"
-					}
-				},
-				"cacache": {
-					"version": "11.3.2",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"chownr": "^1.1.1",
-						"figgy-pudding": "^3.5.1",
-						"glob": "^7.1.3",
-						"graceful-fs": "^4.1.15",
-						"lru-cache": "^5.1.1",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"move-concurrently": "^1.0.1",
-						"promise-inflight": "^1.0.1",
-						"rimraf": "^2.6.2",
-						"ssri": "^6.0.1",
-						"unique-filename": "^1.1.1",
-						"y18n": "^4.0.0"
-					}
-				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"make-fetch-happen": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
-					"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
-					"dev": true,
-					"requires": {
-						"agentkeepalive": "^3.4.1",
-						"cacache": "^11.0.1",
-						"http-cache-semantics": "^3.8.1",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"mississippi": "^3.0.0",
-						"node-fetch-npm": "^2.0.2",
-						"promise-retry": "^1.1.1",
-						"socks-proxy-agent": "^4.0.0",
-						"ssri": "^6.0.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"mississippi": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-					"dev": true,
-					"requires": {
-						"concat-stream": "^1.5.0",
-						"duplexify": "^3.4.2",
-						"end-of-stream": "^1.1.0",
-						"flush-write-stream": "^1.0.0",
-						"from2": "^2.1.0",
-						"parallel-transform": "^1.1.0",
-						"pump": "^3.0.0",
-						"pumpify": "^1.3.3",
-						"stream-each": "^1.1.0",
-						"through2": "^2.0.0"
-					}
-				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"npm-package-arg": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
-					"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.6.0",
-						"osenv": "^0.1.5",
-						"semver": "^5.5.0",
-						"validate-npm-package-name": "^3.0.0"
-					}
-				},
-				"npm-pick-manifest": {
-					"version": "2.2.3",
-					"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
-					"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1",
-						"npm-package-arg": "^6.0.0",
-						"semver": "^5.4.1"
-					}
-				},
-				"npm-registry-fetch": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
-					"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
-					"dev": true,
-					"requires": {
-						"JSONStream": "^1.3.4",
-						"bluebird": "^3.5.1",
-						"figgy-pudding": "^3.4.1",
-						"lru-cache": "^4.1.3",
-						"make-fetch-happen": "^4.0.1",
-						"npm-package-arg": "^6.1.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"pacote": {
-					"version": "9.4.0",
-					"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
-					"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"cacache": "^11.3.2",
-						"figgy-pudding": "^3.5.1",
-						"get-stream": "^4.1.0",
-						"glob": "^7.1.3",
-						"lru-cache": "^5.1.1",
-						"make-fetch-happen": "^4.0.1",
-						"minimatch": "^3.0.4",
-						"minipass": "^2.3.5",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"normalize-package-data": "^2.4.0",
-						"npm-package-arg": "^6.1.0",
-						"npm-packlist": "^1.1.12",
-						"npm-pick-manifest": "^2.2.3",
-						"npm-registry-fetch": "^3.8.0",
-						"osenv": "^0.1.5",
-						"promise-inflight": "^1.0.1",
-						"promise-retry": "^1.1.1",
-						"protoduck": "^5.0.1",
-						"rimraf": "^2.6.2",
-						"safe-buffer": "^5.1.2",
-						"semver": "^5.6.0",
-						"ssri": "^6.0.1",
-						"tar": "^4.4.8",
-						"unique-filename": "^1.1.1",
-						"which": "^1.3.1"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"ssri": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1"
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
-					}
-				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-					"dev": true
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-					"dev": true
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/common": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.3.tgz",
-			"integrity": "sha512-VZOTZdvkitaKEhkxL6daHxPcKqAFwNJm0U4NFB4LRP9KspsFTE60QFVB63o129PTIH9iOQ2D3HRKSRl4o78ZKg==",
+		"@ionic-native/core": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.3.0.tgz",
+			"integrity": "sha512-oIsBvkB/Q63bjKvHGW7zAFMWSXIwnZ/U962UFyuqrF9dKvNSPI5cz8iPOaqKE+jzb2XhlcGKEbp5qAhTI0BcZQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.3.tgz",
-			"integrity": "sha512-UM6n4MyZkR5+VVjlwhLH8IfqdWBkdFcF5at4ckJXOJ/gkIUq97irbis9pGj1b0TO7MAl8uhF4b68xe5lk8b49g==",
-			"dev": true,
+		"@ionic-native/device": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.3.0.tgz",
+			"integrity": "sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler-cli": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.3.tgz",
-			"integrity": "sha512-31hcfTrU2GW66cvvaS629dNVPfiUrUWPncI28optvmKHBaH0mFqkdYNgabuslsXZV5AeidKMUJvR7GITjtvkQA==",
+		"@ionic-native/dialogs": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.3.0.tgz",
+			"integrity": "sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/geolocation": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.3.0.tgz",
+			"integrity": "sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/globalization": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.3.0.tgz",
+			"integrity": "sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-analytics": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz",
+			"integrity": "sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-maps": {
+			"version": "5.0.0-beta.26",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
+			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			}
+		},
+		"@ionic-native/in-app-browser": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz",
+			"integrity": "sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/intercom": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.3.0.tgz",
+			"integrity": "sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/local-notifications": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz",
+			"integrity": "sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/mixpanel": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz",
+			"integrity": "sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/network": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.3.0.tgz",
+			"integrity": "sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/splash-screen": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz",
+			"integrity": "sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/status-bar": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.3.0.tgz",
+			"integrity": "sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/unique-device-id": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz",
+			"integrity": "sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/vibration": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.3.0.tgz",
+			"integrity": "sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic/angular": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.1.2.tgz",
+			"integrity": "sha512-GVdtpPekPjAYo/3IiRg/EoVRw1/9RwW07ITW6TRorcX1XOPJlrRXVcQyWFTbHRD9TOikgE1XmMQd/+1Lk0TQFw==",
+			"requires": {
+				"@ionic/core": "4.1.2",
+				"tslib": "^1.9.3"
+			}
+		},
+		"@ionic/angular-toolkit": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.5.0.tgz",
+			"integrity": "sha512-KHUu7MHi+s1LKox+EBOSN6HO6Sk79qOmBIMGHQMboPbqHGzb5aqCbTmtwa/BJZ1kytZ+yQ8kEejv8YwvrJIZEQ==",
 			"dev": true,
 			"requires": {
-				"canonical-path": "1.0.0",
-				"chokidar": "^1.4.2",
-				"convert-source-map": "^1.5.1",
-				"dependency-graph": "^0.7.2",
-				"magic-string": "^0.25.0",
-				"minimist": "^1.2.0",
-				"reflect-metadata": "^0.1.2",
-				"shelljs": "^0.8.1",
-				"source-map": "^0.6.1",
+				"@schematics/angular": "^7.0.3",
 				"tslib": "^1.9.0",
-				"yargs": "9.0.1"
+				"typescript": "~3.3.3333",
+				"ws": "^6.1.4"
 			},
 			"dependencies": {
-				"anymatch": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-					"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-					"dev": true,
-					"requires": {
-						"micromatch": "^2.1.5",
-						"normalize-path": "^2.0.0"
-					}
-				},
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+				"typescript": {
+					"version": "3.3.4000",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz",
+					"integrity": "sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==",
 					"dev": true
 				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"chokidar": {
-					"version": "1.7.0",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-					"integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-					"dev": true,
-					"requires": {
-						"anymatch": "^1.3.0",
-						"async-each": "^1.0.0",
-						"fsevents": "^1.0.0",
-						"glob-parent": "^2.0.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^2.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0"
-					}
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+				"ws": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+					"integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
 					"dev": true,
 					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"string-width": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-							"dev": true,
-							"requires": {
-								"code-point-at": "^1.0.0",
-								"is-fullwidth-code-point": "^1.0.0",
-								"strip-ansi": "^3.0.0"
-							}
-						}
+						"async-limiter": "~1.0.0"
 					}
-				},
+				}
+			}
+		},
+		"@ionic/app-scripts": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.3.tgz",
+			"integrity": "sha512-t1kL9NqY/sVLfAIVKfN4VJigPqMWs5euKxig3sjsrakSQ9z4njmbDghzAC4taefIpYxLGMOeWgKwrrxOiLkdWQ==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/build-optimizer": "0.0.35",
+				"autoprefixer": "^7.2.6",
+				"chalk": "^2.4.0",
+				"chokidar": "^2.0.4",
+				"clean-css": "^4.1.11",
+				"cross-spawn": "^5.1.0",
+				"dotenv-webpack": "^1.5.7",
+				"express": "^4.16.3",
+				"fs-extra": "^4.0.2",
+				"glob": "^7.1.2",
+				"json-loader": "^0.5.7",
+				"node-sass": "^4.10.0",
+				"os-name": "^2.0.1",
+				"postcss": "^6.0.21",
+				"proxy-middleware": "^0.15.0",
+				"reflect-metadata": "^0.1.10",
+				"rollup": "0.50.0",
+				"rollup-plugin-commonjs": "8.2.6",
+				"rollup-plugin-node-resolve": "3.0.0",
+				"source-map": "^0.6.1",
+				"tiny-lr": "^1.1.1",
+				"tslint": "^5.8.0",
+				"tslint-eslint-rules": "^4.1.1",
+				"uglify-es": "3.2.2",
+				"webpack": "3.12.0",
+				"ws": "3.3.2",
+				"xml2js": "^0.4.19"
+			},
+			"dependencies": {
+				"@angular-devkit/build-optimizer": {
+					"version": "0.0.35",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
+					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
+					"dev": true,
+					"requires": {
+						"loader-utils": "^1.1.0",
+						"source-map": "^0.5.6",
+						"typescript": "~2.6.1",
+						"webpack-sources": "^1.0.1"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
+					}
+				},
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"acorn-dynamic-import": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+					"dev": true,
+					"requires": {
+						"acorn": "^4.0.3"
+					},
+					"dependencies": {
+						"acorn": {
+							"version": "4.0.13",
+							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+							"dev": true
+						}
+					}
+				},
+				"autoprefixer": {
+					"version": "7.2.6",
+					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+					"dev": true,
+					"requires": {
+						"browserslist": "^2.11.3",
+						"caniuse-lite": "^1.0.30000805",
+						"normalize-range": "^0.1.2",
+						"num2fraction": "^1.2.2",
+						"postcss": "^6.0.17",
+						"postcss-value-parser": "^3.2.3"
+					}
+				},
+				"browserslist": {
+					"version": "2.11.3",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30000792",
+						"electron-to-chromium": "^1.3.30"
+					}
+				},
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+					"dev": true,
+					"requires": {
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
+					},
+					"dependencies": {
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+							"dev": true,
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
+						}
+					}
+				},
+				"commander": {
+					"version": "2.12.2",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
+					"dev": true
+				},
 				"cross-spawn": {
 					"version": "5.1.0",
 					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -2191,6 +1476,18 @@
 						"which": "^1.2.9"
 					}
 				},
+				"enhanced-resolve": {
+					"version": "3.4.1",
+					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"memory-fs": "^0.4.0",
+						"object-assign": "^4.0.1",
+						"tapable": "^0.2.7"
+					}
+				},
 				"execa": {
 					"version": "0.7.0",
 					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
@@ -2206,46 +1503,21 @@
 						"strip-eof": "^1.0.0"
 					}
 				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				},
-				"is-extglob": {
+				"invert-kv": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
 					"dev": true
 				},
 				"is-fullwidth-code-point": {
@@ -2257,36 +1529,26 @@
 						"number-is-nan": "^1.0.0"
 					}
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
+				"json5": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+					"dev": true
 				},
-				"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=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^2.2.0",
-						"pify": "^2.0.0",
-						"strip-bom": "^3.0.0"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
+				"macos-release": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
+					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
+					"dev": true
 				},
 				"mem": {
 					"version": "1.1.0",
@@ -2297,39 +1559,6 @@
 						"mimic-fn": "^1.0.0"
 					}
 				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
 				"os-locale": {
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
@@ -2341,76 +1570,132 @@
 						"mem": "^1.1.0"
 					}
 				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+				"os-name": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
+					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
 					"dev": true,
 					"requires": {
-						"p-limit": "^1.1.0"
+						"macos-release": "^1.0.0",
+						"win-release": "^1.0.0"
 					}
 				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+				"postcss": {
+					"version": "6.0.23",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
 					"dev": true,
 					"requires": {
-						"error-ex": "^1.2.0"
+						"chalk": "^2.4.1",
+						"source-map": "^0.6.1",
+						"supports-color": "^5.4.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"
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+				"tapable": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
+					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
 					"dev": true
 				},
-				"read-pkg": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+				"typescript": {
+					"version": "2.6.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
+					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
+					"dev": true
+				},
+				"uglify-es": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
+					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
 					"dev": true,
 					"requires": {
-						"load-json-file": "^2.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^2.0.0"
+						"commander": "~2.12.1",
+						"source-map": "~0.6.1"
 					}
 				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+				"webpack": {
+					"version": "3.12.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
+					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
 					"dev": true,
 					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
+						"acorn": "^5.0.0",
+						"acorn-dynamic-import": "^2.0.0",
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0",
+						"async": "^2.1.2",
+						"enhanced-resolve": "^3.4.0",
+						"escope": "^3.6.0",
+						"interpret": "^1.0.0",
+						"json-loader": "^0.5.4",
+						"json5": "^0.5.1",
+						"loader-runner": "^2.3.0",
+						"loader-utils": "^1.1.0",
+						"memory-fs": "~0.4.1",
+						"mkdirp": "~0.5.0",
+						"node-libs-browser": "^2.0.0",
+						"source-map": "^0.5.3",
+						"supports-color": "^4.2.1",
+						"tapable": "^0.2.7",
+						"uglifyjs-webpack-plugin": "^0.4.6",
+						"watchpack": "^1.4.0",
+						"webpack-sources": "^1.0.1",
+						"yargs": "^8.0.2"
+					},
+					"dependencies": {
+						"has-flag": {
+							"version": "2.0.0",
+							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+							"dev": true
+						},
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						},
+						"supports-color": {
+							"version": "4.5.0",
+							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+							"dev": true,
+							"requires": {
+								"has-flag": "^2.0.0"
+							}
+						}
 					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
+				"ws": {
+					"version": "3.3.2",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
+					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
 				},
 				"yargs": {
-					"version": "9.0.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
 					"dev": true,
 					"requires": {
 						"camelcase": "^4.1.0",
@@ -2439,543 +1724,361 @@
 				}
 			}
 		},
-		"@angular/core": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.3.tgz",
-			"integrity": "sha512-6Ql+sJJnrsxh8O0/IgIP1GgT4eLOHk+dlBs7zBbjstmLuhaQdY+awO9WKoQow+TiD1Go7FW1J3vZ2PTWXKxqjQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/forms": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.3.tgz",
-			"integrity": "sha512-mZpyonfSmRwSvM6efvwFwkLJkK6wHQrm7X4OhVVu3s9i7BI253eLDY7WIRXFvoxJ/5jWIIarVnd/9UA7GINZGw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/http": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.3.tgz",
-			"integrity": "sha512-wzvBKbO/TcSR3U8AQbsGftH8x1OdAgVGHlfXQPmZL1KjIDHrM1VpnkSvgqIt8coG+4OPfWcNklUCrTdEGwqMqw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/language-service": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.3.tgz",
-			"integrity": "sha512-9FBVYbKaNx4Ap+Suz/2ZFBPca1voinZMOCN8LjXRYnfS2MHLQASQlTlK4qeZcomyRfy0FxWmO9R02S7YJ06cnw==",
-			"dev": true
-		},
-		"@angular/platform-browser": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.3.tgz",
-			"integrity": "sha512-DH0Y2lgEgcrP1I/DUQB/krL7Ob7yL685fu4sRapW17SndTQa2pqSFMBVf+mN3FupTXp7nJHSvlIktzedIk04+g==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/platform-browser-dynamic": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.3.tgz",
-			"integrity": "sha512-M8Kiz5FUhnFybJuk/mgOhBjVbRgKDC4bGWKWH9Z9SXBR2dS/FL3QOJsLIthQcWlHOzSoJdEoPBRhn0R4pyLBSw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/pwa": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.0.tgz",
-			"integrity": "sha512-E1rOMduecaUw6sZfm5u3nFWi2B90SD6NriGjciVTcKCjPmHKeIWmpWGhVdgGEzCbg1Gxj8ZhsvvBjJzfbDPF6g==",
+		"@ionic/cli-framework": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.7.0.tgz",
+			"integrity": "sha512-2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg==",
+			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"parse5-html-rewriting-stream": "5.1.0",
-				"rxjs": "6.3.3"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"inquirer": "^6.0.0",
+				"lodash": "^4.17.5",
+				"log-update": "^2.3.0",
+				"minimist": "^1.2.0",
+				"rimraf": "^2.6.2",
+				"slice-ansi": "^2.0.0",
+				"string-width": "^3.0.0",
+				"strip-ansi": "^5.0.0",
+				"tslib": "^1.9.0",
+				"untildify": "^3.0.2",
+				"wrap-ansi": "^4.0.0",
+				"write-file-atomic": "^2.3.0"
 			},
 			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-					"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"ajv": "6.7.0",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.3.3",
-						"source-map": "0.7.3"
+						"ms": "^2.1.1"
 					}
 				},
-				"@angular-devkit/schematics": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-					"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+				"wrap-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
 					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
 					},
 					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"string-width": {
+							"version": "2.1.1",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+							"dev": true,
 							"requires": {
-								"is-descriptor": "^1.0.0"
+								"is-fullwidth-code-point": "^2.0.0",
+								"strip-ansi": "^4.0.0"
+							}
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
 							}
 						}
 					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+				}
+			}
+		},
+		"@ionic/core": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.1.2.tgz",
+			"integrity": "sha512-QVJYpDAycmXgQL3mWdvjlIgrLEG0wVl9+NGZQATEBCTEsuDHrOw7BO28FKPlFCdfTjVA6HDJnSj1HwOUi3Yp4w==",
+			"requires": {
+				"ionicons": "4.5.5"
+			}
+		},
+		"@ionic/discover": {
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.13.tgz",
+			"integrity": "sha512-9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"netmask": "^1.0.6",
+				"tslib": "^1.9.0",
+				"ws": "^6.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-						}
+						"ms": "^2.1.1"
 					}
 				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@ionic/lab": {
+			"version": "1.0.24",
+			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.24.tgz",
+			"integrity": "sha512-sXUx0MZKC43bZ5ZJ1IRQ+yuvCgNGGJ6QPREI1AeHXZpkZRixrh0w14SLgxEzjxvFgW6ypQkdKlymY0nRoU8Gng==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/utils-fs": "1.2.0",
+				"chalk": "^2.3.0",
+				"express": "^4.16.2",
+				"tslib": "^1.9.0"
+			}
+		},
+		"@ionic/ng-toolkit": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
+			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.1.0",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"rxjs": "~6.2.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"@ionic/cli-framework": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
+					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
+					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"@ionic/utils-fs": "0.0.2",
+						"chalk": "^2.3.0",
+						"debug": "^4.0.0",
+						"inquirer": "^6.0.0",
+						"lodash": "^4.17.5",
+						"minimist": "^1.2.0",
+						"rimraf": "^2.6.2",
+						"slice-ansi": "^1.0.0",
+						"stream-combiner2": "^1.1.1",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^5.0.0",
+						"tree-kill": "1.2.0",
+						"tslib": "^1.9.0",
+						"untildify": "^3.0.2",
+						"wrap-ansi": "^4.0.0",
+						"write-file-atomic": "^2.3.0"
 					}
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"@ionic/utils-fs": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
+					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
+					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"debug": "^4.0.0",
+						"ncp": "^2.0.0",
+						"through2": "^2.0.3",
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+					"dev": true
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
 				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
+					"dev": true,
 					"requires": {
 						"tslib": "^1.9.0"
 					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				"slice-ansi": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-						}
+						"is-fullwidth-code-point": "^2.0.0"
 					}
 				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"strip-ansi": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ansi-regex": "^4.0.0"
 					}
 				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg=="
-				}
-			}
-		},
-		"@angular/router": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.3.tgz",
-			"integrity": "sha512-SH7H2I9WTj1puei4m4g5n0/Cp28HS14q4r8lOgW0gLWuT6Ls7MqH/nDjOMiW924iRR6zjQQs7G+WbhL1jmZc2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/service-worker": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
-			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@babel/code-frame": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.0.0"
-			}
-		},
-		"@babel/generator": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.0.tgz",
-			"integrity": "sha512-dZTwMvTgWfhmibq4V9X+LMf6Bgl7zAodRn9PvcPdhlzFMbvUutx74dbEv7Atz3ToeEpevYEJtAwfxq/bDCzHWg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.3.0",
-				"jsesc": "^2.5.1",
-				"lodash": "^4.17.10",
-				"source-map": "^0.5.0",
-				"trim-right": "^1.0.1"
-			},
-			"dependencies": {
-				"jsesc": {
-					"version": "2.5.2",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+				"tree-kill": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
+					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
 					"dev": true
-				}
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "^7.0.0",
-				"@babel/template": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
-			"integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/highlight": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.0.0",
-				"esutils": "^2.0.2",
-				"js-tokens": "^4.0.0"
-			},
-			"dependencies": {
-				"js-tokens": {
+				},
+				"wrap-ansi": {
 					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-					"dev": true
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
+							}
+						}
+					}
 				}
 			}
 		},
-		"@babel/parser": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.1.tgz",
-			"integrity": "sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA==",
-			"dev": true
-		},
-		"@babel/template": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
-			"integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/parser": "^7.2.2",
-				"@babel/types": "^7.2.2"
-			}
+		"@ionic/pro": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
+			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
 		},
-		"@babel/traverse": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
-			"integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
+		"@ionic/schematics-angular": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
+			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/generator": "^7.2.2",
-				"@babel/helper-function-name": "^7.1.0",
-				"@babel/helper-split-export-declaration": "^7.0.0",
-				"@babel/parser": "^7.2.3",
-				"@babel/types": "^7.2.2",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0",
-				"lodash": "^4.17.10"
+				"@schematics/angular": "0.9.0-beta.3",
+				"lodash": "^4.17.5",
+				"tslib": "^1.9.0",
+				"typescript": "3.0.1"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+				"@angular-devkit/core": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
+					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ajv": "6.5.3",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.2.2",
+						"source-map": "0.7.3"
 					}
 				},
-				"globals": {
-					"version": "11.10.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz",
-					"integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==",
-					"dev": true
+				"@angular-devkit/schematics": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
+					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
+					"dev": true,
+					"requires": {
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"rxjs": "6.2.2"
+					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/types": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.0.tgz",
-			"integrity": "sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw==",
-			"dev": true,
-			"requires": {
-				"esutils": "^2.0.2",
-				"lodash": "^4.17.10",
-				"to-fast-properties": "^2.0.0"
-			},
-			"dependencies": {
-				"to-fast-properties": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-					"dev": true
-				}
-			}
-		},
-		"@compodoc/compodoc": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.7.tgz",
-			"integrity": "sha512-bTqkv75T9b+3OxG517YL+5B0npAG0Q5nOMAk562Idr/fICTTHQ/xzSBsTptZ4QqYmtzRMV1OqOlk74FXfGPZWw==",
-			"dev": true,
-			"requires": {
-				"@compodoc/ngd-transformer": "^2.0.0",
-				"chalk": "^2.4.1",
-				"cheerio": "^1.0.0-rc.2",
-				"chokidar": "^2.0.4",
-				"colors": "^1.3.2",
-				"commander": "2.19.0",
-				"cosmiconfig": "^5.0.7",
-				"fancy-log": "^1.3.2",
-				"findit2": "^2.2.3",
-				"fs-extra": "^7.0.1",
-				"glob": "^7.1.3",
-				"handlebars": "4.0.10",
-				"html-entities": "^1.2.1",
-				"i18next": "^12.1.0",
-				"inside": "^1.0.0",
-				"json5": "^2.1.0",
-				"live-server": "1.2.1",
-				"lodash": "^4.17.11",
-				"lunr": "2.3.5",
-				"marked": "^0.4.0",
-				"opencollective": "^1.0.3",
-				"os-name": "^3.0.0",
-				"traverse": "^0.6.6",
-				"ts-simple-ast": "12.4.0",
-				"uuid": "^3.3.2"
-			},
-			"dependencies": {
-				"@compodoc/ngd-transformer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
-					"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+				"@schematics/angular": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
+					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
 					"dev": true,
 					"requires": {
-						"@compodoc/ngd-core": "~2.0.0",
-						"dot": "^1.1.1",
-						"fs-extra": "^4.0.1",
-						"viz.js": "^1.8.0"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "4.0.3",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-							"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"@angular-devkit/schematics": "0.9.0-beta.3",
+						"typescript": "3.0.1"
 					}
 				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
+				"ajv": {
+					"version": "6.5.3",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
+					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
 				},
 				"base": {
 					"version": "0.11.2",
@@ -3021,31 +2124,10 @@
 						"to-regex": "^3.0.1"
 					}
 				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true,
-					"optional": true
-				},
-				"cheerio": {
-					"version": "1.0.0-rc.2",
-					"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
-					"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
-					"dev": true,
-					"requires": {
-						"css-select": "~1.2.0",
-						"dom-serializer": "~0.1.0",
-						"entities": "~1.1.1",
-						"htmlparser2": "^3.9.1",
-						"lodash": "^4.15.0",
-						"parse5": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"chokidar": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
 					"dev": true,
 					"requires": {
 						"anymatch": "^2.0.0",
@@ -3063,48 +2145,6 @@
 						"upath": "^1.0.5"
 					}
 				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-					"dev": true
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"cosmiconfig": {
-					"version": "5.0.7",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz",
-					"integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^2.0.0",
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0"
-					}
-				},
 				"define-property": {
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -3173,31 +2213,6 @@
 						}
 					}
 				},
-				"dir-glob": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-					"dev": true,
-					"requires": {
-						"arrify": "^1.0.1",
-						"path-type": "^3.0.0"
-					}
-				},
-				"event-stream": {
-					"version": "3.3.4",
-					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-					"dev": true,
-					"requires": {
-						"duplexer": "~0.1.1",
-						"from": "~0",
-						"map-stream": "~0.1.0",
-						"pause-stream": "0.0.11",
-						"split": "0.3",
-						"stream-combiner": "~0.0.4",
-						"through": "~2.3.1"
-					}
-				},
 				"extend-shallow": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
@@ -3207,80 +2222,6 @@
 						"is-extendable": "^0.1.0"
 					}
 				},
-				"faye-websocket": {
-					"version": "0.11.1",
-					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-					"dev": true,
-					"requires": {
-						"websocket-driver": ">=0.5.1"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"globby": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"dir-glob": "2.0.0",
-						"fast-glob": "^2.0.2",
-						"glob": "^7.1.2",
-						"ignore": "^3.3.5",
-						"pify": "^3.0.0",
-						"slash": "^1.0.0"
-					}
-				},
-				"handlebars": {
-					"version": "4.0.10",
-					"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
-					"integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
-					"dev": true,
-					"requires": {
-						"async": "^1.4.0",
-						"optimist": "^0.6.1",
-						"source-map": "^0.4.4",
-						"uglify-js": "^2.6"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.4.4",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-							"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
-					}
-				},
-				"http-auth": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
-					"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
-					"dev": true,
-					"requires": {
-						"apache-crypt": "^1.1.2",
-						"apache-md5": "^1.0.6",
-						"bcryptjs": "^2.3.0",
-						"uuid": "^3.0.0"
-					}
-				},
 				"is-accessor-descriptor": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -3316,98 +2257,13 @@
 					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
 					"dev": true
 				},
-				"live-server": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
-					"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
-					"dev": true,
-					"requires": {
-						"chokidar": "^2.0.4",
-						"colors": "^1.3.3",
-						"connect": "^3.6.6",
-						"cors": "^2.8.5",
-						"event-stream": "3.3.4",
-						"faye-websocket": "0.11.x",
-						"http-auth": "3.1.x",
-						"morgan": "^1.9.1",
-						"object-assign": "^4.1.1",
-						"opn": "^5.4.0",
-						"proxy-middleware": "^0.15.0",
-						"send": "^0.16.2",
-						"serve-index": "^1.9.1"
-					},
-					"dependencies": {
-						"colors": {
-							"version": "1.3.3",
-							"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-							"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-							"dev": true
-						}
-					}
-				},
-				"map-stream": {
-					"version": "0.1.0",
-					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-					"dev": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				},
-				"opn": {
-					"version": "5.4.0",
-					"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-					"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-					"dev": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parse5": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-					"dev": true,
-					"requires": {
-						"@types/node": "*"
-					}
-				},
-				"send": {
-					"version": "0.16.2",
-					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+				"rxjs": {
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
 					"dev": true,
 					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					},
-					"dependencies": {
-						"statuses": {
-							"version": "1.4.0",
-							"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-							"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-							"dev": true
-						}
+						"tslib": "^1.9.0"
 					}
 				},
 				"snapdragon": {
@@ -3424,8 +2280,22 @@
 						"source-map": "^0.5.6",
 						"source-map-resolve": "^0.5.0",
 						"use": "^3.1.0"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
 					}
 				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				},
 				"source-map-resolve": {
 					"version": "0.5.2",
 					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
@@ -3439,2179 +2309,588 @@
 						"urix": "^0.1.0"
 					}
 				},
-				"split": {
-					"version": "0.3.3",
-					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-					"dev": true,
-					"requires": {
-						"through": "2"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+				"typescript": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
 					"dev": true
-				},
-				"stream-combiner": {
-					"version": "0.0.4",
-					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+				}
+			}
+		},
+		"@ionic/storage": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
+			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
+			"requires": {
+				"localforage": "1.7.1",
+				"localforage-cordovasqlitedriver": "1.7.0",
+				"tslib": "^1.7.1"
+			}
+		},
+		"@ionic/utils-array": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-0.0.1.tgz",
+			"integrity": "sha512-gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"duplexer": "~0.1.1"
+						"ms": "^2.1.1"
 					}
 				},
-				"ts-simple-ast": {
-					"version": "12.4.0",
-					"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
-					"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
-					"dev": true,
-					"requires": {
-						"@dsherret/to-absolute-glob": "^2.0.2",
-						"code-block-writer": "^7.2.0",
-						"fs-extra": "^6.0.1",
-						"glob-parent": "^3.1.0",
-						"globby": "^8.0.1",
-						"is-negated-glob": "^1.0.0",
-						"multimatch": "^2.1.0",
-						"object-assign": "^4.1.1",
-						"tslib": "^1.9.0",
-						"typescript": "2.9.1"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-							"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.9.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
-					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
-				},
-				"uglify-js": {
-					"version": "2.8.29",
-					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+				}
+			}
+		},
+		"@ionic/utils-fs": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.2.0.tgz",
+			"integrity": "sha512-31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"fs-extra": "^7.0.1",
+				"through2": "^3.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"source-map": "~0.5.1",
-						"uglify-to-browserify": "~1.0.0",
-						"yargs": "~3.10.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true,
-					"optional": true
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"yargs": {
-					"version": "3.10.0",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"camelcase": "^1.0.2",
-						"cliui": "^2.1.0",
-						"decamelize": "^1.0.0",
-						"window-size": "0.1.0"
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
 		},
-		"@compodoc/ngd-core": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
-			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
+		"@ionic/utils-network": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.8.tgz",
+			"integrity": "sha512-DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg==",
 			"dev": true,
 			"requires": {
-				"ansi-colors": "^1.0.1",
-				"fancy-log": "^1.3.2",
-				"typescript": "^2.4.2"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
 			},
 			"dependencies": {
-				"ansi-colors": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ansi-wrap": "^0.1.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"typescript": {
-					"version": "2.9.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
 		},
-		"@dsherret/to-absolute-glob": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
+		"@ionic/utils-object": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-0.0.1.tgz",
+			"integrity": "sha512-ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ==",
 			"dev": true,
 			"requires": {
-				"is-absolute": "^1.0.0",
-				"is-negated-glob": "^1.0.0"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/barcode-scanner": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.0.0.tgz",
-			"integrity": "sha512-DjTWPZan6s1easv6A6LgI/ZcPQ+HJX2PxZHBuJckwkNxJ+KAWwEZBpEQ5rbyntZyTHLUZLCUrOhgDq4Y/TOI+Q==",
+		"@ionic/utils-process": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-0.1.0.tgz",
+			"integrity": "sha512-CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-terminal": "0.0.1",
+				"debug": "^4.0.0",
+				"lodash": "^4.17.5",
+				"tree-kill": "1.2.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/call-number": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.0.0.tgz",
-			"integrity": "sha512-kzIAMs7+hTRL2A2wO6PyIOVAJYxhBFNDsYyuE5vLmDs1Um74mFq62CFdYhLNpF+/wovbuNG3+u/b1BFToXIUWw==",
+		"@ionic/utils-stream": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-0.0.1.tgz",
+			"integrity": "sha512-IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"stream-combiner2": "^1.1.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/core": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.0.0.tgz",
-			"integrity": "sha512-qtshWPo+CMq9ZoDGcg+1XF1+k2ASm0sLtZsIbXmYo5X82Q9cUhjk95X9BqHnjXHOdIWk4J/D3ot0/vzmMTNdbA==",
+		"@ionic/utils-subprocess": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz",
+			"integrity": "sha512-8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"cross-spawn": "^6.0.5",
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/device": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.0.0.tgz",
-			"integrity": "sha512-Mf8kLO+BbvsdYrDvgkpp2YTX4ygXQLEMrsnqPauibhE8ZGsAZUDmfH7+Mtv1OIN0z0ot0zhEOhsfF7y/QuWRzw==",
+		"@ionic/utils-terminal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz",
+			"integrity": "sha512-xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/dialogs": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.0.0.tgz",
-			"integrity": "sha512-DXhWE9tbEtBmEmbcRD+cmQ42zIGG6NbQCKL/Gs4YsAGrLVBhbhCJx7M/Yk8C2gn2ktczfl4h7KMne/NABbfbqA==",
+		"@mrmlnc/readdir-enhanced": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"call-me-maybe": "^1.0.1",
+				"glob-to-regexp": "^0.3.0"
 			}
 		},
-		"@ionic-native/geolocation": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.0.0.tgz",
-			"integrity": "sha512-gU3GNCEJgh+2KpK0Tg9l85HDMRkUWO9FAszF4UDnqAUihTQGCM0Nl+hpmEQowkM9+Him8FJ83rT82pPmnGERCA==",
+		"@ngtools/webpack": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.7.tgz",
+			"integrity": "sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"enhanced-resolve": "4.1.0",
+				"rxjs": "6.3.3",
+				"tree-kill": "1.2.1",
+				"webpack-sources": "1.3.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/globalization": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.0.0.tgz",
-			"integrity": "sha512-a3JsDwgwvzKyq2tda6FNIXmrVMeaZ9muXl9h1HKcG1ThqWHNGW9Zxmpakv3sO4onUv6KUEaP49rcim/xoeo9BA==",
+		"@ngx-progressbar/core": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.2.tgz",
+			"integrity": "sha512-z0VzsJpgWxoU7wLXviCutXPXDop1Ry/SPOlVOtXHlkUGFAzHs3soDeXpTyigSdBB8Q16Nisow4EVuOKCByp6PQ==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-analytics": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.0.0.tgz",
-			"integrity": "sha512-mYeP9QmHfjjJe3y5uHUz4atfR2EuRCf5TFRCyi+yoCs5WEwC4JbM7k4GxGyx6YY1MHqNDoUrDZu5F0NypqxsKg==",
+		"@ngx-translate/core": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
+			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-maps": {
-			"version": "5.0.0-beta.26",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
-			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+		"@ngx-translate/http-loader": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
+			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/intercom": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.0.0.tgz",
-			"integrity": "sha512-rXk3IEFbT3Ec/kmz53Xrkvicch1CFeL/0dSOKsM5mrIYoUWQJGV2qMP5Clbq7ZdMJ/8q2Bv2gF2b9L/UipAy/w==",
+		"@nodelib/fs.stat": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+			"dev": true
+		},
+		"@schematics/angular": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.7.tgz",
+			"integrity": "sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"typescript": "3.2.4"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+					"requires": {
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
+					}
+				},
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+					"requires": {
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
+					}
+				},
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
 			}
 		},
-		"@ionic-native/local-notifications": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.0.0.tgz",
-			"integrity": "sha512-lKdZ60rJncgCwwVeCYSfhHJGtrFUBqj9FkJpRcLUxeOZSxp9EVCN/ZGoGyeTlOKwunNBaw8a77hBZ7lbriBW6w==",
+		"@schematics/update": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.7.tgz",
+			"integrity": "sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"pacote": "9.4.0",
+				"rxjs": "6.3.3",
+				"semver": "5.6.0",
+				"semver-intersect": "1.4.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/mixpanel": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.0.0.tgz",
-			"integrity": "sha512-SqKHc5yCTJ2qnX1bk7GFcNQCpDzIqzg0+CNWptSkFPBxtais3qw07GYTASaEzQM1kjmPSPD++avkfWmUXT2CXg==",
+		"@types/bson": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.0.tgz",
+			"integrity": "sha512-pq/rqJwJWkbS10crsG5bgnrisL8pML79KlMKQMoQwLUjlPAkrUHMvHJ3oGwE7WHR61Lv/nadMwXVAD2b+fpD8Q==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/network": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.0.0.tgz",
-			"integrity": "sha512-Yb8c+U8GZOhL5qc6LdbzJdwzTclZ9w0QpPH5YTbFXLJOSzhmq+ibN2dzWbmWLjPZuwR0V7K+KrefoJNacFDejw==",
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
+		"@types/d3-color": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",
+			"integrity": "sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==",
+			"dev": true
+		},
+		"@types/geojson": {
+			"version": "7946.0.7",
+			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+			"integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==",
+			"dev": true
+		},
+		"@types/googlemaps": {
+			"version": "3.30.19",
+			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.19.tgz",
+			"integrity": "sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==",
+			"dev": true
+		},
+		"@types/graphql": {
+			"version": "14.2.0",
+			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.2.0.tgz",
+			"integrity": "sha512-lELg5m6eBOmATWyCZl8qULEOvnPIUG6B443yXKj930glXIgwQirIBPp5rthP2amJW0YSzUg2s5sfgba4mRRCNw==",
+			"dev": true
+		},
+		"@types/jasmine": {
+			"version": "3.3.12",
+			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.12.tgz",
+			"integrity": "sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==",
+			"dev": true
+		},
+		"@types/jasminewd2": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
+			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/jasmine": "*"
 			}
 		},
-		"@ionic-native/splash-screen": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.0.0.tgz",
-			"integrity": "sha512-+7QfXPkaosGsR3ohEiL/WJn23NHVDZYvnilYNrOMF7oohnj5ngH46fCNYp1Tpybe5GCV1iP++RzDvE5jghWLZg==",
+		"@types/leaflet": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.3.tgz",
+			"integrity": "sha512-jFRBSsPHi1EwQSwrN0cOJLdPhwOZsRl4IMxvm/2ShLh0YM5GfCtQXCzsrv8RE7DWL+AykXdYSAd9bFLWbZT4CQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/geojson": "*"
 			}
 		},
-		"@ionic-native/status-bar": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.0.0.tgz",
-			"integrity": "sha512-mJfj+VXTOgf9Og0S7QDlT9I8UVI+Wj4kpZUHdQizovA/R0m1HG2hLKtEMy00iDVbOBjRsXGcD6JXCOeyVjg7LA==",
+		"@types/mongodb": {
+			"version": "3.1.22",
+			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.22.tgz",
+			"integrity": "sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/bson": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/unique-device-id": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.0.0.tgz",
-			"integrity": "sha512-yfiQKkkh6N6ypZFBPqu2rDCsdYVUdy7W4ZezD3nCj33FkrNS7Xrdo9H76SQW2c7smXQ+fnSeH7prS//Yyc0KvQ==",
+		"@types/mongoose": {
+			"version": "5.3.24",
+			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.24.tgz",
+			"integrity": "sha512-Txa5C/veUJJG2o1sRbl8z1M7GhPjJz6J3JJQV76eYN0PyI9F2NO3gbVUj059ND5nlbvQjRhXuFLaqN6NH8nMNQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/mongodb": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/vibration": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.0.0.tgz",
-			"integrity": "sha512-XIAfp3oeizseetvnYPAMZ0kK+nyh2i/0Vy0FJkcEGM0fCD36PZkyNpx1Ai1bk3/Ln3nTMZddoBZket1aTXetNA==",
+		"@types/node": {
+			"version": "11.12.1",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-11.12.1.tgz",
+			"integrity": "sha512-sKDlqv6COJrR7ar0+GqqhrXQDzQlMcqMnF2iEU6m9hLo8kxozoAGUazwPyELHlRVmjsbvlnGXjnzyptSXVmceA==",
+			"dev": true
+		},
+		"@types/q": {
+			"version": "0.0.32",
+			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+			"dev": true
+		},
+		"@types/reflect-metadata": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
+			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"reflect-metadata": "*"
 			}
 		},
-		"@ionic/angular": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.0.0.tgz",
-			"integrity": "sha512-kxvlZN5daRql/VRcbB7YWMcmE4jKDgwlPRykzNvmYWFDr9vg1AbXirLHAPtR7BaKWJEN4dJwlibjBEJQw8kVYQ==",
+		"@types/selenium-webdriver": {
+			"version": "3.0.14",
+			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
+			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
+			"dev": true
+		},
+		"@types/socket.io-client": {
+			"version": "1.4.32",
+			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
+			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
+			"dev": true
+		},
+		"@types/source-list-map": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+			"dev": true
+		},
+		"@types/stripe": {
+			"version": "6.25.7",
+			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.25.7.tgz",
+			"integrity": "sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==",
+			"dev": true,
 			"requires": {
-				"@ionic/core": "4.0.0",
-				"tslib": "^1.9.3"
+				"@types/node": "*"
 			}
 		},
-		"@ionic/angular-toolkit": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.3.0.tgz",
-			"integrity": "sha512-GOoAx/cs6Hhl0FiOhZAFPCG3cgz2DbyfYflhWFbi08MLIQD2aCoVg6wIpcBoMHQf4eob5WDDIlbOO0t9LVn3dg==",
+		"@types/swiper": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.2.tgz",
+			"integrity": "sha512-bJzmpMwGaA6elG0/9M3H45Az0IwuuJoUGUXGgH/DVKZOJg3iBtu+djAlBnOXOonAHd5kDsrfdhdxFKOGjzM+Vw==",
+			"dev": true
+		},
+		"@types/uuid": {
+			"version": "3.4.4",
+			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
+			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
 			"dev": true,
 			"requires": {
-				"@schematics/angular": "^7.0.3",
-				"tslib": "^1.9.0",
-				"typescript": "^3.2.4"
+				"@types/node": "*"
+			}
+		},
+		"@types/webpack-sources": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
+			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/source-list-map": "*",
+				"source-map": "^0.6.1"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					},
-					"dependencies": {
-						"typescript": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-							"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-							"dev": true
-						}
-					}
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
 				}
 			}
 		},
-		"@ionic/app-scripts": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.2.tgz",
-			"integrity": "sha512-ZpeAafEboO/xHnmgy61ZOsaMGpoer621YX3q09x+BA2sbcuqOEsMKV91BRZmghoiHlwBB9woxXRyAwuYIAASHw==",
-			"dev": true,
-			"requires": {
-				"@angular-devkit/build-optimizer": "0.0.35",
-				"autoprefixer": "^7.2.6",
-				"chalk": "^2.4.0",
-				"chokidar": "^2.0.4",
-				"clean-css": "^4.1.11",
-				"cross-spawn": "^5.1.0",
-				"dotenv-webpack": "^1.5.7",
-				"express": "^4.16.3",
-				"fs-extra": "^4.0.2",
-				"glob": "^7.1.2",
-				"json-loader": "^0.5.7",
-				"node-sass": "^4.10.0",
-				"os-name": "^2.0.1",
-				"postcss": "^6.0.21",
-				"proxy-middleware": "^0.15.0",
-				"reflect-metadata": "^0.1.10",
-				"rollup": "0.50.0",
-				"rollup-plugin-commonjs": "8.2.6",
-				"rollup-plugin-node-resolve": "3.0.0",
-				"source-map": "^0.6.1",
-				"tiny-lr": "^1.1.1",
-				"tslint": "^5.8.0",
-				"tslint-eslint-rules": "^4.1.1",
-				"uglify-es": "3.2.2",
-				"webpack": "3.12.0",
-				"ws": "3.3.2",
-				"xml2js": "^0.4.19"
-			},
-			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.0.35",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
-					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.1.0",
-						"source-map": "^0.5.6",
-						"typescript": "~2.6.1",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"acorn-dynamic-import": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
-					"dev": true,
-					"requires": {
-						"acorn": "^4.0.3"
-					},
-					"dependencies": {
-						"acorn": {
-							"version": "4.0.13",
-							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-							"dev": true
-						}
-					}
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"autoprefixer": {
-					"version": "7.2.6",
-					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
-					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^2.11.3",
-						"caniuse-lite": "^1.0.30000805",
-						"normalize-range": "^0.1.2",
-						"num2fraction": "^1.2.2",
-						"postcss": "^6.0.17",
-						"postcss-value-parser": "^3.2.3"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"body": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-					"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-					"dev": true,
-					"requires": {
-						"continuable-cache": "^0.3.1",
-						"error": "^7.0.0",
-						"raw-body": "~1.1.0",
-						"safe-json-parse": "~1.0.1"
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"browserslist": {
-					"version": "2.11.3",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30000792",
-						"electron-to-chromium": "^1.3.30"
-					}
-				},
-				"bytes": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-					"dev": true
-				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.12.2",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
-					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^4.0.1",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"enhanced-resolve": {
-					"version": "3.4.1",
-					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"memory-fs": "^0.4.0",
-						"object-assign": "^4.0.1",
-						"tapable": "^0.2.7"
-					}
-				},
-				"execa": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"fs-extra": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"json5": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"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"
-					}
-				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"macos-release": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
-					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
-					"dev": true
-				},
-				"magic-string": {
-					"version": "0.22.5",
-					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
-					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
-					"dev": true,
-					"requires": {
-						"vlq": "^0.2.2"
-					}
-				},
-				"mem": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^1.0.0"
-					}
-				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"os-locale": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-					"dev": true,
-					"requires": {
-						"execa": "^0.7.0",
-						"lcid": "^1.0.0",
-						"mem": "^1.1.0"
-					}
-				},
-				"os-name": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
-					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
-					"dev": true,
-					"requires": {
-						"macos-release": "^1.0.0",
-						"win-release": "^1.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-					"dev": true,
-					"requires": {
-						"p-limit": "^1.1.0"
-					}
-				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.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
-				},
-				"postcss": {
-					"version": "6.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.1",
-						"source-map": "^0.6.1",
-						"supports-color": "^5.4.0"
-					}
-				},
-				"raw-body": {
-					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-					"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-					"dev": true,
-					"requires": {
-						"bytes": "1",
-						"string_decoder": "0.10"
-					}
-				},
-				"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"
-					}
-				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-					"dev": true,
-					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				},
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				},
-				"rollup-plugin-commonjs": {
-					"version": "8.2.6",
-					"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
-					"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.2.1",
-						"estree-walker": "^0.5.0",
-						"magic-string": "^0.22.4",
-						"resolve": "^1.4.0",
-						"rollup-pluginutils": "^2.0.1"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				},
-				"tapable": {
-					"version": "0.2.9",
-					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
-					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
-					"dev": true
-				},
-				"tiny-lr": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-					"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-					"dev": true,
-					"requires": {
-						"body": "^5.1.0",
-						"debug": "^3.1.0",
-						"faye-websocket": "~0.10.0",
-						"livereload-js": "^2.3.0",
-						"object-assign": "^4.1.0",
-						"qs": "^6.4.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.6.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
-					"dev": true
-				},
-				"uglify-es": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
-					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
-					"dev": true,
-					"requires": {
-						"commander": "~2.12.1",
-						"source-map": "~0.6.1"
-					}
-				},
-				"uglifyjs-webpack-plugin": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-					"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
-					"dev": true,
-					"requires": {
-						"source-map": "^0.5.6",
-						"uglify-js": "^2.8.29",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"uglify-js": {
-							"version": "2.8.29",
-							"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-							"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-							"dev": true,
-							"requires": {
-								"source-map": "~0.5.1",
-								"uglify-to-browserify": "~1.0.0",
-								"yargs": "~3.10.0"
-							}
-						},
-						"yargs": {
-							"version": "3.10.0",
-							"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-							"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-							"dev": true,
-							"requires": {
-								"camelcase": "^1.0.2",
-								"cliui": "^2.1.0",
-								"decamelize": "^1.0.0",
-								"window-size": "0.1.0"
-							}
-						}
-					}
-				},
-				"webpack": {
-					"version": "3.12.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
-					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.0.0",
-						"acorn-dynamic-import": "^2.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"async": "^2.1.2",
-						"enhanced-resolve": "^3.4.0",
-						"escope": "^3.6.0",
-						"interpret": "^1.0.0",
-						"json-loader": "^0.5.4",
-						"json5": "^0.5.1",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"mkdirp": "~0.5.0",
-						"node-libs-browser": "^2.0.0",
-						"source-map": "^0.5.3",
-						"supports-color": "^4.2.1",
-						"tapable": "^0.2.7",
-						"uglifyjs-webpack-plugin": "^0.4.6",
-						"watchpack": "^1.4.0",
-						"webpack-sources": "^1.0.1",
-						"yargs": "^8.0.2"
-					},
-					"dependencies": {
-						"has-flag": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-							"dev": true
-						},
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "4.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-							"dev": true,
-							"requires": {
-								"has-flag": "^2.0.0"
-							}
-						}
-					}
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
-				},
-				"win-release": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
-					"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
-					"dev": true,
-					"requires": {
-						"semver": "^5.0.1"
-					}
-				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true
-				},
-				"ws": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
-					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
-				},
-				"yargs": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0",
-						"cliui": "^3.2.0",
-						"decamelize": "^1.1.1",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^2.0.0",
-						"read-pkg-up": "^2.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1",
-						"yargs-parser": "^7.0.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						},
-						"cliui": {
-							"version": "3.2.0",
-							"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-							"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-							"dev": true,
-							"requires": {
-								"string-width": "^1.0.1",
-								"strip-ansi": "^3.0.1",
-								"wrap-ansi": "^2.0.0"
-							},
-							"dependencies": {
-								"string-width": {
-									"version": "1.0.2",
-									"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-									"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-									"dev": true,
-									"requires": {
-										"code-point-at": "^1.0.0",
-										"is-fullwidth-code-point": "^1.0.0",
-										"strip-ansi": "^3.0.0"
-									}
-								}
-							}
-						}
-					}
-				},
-				"yargs-parser": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						}
-					}
-				}
-			}
-		},
-		"@ionic/core": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.0.0.tgz",
-			"integrity": "sha512-/hW4882TyjcJTiNBYpoLGRYxkQhRidSuVjCL2RvfMS8a7FDQoS2dkje5KBGG+O2TCjtyXE5de1A6HvUgvDqjGA==",
-			"requires": {
-				"ionicons": "4.5.5"
-			}
-		},
-		"@ionic/lab": {
-			"version": "1.0.20",
-			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.20.tgz",
-			"integrity": "sha512-srSpTMb22BYk9qbEnyyb04KwBFpauBn5BksPmJnlPq8oAjNdNzZOuO/L95qKO9OqfIxRqFwpRVfzvI0TMWjCig==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/utils-fs": "1.0.0",
-				"chalk": "^2.3.0",
-				"express": "^4.16.2",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "2.6.9",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-							"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/ng-toolkit": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
-			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.1.0",
-				"chalk": "^2.3.0",
-				"debug": "^4.0.0",
-				"rxjs": "~6.2.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
-					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "0.0.2",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^1.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.0",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
-					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"ncp": "^2.0.0",
-						"through2": "^2.0.3",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"slice-ansi": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"tree-kill": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
-					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
-					"dev": true
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/pro": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
-			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
-		},
-		"@ionic/schematics-angular": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
-			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
-			"dev": true,
-			"requires": {
-				"@schematics/angular": "0.9.0-beta.3",
-				"lodash": "^4.17.5",
-				"tslib": "^1.9.0",
-				"typescript": "3.0.1"
-			},
-			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
-					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
-					"dev": true,
-					"requires": {
-						"ajv": "6.5.3",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.2.2",
-						"source-map": "0.7.3"
-					}
-				},
-				"@angular-devkit/schematics": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
-					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"rxjs": "6.2.2"
-					}
-				},
-				"@schematics/angular": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
-					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"@angular-devkit/schematics": "0.9.0-beta.3",
-						"typescript": "3.0.1"
-					}
-				},
-				"ajv": {
-					"version": "6.5.3",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
-					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^2.0.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"typescript": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
-					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
-					"dev": true
-				}
-			}
-		},
-		"@ionic/storage": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
-			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
-			"requires": {
-				"localforage": "1.7.1",
-				"localforage-cordovasqlitedriver": "1.7.0",
-				"tslib": "^1.7.1"
-			}
-		},
-		"@ionic/utils-network": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.6.tgz",
-			"integrity": "sha512-1aHXzL1PPJDdXLwicu5+Zv0QfWIrKxqGvat4A8zruAjm4oLvIOli5DnUb61VqP2ocAhiI3t39jxtBq9Fb/Gl9w==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.0.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@mrmlnc/readdir-enhanced": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-			"dev": true,
-			"requires": {
-				"call-me-maybe": "^1.0.1",
-				"glob-to-regexp": "^0.3.0"
-			}
-		},
-		"@ngx-progressbar/core": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.1.tgz",
-			"integrity": "sha512-IAbpPbv0RHwnLTqr8JpEOR2mDbia8jTyZdG0yWmyiGoVfIisSs/NkzMDph43pLvWl2aaJ+Bd2BJTdM2olYK4MQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/core": {
-			"version": "11.0.1",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
-			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/http-loader": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
-			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-			"dev": true
-		},
-		"@types/bson": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-1.0.11.tgz",
-			"integrity": "sha512-j+UcCWI+FsbI5/FQP/Kj2CXyplWAz39ktHFkXk84h7dNblKRSoNJs95PZFRd96NQGqsPEPgeclqnznWZr14ZDA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/cordova": {
-			"version": "0.0.34",
-			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-		},
-		"@types/d3-color": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.1.tgz",
-			"integrity": "sha512-xwb1tqvYNWllbHuhMFhiXk63Imf+QNq/dJdmbXmr2wQVnwGenCuj3/0IWJ9hdIFQIqzvhT7T37cvx93jtAsDbQ==",
-			"dev": true
-		},
-		"@types/geojson": {
-			"version": "7946.0.5",
-			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.5.tgz",
-			"integrity": "sha512-rLlMXpd3rdlrp0+xsrda/hFfOpIxgqFcRpk005UKbHtcdFK+QXAjhBAPnvO58qF4O1LdDXrcaiJxMgstCIlcaw==",
-			"dev": true
-		},
-		"@types/googlemaps": {
-			"version": "3.30.16",
-			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.16.tgz",
-			"integrity": "sha512-6OZ64ahLzYfzuSr71y4jAHZXiwxjvvEM2bfF2tzjIc9KUZVbO30SkYa8WewTsR8aM5BFz/uBiNlZ14eRLXYS0g==",
-			"dev": true
-		},
-		"@types/graphql": {
-			"version": "14.0.5",
-			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.0.5.tgz",
-			"integrity": "sha512-bwGYLE0SRy5ZraC91dqI2bxbspfm10kyJ2Yjuvk4OjdGznh7fkoWW+xXZHfFydJaqu9syZi099cpiZw3GlPDiA==",
-			"dev": true
-		},
-		"@types/jasmine": {
-			"version": "3.3.8",
-			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.8.tgz",
-			"integrity": "sha512-BaOFpaddRVV8qykJoWHrHtamml880oh0+DIZWbtJgx0pu+KhDF1gER5hSfCIfzyMrbjMuYFnLUfyo1l0JUVU3Q==",
-			"dev": true
-		},
-		"@types/jasminewd2": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
-			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
-			"dev": true,
-			"requires": {
-				"@types/jasmine": "*"
-			}
-		},
-		"@types/leaflet": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.0.tgz",
-			"integrity": "sha512-ZA+g6XyK/00labaNCWhbhahAOwEf9X4v9cAB0ZBwWjGOj5ewPC8qcdN/M2VsIAfP699Yz3+E7zaaClxmRaf4BQ==",
-			"dev": true,
-			"requires": {
-				"@types/geojson": "*"
-			}
-		},
-		"@types/mongodb": {
-			"version": "3.1.19",
-			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.19.tgz",
-			"integrity": "sha512-H54hQEovAhyLrIZOhPNfGyCCDoTqKsjb8GQBy8nptJqfxrYCp5WVcPJf9v0kfTPR72xOhaz9+WcYxOXWwEg1Vg==",
-			"dev": true,
-			"requires": {
-				"@types/bson": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/mongoose": {
-			"version": "5.3.12",
-			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.12.tgz",
-			"integrity": "sha512-dmZv3H9lXWhLY8XrxJNu+pVUecquReR3AtPxVsnPTcTH/T/YTgxE0zeTavNcqaBUD5XXKtlTy+2VhZxDkn/0Jw==",
-			"dev": true,
-			"requires": {
-				"@types/mongodb": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/node": {
-			"version": "10.12.21",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz",
-			"integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==",
-			"dev": true
-		},
-		"@types/q": {
-			"version": "0.0.32",
-			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
-			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
-			"dev": true
-		},
-		"@types/reflect-metadata": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
-			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
-			"dev": true,
-			"requires": {
-				"reflect-metadata": "*"
-			}
-		},
-		"@types/selenium-webdriver": {
-			"version": "3.0.14",
-			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
-			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
-			"dev": true
-		},
-		"@types/socket.io-client": {
-			"version": "1.4.32",
-			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
-			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
-			"dev": true
-		},
-		"@types/source-list-map": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-			"dev": true
-		},
-		"@types/stripe": {
-			"version": "6.19.5",
-			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.19.5.tgz",
-			"integrity": "sha512-NHSloxUEjergjDO3U5ZOJgURP6H9vPlJGWbwdUOCB/r24vMzZevjGfbUiwR0u51Yum9AId/7VG/qcbq5q/Hcng==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/swiper": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.1.tgz",
-			"integrity": "sha512-kG4moYcEEhAZH2l6ges7JyCit1tBMfQvAar6MLfZTfwZ1bvaTJQU8sxKiJavhoA69bc9A+lNYC2bhhEaVbp35w==",
-			"dev": true
-		},
-		"@types/uuid": {
-			"version": "3.4.4",
-			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
-			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/webpack-sources": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
-			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/source-list-map": "*",
-				"source-map": "^0.6.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"@types/zen-observable": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
-			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
-		},
-		"@webassemblyjs/ast": {
-			"version": "1.7.11",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
-			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
+		"@types/yargs": {
+			"version": "12.0.10",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.10.tgz",
+			"integrity": "sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==",
+			"dev": true
+		},
+		"@types/zen-observable": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
+			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
+		},
+		"@webassemblyjs/ast": {
+			"version": "1.7.11",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
+			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
 			"dev": true,
 			"requires": {
 				"@webassemblyjs/helper-module-context": "1.7.11",
@@ -5817,16 +3096,15 @@
 			"version": "1.3.5",
 			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
 			"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-			"dev": true,
 			"requires": {
 				"mime-types": "~2.1.18",
 				"negotiator": "0.6.1"
 			}
 		},
 		"acorn": {
-			"version": "6.0.6",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.6.tgz",
-			"integrity": "sha512-5M3G/A4uBSMIlfJ+h9W125vJvPFH/zirISsW5qfxF5YzEvXJCtolLoQvM5yZft0DvMcUrPGKPOlgEu55I6iUtA==",
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+			"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
 			"dev": true
 		},
 		"acorn-dynamic-import": {
@@ -5835,6 +3113,12 @@
 			"integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
 			"dev": true
 		},
+		"acorn-walk": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+			"integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+			"dev": true
+		},
 		"adm-zip": {
 			"version": "0.4.13",
 			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz",
@@ -5882,9 +3166,9 @@
 			"dev": true
 		},
 		"ajv-keywords": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.3.0.tgz",
-			"integrity": "sha512-CMzN9S62ZOO4sA/mJZIO4S++ZM7KFWzH3PPWkveLhy4OZ9i1/VatgwWMD46w/XbGCBy7Ye0gCk+Za6mmyfKK7g==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+			"integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
 			"dev": true
 		},
 		"align-text": {
@@ -5908,6 +3192,11 @@
 			"resolved": "https://registry.npmjs.org/angular2-logger/-/angular2-logger-0.7.0.tgz",
 			"integrity": "sha512-fB2ucBEKqJ6K+PyQEVKwIZhwcB2NvxPashHJEBGTG5Ex+NhC2xUNDhd1AILX+ZIRi3hz6QEKzbqGAxmusdUCkw=="
 		},
+		"ansi": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+			"integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
+		},
 		"ansi-align": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
@@ -5918,9 +3207,9 @@
 			}
 		},
 		"ansi-colors": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-			"integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+			"integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
 			"dev": true
 		},
 		"ansi-escapes": {
@@ -5953,7 +3242,6 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
 			"requires": {
 				"color-convert": "^1.9.0"
 			}
@@ -6332,102 +3620,121 @@
 			}
 		},
 		"apollo-angular-link-http": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.4.0.tgz",
-			"integrity": "sha512-YMtk4ZmmQ32kvQVnKNhkqk4QQQ+xb5aaq5XVxLv7AX6S7jDfHDLi18Hc25C4c8revM6gLoGV2Xj9ijvyGGbRCg==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz",
+			"integrity": "sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==",
 			"requires": {
-				"apollo-angular-link-http-common": "~1.4.0",
+				"apollo-angular-link-http-common": "~1.5.0",
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-angular-link-http-common": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.4.0.tgz",
-			"integrity": "sha512-VAneRp1YYwaggOKgbMGVSuLMpYroLL6tEgS5WH3iNBg4P7cBcubo3uajWRih7E4pZlzX+bCJ5GNqNDJ6xMFT7Q==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.1.tgz",
+			"integrity": "sha512-uSA7dDZpum9FCocxhrp24mL9EUGYWr2mgW9Tb5uea0eYU3UDmjYSKT/sBSLGQN87P5drXbYrmSj58PtCWmhIMA==",
 			"requires": {
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-cache": {
-			"version": "1.1.25",
-			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.25.tgz",
-			"integrity": "sha512-9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz",
+			"integrity": "sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==",
 			"requires": {
-				"apollo-utilities": "^1.1.2",
+				"apollo-utilities": "^1.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-cache-inmemory": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.2.tgz",
-			"integrity": "sha512-fDVmj5j1e3W+inyuSwjIcMgbQ4edcFgmiKTBMFAEKAq0jg33X7FrbDX8JT2t5Vuf75Mva50JDlt5wXdu7C6WuA==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz",
+			"integrity": "sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==",
 			"requires": {
-				"apollo-cache": "^1.1.25",
-				"apollo-utilities": "^1.1.2",
+				"apollo-cache": "^1.2.1",
+				"apollo-utilities": "^1.2.1",
 				"optimism": "^0.6.9",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-client": {
-			"version": "2.4.12",
-			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.12.tgz",
-			"integrity": "sha512-E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w==",
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz",
+			"integrity": "sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==",
 			"requires": {
 				"@types/zen-observable": "^0.8.0",
-				"apollo-cache": "1.1.25",
+				"apollo-cache": "1.2.1",
 				"apollo-link": "^1.0.0",
 				"apollo-link-dedup": "^1.0.0",
-				"apollo-utilities": "1.1.2",
+				"apollo-utilities": "1.2.1",
 				"symbol-observable": "^1.0.2",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"apollo-link": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.8.tgz",
-			"integrity": "sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==",
+			"version": "1.2.11",
+			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.11.tgz",
+			"integrity": "sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==",
 			"requires": {
-				"zen-observable-ts": "^0.8.15"
+				"apollo-utilities": "^1.2.1",
+				"ts-invariant": "^0.3.2",
+				"tslib": "^1.9.3",
+				"zen-observable-ts": "^0.8.18"
+			},
+			"dependencies": {
+				"ts-invariant": {
+					"version": "0.3.2",
+					"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz",
+					"integrity": "sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==",
+					"requires": {
+						"tslib": "^1.9.3"
+					}
+				}
 			}
 		},
 		"apollo-link-context": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.14.tgz",
-			"integrity": "sha512-l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.17.tgz",
+			"integrity": "sha512-W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-dedup": {
-			"version": "1.0.15",
-			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz",
-			"integrity": "sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==",
+			"version": "1.0.18",
+			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz",
+			"integrity": "sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-ws": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz",
-			"integrity": "sha512-KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz",
+			"integrity": "sha512-0PKgahM2BOcUiI3QSJMYXOoUylWKzar5NTZLgMLEW4K/CczOTzC4CTXvKMjh/cx57Jto/U2xzKRy9BEoNfnK5Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-utilities": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.2.tgz",
-			"integrity": "sha512-EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
+			"integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
 			"requires": {
 				"fast-json-stable-stringify": "^2.0.0",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"app-root-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
-			"integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=",
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+			"integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
 			"dev": true
 		},
 		"append-transform": {
@@ -6492,6 +3799,16 @@
 				"sprintf-js": "~1.0.2"
 			}
 		},
+		"aria-query": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+			"integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7",
+				"commander": "^2.11.0"
+			}
+		},
 		"arr-diff": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -6524,12 +3841,6 @@
 			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
 			"dev": true
 		},
-		"array-slice": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-			"integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-			"dev": true
-		},
 		"array-union": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -6623,10 +3934,69 @@
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
 			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
 		},
+		"ast-transform": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/ast-transform/-/ast-transform-0.0.0.tgz",
+			"integrity": "sha1-dJRAWIh9goPhidlUYAlHvJj+AGI=",
+			"dev": true,
+			"requires": {
+				"escodegen": "~1.2.0",
+				"esprima": "~1.0.4",
+				"through": "~2.3.4"
+			},
+			"dependencies": {
+				"escodegen": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz",
+					"integrity": "sha1-Cd55Z3kcyVi3+Jot220jRRrzJ+E=",
+					"dev": true,
+					"requires": {
+						"esprima": "~1.0.4",
+						"estraverse": "~1.5.0",
+						"esutils": "~1.0.0",
+						"source-map": "~0.1.30"
+					}
+				},
+				"esprima": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+					"integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=",
+					"dev": true
+				},
+				"estraverse": {
+					"version": "1.5.1",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+					"integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
+					"integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
 		"ast-types": {
-			"version": "0.11.7",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz",
-			"integrity": "sha512-2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw==",
+			"version": "0.7.8",
+			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.7.8.tgz",
+			"integrity": "sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=",
+			"dev": true
+		},
+		"ast-types-flow": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+			"integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
 			"dev": true
 		},
 		"astral-regex": {
@@ -6692,6 +4062,15 @@
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
 			"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
 		},
+		"axobject-query": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+			"integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7"
+			}
+		},
 		"babel-code-frame": {
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -6774,6 +4153,12 @@
 				"regenerator-runtime": "^0.10.0"
 			},
 			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				},
 				"regenerator-runtime": {
 					"version": "0.10.5",
 					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
@@ -6790,6 +4175,14 @@
 			"requires": {
 				"core-js": "^2.4.0",
 				"regenerator-runtime": "^0.11.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				}
 			}
 		},
 		"babel-template": {
@@ -6850,15 +4243,70 @@
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
 		},
+		"base": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"requires": {
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"requires": {
+						"is-descriptor": "^1.0.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				}
+			}
+		},
 		"base64-arraybuffer": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
 			"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
 		},
 		"base64-js": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
-			"integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+			"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
 			"dev": true
 		},
 		"base64id": {
@@ -6916,6 +4364,11 @@
 				"tryer": "^1.0.0"
 			}
 		},
+		"big-integer": {
+			"version": "1.6.43",
+			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz",
+			"integrity": "sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg=="
+		},
 		"big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -6960,11 +4413,22 @@
 			"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
 			"dev": true
 		},
+		"body": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+			"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+			"dev": true,
+			"requires": {
+				"continuable-cache": "^0.3.1",
+				"error": "^7.0.0",
+				"raw-body": "~1.1.0",
+				"safe-json-parse": "~1.0.1"
+			}
+		},
 		"body-parser": {
 			"version": "1.18.3",
 			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
 			"integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
-			"dev": true,
 			"requires": {
 				"bytes": "3.0.0",
 				"content-type": "~1.0.4",
@@ -6982,7 +4446,6 @@
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
 					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
-					"dev": true,
 					"requires": {
 						"bytes": "3.0.0",
 						"http-errors": "1.6.3",
@@ -7021,9 +4484,9 @@
 			}
 		},
 		"bootstrap": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.2.1.tgz",
-			"integrity": "sha512-tt/7vIv3Gm2mnd/WeDx36nfGGHleil0Wg8IeB7eMrVkY0fZ5iTaBisSh8oNANc2IBsCc6vCgCNTIM/IEN0+50Q=="
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+			"integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
 		},
 		"boxen": {
 			"version": "1.3.0",
@@ -7040,6 +4503,14 @@
 				"widest-line": "^2.0.0"
 			}
 		},
+		"bplist-parser": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+			"integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+			"requires": {
+				"big-integer": "^1.6.7"
+			}
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -7049,12 +4520,60 @@
 				"concat-map": "0.0.1"
 			}
 		},
+		"braces": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+			"requires": {
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"brfs": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz",
+			"integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==",
+			"dev": true,
+			"requires": {
+				"quote-stream": "^1.0.1",
+				"resolve": "^1.1.5",
+				"static-module": "^2.2.0",
+				"through2": "^2.0.0"
+			}
+		},
 		"brorand": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
 			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
 			"dev": true
 		},
+		"brotli": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz",
+			"integrity": "sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=",
+			"dev": true,
+			"requires": {
+				"base64-js": "^1.1.2"
+			}
+		},
 		"browser-resolve": {
 			"version": "1.11.3",
 			"resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
@@ -7062,6 +4581,14 @@
 			"dev": true,
 			"requires": {
 				"resolve": "1.1.7"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.1.7",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+					"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+					"dev": true
+				}
 			}
 		},
 		"browserify-aes": {
@@ -7101,6 +4628,17 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"browserify-optional": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/browserify-optional/-/browserify-optional-1.0.1.tgz",
+			"integrity": "sha1-HhNyLP3g2F8SFnbCpyztUzoBiGk=",
+			"dev": true,
+			"requires": {
+				"ast-transform": "0.0.0",
+				"ast-types": "^0.7.0",
+				"browser-resolve": "^1.8.1"
+			}
+		},
 		"browserify-rsa": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
@@ -7136,14 +4674,14 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz",
-			"integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==",
+			"version": "4.5.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.3.tgz",
+			"integrity": "sha512-Tx/Jtrmh6vFg24AelzLwCaCq1IUJiMDM1x/LPzqbmbktF8Zo7F9ONUpOWsFK6TtdON95mSMaQUWqi0ilc8xM6g==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30000929",
-				"electron-to-chromium": "^1.3.103",
-				"node-releases": "^1.1.3"
+				"caniuse-lite": "^1.0.30000955",
+				"electron-to-chromium": "^1.3.122",
+				"node-releases": "^1.1.12"
 			}
 		},
 		"browserstack": {
@@ -7182,6 +4720,12 @@
 			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
 			"dev": true
 		},
+		"buffer-equal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
+			"integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=",
+			"dev": true
+		},
 		"buffer-fill": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
@@ -7226,8 +4770,36 @@
 		"bytes": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-			"dev": true
+			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+		},
+		"cacache": {
+			"version": "10.0.4",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+			"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.1",
+				"chownr": "^1.0.1",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.1.11",
+				"lru-cache": "^4.1.1",
+				"mississippi": "^2.0.0",
+				"mkdirp": "^0.5.1",
+				"move-concurrently": "^1.0.1",
+				"promise-inflight": "^1.0.1",
+				"rimraf": "^2.6.2",
+				"ssri": "^5.2.4",
+				"unique-filename": "^1.1.0",
+				"y18n": "^4.0.0"
+			},
+			"dependencies": {
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
 		},
 		"cache-base": {
 			"version": "1.0.1",
@@ -7252,9 +4824,9 @@
 			"dev": true
 		},
 		"call-number": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/call-number/-/call-number-0.0.2.tgz",
-			"integrity": "sha1-GWnh1XQt42na7Q9EM4wawhKDcP8="
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/call-number/-/call-number-1.0.1.tgz",
+			"integrity": "sha1-v52q5If9alVz+JqjZV++ivA2r9I="
 		},
 		"caller-callsite": {
 			"version": "2.0.0",
@@ -7316,9 +4888,9 @@
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30000933",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000933.tgz",
-			"integrity": "sha512-d3QXv7eFTU40DSedSP81dV/ajcGSKpT+GW+uhtWmLvQm9bPk0KK++7i1e2NSW/CXGZhWFt2mFbFtCJ5I5bMuVA==",
+			"version": "1.0.30000955",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
+			"integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==",
 			"dev": true
 		},
 		"canonical-path": {
@@ -7352,7 +4924,6 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -7363,7 +4934,6 @@
 					"version": "5.5.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
 					"requires": {
 						"has-flag": "^3.0.0"
 					}
@@ -7382,6 +4952,51 @@
 			"integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
 			"dev": true
 		},
+		"cheerio": {
+			"version": "1.0.0-rc.2",
+			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
+			"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
+			"dev": true,
+			"requires": {
+				"css-select": "~1.2.0",
+				"dom-serializer": "~0.1.0",
+				"entities": "~1.1.1",
+				"htmlparser2": "^3.9.1",
+				"lodash": "^4.15.0",
+				"parse5": "^3.0.1"
+			},
+			"dependencies": {
+				"parse5": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+					"dev": true,
+					"requires": {
+						"@types/node": "*"
+					}
+				}
+			}
+		},
+		"chokidar": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+			"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+			"requires": {
+				"anymatch": "^2.0.0",
+				"async-each": "^1.0.0",
+				"braces": "^2.3.0",
+				"fsevents": "^1.2.2",
+				"glob-parent": "^3.1.0",
+				"inherits": "^2.0.1",
+				"is-binary-path": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"lodash.debounce": "^4.0.8",
+				"normalize-path": "^2.1.1",
+				"path-is-absolute": "^1.0.0",
+				"readdirp": "^2.0.0",
+				"upath": "^1.0.5"
+			}
+		},
 		"chownr": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
@@ -7419,12 +5034,6 @@
 			"integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
 			"dev": true
 		},
-		"circular-json": {
-			"version": "0.5.9",
-			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-			"integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
-			"dev": true
-		},
 		"class-utils": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -7484,6 +5093,34 @@
 			"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
 			"dev": true
 		},
+		"cliui": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+			"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^2.1.1",
+				"strip-ansi": "^4.0.0",
+				"wrap-ansi": "^2.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^3.0.0"
+					}
+				}
+			}
+		},
 		"clone": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
@@ -7515,9 +5152,9 @@
 			"dev": true
 		},
 		"code-block-writer": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.2.2.tgz",
-			"integrity": "sha512-8SyXM1bWsMDCzvCoTdnDBhnnUbHntxcba4ApBIO3S3QX0M2Iq0xZCzs6SYdBOGaSUi4drysvrAK15JoXhlpsvQ==",
+			"version": "7.3.0",
+			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.3.0.tgz",
+			"integrity": "sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==",
 			"dev": true
 		},
 		"code-point-at": {
@@ -7526,17 +5163,20 @@
 			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
 		},
 		"codelyzer": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz",
-			"integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.0.0.tgz",
+			"integrity": "sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==",
 			"dev": true,
 			"requires": {
 				"app-root-path": "^2.1.0",
-				"css-selector-tokenizer": "^0.7.0",
+				"aria-query": "^3.0.0",
+				"axobject-query": "^2.0.2",
+				"css-selector-tokenizer": "^0.7.1",
 				"cssauron": "^1.4.0",
+				"damerau-levenshtein": "^1.0.4",
 				"semver-dsl": "^1.0.1",
 				"source-map": "^0.5.7",
-				"sprintf-js": "^1.1.1"
+				"sprintf-js": "^1.1.2"
 			},
 			"dependencies": {
 				"source-map": {
@@ -7566,7 +5206,6 @@
 			"version": "1.9.3",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
 			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
 			"requires": {
 				"color-name": "1.1.3"
 			}
@@ -7574,550 +5213,290 @@
 		"color-name": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
 		"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
-		},
-		"colors": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-			"dev": true
-		},
-		"combine-lists": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-			"integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.5.0"
-			}
-		},
-		"combined-stream": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
-		"commander": {
-			"version": "2.17.1",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-			"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-			"dev": true
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-			"dev": true
-		},
-		"compare-versions": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
-			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
-			"dev": true
-		},
-		"component-bind": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
-		},
-		"component-emitter": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
-		},
-		"component-inherit": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
-		},
-		"compressible": {
-			"version": "2.0.15",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
-			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
-			"dev": true,
-			"requires": {
-				"mime-db": ">= 1.36.0 < 2"
-			},
-			"dependencies": {
-				"mime-db": {
-					"version": "1.37.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
-					"dev": true
-				}
-			}
-		},
-		"compression": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
-			"dev": true,
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.14",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.1",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			}
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"concat-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
-			}
-		},
-		"configstore": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-			"dev": true,
-			"requires": {
-				"dot-prop": "^4.1.0",
-				"graceful-fs": "^4.1.2",
-				"make-dir": "^1.0.0",
-				"unique-string": "^1.0.0",
-				"write-file-atomic": "^2.0.0",
-				"xdg-basedir": "^3.0.0"
-			}
-		},
-		"connect-history-api-fallback": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-			"dev": true
-		},
-		"console-browserify": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-			"dev": true,
-			"requires": {
-				"date-now": "^0.1.4"
-			}
-		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-		},
-		"constants-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-			"dev": true
-		},
-		"content-disposition": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-			"dev": true
-		},
-		"content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
 			"dev": true
 		},
-		"continuable-cache": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+		"colors": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
 			"dev": true
 		},
-		"convert-source-map": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
-			"dev": true,
+		"combined-stream": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
 			"requires": {
-				"safe-buffer": "~5.1.1"
+				"delayed-stream": "~1.0.0"
 			}
 		},
-		"cookie": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+		"commander": {
+			"version": "2.19.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+			"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
 			"dev": true
 		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+		"commondir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
 			"dev": true
 		},
-		"cookiejar": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+		"compare-versions": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
+			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
 			"dev": true
 		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		"component-bind": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
 		},
-		"cordova-android": {
-			"version": "7.1.4",
-			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
-			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
-			"requires": {
-				"abbrev": "*",
-				"android-versions": "1.4.0",
-				"ansi": "*",
-				"balanced-match": "*",
-				"base64-js": "1.2.0",
-				"big-integer": "1.6.32",
-				"bplist-parser": "*",
-				"brace-expansion": "*",
-				"concat-map": "*",
-				"cordova-common": "2.2.5",
-				"cordova-registry-mapper": "*",
-				"elementtree": "0.1.6",
-				"glob": "5.0.15",
-				"inflight": "*",
-				"inherits": "*",
-				"minimatch": "*",
-				"nopt": "3.0.1",
-				"once": "*",
-				"path-is-absolute": "1.0.1",
-				"plist": "2.1.0",
-				"properties-parser": "0.2.3",
-				"q": "1.4.1",
-				"sax": "0.3.5",
-				"semver": "5.5.0",
-				"shelljs": "0.5.3",
-				"underscore": "*",
-				"unorm": "*",
-				"wrappy": "*",
-				"xmlbuilder": "8.2.2",
-				"xmldom": "*"
-			},
-			"dependencies": {
-				"abbrev": {
-					"version": "1.1.1",
-					"bundled": true
-				},
-				"android-versions": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"semver": "^5.4.1"
-					}
-				},
-				"ansi": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"base64-js": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"bundled": true
-				},
-				"cordova-common": {
-					"version": "2.2.5",
-					"bundled": true,
-					"requires": {
-						"ansi": "^0.3.1",
-						"bplist-parser": "^0.1.0",
-						"cordova-registry-mapper": "^1.1.8",
-						"elementtree": "0.1.6",
-						"glob": "^5.0.13",
-						"minimatch": "^3.0.0",
-						"plist": "^2.1.0",
-						"q": "^1.4.1",
-						"shelljs": "^0.5.3",
-						"underscore": "^1.8.3",
-						"unorm": "^1.3.3"
-					}
-				},
-				"cordova-registry-mapper": {
-					"version": "1.1.15",
-					"bundled": true
-				},
-				"elementtree": {
-					"version": "0.1.6",
-					"bundled": true,
-					"requires": {
-						"sax": "0.3.5"
-					}
-				},
-				"glob": {
-					"version": "5.0.15",
-					"bundled": true,
-					"requires": {
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "2 || 3",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"inflight": {
-					"version": "1.0.6",
-					"bundled": true,
-					"requires": {
-						"once": "^1.3.0",
-						"wrappy": "1"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"bundled": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"bundled": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"nopt": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"abbrev": "1"
-					}
-				},
-				"once": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"properties-parser": {
-					"version": "0.2.3",
-					"bundled": true
-				},
-				"q": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"semver": {
-					"version": "5.5.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"underscore": {
-					"version": "1.9.1",
-					"bundled": true
-				},
-				"unorm": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"wrappy": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"xmlbuilder": {
-					"version": "8.2.2",
-					"bundled": true
-				},
-				"xmldom": {
-					"version": "0.1.27",
-					"bundled": true
+		"component-emitter": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+		},
+		"component-inherit": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
+		},
+		"compressible": {
+			"version": "2.0.15",
+			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
+			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
+			"requires": {
+				"mime-db": ">= 1.36.0 < 2"
+			},
+			"dependencies": {
+				"mime-db": {
+					"version": "1.37.0",
+					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
+					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
 				}
 			}
 		},
-		"cordova-android-support-gradle-release": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
-			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+		"compression": {
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
 			"requires": {
-				"semver": "5.1.0",
-				"xml2js": "~0.4.19"
+				"accepts": "~1.3.5",
+				"bytes": "3.0.0",
+				"compressible": "~2.0.14",
+				"debug": "2.6.9",
+				"on-headers": "~1.0.1",
+				"safe-buffer": "5.1.2",
+				"vary": "~1.1.2"
+			}
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+		},
+		"concat-stream": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+			"dev": true,
+			"requires": {
+				"buffer-from": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.2.2",
+				"typedarray": "^0.0.6"
+			}
+		},
+		"configstore": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
+			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+			"dev": true,
+			"requires": {
+				"dot-prop": "^4.1.0",
+				"graceful-fs": "^4.1.2",
+				"make-dir": "^1.0.0",
+				"unique-string": "^1.0.0",
+				"write-file-atomic": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			}
+		},
+		"connect": {
+			"version": "3.6.6",
+			"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+			"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+			"dev": true,
+			"requires": {
+				"debug": "2.6.9",
+				"finalhandler": "1.1.0",
+				"parseurl": "~1.3.2",
+				"utils-merge": "1.0.1"
 			},
 			"dependencies": {
-				"semver": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
-					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				"finalhandler": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"encodeurl": "~1.0.1",
+						"escape-html": "~1.0.3",
+						"on-finished": "~2.3.0",
+						"parseurl": "~1.3.2",
+						"statuses": "~1.3.1",
+						"unpipe": "~1.0.0"
+					}
+				},
+				"statuses": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+					"dev": true
 				}
 			}
 		},
-		"cordova-browser": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-5.0.4.tgz",
-			"integrity": "sha512-EDuG+9NGsaYpNSY6wF0kR34m1m38V+nRglGXxQ609fgMYrMHEYR2lg38nDr1Os4qeF0LJz8UQ7nq7Y+idg6Aig==",
+		"connect-history-api-fallback": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+			"dev": true
+		},
+		"console-browserify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+			"dev": true,
+			"requires": {
+				"date-now": "^0.1.4"
+			}
+		},
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+		},
+		"constants-browserify": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+			"dev": true
+		},
+		"content-disposition": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+		},
+		"content-type": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+		},
+		"continuable-cache": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+			"dev": true
+		},
+		"convert-source-map": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"cookie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+		},
+		"cookie-signature": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+		},
+		"cookiejar": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+			"dev": true
+		},
+		"copy-concurrently": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"fs-write-stream-atomic": "^1.0.8",
+				"iferr": "^0.1.5",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.0"
+			}
+		},
+		"copy-descriptor": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		},
+		"copy-webpack-plugin": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+			"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+			"dev": true,
+			"requires": {
+				"cacache": "^10.0.4",
+				"find-cache-dir": "^1.0.0",
+				"globby": "^7.1.1",
+				"is-glob": "^4.0.0",
+				"loader-utils": "^1.1.0",
+				"minimatch": "^3.0.4",
+				"p-limit": "^1.0.0",
+				"serialize-javascript": "^1.4.0"
+			}
+		},
+		"cordova-android": {
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
+			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
 			"requires": {
 				"abbrev": "*",
-				"accepts": "*",
+				"android-versions": "1.4.0",
 				"ansi": "*",
-				"ansi-regex": "2.1.1",
-				"ansi-styles": "2.2.1",
-				"array-flatten": "1.1.1",
 				"balanced-match": "*",
 				"base64-js": "1.2.0",
-				"big-integer": "*",
-				"body-parser": "1.18.2",
+				"big-integer": "1.6.32",
 				"bplist-parser": "*",
 				"brace-expansion": "*",
-				"bytes": "*",
-				"chalk": "1.1.3",
-				"compressible": "*",
-				"compression": "1.7.2",
 				"concat-map": "*",
-				"content-disposition": "*",
-				"content-type": "*",
-				"cookie": "*",
-				"cookie-signature": "1.0.6",
 				"cordova-common": "2.2.5",
 				"cordova-registry-mapper": "*",
-				"cordova-serve": "2.0.1",
-				"debug": "2.6.9",
-				"depd": "*",
-				"destroy": "*",
-				"ee-first": "*",
 				"elementtree": "0.1.6",
-				"encodeurl": "*",
-				"escape-html": "*",
-				"escape-string-regexp": "*",
-				"etag": "*",
-				"express": "*",
-				"finalhandler": "*",
-				"forwarded": "*",
-				"fresh": "*",
 				"glob": "5.0.15",
-				"has-ansi": "2.0.0",
-				"http-errors": "1.6.3",
-				"iconv-lite": "0.4.19",
 				"inflight": "*",
 				"inherits": "*",
-				"ipaddr.js": "1.6.0",
-				"is-wsl": "*",
-				"media-typer": "*",
-				"merge-descriptors": "*",
-				"methods": "*",
-				"mime": "1.4.1",
-				"mime-db": "1.33.0",
-				"mime-types": "2.1.18",
 				"minimatch": "*",
-				"ms": "2.0.0",
-				"negotiator": "*",
-				"nopt": "3.0.6",
-				"on-finished": "*",
-				"on-headers": "*",
+				"nopt": "3.0.1",
 				"once": "*",
-				"opn": "*",
-				"parseurl": "*",
-				"path-is-absolute": "*",
-				"path-to-regexp": "0.1.7",
+				"path-is-absolute": "1.0.1",
 				"plist": "2.1.0",
-				"proxy-addr": "2.0.3",
-				"q": "*",
-				"qs": "6.5.1",
-				"range-parser": "*",
-				"raw-body": "2.3.2",
-				"safe-buffer": "5.1.1",
+				"properties-parser": "0.2.3",
+				"q": "1.4.1",
 				"sax": "0.3.5",
-				"send": "*",
-				"serve-static": "*",
-				"setprototypeof": "*",
+				"semver": "5.5.0",
 				"shelljs": "0.5.3",
-				"statuses": "1.4.0",
-				"strip-ansi": "3.0.1",
-				"supports-color": "2.0.0",
-				"type-is": "*",
 				"underscore": "*",
 				"unorm": "*",
-				"unpipe": "*",
-				"utils-merge": "*",
-				"vary": "*",
 				"wrappy": "*",
 				"xmlbuilder": "8.2.2",
 				"xmldom": "*"
@@ -8127,30 +5506,17 @@
 					"version": "1.1.1",
 					"bundled": true
 				},
-				"accepts": {
-					"version": "1.3.5",
+				"android-versions": {
+					"version": "1.4.0",
 					"bundled": true,
 					"requires": {
-						"mime-types": "~2.1.18",
-						"negotiator": "0.6.1"
+						"semver": "^5.4.1"
 					}
 				},
 				"ansi": {
 					"version": "0.3.1",
 					"bundled": true
 				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"bundled": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"bundled": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true
@@ -8160,101 +5526,28 @@
 					"bundled": true
 				},
 				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"body-parser": {
-					"version": "1.18.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"content-type": "~1.0.4",
-						"debug": "2.6.9",
-						"depd": "~1.1.1",
-						"http-errors": "~1.6.2",
-						"iconv-lite": "0.4.19",
-						"on-finished": "~2.3.0",
-						"qs": "6.5.1",
-						"raw-body": "2.3.2",
-						"type-is": "~1.6.15"
-					}
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"bytes": {
-					"version": "3.0.0",
-					"bundled": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"bundled": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
+					"version": "1.6.32",
+					"bundled": true
 				},
-				"compressible": {
-					"version": "2.0.14",
+				"bplist-parser": {
+					"version": "0.1.1",
 					"bundled": true,
 					"requires": {
-						"mime-db": ">= 1.34.0 < 2"
-					},
-					"dependencies": {
-						"mime-db": {
-							"version": "1.34.0",
-							"bundled": true
-						}
+						"big-integer": "^1.6.7"
 					}
 				},
-				"compression": {
-					"version": "1.7.2",
+				"brace-expansion": {
+					"version": "1.1.11",
 					"bundled": true,
 					"requires": {
-						"accepts": "~1.3.4",
-						"bytes": "3.0.0",
-						"compressible": "~2.0.13",
-						"debug": "2.6.9",
-						"on-headers": "~1.0.1",
-						"safe-buffer": "5.1.1",
-						"vary": "~1.1.2"
+						"balanced-match": "^1.0.0",
+						"concat-map": "0.0.1"
 					}
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true
 				},
-				"content-disposition": {
-					"version": "0.5.2",
-					"bundled": true
-				},
-				"content-type": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"cookie": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"cookie-signature": {
-					"version": "1.0.6",
-					"bundled": true
-				},
 				"cordova-common": {
 					"version": "2.2.5",
 					"bundled": true,
@@ -8276,36 +5569,6 @@
 					"version": "1.1.15",
 					"bundled": true
 				},
-				"cordova-serve": {
-					"version": "2.0.1",
-					"bundled": true,
-					"requires": {
-						"chalk": "^1.1.1",
-						"compression": "^1.6.0",
-						"express": "^4.13.3",
-						"opn": "^5.3.0",
-						"shelljs": "^0.5.3"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"bundled": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"destroy": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"ee-first": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"elementtree": {
 					"version": "0.1.6",
 					"bundled": true,
@@ -8313,79 +5576,6 @@
 						"sax": "0.3.5"
 					}
 				},
-				"encodeurl": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"escape-html": {
-					"version": "1.0.3",
-					"bundled": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"bundled": true
-				},
-				"etag": {
-					"version": "1.8.1",
-					"bundled": true
-				},
-				"express": {
-					"version": "4.16.3",
-					"bundled": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.2",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.3",
-						"qs": "6.5.1",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.1",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.1",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.4.0",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"forwarded": {
-					"version": "0.1.2",
-					"bundled": true
-				},
-				"fresh": {
-					"version": "0.5.2",
-					"bundled": true
-				},
 				"glob": {
 					"version": "5.0.15",
 					"bundled": true,
@@ -8397,27 +5587,6 @@
 						"path-is-absolute": "^1.0.0"
 					}
 				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"bundled": true,
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"bundled": true
-				},
 				"inflight": {
 					"version": "1.0.6",
 					"bundled": true,
@@ -8430,41 +5599,6 @@
 					"version": "2.0.3",
 					"bundled": true
 				},
-				"ipaddr.js": {
-					"version": "1.6.0",
-					"bundled": true
-				},
-				"is-wsl": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"media-typer": {
-					"version": "0.3.0",
-					"bundled": true
-				},
-				"merge-descriptors": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"methods": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"mime-db": {
-					"version": "1.33.0",
-					"bundled": true
-				},
-				"mime-types": {
-					"version": "2.1.18",
-					"bundled": true,
-					"requires": {
-						"mime-db": "~1.33.0"
-					}
-				},
 				"minimatch": {
 					"version": "3.0.4",
 					"bundled": true,
@@ -8472,32 +5606,13 @@
 						"brace-expansion": "^1.1.7"
 					}
 				},
-				"ms": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"negotiator": {
-					"version": "0.6.1",
-					"bundled": true
-				},
 				"nopt": {
-					"version": "3.0.6",
+					"version": "3.0.1",
 					"bundled": true,
 					"requires": {
 						"abbrev": "1"
 					}
 				},
-				"on-finished": {
-					"version": "2.3.0",
-					"bundled": true,
-					"requires": {
-						"ee-first": "1.1.1"
-					}
-				},
-				"on-headers": {
-					"version": "1.0.1",
-					"bundled": true
-				},
 				"once": {
 					"version": "1.4.0",
 					"bundled": true,
@@ -8505,170 +5620,45 @@
 						"wrappy": "1"
 					}
 				},
-				"opn": {
-					"version": "5.3.0",
-					"bundled": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parseurl": {
-					"version": "1.3.2",
-					"bundled": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"path-to-regexp": {
-					"version": "0.1.7",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"proxy-addr": {
-					"version": "2.0.3",
-					"bundled": true,
-					"requires": {
-						"forwarded": "~0.1.2",
-						"ipaddr.js": "1.6.0"
-					}
-				},
-				"q": {
-					"version": "1.5.1",
-					"bundled": true
-				},
-				"qs": {
-					"version": "6.5.1",
-					"bundled": true
-				},
-				"range-parser": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"raw-body": {
-					"version": "2.3.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"http-errors": "1.6.2",
-						"iconv-lite": "0.4.19",
-						"unpipe": "1.0.0"
-					},
-					"dependencies": {
-						"depd": {
-							"version": "1.1.1",
-							"bundled": true
-						},
-						"http-errors": {
-							"version": "1.6.2",
-							"bundled": true,
-							"requires": {
-								"depd": "1.1.1",
-								"inherits": "2.0.3",
-								"setprototypeof": "1.0.3",
-								"statuses": ">= 1.3.1 < 2"
-							}
-						},
-						"setprototypeof": {
-							"version": "1.0.3",
-							"bundled": true
-						}
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"send": {
-					"version": "0.16.2",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					}
-				},
-				"serve-static": {
-					"version": "1.13.2",
-					"bundled": true,
-					"requires": {
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"parseurl": "~1.3.2",
-						"send": "0.16.2"
-					}
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"statuses": {
-					"version": "1.4.0",
-					"bundled": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
+				"path-is-absolute": {
+					"version": "1.0.1",
 					"bundled": true
 				},
-				"type-is": {
-					"version": "1.6.16",
+				"plist": {
+					"version": "2.1.0",
 					"bundled": true,
 					"requires": {
-						"media-typer": "0.3.0",
-						"mime-types": "~2.1.18"
+						"base64-js": "1.2.0",
+						"xmlbuilder": "8.2.2",
+						"xmldom": "0.1.x"
 					}
 				},
-				"underscore": {
-					"version": "1.9.1",
+				"properties-parser": {
+					"version": "0.2.3",
 					"bundled": true
 				},
-				"unorm": {
+				"q": {
 					"version": "1.4.1",
 					"bundled": true
 				},
-				"unpipe": {
-					"version": "1.0.0",
+				"sax": {
+					"version": "0.3.5",
 					"bundled": true
 				},
-				"utils-merge": {
-					"version": "1.0.1",
+				"semver": {
+					"version": "5.5.0",
 					"bundled": true
 				},
-				"vary": {
-					"version": "1.1.2",
+				"shelljs": {
+					"version": "0.5.3",
+					"bundled": true
+				},
+				"underscore": {
+					"version": "1.9.1",
+					"bundled": true
+				},
+				"unorm": {
+					"version": "1.4.1",
 					"bundled": true
 				},
 				"wrappy": {
@@ -8685,6 +5675,69 @@
 				}
 			}
 		},
+		"cordova-android-support-gradle-release": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
+			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+			"requires": {
+				"semver": "5.1.0",
+				"xml2js": "~0.4.19"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
+					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				}
+			}
+		},
+		"cordova-browser": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-6.0.0.tgz",
+			"integrity": "sha512-G61S7fhnVVJC98lvkGeKCVpfFtoW0a1P1Sg9TK+n03g3yupDMIM7XuecWuJ3KEMRhED4+CEc2hauruAff7oXrw==",
+			"requires": {
+				"cordova-common": "^3.1.0",
+				"cordova-serve": "^3.0.0",
+				"nopt": "^4.0.1",
+				"shelljs": "^0.5.3"
+			},
+			"dependencies": {
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				},
+				"shelljs": {
+					"version": "0.5.3",
+					"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+					"integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
+				}
+			}
+		},
+		"cordova-common": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.1.0.tgz",
+			"integrity": "sha512-J2MM1ioyLlBYdwdXH40OZL4hN7XEBOfurddKYifF4aTkb2PkbeM+KVORt53eyU+8ScA0QmRLuTG0EM55eLms0A==",
+			"requires": {
+				"ansi": "^0.3.1",
+				"bplist-parser": "^0.1.0",
+				"cross-spawn": "^6.0.5",
+				"elementtree": "0.1.7",
+				"endent": "^1.1.1",
+				"fs-extra": "^7.0.0",
+				"glob": "^7.1.2",
+				"minimatch": "^3.0.0",
+				"plist": "^3.0.1",
+				"q": "^1.4.1",
+				"strip-bom": "^3.0.0",
+				"underscore": "^1.8.3",
+				"which": "^1.3.0"
+			}
+		},
 		"cordova-plugin-appavailability": {
 			"version": "0.4.2",
 			"resolved": "https://registry.npmjs.org/cordova-plugin-appavailability/-/cordova-plugin-appavailability-0.4.2.tgz",
@@ -8731,9 +5784,9 @@
 			"integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ=="
 		},
 		"cordova-plugin-ionic-webview": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-3.1.1.tgz",
-			"integrity": "sha512-dVRTvotXa1c63P55ckE/uejVlNOQU+wCLp5KANAFEYW1fxNswWJ6AM/NMNh1q9rGSH/hl9Z3C3rTkgYfdqNqDA=="
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.1.tgz",
+			"integrity": "sha512-rJf7jFQNw7l0U4Y7P6DjxwmO/qQgS7xqiTgwDbNFS4z4+FZ3EZyupll7/cFEDnxGRNMgWsMKDhIABUo5mIDaUQ=="
 		},
 		"cordova-plugin-mixpanel": {
 			"version": "4.5.2",
@@ -8765,10 +5818,22 @@
 			"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
 			"integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q="
 		},
+		"cordova-serve": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-3.0.0.tgz",
+			"integrity": "sha512-h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w==",
+			"requires": {
+				"chalk": "^2.4.1",
+				"compression": "^1.6.0",
+				"express": "^4.13.3",
+				"opn": "^5.3.0",
+				"which": "^1.3.0"
+			}
+		},
 		"core-js": {
-			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
-			"integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ=="
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz",
+			"integrity": "sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ=="
 		},
 		"core-util-is": {
 			"version": "1.0.2",
@@ -8785,6 +5850,18 @@
 				"vary": "^1"
 			}
 		},
+		"cosmiconfig": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+			"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+			"dev": true,
+			"requires": {
+				"is-directory": "^0.3.1",
+				"js-yaml": "^3.9.0",
+				"parse-json": "^4.0.0",
+				"require-from-string": "^2.0.1"
+			}
+		},
 		"cpr": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz",
@@ -8843,6 +5920,28 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"cross-env": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz",
+			"integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.5",
+				"is-windows": "^1.0.0"
+			}
+		},
+		"cross-spawn": {
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"requires": {
+				"nice-try": "^1.0.4",
+				"path-key": "^2.0.1",
+				"semver": "^5.5.0",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			}
+		},
 		"cryptiles": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-4.1.3.tgz",
@@ -8870,6 +5969,12 @@
 				"randomfill": "^1.0.3"
 			}
 		},
+		"crypto-js": {
+			"version": "3.1.9-1",
+			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
+			"integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=",
+			"dev": true
+		},
 		"crypto-random-string": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -8906,9 +6011,9 @@
 			}
 		},
 		"css-what": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz",
-			"integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+			"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
 			"dev": true
 		},
 		"cssauron": {
@@ -8955,6 +6060,12 @@
 				"es5-ext": "^0.10.9"
 			}
 		},
+		"damerau-levenshtein": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
+			"integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=",
+			"dev": true
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -8973,17 +6084,17 @@
 			},
 			"dependencies": {
 				"@types/node": {
-					"version": "8.10.39",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.39.tgz",
-					"integrity": "sha512-rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA==",
+					"version": "8.10.45",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz",
+					"integrity": "sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==",
 					"dev": true
 				}
 			}
 		},
 		"date-format": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-			"integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
+			"integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==",
 			"dev": true
 		},
 		"date-now": {
@@ -9010,11 +6121,15 @@
 			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
 			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
 		},
+		"dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+		},
 		"deep-equal": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-			"dev": true
+			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
 		},
 		"deep-extend": {
 			"version": "0.6.0",
@@ -9036,36 +6151,6 @@
 			"requires": {
 				"execa": "^0.10.0",
 				"ip-regex": "^2.1.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"default-require-extensions": {
@@ -9077,6 +6162,14 @@
 				"strip-bom": "^3.0.0"
 			}
 		},
+		"define-properties": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+			"requires": {
+				"object-keys": "^1.0.12"
+			}
+		},
 		"define-property": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -9119,6 +6212,67 @@
 				}
 			}
 		},
+		"defined": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+			"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+		},
+		"degenerator": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
+			"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+			"dev": true,
+			"requires": {
+				"ast-types": "0.x.x",
+				"escodegen": "1.x.x",
+				"esprima": "3.x.x"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				}
+			}
+		},
+		"del": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+			"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+			"dev": true,
+			"requires": {
+				"globby": "^6.1.0",
+				"is-path-cwd": "^1.0.0",
+				"is-path-in-cwd": "^1.0.0",
+				"p-map": "^1.1.1",
+				"pify": "^3.0.0",
+				"rimraf": "^2.2.8"
+			},
+			"dependencies": {
+				"globby": {
+					"version": "6.1.0",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+					"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"glob": "^7.0.3",
+						"object-assign": "^4.0.1",
+						"pify": "^2.0.0",
+						"pinkie-promise": "^2.0.0"
+					},
+					"dependencies": {
+						"pify": {
+							"version": "2.3.0",
+							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+							"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+							"dev": true
+						}
+					}
+				}
+			}
+		},
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -9132,8 +6286,7 @@
 		"depd": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-			"dev": true
+			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
 		},
 		"dependency-graph": {
 			"version": "0.7.2",
@@ -9154,8 +6307,7 @@
 		"destroy": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-			"dev": true
+			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
 		},
 		"detect-indent": {
 			"version": "4.0.0",
@@ -9172,6 +6324,15 @@
 			"integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
 			"dev": true
 		},
+		"dfa": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/dfa/-/dfa-1.1.0.tgz",
+			"integrity": "sha1-0wIYvRDQMPpCHfPrvIIoVGOjF4E=",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6"
+			}
+		},
 		"di": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -9271,27 +6432,19 @@
 			}
 		},
 		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+			"integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "~1.1.1",
-				"entities": "~1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-					"dev": true
-				}
+				"domelementtype": "^1.3.0",
+				"entities": "^1.1.1"
 			}
 		},
 		"dom7": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.2.tgz",
-			"integrity": "sha512-cGwWtpu7KY3JnbREGqG4EGC/u+1hyLfWVMqrqRjmwiO8d5i4B+0imLZAQ/cJbiXnjbs0pdIUzcUyeI9BbnyKNg==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
+			"integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
 			"requires": {
 				"ssr-window": "^1.0.1"
 			}
@@ -9343,9 +6496,9 @@
 			}
 		},
 		"dotenv": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-			"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
+			"integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==",
 			"dev": true
 		},
 		"dotenv-defaults": {
@@ -9355,6 +6508,14 @@
 			"dev": true,
 			"requires": {
 				"dotenv": "^6.2.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
 			}
 		},
 		"dotenv-webpack": {
@@ -9413,41 +6574,15 @@
 			"dev": true
 		},
 		"duplexify": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
-			"integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
 			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.0.0",
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0",
 				"stream-shift": "^1.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ecc-jsbn": {
@@ -9462,8 +6597,7 @@
 		"ee-first": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-			"dev": true
+			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
 		},
 		"ejs": {
 			"version": "2.6.1",
@@ -9472,16 +6606,15 @@
 			"dev": true
 		},
 		"electron-to-chromium": {
-			"version": "1.3.112",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.112.tgz",
-			"integrity": "sha512-FyVLdiRZnLw2WE5ECtveN0JJ7klyiz/HMfKE1/Rjff3l7pe4vfkYtBlcCqTckvR8E7asjJGh0m9gRPR3Anp/UA==",
+			"version": "1.3.122",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
+			"integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw==",
 			"dev": true
 		},
 		"elementtree": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
 			"integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
-			"dev": true,
 			"requires": {
 				"sax": "1.1.4"
 			},
@@ -9489,8 +6622,7 @@
 				"sax": {
 					"version": "1.1.4",
 					"resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
-					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=",
-					"dev": true
+					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
 				}
 			}
 		},
@@ -9523,8 +6655,7 @@
 		"encodeurl": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-			"dev": true
+			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
 		},
 		"encoding": {
 			"version": "0.1.12",
@@ -9543,6 +6674,16 @@
 				"once": "^1.4.0"
 			}
 		},
+		"endent": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz",
+			"integrity": "sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==",
+			"requires": {
+				"dedent": "^0.7.0",
+				"fast-json-parse": "^1.0.3",
+				"objectorarray": "^1.0.3"
+			}
+		},
 		"engine.io": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
@@ -9579,6 +6720,47 @@
 				}
 			}
 		},
+		"engine.io-client": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+			"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "1.2.1",
+				"component-inherit": "0.0.3",
+				"debug": "~3.1.0",
+				"engine.io-parser": "~2.1.1",
+				"has-cors": "1.1.0",
+				"indexof": "0.0.1",
+				"parseqs": "0.0.5",
+				"parseuri": "0.0.5",
+				"ws": "~3.3.1",
+				"xmlhttprequest-ssl": "~1.5.4",
+				"yeast": "0.1.2"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"ws": {
+					"version": "3.3.3",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
+				}
+			}
+		},
 		"engine.io-parser": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
@@ -9600,42 +6782,6 @@
 				"graceful-fs": "^4.1.2",
 				"memory-fs": "^0.4.0",
 				"tapable": "^1.0.0"
-			},
-			"dependencies": {
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ent": {
@@ -9650,6 +6796,26 @@
 			"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
 			"dev": true
 		},
+		"envalid": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/envalid/-/envalid-4.2.2.tgz",
+			"integrity": "sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.4.1",
+				"dotenv": "^6.2.0",
+				"meant": "^1.0.1",
+				"validator": "^10.11.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
+			}
+		},
 		"err-code": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
@@ -9683,15 +6849,38 @@
 				"is-arrayish": "^0.2.1"
 			}
 		},
+		"es-abstract": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+			"integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+			"requires": {
+				"es-to-primitive": "^1.2.0",
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"is-callable": "^1.1.4",
+				"is-regex": "^1.0.4",
+				"object-keys": "^1.0.12"
+			}
+		},
+		"es-to-primitive": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+			"integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+			"requires": {
+				"is-callable": "^1.1.4",
+				"is-date-object": "^1.0.1",
+				"is-symbol": "^1.0.2"
+			}
+		},
 		"es5-ext": {
-			"version": "0.10.47",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz",
-			"integrity": "sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==",
+			"version": "0.10.49",
+			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz",
+			"integrity": "sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==",
 			"dev": true,
 			"requires": {
 				"es6-iterator": "~2.0.3",
 				"es6-symbol": "~3.1.1",
-				"next-tick": "1"
+				"next-tick": "^1.0.0"
 			}
 		},
 		"es6-iterator": {
@@ -9772,14 +6961,41 @@
 		"escape-html": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-			"dev": true
+			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
 		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
 		},
+		"escodegen": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
+			"integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+			"dev": true,
+			"requires": {
+				"esprima": "^3.1.3",
+				"estraverse": "^4.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"escope": {
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
@@ -9790,38 +7006,22 @@
 				"es6-weak-map": "^2.0.1",
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"eslint-scope": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-			"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
 			"dev": true,
 			"requires": {
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"esprima": {
-			"version": "2.7.3",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-			"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true
 		},
 		"esrecurse": {
@@ -9831,20 +7031,12 @@
 			"dev": true,
 			"requires": {
 				"estraverse": "^4.1.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"estraverse": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-			"integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
 			"dev": true
 		},
 		"estree-walker": {
@@ -9861,610 +7053,347 @@
 		},
 		"etag": {
 			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-			"dev": true
-		},
-		"event-emitter": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-			"dev": true,
-			"requires": {
-				"d": "1",
-				"es5-ext": "~0.10.14"
-			}
-		},
-		"event-stream": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
-			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
-			"requires": {
-				"duplexer": "^0.1.1",
-				"from": "^0.1.7",
-				"map-stream": "0.0.7",
-				"pause-stream": "^0.0.11",
-				"split": "^1.0.1",
-				"stream-combiner": "^0.2.2",
-				"through": "^2.3.8"
-			}
-		},
-		"eventemitter3": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
-		},
-		"events": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
-			"dev": true
-		},
-		"eventsource": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-			"dev": true,
-			"requires": {
-				"original": "^1.0.0"
-			}
-		},
-		"evp_bytestokey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-			"dev": true,
-			"requires": {
-				"md5.js": "^1.3.4",
-				"safe-buffer": "^5.1.1"
-			}
-		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
-		"expand-braces": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-			"integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
-			"dev": true,
-			"requires": {
-				"array-slice": "^0.2.3",
-				"array-unique": "^0.2.1",
-				"braces": "^0.1.2"
-			},
-			"dependencies": {
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-					"integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^0.1.0"
-					}
-				},
-				"expand-range": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-					"integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
-					"dev": true,
-					"requires": {
-						"is-number": "^0.1.1",
-						"repeat-string": "^0.2.2"
-					}
-				},
-				"is-number": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-					"integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-					"dev": true
-				},
-				"repeat-string": {
-					"version": "0.2.2",
-					"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-					"integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
-					"dev": true
-				}
-			}
-		},
-		"expand-range": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
-			"requires": {
-				"fill-range": "^2.1.0"
-			},
-			"dependencies": {
-				"fill-range": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-					"integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-					"dev": true,
-					"requires": {
-						"is-number": "^2.1.0",
-						"isobject": "^2.0.0",
-						"randomatic": "^3.0.0",
-						"repeat-element": "^1.1.2",
-						"repeat-string": "^1.5.2"
-					}
-				},
-				"is-number": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-					"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					}
-				},
-				"isobject": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-					"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-					"dev": true,
-					"requires": {
-						"isarray": "1.0.0"
-					}
-				}
-			}
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-		},
-		"extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
-			}
-		},
-		"external-editor": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
-			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
-			"dev": true,
-			"requires": {
-				"chardet": "^0.7.0",
-				"iconv-lite": "^0.4.24",
-				"tmp": "^0.0.33"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
-			}
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
 		},
-		"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==",
+		"event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
 			"dev": true,
 			"requires": {
-				"ansi-gray": "^0.1.1",
-				"color-support": "^1.1.3",
-				"parse-node-version": "^1.0.0",
-				"time-stamp": "^1.0.0"
+				"d": "1",
+				"es5-ext": "~0.10.14"
 			}
 		},
-		"fast-deep-equal": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		"event-stream": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
+			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
+			"requires": {
+				"duplexer": "^0.1.1",
+				"from": "^0.1.7",
+				"map-stream": "0.0.7",
+				"pause-stream": "^0.0.11",
+				"split": "^1.0.1",
+				"stream-combiner": "^0.2.2",
+				"through": "^2.3.8"
+			}
 		},
-		"fast-glob": {
-			"version": "2.2.6",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
-			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+		"eventemitter3": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
+		},
+		"events": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+			"dev": true
+		},
+		"eventsource": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
 			"dev": true,
-			"requires": {
-				"@mrmlnc/readdir-enhanced": "^2.2.1",
-				"@nodelib/fs.stat": "^1.1.2",
-				"glob-parent": "^3.1.0",
-				"is-glob": "^4.0.0",
-				"merge2": "^1.2.3",
-				"micromatch": "^3.1.10"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-					"dev": true,
-					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+			"requires": {
+				"original": "^1.0.0"
+			}
+		},
+		"evp_bytestokey": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+			"dev": true,
+			"requires": {
+				"md5.js": "^1.3.4",
+				"safe-buffer": "^5.1.1"
+			}
+		},
+		"execa": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+			"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.0",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			}
+		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
+		"expand-brackets": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+			"dev": true,
+			"requires": {
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"is-descriptor": "^0.1.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extendable": "^0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
+				}
+			}
+		},
+		"express": {
+			"version": "4.16.4",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
+			"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+			"requires": {
+				"accepts": "~1.3.5",
+				"array-flatten": "1.1.1",
+				"body-parser": "1.18.3",
+				"content-disposition": "0.5.2",
+				"content-type": "~1.0.4",
+				"cookie": "0.3.1",
+				"cookie-signature": "1.0.6",
+				"debug": "2.6.9",
+				"depd": "~1.1.2",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"finalhandler": "1.1.1",
+				"fresh": "0.5.2",
+				"merge-descriptors": "1.0.1",
+				"methods": "~1.1.2",
+				"on-finished": "~2.3.0",
+				"parseurl": "~1.3.2",
+				"path-to-regexp": "0.1.7",
+				"proxy-addr": "~2.0.4",
+				"qs": "6.5.2",
+				"range-parser": "~1.2.0",
+				"safe-buffer": "5.1.2",
+				"send": "0.16.2",
+				"serve-static": "1.13.2",
+				"setprototypeof": "1.1.0",
+				"statuses": "~1.4.0",
+				"type-is": "~1.6.16",
+				"utils-merge": "1.0.1",
+				"vary": "~1.1.2"
+			},
+			"dependencies": {
+				"array-flatten": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+				}
+			}
+		},
+		"extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		},
+		"extend-shallow": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+			"requires": {
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
+			},
+			"dependencies": {
+				"is-extendable": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"is-plain-object": "^2.0.4"
 					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				}
+			}
+		},
+		"external-editor": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+			"dev": true,
+			"requires": {
+				"chardet": "^0.7.0",
+				"iconv-lite": "^0.4.24",
+				"tmp": "^0.0.33"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"safer-buffer": ">= 2.1.2 < 3"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+				}
+			}
+		},
+		"extglob": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+			"dev": true,
+			"requires": {
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^1.0.0"
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"is-extendable": "^0.1.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
 					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
+		"extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+		},
+		"falafel": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz",
+			"integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.0.0",
+				"foreach": "^2.0.5",
+				"isarray": "0.0.1",
+				"object-keys": "^1.0.6"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				}
 			}
 		},
+		"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": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		},
+		"fast-glob": {
+			"version": "2.2.6",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
+			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+			"dev": true,
+			"requires": {
+				"@mrmlnc/readdir-enhanced": "^2.2.1",
+				"@nodelib/fs.stat": "^1.1.2",
+				"glob-parent": "^3.1.0",
+				"is-glob": "^4.0.0",
+				"merge2": "^1.2.3",
+				"micromatch": "^3.1.10"
+			}
+		},
+		"fast-json-parse": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+			"integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
+		},
 		"fast-json-stable-stringify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -10506,18 +7435,22 @@
 				"escape-string-regexp": "^1.0.5"
 			}
 		},
+		"file-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
+			"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"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==",
 			"dev": true
 		},
-		"filename-regex": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
-		},
 		"fileset": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
@@ -10559,7 +7492,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
 			"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"encodeurl": "~1.0.2",
@@ -10602,58 +7534,38 @@
 			"dev": true
 		},
 		"flush-write-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
 		"follow-redirects": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
-			"integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+			"integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
 			"dev": true,
 			"requires": {
-				"debug": "=3.1.0"
+				"debug": "^3.2.6"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
 					"requires": {
-						"ms": "2.0.0"
+						"ms": "^2.1.1"
 					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
@@ -10662,6 +7574,41 @@
 			"resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
 			"integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
 		},
+		"fontkit": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.8.0.tgz",
+			"integrity": "sha512-EFDRCca7khfQWYu1iFhsqeABpi87f03MBdkT93ZE6YhqCdMzb5Eojb6c4dlJikGv5liuhByyzA7ikpIPTSBWbQ==",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6",
+				"brfs": "^1.4.0",
+				"brotli": "^1.2.0",
+				"browserify-optional": "^1.0.0",
+				"clone": "^1.0.1",
+				"deep-equal": "^1.0.0",
+				"dfa": "^1.0.0",
+				"restructure": "^0.5.3",
+				"tiny-inflate": "^1.0.2",
+				"unicode-properties": "^1.0.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"clone": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+					"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+					"dev": true
+				}
+			}
+		},
+		"for-each": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+			"requires": {
+				"is-callable": "^1.1.3"
+			}
+		},
 		"for-in": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -10675,6 +7622,12 @@
 				"for-in": "^1.0.1"
 			}
 		},
+		"foreach": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+			"dev": true
+		},
 		"forever-agent": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -10699,8 +7652,7 @@
 		"forwarded": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-			"dev": true
+			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
 		},
 		"fragment-cache": {
 			"version": "0.2.1",
@@ -10713,8 +7665,7 @@
 		"fresh": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-			"dev": true
+			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
 		},
 		"from": {
 			"version": "0.1.7",
@@ -10729,32 +7680,6 @@
 			"requires": {
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"fs-access": {
@@ -10770,7 +7695,6 @@
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
 			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"jsonfile": "^4.0.0",
@@ -10785,43 +7709,17 @@
 			"requires": {
 				"minipass": "^2.2.1"
 			}
-		},
-		"fs-write-stream-atomic": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"iferr": "^0.1.5",
-				"imurmurhash": "^0.1.4",
-				"readable-stream": "1 || 2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+		},
+		"fs-write-stream-atomic": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"iferr": "^0.1.5",
+				"imurmurhash": "^0.1.4",
+				"readable-stream": "1 || 2"
 			}
 		},
 		"fs.realpath": {
@@ -10869,12 +7767,14 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
 					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+					"optional": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
@@ -10889,17 +7789,20 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -11016,7 +7919,8 @@
 				"inherits": {
 					"version": "2.0.3",
 					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"optional": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -11028,6 +7932,7 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+					"optional": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -11035,750 +7940,205 @@
 				"isarray": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"optional": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-				},
-				"minipass": {
-					"version": "2.3.5",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-					"requires": {
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.0"
-					}
-				},
-				"minizlib": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-					"optional": true,
-					"requires": {
-						"minipass": "^2.2.1"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"optional": true
-				},
-				"needle": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
-					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
-					"optional": true,
-					"requires": {
-						"debug": "^2.1.2",
-						"iconv-lite": "^0.4.4",
-						"sax": "^1.2.4"
-					}
-				},
-				"node-pre-gyp": {
-					"version": "0.10.3",
-					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
-					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
-					"optional": true,
-					"requires": {
-						"detect-libc": "^1.0.2",
-						"mkdirp": "^0.5.1",
-						"needle": "^2.2.1",
-						"nopt": "^4.0.1",
-						"npm-packlist": "^1.1.6",
-						"npmlog": "^4.0.2",
-						"rc": "^1.2.7",
-						"rimraf": "^2.6.1",
-						"semver": "^5.3.0",
-						"tar": "^4"
-					}
-				},
-				"nopt": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-					"optional": true,
-					"requires": {
-						"abbrev": "1",
-						"osenv": "^0.1.4"
-					}
-				},
-				"npm-bundled": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
-					"optional": true
-				},
-				"npm-packlist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
-					"optional": true,
-					"requires": {
-						"ignore-walk": "^3.0.1",
-						"npm-bundled": "^1.0.1"
-					}
-				},
-				"npmlog": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-					"optional": true,
-					"requires": {
-						"are-we-there-yet": "~1.1.2",
-						"console-control-strings": "~1.1.0",
-						"gauge": "~2.7.3",
-						"set-blocking": "~2.0.0"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"optional": true
-				},
-				"once": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-					"optional": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"optional": true
-				},
-				"osenv": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-					"optional": true,
-					"requires": {
-						"os-homedir": "^1.0.0",
-						"os-tmpdir": "^1.0.0"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"optional": true
-				},
-				"process-nextick-args": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-					"optional": true
-				},
-				"rc": {
-					"version": "1.2.8",
-					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-					"optional": true,
-					"requires": {
-						"deep-extend": "^0.6.0",
-						"ini": "~1.3.0",
-						"minimist": "^1.2.0",
-						"strip-json-comments": "~2.0.1"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-							"optional": true
-						}
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"optional": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"optional": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				},
-				"safer-buffer": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-					"optional": true
-				},
-				"sax": {
-					"version": "1.2.4",
-					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-					"optional": true
-				},
-				"semver": {
-					"version": "5.6.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-					"optional": true
-				},
-				"set-blocking": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"optional": true
 				},
-				"signal-exit": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"optional": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"optional": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"minipass": {
+					"version": "2.3.5",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+					"optional": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"minizlib": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
 					"optional": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"minipass": "^2.2.1"
 					}
 				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"optional": true,
 					"requires": {
-						"ansi-regex": "^2.0.0"
+						"minimist": "0.0.8"
 					}
 				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
 					"optional": true
 				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+				"needle": {
+					"version": "2.2.4",
+					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
+					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
 					"optional": true,
 					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"debug": "^2.1.2",
+						"iconv-lite": "^0.4.4",
+						"sax": "^1.2.4"
 					}
 				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"optional": true
+				"node-pre-gyp": {
+					"version": "0.10.3",
+					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
+					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
+					"optional": true,
+					"requires": {
+						"detect-libc": "^1.0.2",
+						"mkdirp": "^0.5.1",
+						"needle": "^2.2.1",
+						"nopt": "^4.0.1",
+						"npm-packlist": "^1.1.6",
+						"npmlog": "^4.0.2",
+						"rc": "^1.2.7",
+						"rimraf": "^2.6.1",
+						"semver": "^5.3.0",
+						"tar": "^4"
+					}
 				},
-				"wide-align": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"optional": true,
 					"requires": {
-						"string-width": "^1.0.2 || 2"
+						"abbrev": "1",
+						"osenv": "^0.1.4"
 					}
 				},
-				"wrappy": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				"npm-bundled": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
+					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+					"optional": true
 				},
-				"yallist": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-				}
-			}
-		},
-		"ftp": {
-			"version": "0.3.10",
-			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "1.1.x",
-				"xregexp": "2.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
+				"npm-packlist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
+					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+					"optional": true,
+					"requires": {
+						"ignore-walk": "^3.0.1",
+						"npm-bundled": "^1.0.1"
+					}
 				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-					"dev": true,
+				"npmlog": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+					"optional": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.1",
-						"isarray": "0.0.1",
-						"string_decoder": "~0.10.x"
+						"are-we-there-yet": "~1.1.2",
+						"console-control-strings": "~1.1.0",
+						"gauge": "~2.7.3",
+						"set-blocking": "~2.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
+				"number-is-nan": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+					"optional": true
 				},
-				"xregexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
-					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
-					"dev": true
-				}
-			}
-		},
-		"gaze": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-			"requires": {
-				"globule": "^1.0.0"
-			}
-		},
-		"genfun": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-			"dev": true
-		},
-		"get-caller-file": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-		},
-		"get-stdin": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
-		},
-		"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
-		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
-		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
-		"glob": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
-		"glob-base": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
-			"requires": {
-				"glob-parent": "^2.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-					"dev": true,
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"optional": true
+				},
+				"once": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+					"optional": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"wrappy": "1"
 					}
 				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+				"os-homedir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
-		"glob-parent": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-			"requires": {
-				"is-glob": "^3.1.0",
-				"path-dirname": "^1.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+				"osenv": {
+					"version": "0.1.5",
+					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+					"optional": true,
 					"requires": {
-						"is-extglob": "^2.1.0"
+						"os-homedir": "^1.0.0",
+						"os-tmpdir": "^1.0.0"
 					}
-				}
-			}
-		},
-		"glob-to-regexp": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-			"dev": true
-		},
-		"global-dirs": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-			"dev": true,
-			"requires": {
-				"ini": "^1.3.4"
-			}
-		},
-		"globals": {
-			"version": "9.18.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-			"dev": true
-		},
-		"globby": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-			"dev": true,
-			"requires": {
-				"array-union": "^1.0.1",
-				"dir-glob": "^2.0.0",
-				"glob": "^7.1.2",
-				"ignore": "^3.3.5",
-				"pify": "^3.0.0",
-				"slash": "^1.0.0"
-			}
-		},
-		"globule": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
-			"requires": {
-				"glob": "~7.1.1",
-				"lodash": "~4.17.10",
-				"minimatch": "~3.0.2"
-			}
-		},
-		"got": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-			"dev": true,
-			"requires": {
-				"create-error-class": "^3.0.0",
-				"duplexer3": "^0.1.4",
-				"get-stream": "^3.0.0",
-				"is-redirect": "^1.0.0",
-				"is-retry-allowed": "^1.0.0",
-				"is-stream": "^1.0.0",
-				"lowercase-keys": "^1.0.0",
-				"safe-buffer": "^5.0.1",
-				"timed-out": "^4.0.0",
-				"unzip-response": "^2.0.1",
-				"url-parse-lax": "^1.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.1.15",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
-		},
-		"graphql": {
-			"version": "14.1.1",
-			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
-			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
-			"requires": {
-				"iterall": "^1.2.2"
-			}
-		},
-		"graphql-tag": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
-			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
-		},
-		"gzip-size": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
-			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
-			"dev": true,
-			"requires": {
-				"duplexer": "^0.1.1",
-				"pify": "^3.0.0"
-			}
-		},
-		"handle-thing": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
-			"dev": true
-		},
-		"handlebars": {
-			"version": "4.0.12",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
-			"integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
-			"dev": true,
-			"requires": {
-				"async": "^2.5.0",
-				"optimist": "^0.6.1",
-				"source-map": "^0.6.1",
-				"uglify-js": "^3.1.4"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-		},
-		"har-validator": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-			"requires": {
-				"ajv": "^6.5.5",
-				"har-schema": "^2.0.0"
-			}
-		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"requires": {
-				"ansi-regex": "^2.0.0"
-			}
-		},
-		"has-binary2": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-			"requires": {
-				"isarray": "2.0.1"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
-				}
-			}
-		},
-		"has-cors": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
-		},
-		"has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-			"dev": true
-		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
-			}
-		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"optional": true
+				},
+				"process-nextick-args": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+					"optional": true
+				},
+				"rc": {
+					"version": "1.2.8",
+					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+					"optional": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"deep-extend": "^0.6.0",
+						"ini": "~1.3.0",
+						"minimist": "^1.2.0",
+						"strip-json-comments": "~2.0.1"
+					},
+					"dependencies": {
+						"minimist": {
+							"version": "1.2.0",
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+							"optional": true
+						}
 					}
-				}
-			}
-		},
-		"hash-base": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"hash.js": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"minimalistic-assert": "^1.0.1"
-			}
-		},
-		"hmac-drbg": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-			"dev": true,
-			"requires": {
-				"hash.js": "^1.0.3",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.1"
-			}
-		},
-		"hoek": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
-			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
-		},
-		"hoopy": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-			"dev": true
-		},
-		"hosted-git-info": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
-			},
-			"dependencies": {
+				},
 				"readable-stream": {
 					"version": "2.3.6",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"core-util-is": "~1.0.0",
 						"inherits": "~2.0.3",
@@ -11789,490 +8149,696 @@
 						"util-deprecate": "~1.0.1"
 					}
 				},
+				"rimraf": {
+					"version": "2.6.3",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+					"optional": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+				},
+				"safer-buffer": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+					"optional": true
+				},
+				"sax": {
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+					"optional": true
+				},
+				"semver": {
+					"version": "5.6.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+					"optional": true
+				},
+				"set-blocking": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"optional": true
+				},
+				"signal-exit": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+					"optional": true
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+					"optional": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
 				"string_decoder": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"safe-buffer": "~5.1.0"
 					}
-				}
-			}
-		},
-		"html-entities": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-			"dev": true
-		},
-		"htmlparser2": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
-			"integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^1.3.0",
-				"domhandler": "^2.3.0",
-				"domutils": "^1.5.1",
-				"entities": "^1.1.1",
-				"inherits": "^2.0.1",
-				"readable-stream": "^3.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
+						"ansi-regex": "^2.0.0"
 					}
-				}
-			}
-		},
-		"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",
-			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-			"dev": true
-		},
-		"http-errors": {
-			"version": "1.6.3",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-			"dev": true,
-			"requires": {
-				"depd": "~1.1.2",
-				"inherits": "2.0.3",
-				"setprototypeof": "1.1.0",
-				"statuses": ">= 1.4.0 < 2"
-			}
-		},
-		"http-parser-js": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
-			"dev": true
-		},
-		"http-proxy": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
-			"dev": true,
-			"requires": {
-				"eventemitter3": "^3.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
-			}
-		},
-		"http-proxy-agent": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-			"dev": true,
-			"requires": {
-				"agent-base": "4",
-				"debug": "3.1.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
+				},
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+					"optional": true
+				},
+				"tar": {
+					"version": "4.4.8",
+					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+					"optional": true,
+					"requires": {
+						"chownr": "^1.1.1",
+						"fs-minipass": "^1.2.5",
+						"minipass": "^2.3.4",
+						"minizlib": "^1.1.1",
+						"mkdirp": "^0.5.0",
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.2"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"optional": true
+				},
+				"wide-align": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+					"optional": true,
 					"requires": {
-						"ms": "2.0.0"
+						"string-width": "^1.0.2 || 2"
 					}
+				},
+				"wrappy": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				},
+				"yallist": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
 				}
 			}
 		},
-		"http-proxy-middleware": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
-			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+		"ftp": {
+			"version": "0.3.10",
+			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
 			"dev": true,
 			"requires": {
-				"http-proxy": "^1.16.2",
-				"is-glob": "^4.0.0",
-				"lodash": "^4.17.5",
-				"micromatch": "^3.1.9"
+				"readable-stream": "1.1.x",
+				"xregexp": "2.0.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"readable-stream": {
+					"version": "1.1.14",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
+						"isarray": "0.0.1",
+						"string_decoder": "~0.10.x"
 					}
 				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"xregexp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
+					"dev": true
+				}
+			}
+		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+		},
+		"gaze": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+			"requires": {
+				"globule": "^1.0.0"
+			}
+		},
+		"genfun": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+			"dev": true
+		},
+		"get-caller-file": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+		},
+		"get-stdin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+		},
+		"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
+		},
+		"get-uri": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
+			"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
+			"dev": true,
+			"requires": {
+				"data-uri-to-buffer": "2",
+				"debug": "4",
+				"extend": "~3.0.2",
+				"file-uri-to-path": "1",
+				"ftp": "~0.3.10",
+				"readable-stream": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
+				}
+			}
+		},
+		"get-value": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+		},
+		"getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+			"requires": {
+				"assert-plus": "^1.0.0"
+			}
+		},
+		"glob": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+			"requires": {
+				"is-glob": "^3.1.0",
+				"path-dirname": "^1.0.0"
+			},
+			"dependencies": {
+				"is-extglob": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
+				"is-glob": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extglob": "^2.1.0"
 					}
-				},
+				}
+			}
+		},
+		"glob-to-regexp": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+			"dev": true
+		},
+		"global-dirs": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+			"dev": true,
+			"requires": {
+				"ini": "^1.3.4"
+			}
+		},
+		"globals": {
+			"version": "9.18.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+			"dev": true
+		},
+		"globby": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+			"dev": true,
+			"requires": {
+				"array-union": "^1.0.1",
+				"dir-glob": "^2.0.0",
+				"glob": "^7.1.2",
+				"ignore": "^3.3.5",
+				"pify": "^3.0.0",
+				"slash": "^1.0.0"
+			}
+		},
+		"globule": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+			"requires": {
+				"glob": "~7.1.1",
+				"lodash": "~4.17.10",
+				"minimatch": "~3.0.2"
+			}
+		},
+		"got": {
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+			"dev": true,
+			"requires": {
+				"create-error-class": "^3.0.0",
+				"duplexer3": "^0.1.4",
+				"get-stream": "^3.0.0",
+				"is-redirect": "^1.0.0",
+				"is-retry-allowed": "^1.0.0",
+				"is-stream": "^1.0.0",
+				"lowercase-keys": "^1.0.0",
+				"safe-buffer": "^5.0.1",
+				"timed-out": "^4.0.0",
+				"unzip-response": "^2.0.1",
+				"url-parse-lax": "^1.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.1.15",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+		},
+		"graphql": {
+			"version": "14.1.1",
+			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
+			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
+			"requires": {
+				"iterall": "^1.2.2"
+			}
+		},
+		"graphql-tag": {
+			"version": "2.10.1",
+			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
+			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
+		},
+		"gzip-size": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
+			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
+			"dev": true,
+			"requires": {
+				"duplexer": "^0.1.1",
+				"pify": "^3.0.0"
+			}
+		},
+		"handle-thing": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+			"dev": true
+		},
+		"handlebars": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz",
+			"integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==",
+			"dev": true,
+			"requires": {
+				"neo-async": "^2.6.0",
+				"optimist": "^0.6.1",
+				"source-map": "^0.6.1",
+				"uglify-js": "^3.1.4"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"har-schema": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+		},
+		"har-validator": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+			"requires": {
+				"ajv": "^6.5.5",
+				"har-schema": "^2.0.0"
+			}
+		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
+		"has-ansi": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+			"requires": {
+				"ansi-regex": "^2.0.0"
+			}
+		},
+		"has-binary2": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+			"requires": {
+				"isarray": "2.0.1"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+				}
+			}
+		},
+		"has-cors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+		},
+		"has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+		},
+		"has-symbols": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+			"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+		},
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+		},
+		"has-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+			"requires": {
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
+			}
+		},
+		"has-values": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+			"requires": {
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
+			},
+			"dependencies": {
 				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-					"dev": true,
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"is-buffer": "^1.1.5"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				}
+			}
+		},
+		"hash-base": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"hash.js": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.3",
+				"minimalistic-assert": "^1.0.1"
+			}
+		},
+		"hmac-drbg": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+			"dev": true,
+			"requires": {
+				"hash.js": "^1.0.3",
+				"minimalistic-assert": "^1.0.0",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
+		},
+		"hoek": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
+			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
+		},
+		"hoopy": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+			"dev": true
+		},
+		"hosted-git-info": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+		},
+		"hpack.js": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"obuf": "^1.0.0",
+				"readable-stream": "^2.0.1",
+				"wbuf": "^1.1.0"
+			}
+		},
+		"html-entities": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+			"dev": true
+		},
+		"htmlparser2": {
+			"version": "3.10.1",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+			"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^1.3.1",
+				"domhandler": "^2.3.0",
+				"domutils": "^1.5.1",
+				"entities": "^1.1.1",
+				"inherits": "^2.0.1",
+				"readable-stream": "^3.1.1"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				}
+			}
+		},
+		"http-auth": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
+			"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
+			"dev": true,
+			"requires": {
+				"apache-crypt": "^1.1.2",
+				"apache-md5": "^1.0.6",
+				"bcryptjs": "^2.3.0",
+				"uuid": "^3.0.0"
+			}
+		},
+		"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",
+			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+			"dev": true
+		},
+		"http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+			"requires": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			}
+		},
+		"http-parser-js": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
+			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
+			"dev": true
+		},
+		"http-proxy": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+			"dev": true,
+			"requires": {
+				"eventemitter3": "^3.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"http-proxy-agent": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+			"dev": true,
+			"requires": {
+				"agent-base": "4",
+				"debug": "3.1.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ms": "2.0.0"
 					}
 				}
 			}
 		},
+		"http-proxy-middleware": {
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+			"dev": true,
+			"requires": {
+				"http-proxy": "^1.16.2",
+				"is-glob": "^4.0.0",
+				"lodash": "^4.17.5",
+				"micromatch": "^3.1.9"
+			}
+		},
+		"http-signature": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"jsprim": "^1.2.2",
+				"sshpk": "^1.7.0"
+			}
+		},
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -12429,24 +8995,26 @@
 			}
 		},
 		"i18next": {
-			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/i18next/-/i18next-12.1.0.tgz",
-			"integrity": "sha512-AexmwGkKxwKfo5fGeXTWEY4xqzRPigQ1S/0InOUUVziGO54cd4fKyYK8ED1Thx9fd+WA3fRSZ+1iekvFQMbsFw==",
-			"dev": true
+			"version": "15.0.8",
+			"resolved": "https://registry.npmjs.org/i18next/-/i18next-15.0.8.tgz",
+			"integrity": "sha512-ayzNwJ9NHtqEeAG0nQ6yKFbIpZULpDeesjVnfWQaPwbH7Anee8QwRAYPNWHtFCmDZV9FZaKiEbfo1scH8+KSDg==",
+			"dev": true,
+			"requires": {
+				"@babel/runtime": "^7.3.1"
+			}
 		},
 		"iconv-lite": {
 			"version": "0.4.23",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
 			"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-			"dev": true,
 			"requires": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
 		"ieee754": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-			"integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+			"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
 			"dev": true
 		},
 		"iferr": {
@@ -12656,20 +9224,26 @@
 			}
 		},
 		"invert-kv": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-			"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+			"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+			"dev": true
 		},
 		"ionic": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.10.1.tgz",
-			"integrity": "sha512-nqwFQ1Ec3Dtg9EqMQGXO003bNlVZuH+/hKU+asmX+DO5V6Am6E+KHrgBRRzSKqmuF+l5Wk81EvMD8L5tg2sLRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/discover": "1.0.11",
-				"@ionic/utils-fs": "1.0.0",
-				"@ionic/utils-network": "0.0.6",
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.12.0.tgz",
+			"integrity": "sha512-3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/discover": "1.0.13",
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-network": "0.0.8",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
 				"chalk": "^2.3.0",
 				"debug": "^4.0.0",
 				"diff": "^4.0.1",
@@ -12691,325 +9265,34 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/discover": {
-					"version": "1.0.11",
-					"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.11.tgz",
-					"integrity": "sha512-E2CYZsR2noHtUjYceUNP6w1DMYnjPqITyC8Ewiz1iaNWgEntr7xvt1/XbkMlnswn9QKNSItNL6iWY0Q91N+k2A==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"netmask": "^1.0.6",
-						"tslib": "^1.9.0",
-						"ws": "^6.0.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"ci-info": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-					"dev": true
-				},
 				"debug": {
 					"version": "4.1.1",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
 					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"diff": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
-					"dev": true
-				},
-				"get-uri": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
-					"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
-					"dev": true,
-					"requires": {
-						"data-uri-to-buffer": "2",
-						"debug": "4",
-						"extend": "~3.0.2",
-						"file-uri-to-path": "1",
-						"ftp": "~0.3.10",
-						"readable-stream": "3"
-					}
-				},
-				"is-ci": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-					"dev": true,
-					"requires": {
-						"ci-info": "^1.5.0"
-					}
-				},
-				"mime": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"pac-proxy-agent": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
-					"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"get-uri": "^2.0.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"pac-resolver": "^3.0.0",
-						"raw-body": "^2.2.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"proxy-agent": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz",
-					"integrity": "sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"pac-proxy-agent": "^3.0.0",
-						"proxy-from-env": "^1.0.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"qs": {
-					"version": "6.6.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.6.0.tgz",
-					"integrity": "sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"superagent": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
-					"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
-					"dev": true,
-					"requires": {
-						"component-emitter": "^1.2.0",
-						"cookiejar": "^2.1.2",
-						"debug": "^4.1.0",
-						"form-data": "^2.3.3",
-						"formidable": "^1.2.0",
-						"methods": "^1.1.1",
-						"mime": "^2.4.0",
-						"qs": "^6.6.0",
-						"readable-stream": "^3.0.6"
-					}
-				},
-				"superagent-proxy": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
-					"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"proxy-agent": "3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
+				"diff": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+					"dev": true
 				},
-				"update-notifier": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-					"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-					"dev": true,
-					"requires": {
-						"boxen": "^1.2.1",
-						"chalk": "^2.0.1",
-						"configstore": "^3.0.0",
-						"import-lazy": "^2.1.0",
-						"is-ci": "^1.0.10",
-						"is-installed-globally": "^0.1.0",
-						"is-npm": "^1.0.0",
-						"latest-version": "^3.0.0",
-						"semver-diff": "^2.0.0",
-						"xdg-basedir": "^3.0.0"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
@@ -13032,9 +9315,9 @@
 			"dev": true
 		},
 		"ipaddr.js": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
-			"integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=",
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+			"integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
 			"dev": true
 		},
 		"is-absolute": {
@@ -13081,6 +9364,11 @@
 				"builtin-modules": "^1.0.0"
 			}
 		},
+		"is-callable": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+			"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+		},
 		"is-ci": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -13098,6 +9386,11 @@
 				"kind-of": "^3.0.2"
 			}
 		},
+		"is-date-object": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+		},
 		"is-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -13121,21 +9414,6 @@
 			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
 			"dev": true
 		},
-		"is-dotfile": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-			"dev": true
-		},
-		"is-equal-shallow": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
-			"requires": {
-				"is-primitive": "^2.0.0"
-			}
-		},
 		"is-extendable": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -13200,907 +9478,550 @@
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
 			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-			"dev": true
-		},
-		"is-path-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "^1.0.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "^1.0.1"
-			}
-		},
-		"is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"requires": {
-				"isobject": "^3.0.1"
-			}
-		},
-		"is-posix-bracket": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
-		},
-		"is-primitive": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-			"dev": true
-		},
-		"is-redirect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-			"dev": true
-		},
-		"is-relative": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-			"dev": true,
-			"requires": {
-				"is-unc-path": "^1.0.0"
-			}
-		},
-		"is-retry-allowed": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-			"dev": true
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-		},
-		"is-unc-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-			"dev": true,
-			"requires": {
-				"unc-path-regex": "^0.1.2"
-			}
-		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-		},
-		"is-wsl": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-			"dev": true
-		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-		},
-		"isbinaryfile": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-			"dev": true,
-			"requires": {
-				"buffer-alloc": "^1.2.0"
-			}
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-		},
-		"istanbul-instrumenter-loader": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
-			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
-			"dev": true,
-			"requires": {
-				"convert-source-map": "^1.5.0",
-				"istanbul-lib-instrument": "^1.7.3",
-				"loader-utils": "^1.1.0",
-				"schema-utils": "^0.3.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.5.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-					"dev": true,
-					"requires": {
-						"co": "^4.6.0",
-						"fast-deep-equal": "^1.0.0",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.3.0"
-					}
-				},
-				"fast-deep-equal": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-					"dev": true,
-					"requires": {
-						"ajv": "^5.0.0"
-					}
-				}
+				"kind-of": "^3.0.2"
 			}
 		},
-		"istanbul-lib-coverage": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+		"is-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
 			"dev": true
 		},
-		"istanbul-lib-hook": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz",
-			"integrity": "sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==",
-			"dev": true,
-			"requires": {
-				"append-transform": "^1.0.0"
-			}
+		"is-path-cwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+			"dev": true
 		},
-		"istanbul-lib-instrument": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+		"is-path-in-cwd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
 			"dev": true,
 			"requires": {
-				"babel-generator": "^6.18.0",
-				"babel-template": "^6.16.0",
-				"babel-traverse": "^6.18.0",
-				"babel-types": "^6.18.0",
-				"babylon": "^6.18.0",
-				"istanbul-lib-coverage": "^1.2.1",
-				"semver": "^5.3.0"
+				"is-path-inside": "^1.0.0"
 			}
 		},
-		"istanbul-lib-report": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz",
-			"integrity": "sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==",
+		"is-path-inside": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
 			"dev": true,
 			"requires": {
-				"istanbul-lib-coverage": "^2.0.1",
-				"make-dir": "^1.3.0",
-				"supports-color": "^5.4.0"
-			},
-			"dependencies": {
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
+				"path-is-inside": "^1.0.1"
 			}
 		},
-		"istanbul-reports": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.0.1.tgz",
-			"integrity": "sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==",
-			"dev": true,
+		"is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"requires": {
-				"handlebars": "^4.0.11"
+				"isobject": "^3.0.1"
 			}
 		},
-		"iterall": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
-			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		"is-promise": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+			"dev": true
 		},
-		"jasmine": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
-			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+		"is-redirect": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+			"dev": true
+		},
+		"is-regex": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
 			"requires": {
-				"glob": "^7.0.6",
-				"jasmine-core": "~3.3.0"
+				"has": "^1.0.1"
 			}
 		},
-		"jasmine-core": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
-			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
-		},
-		"jasmine-spec-reporter": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+		"is-relative": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
 			"dev": true,
 			"requires": {
-				"colors": "1.1.2"
-			},
-			"dependencies": {
-				"colors": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-					"dev": true
-				}
+				"is-unc-path": "^1.0.0"
 			}
 		},
-		"jasminewd2": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
-			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+		"is-retry-allowed": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
 			"dev": true
 		},
-		"js-base64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
-		},
-		"js-tokens": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-			"dev": true
+		"is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
 		},
-		"js-yaml": {
-			"version": "3.12.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
-			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
-			"dev": true,
+		"is-symbol": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+			"integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
 			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"dependencies": {
-				"esprima": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-					"dev": true
-				}
+				"has-symbols": "^1.0.0"
 			}
 		},
-		"jsbarcode": {
-			"version": "4.0.0-alpha.5",
-			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-4.0.0-alpha.5.tgz",
-			"integrity": "sha512-YVBAjFgNKGzUGmSAmzU1dsNTR5omfwWhvusKR+SRRXcuSg4xT3Wl7hYfovt8eZK2LZyFJviQ+Glt9W6T7caQYw=="
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
 		},
-		"jsesc": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-			"dev": true
+		"is-unc-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+			"dev": true,
+			"requires": {
+				"unc-path-regex": "^0.1.2"
+			}
 		},
-		"json-loader": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-			"dev": true
+		"is-utf8": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
 		},
-		"json-parse-better-errors": {
+		"is-windows": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-			"dev": true
-		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 		},
-		"json3": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-			"dev": true
+		"is-wsl": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
 		},
-		"json5": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
-			"dev": true,
-			"requires": {
-				"minimist": "^1.2.0"
-			}
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 		},
-		"jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+		"isbinaryfile": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.6"
+				"buffer-alloc": "^1.2.0"
 			}
 		},
-		"jsonparse": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-			"dev": true
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
 		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			}
+		"isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
 		},
-		"karma": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.0.tgz",
-			"integrity": "sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==",
-			"dev": true,
-			"requires": {
-				"bluebird": "^3.3.0",
-				"body-parser": "^1.16.1",
-				"chokidar": "^2.0.3",
-				"colors": "^1.1.0",
-				"combine-lists": "^1.0.0",
-				"connect": "^3.6.0",
-				"core-js": "^2.2.0",
-				"di": "^0.0.1",
-				"dom-serialize": "^2.2.0",
-				"expand-braces": "^0.1.1",
-				"flatted": "^2.0.0",
-				"glob": "^7.1.1",
-				"graceful-fs": "^4.1.2",
-				"http-proxy": "^1.13.0",
-				"isbinaryfile": "^3.0.0",
-				"lodash": "^4.17.5",
-				"log4js": "^3.0.0",
-				"mime": "^2.3.1",
-				"minimatch": "^3.0.2",
-				"optimist": "^0.6.1",
-				"qjobs": "^1.1.4",
-				"range-parser": "^1.2.0",
-				"rimraf": "^2.6.0",
-				"safe-buffer": "^5.0.1",
-				"socket.io": "2.1.1",
-				"source-map": "^0.6.1",
-				"tmp": "0.0.33",
-				"useragent": "2.3.0"
+		"isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+		},
+		"istanbul-api": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.1.tgz",
+			"integrity": "sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"compare-versions": "^3.2.1",
+				"fileset": "^2.0.3",
+				"istanbul-lib-coverage": "^2.0.3",
+				"istanbul-lib-hook": "^2.0.3",
+				"istanbul-lib-instrument": "^3.1.0",
+				"istanbul-lib-report": "^2.0.4",
+				"istanbul-lib-source-maps": "^3.0.2",
+				"istanbul-reports": "^2.1.1",
+				"js-yaml": "^3.12.0",
+				"make-dir": "^1.3.0",
+				"minimatch": "^3.0.4",
+				"once": "^1.4.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"engine.io-client": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-					"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+				"istanbul-lib-instrument": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz",
+					"integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==",
 					"dev": true,
 					"requires": {
-						"component-emitter": "1.2.1",
-						"component-inherit": "0.0.3",
-						"debug": "~3.1.0",
-						"engine.io-parser": "~2.1.1",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"ws": "~3.3.1",
-						"xmlhttprequest-ssl": "~1.5.4",
-						"yeast": "0.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
+						"@babel/generator": "^7.0.0",
+						"@babel/parser": "^7.0.0",
+						"@babel/template": "^7.0.0",
+						"@babel/traverse": "^7.0.0",
+						"@babel/types": "^7.0.0",
+						"istanbul-lib-coverage": "^2.0.3",
+						"semver": "^5.5.0"
 					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				}
+			}
+		},
+		"istanbul-instrumenter-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
+			"dev": true,
+			"requires": {
+				"convert-source-map": "^1.5.0",
+				"istanbul-lib-instrument": "^1.7.3",
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^0.3.0"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "5.5.2",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"co": "^4.6.0",
+						"fast-deep-equal": "^1.0.0",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.3.0"
 					}
 				},
-				"finalhandler": {
+				"fast-deep-equal": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
+					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+					"dev": true
+				},
+				"json-schema-traverse": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"schema-utils": {
+					"version": "0.3.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ajv": "^5.0.0"
 					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				}
+			}
+		},
+		"istanbul-lib-coverage": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
+			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+			"dev": true
+		},
+		"istanbul-lib-hook": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz",
+			"integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==",
+			"dev": true,
+			"requires": {
+				"append-transform": "^1.0.0"
+			}
+		},
+		"istanbul-lib-instrument": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
+			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+			"dev": true,
+			"requires": {
+				"babel-generator": "^6.18.0",
+				"babel-template": "^6.16.0",
+				"babel-traverse": "^6.18.0",
+				"babel-types": "^6.18.0",
+				"babylon": "^6.18.0",
+				"istanbul-lib-coverage": "^1.2.1",
+				"semver": "^5.3.0"
+			}
+		},
+		"istanbul-lib-report": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz",
+			"integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==",
+			"dev": true,
+			"requires": {
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"supports-color": "^6.0.0"
+			},
+			"dependencies": {
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-lib-source-maps": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz",
+			"integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"rimraf": "^2.6.2",
+				"source-map": "^0.6.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-reports": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.1.1.tgz",
+			"integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==",
+			"dev": true,
+			"requires": {
+				"handlebars": "^4.1.0"
+			}
+		},
+		"iterall": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
+			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		},
+		"jasmine": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
+			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+			"requires": {
+				"glob": "^7.0.6",
+				"jasmine-core": "~3.3.0"
+			}
+		},
+		"jasmine-core": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
+			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
+		},
+		"jasmine-spec-reporter": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
+			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+			"dev": true,
+			"requires": {
+				"colors": "1.1.2"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+					"dev": true
+				}
+			}
+		},
+		"jasminewd2": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+			"dev": true
+		},
+		"js-base64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
+		},
+		"js-tokens": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.12.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
+			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+					"dev": true
+				}
+			}
+		},
+		"jsbarcode": {
+			"version": "3.11.0",
+			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.0.tgz",
+			"integrity": "sha512-/ozCd7wsa+VIHo9sUc03HneVEQrH7cVWfJolUT/WOW1m8mJ2e3iYZje6C9X3LFHdczlesqFHRpxLtbVsNtjyow=="
+		},
+		"jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		},
+		"jsesc": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+			"dev": true
+		},
+		"json-loader": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+			"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",
+			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+			"dev": true
+		},
+		"json-schema": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
+		"json-stringify-safe": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+		},
+		"json3": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+			"dev": true
+		},
+		"json5": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.0"
+			}
+		},
+		"jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"requires": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"jsonparse": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+			"dev": true
+		},
+		"jsprim": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+			"requires": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.2.3",
+				"verror": "1.10.0"
+			}
+		},
+		"karma": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz",
+			"integrity": "sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.3.0",
+				"body-parser": "^1.16.1",
+				"braces": "^2.3.2",
+				"chokidar": "^2.0.3",
+				"colors": "^1.1.0",
+				"connect": "^3.6.0",
+				"core-js": "^2.2.0",
+				"di": "^0.0.1",
+				"dom-serialize": "^2.2.0",
+				"flatted": "^2.0.0",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.1.2",
+				"http-proxy": "^1.13.0",
+				"isbinaryfile": "^3.0.0",
+				"lodash": "^4.17.11",
+				"log4js": "^4.0.0",
+				"mime": "^2.3.1",
+				"minimatch": "^3.0.2",
+				"optimist": "^0.6.1",
+				"qjobs": "^1.1.4",
+				"range-parser": "^1.2.0",
+				"rimraf": "^2.6.0",
+				"safe-buffer": "^5.0.1",
+				"socket.io": "2.1.1",
+				"source-map": "^0.6.1",
+				"tmp": "0.0.33",
+				"useragent": "2.3.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
 					"dev": true
 				},
-				"log4js": {
-					"version": "3.0.6",
-					"resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
-					"integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
-					"dev": true,
-					"requires": {
-						"circular-json": "^0.5.5",
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"rfdc": "^1.1.2",
-						"streamroller": "0.7.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
 				"mime": {
 					"version": "2.4.0",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
 					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-					"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
-					"dev": true,
-					"requires": {
-						"debug": "~3.1.0",
-						"engine.io": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"socket.io-adapter": "~1.1.0",
-						"socket.io-client": "2.1.1",
-						"socket.io-parser": "~3.2.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io-client": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
-					"dev": true,
-					"requires": {
-						"backo2": "1.0.2",
-						"base64-arraybuffer": "0.1.5",
-						"component-bind": "1.0.0",
-						"component-emitter": "1.2.1",
-						"debug": "~3.1.0",
-						"engine.io-client": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"object-component": "0.0.3",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"socket.io-parser": "~3.2.0",
-						"to-array": "0.1.4"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-					"dev": true
-				},
-				"streamroller": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-					"integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
-					"dev": true,
-					"requires": {
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"mkdirp": "^0.5.1",
-						"readable-stream": "^2.3.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"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"
-					}
-				},
-				"ws": {
-					"version": "3.3.3",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
 				}
 			}
 		},
@@ -14115,90 +10036,13 @@
 			}
 		},
 		"karma-coverage-istanbul-reporter": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz",
-			"integrity": "sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz",
+			"integrity": "sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==",
 			"dev": true,
 			"requires": {
-				"istanbul-api": "^2.0.5",
+				"istanbul-api": "^2.1.1",
 				"minimatch": "^3.0.4"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.6",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"istanbul-api": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.0.6.tgz",
-					"integrity": "sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==",
-					"dev": true,
-					"requires": {
-						"async": "^2.6.1",
-						"compare-versions": "^3.2.1",
-						"fileset": "^2.0.3",
-						"istanbul-lib-coverage": "^2.0.1",
-						"istanbul-lib-hook": "^2.0.1",
-						"istanbul-lib-instrument": "^3.0.0",
-						"istanbul-lib-report": "^2.0.2",
-						"istanbul-lib-source-maps": "^2.0.1",
-						"istanbul-reports": "^2.0.1",
-						"js-yaml": "^3.12.0",
-						"make-dir": "^1.3.0",
-						"once": "^1.4.0"
-					}
-				},
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"istanbul-lib-instrument": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz",
-					"integrity": "sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==",
-					"dev": true,
-					"requires": {
-						"@babel/generator": "^7.0.0",
-						"@babel/parser": "^7.0.0",
-						"@babel/template": "^7.0.0",
-						"@babel/traverse": "^7.0.0",
-						"@babel/types": "^7.0.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"semver": "^5.5.0"
-					}
-				},
-				"istanbul-lib-source-maps": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz",
-					"integrity": "sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"make-dir": "^1.3.0",
-						"rimraf": "^2.6.2",
-						"source-map": "^0.6.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
 			}
 		},
 		"karma-jasmine": {
@@ -14246,20 +10090,6 @@
 			"dev": true,
 			"requires": {
 				"package-json": "^4.0.0"
-			},
-			"dependencies": {
-				"package-json": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-					"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-					"dev": true,
-					"requires": {
-						"got": "^6.7.1",
-						"registry-auth-token": "^3.0.1",
-						"registry-url": "^3.0.3",
-						"semver": "^5.1.0"
-					}
-				}
 			}
 		},
 		"lazy-cache": {
@@ -14269,11 +10099,12 @@
 			"dev": true
 		},
 		"lcid": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+			"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+			"dev": true,
 			"requires": {
-				"invert-kv": "^1.0.0"
+				"invert-kv": "^2.0.0"
 			}
 		},
 		"leek": {
@@ -14300,6 +10131,32 @@
 				}
 			}
 		},
+		"less": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
+			"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+			"dev": true,
+			"requires": {
+				"clone": "^2.1.2",
+				"errno": "^0.1.1",
+				"graceful-fs": "^4.1.2",
+				"image-size": "~0.5.0",
+				"mime": "^1.4.1",
+				"mkdirp": "^0.5.0",
+				"promise": "^7.1.1",
+				"request": "^2.83.0",
+				"source-map": "~0.6.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"less-loader": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
@@ -14339,6 +10196,144 @@
 				"immediate": "~3.0.5"
 			}
 		},
+		"linebreak": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/linebreak/-/linebreak-0.3.0.tgz",
+			"integrity": "sha1-BSZICmLAW9Z58+nZmDDgnGp9DtY=",
+			"dev": true,
+			"requires": {
+				"base64-js": "0.0.8",
+				"brfs": "^1.3.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+					"integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+					"dev": true
+				}
+			}
+		},
+		"live-server": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
+			"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.4",
+				"colors": "^1.3.3",
+				"connect": "^3.6.6",
+				"cors": "^2.8.5",
+				"event-stream": "3.3.4",
+				"faye-websocket": "0.11.x",
+				"http-auth": "3.1.x",
+				"morgan": "^1.9.1",
+				"object-assign": "^4.1.1",
+				"opn": "^6.0.0",
+				"proxy-middleware": "^0.15.0",
+				"send": "^0.16.2",
+				"serve-index": "^1.9.1"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.3.3",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+					"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+					"dev": true
+				},
+				"event-stream": {
+					"version": "3.3.4",
+					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1",
+						"from": "~0",
+						"map-stream": "~0.1.0",
+						"pause-stream": "0.0.11",
+						"split": "0.3",
+						"stream-combiner": "~0.0.4",
+						"through": "~2.3.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"map-stream": {
+					"version": "0.1.0",
+					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+					"dev": true
+				},
+				"mime": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+					"dev": true
+				},
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"dev": true
+				},
+				"opn": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz",
+					"integrity": "sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==",
+					"dev": true,
+					"requires": {
+						"is-wsl": "^1.1.0"
+					}
+				},
+				"send": {
+					"version": "0.16.2",
+					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"depd": "~1.1.2",
+						"destroy": "~1.0.4",
+						"encodeurl": "~1.0.2",
+						"escape-html": "~1.0.3",
+						"etag": "~1.8.1",
+						"fresh": "0.5.2",
+						"http-errors": "~1.6.2",
+						"mime": "1.4.1",
+						"ms": "2.0.0",
+						"on-finished": "~2.3.0",
+						"range-parser": "~1.2.0",
+						"statuses": "~1.4.0"
+					}
+				},
+				"split": {
+					"version": "0.3.3",
+					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+					"dev": true,
+					"requires": {
+						"through": "2"
+					}
+				},
+				"stream-combiner": {
+					"version": "0.0.4",
+					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1"
+					}
+				}
+			}
+		},
 		"livereload-js": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
@@ -14578,6 +10573,36 @@
 				}
 			}
 		},
+		"log4js": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log4js/-/log4js-4.1.0.tgz",
+			"integrity": "sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==",
+			"dev": true,
+			"requires": {
+				"date-format": "^2.0.0",
+				"debug": "^4.1.1",
+				"flatted": "^2.0.0",
+				"rfdc": "^1.1.2",
+				"streamroller": "^1.0.4"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"loglevel": {
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
@@ -14631,24 +10656,24 @@
 			}
 		},
 		"lunr": {
-			"version": "2.3.5",
-			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.5.tgz",
-			"integrity": "sha512-EtnfmHsHJTr3u24sito9JctSxej5Ds0SgUD2Lm+qRHyLgM7BGesFlW14eNh1mil0fV5Muh8gf3dBBXzADlUlzQ==",
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.6.tgz",
+			"integrity": "sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==",
 			"dev": true
 		},
 		"macos-release": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.0.0.tgz",
-			"integrity": "sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.1.0.tgz",
+			"integrity": "sha512-8TCbwvN1mfNxbBv0yBtfyIFMo3m1QsNbKHv7PYIp/abRBKVQBXN7ecu3aeGGgT18VC/Tf397LBDGZF9KBGJFFw==",
 			"dev": true
 		},
 		"magic-string": {
-			"version": "0.25.1",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz",
-			"integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==",
+			"version": "0.25.2",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz",
+			"integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
 			"dev": true,
 			"requires": {
-				"sourcemap-codec": "^1.4.1"
+				"sourcemap-codec": "^1.4.4"
 			}
 		},
 		"make-dir": {
@@ -14666,6 +10691,93 @@
 			"integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
 			"dev": true
 		},
+		"make-fetch-happen": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
+			"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
+			"dev": true,
+			"requires": {
+				"agentkeepalive": "^3.4.1",
+				"cacache": "^11.0.1",
+				"http-cache-semantics": "^3.8.1",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"mississippi": "^3.0.0",
+				"node-fetch-npm": "^2.0.2",
+				"promise-retry": "^1.1.1",
+				"socks-proxy-agent": "^4.0.0",
+				"ssri": "^6.0.0"
+			},
+			"dependencies": {
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+					"dev": true,
+					"requires": {
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
+					},
+					"dependencies": {
+						"lru-cache": {
+							"version": "5.1.1",
+							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+							"dev": true,
+							"requires": {
+								"yallist": "^3.0.2"
+							}
+						}
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
+		},
 		"map-age-cleaner": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -14698,15 +10810,9 @@
 			}
 		},
 		"marked": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz",
-			"integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==",
-			"dev": true
-		},
-		"math-random": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-			"integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz",
+			"integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==",
 			"dev": true
 		},
 		"md5.js": {
@@ -14720,11 +10826,16 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"meant": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz",
+			"integrity": "sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg==",
+			"dev": true
+		},
 		"media-typer": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-			"dev": true
+			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
 		},
 		"mem": {
 			"version": "4.1.0",
@@ -14736,6 +10847,16 @@
 				"p-is-promise": "^2.0.0"
 			}
 		},
+		"memory-fs": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+			"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+			"dev": true,
+			"requires": {
+				"errno": "^0.1.3",
+				"readable-stream": "^2.0.1"
+			}
+		},
 		"meow": {
 			"version": "3.7.0",
 			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -14820,8 +10941,16 @@
 		"merge-descriptors": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-			"dev": true
+			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+		},
+		"merge-source-map": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
+			"integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6"
+			}
 		},
 		"merge2": {
 			"version": "1.2.3",
@@ -14832,8 +10961,36 @@
 		"methods": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-			"dev": true
+			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+		},
+		"micromatch": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"braces": "^2.3.1",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"extglob": "^2.0.4",
+				"fragment-cache": "^0.2.1",
+				"kind-of": "^6.0.2",
+				"nanomatch": "^1.2.9",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.2"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
 		},
 		"miller-rabin": {
 			"version": "4.0.1",
@@ -14877,6 +11034,17 @@
 			"resolved": "https://registry.npmjs.org/mingo/-/mingo-1.3.3.tgz",
 			"integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY="
 		},
+		"mini-css-extract-plugin": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
+			"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0",
+				"webpack-sources": "^1.1.0"
+			}
+		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -15014,6 +11182,20 @@
 				"on-headers": "~1.0.1"
 			}
 		},
+		"move-concurrently": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+			"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"copy-concurrently": "^1.0.0",
+				"fs-write-stream-atomic": "^1.0.8",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.3"
+			}
+		},
 		"ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -15063,6 +11245,33 @@
 			"resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
 			"integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
 		},
+		"nanomatch": {
+			"version": "1.2.13",
+			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"fragment-cache": "^0.2.1",
+				"is-windows": "^1.0.2",
+				"kind-of": "^6.0.2",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
 		"ncp": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
@@ -15072,8 +11281,7 @@
 		"negotiator": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-			"dev": true
+			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
 		},
 		"neo-async": {
 			"version": "2.6.0",
@@ -15153,40 +11361,12 @@
 				"url": "^0.11.0",
 				"util": "^0.11.0",
 				"vm-browserify": "0.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				}
 			}
 		},
 		"node-releases": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.6.tgz",
-			"integrity": "sha512-lODUVHEIZutZx+TDdOk47qLik8FJMXzJ+WnyUGci1MTvTOyzZrz5eVPIIpc5Hb3NfHZGeGHeuwrRYVI1PEITWg==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.12.tgz",
+			"integrity": "sha512-Y+AQ1xdjcgaEzpL65PBEF3fnl1FNKnDh9Zm+AUQLIlyyqtSc4u93jyMN4zrjMzdwKQ10RTr3tgY1x7qpsfF/xg==",
 			"dev": true,
 			"requires": {
 				"semver": "^5.3.0"
@@ -15318,8 +11498,7 @@
 					"requires": {
 						"glob": "^7.0.0",
 						"lodash": "^4.0.0",
-						"scss-tokenizer": "^0.2.3",
-						"yargs": "^7.0.0"
+						"scss-tokenizer": "^0.2.3"
 					}
 				},
 				"semver": {
@@ -15352,6 +11531,18 @@
 				"abbrev": "1"
 			}
 		},
+		"normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
 		"normalize-path": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -15367,21 +11558,58 @@
 			"dev": true
 		},
 		"npm-bundled": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-			"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+			"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
 			"dev": true
 		},
+		"npm-package-arg": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
+			"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.6.0",
+				"osenv": "^0.1.5",
+				"semver": "^5.5.0",
+				"validate-npm-package-name": "^3.0.0"
+			}
+		},
 		"npm-packlist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-			"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+			"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
 			"dev": true,
 			"requires": {
 				"ignore-walk": "^3.0.1",
 				"npm-bundled": "^1.0.1"
 			}
 		},
+		"npm-pick-manifest": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
+			"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+			"dev": true,
+			"requires": {
+				"figgy-pudding": "^3.5.1",
+				"npm-package-arg": "^6.0.0",
+				"semver": "^5.4.1"
+			}
+		},
+		"npm-registry-fetch": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
+			"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
+			"dev": true,
+			"requires": {
+				"JSONStream": "^1.3.4",
+				"bluebird": "^3.5.1",
+				"figgy-pudding": "^3.4.1",
+				"lru-cache": "^4.1.3",
+				"make-fetch-happen": "^4.0.1",
+				"npm-package-arg": "^6.1.0"
+			}
+		},
 		"npm-run-path": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -15497,6 +11725,16 @@
 				}
 			}
 		},
+		"object-inspect": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+			"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+		},
+		"object-keys": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+			"integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+		},
 		"object-visit": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -15505,27 +11743,6 @@
 				"isobject": "^3.0.0"
 			}
 		},
-		"object.omit": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
-			"requires": {
-				"for-own": "^0.1.4",
-				"is-extendable": "^0.1.1"
-			},
-			"dependencies": {
-				"for-own": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-					"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-					"dev": true,
-					"requires": {
-						"for-in": "^1.0.1"
-					}
-				}
-			}
-		},
 		"object.pick": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -15534,6 +11751,14 @@
 				"isobject": "^3.0.1"
 			}
 		},
+		"objectorarray": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz",
+			"integrity": "sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==",
+			"requires": {
+				"tape": "^4.8.0"
+			}
+		},
 		"obuf": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -15544,7 +11769,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
 			"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-			"dev": true,
 			"requires": {
 				"ee-first": "1.1.1"
 			}
@@ -15552,8 +11776,7 @@
 		"on-headers": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-			"dev": true
+			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
 		},
 		"once": {
 			"version": "1.4.0",
@@ -15677,7 +11900,6 @@
 			"version": "5.4.0",
 			"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
 			"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-			"dev": true,
 			"requires": {
 				"is-wsl": "^1.1.0"
 			}
@@ -15748,6 +11970,43 @@
 			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
 		},
+		"os-locale": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+			"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+			"dev": true,
+			"requires": {
+				"execa": "^1.0.0",
+				"lcid": "^2.0.0",
+				"mem": "^4.0.0"
+			},
+			"dependencies": {
+				"execa": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+					"dev": true,
+					"requires": {
+						"cross-spawn": "^6.0.0",
+						"get-stream": "^4.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
+					}
+				},
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+					"dev": true,
+					"requires": {
+						"pump": "^3.0.0"
+					}
+				}
+			}
+		},
 		"os-name": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz",
@@ -15831,6 +12090,51 @@
 			"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
 			"dev": true
 		},
+		"pac-proxy-agent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
+			"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"get-uri": "^2.0.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"pac-resolver": "^3.0.0",
+				"raw-body": "^2.2.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"raw-body": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+					"dev": true,
+					"requires": {
+						"bytes": "3.0.0",
+						"http-errors": "1.6.3",
+						"iconv-lite": "0.4.23",
+						"unpipe": "1.0.0"
+					}
+				}
+			}
+		},
 		"pac-resolver": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz",
@@ -15842,50 +12146,127 @@
 				"ip": "^1.1.5",
 				"netmask": "^1.0.6",
 				"thunkify": "^2.1.2"
+			}
+		},
+		"package-json": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+			"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+			"dev": true,
+			"requires": {
+				"got": "^6.7.1",
+				"registry-auth-token": "^3.0.1",
+				"registry-url": "^3.0.3",
+				"semver": "^5.1.0"
+			}
+		},
+		"pacote": {
+			"version": "9.4.0",
+			"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
+			"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.3",
+				"cacache": "^11.3.2",
+				"figgy-pudding": "^3.5.1",
+				"get-stream": "^4.1.0",
+				"glob": "^7.1.3",
+				"lru-cache": "^5.1.1",
+				"make-fetch-happen": "^4.0.1",
+				"minimatch": "^3.0.4",
+				"minipass": "^2.3.5",
+				"mississippi": "^3.0.0",
+				"mkdirp": "^0.5.1",
+				"normalize-package-data": "^2.4.0",
+				"npm-package-arg": "^6.1.0",
+				"npm-packlist": "^1.1.12",
+				"npm-pick-manifest": "^2.2.3",
+				"npm-registry-fetch": "^3.8.0",
+				"osenv": "^0.1.5",
+				"promise-inflight": "^1.0.1",
+				"promise-retry": "^1.1.1",
+				"protoduck": "^5.0.1",
+				"rimraf": "^2.6.2",
+				"safe-buffer": "^5.1.2",
+				"semver": "^5.6.0",
+				"ssri": "^6.0.1",
+				"tar": "^4.4.8",
+				"unique-filename": "^1.1.1",
+				"which": "^1.3.1"
 			},
 			"dependencies": {
-				"degenerator": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
-					"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"ast-types": "0.x.x",
-						"escodegen": "1.x.x",
-						"esprima": "3.x.x"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.11.0",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
-					"integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
 					"dev": true,
 					"requires": {
-						"esprima": "^3.1.3",
-						"estraverse": "^4.2.0",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.6.1"
+						"pump": "^3.0.0"
 					}
 				},
-				"esprima": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-					"dev": true
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
 				},
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
@@ -15904,38 +12285,12 @@
 				"cyclist": "~0.2.2",
 				"inherits": "^2.0.3",
 				"readable-stream": "^2.1.5"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"parse-asn1": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.3.tgz",
-			"integrity": "sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==",
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+			"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 			"dev": true,
 			"requires": {
 				"asn1.js": "^4.0.0",
@@ -15946,35 +12301,6 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"parse-glob": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
-			"requires": {
-				"glob-base": "^0.3.0",
-				"is-dotfile": "^1.0.0",
-				"is-extglob": "^1.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
 		"parse-json": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -16032,8 +12358,7 @@
 		"parseurl": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-			"dev": true
+			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
 		},
 		"pascalcase": {
 			"version": "0.1.1",
@@ -16075,14 +12400,12 @@
 		"path-parse": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-			"dev": true
+			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
 		},
 		"path-to-regexp": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-			"dev": true
+			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
 		},
 		"path-type": {
 			"version": "3.0.0",
@@ -16114,6 +12437,41 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"pdfkit": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/pdfkit/-/pdfkit-0.9.0.tgz",
+			"integrity": "sha512-j/tJvvoEM7qMiOfodNkz6XRNBvAhVohWP1mUvgg+Xy8X8S3aMBpVGXJGZWNCoCUH2ywLidZSbHyn5mJaqv9umw==",
+			"dev": true,
+			"requires": {
+				"crypto-js": "^3.1.9-1",
+				"fontkit": "^1.0.0",
+				"linebreak": "^0.3.0",
+				"png-js": ">=0.1.0",
+				"saslprep": "1.0.1"
+			}
+		},
+		"pdfmake": {
+			"version": "0.1.54",
+			"resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.1.54.tgz",
+			"integrity": "sha512-HO2FX+czmO+8LpWXQMFQfdUCCKnqwSvSEJExGkUKfsV34DRIV5PZjNg0xWS7ypGrnTY6RTTssWpdreX/pbyeyw==",
+			"dev": true,
+			"requires": {
+				"iconv-lite": "^0.4.24",
+				"linebreak": "^0.3.0",
+				"pdfkit": "^0.9.0"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+					"dev": true,
+					"requires": {
+						"safer-buffer": ">= 2.1.2 < 3"
+					}
+				}
+			}
+		},
 		"performance-now": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -16190,6 +12548,29 @@
 				"semver-compare": "^1.0.0"
 			}
 		},
+		"plist": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
+			"integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+			"requires": {
+				"base64-js": "^1.2.3",
+				"xmlbuilder": "^9.0.7",
+				"xmldom": "0.1.x"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
+				}
+			}
+		},
+		"png-js": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/png-js/-/png-js-0.1.1.tgz",
+			"integrity": "sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=",
+			"dev": true
+		},
 		"pngjs": {
 			"version": "3.3.3",
 			"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.3.tgz",
@@ -16258,20 +12639,6 @@
 			"requires": {
 				"cosmiconfig": "^4.0.0",
 				"import-cwd": "^2.0.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-					"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
-					"dev": true,
-					"requires": {
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0",
-						"require-from-string": "^2.0.1"
-					}
-				}
 			}
 		},
 		"postcss-loader": {
@@ -16304,12 +12671,6 @@
 			"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
 			"dev": true
 		},
-		"preserve": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
-		},
 		"process": {
 			"version": "0.11.10",
 			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -16601,7 +12962,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
 			"integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
-			"dev": true,
 			"requires": {
 				"forwarded": "~0.1.2",
 				"ipaddr.js": "1.8.0"
@@ -16610,7 +12970,39 @@
 				"ipaddr.js": {
 					"version": "1.8.0",
 					"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+				}
+			}
+		},
+		"proxy-agent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.0.tgz",
+			"integrity": "sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"pac-proxy-agent": "^3.0.0",
+				"proxy-from-env": "^1.0.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
@@ -16697,8 +13089,7 @@
 		"q": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-			"dev": true
+			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4="
 		},
 		"qjobs": {
 			"version": "1.2.0",
@@ -16861,40 +13252,26 @@
 			"dev": true
 		},
 		"querystringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
-			"integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+			"integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
 			"dev": true
 		},
-		"randomatic": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-			"integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+		"quote-stream": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
+			"integrity": "sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=",
 			"dev": true,
 			"requires": {
-				"is-number": "^4.0.0",
-				"kind-of": "^6.0.0",
-				"math-random": "^1.0.1"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				}
+				"buffer-equal": "0.0.1",
+				"minimist": "^1.1.3",
+				"through2": "^2.0.0"
 			}
 		},
 		"randombytes": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-			"integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.1.0"
@@ -16913,53 +13290,42 @@
 		"range-parser": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-			"dev": true
+			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
 		},
 		"raw-body": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-			"integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+			"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
 			"dev": true,
 			"requires": {
-				"bytes": "3.0.0",
-				"http-errors": "1.6.2",
-				"iconv-lite": "0.4.19",
-				"unpipe": "1.0.0"
+				"bytes": "1",
+				"string_decoder": "0.10"
 			},
 			"dependencies": {
-				"depd": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-					"integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-					"dev": true
-				},
-				"http-errors": {
-					"version": "1.6.2",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-					"integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-					"dev": true,
-					"requires": {
-						"depd": "1.1.1",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.0.3",
-						"statuses": ">= 1.3.1 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-					"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+				"bytes": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
 					"dev": true
 				},
-				"setprototypeof": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-					"integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
 					"dev": true
 				}
 			}
 		},
+		"raw-loader": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
+			"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"rc": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -16972,21 +13338,125 @@
 				"strip-json-comments": "~2.0.1"
 			}
 		},
-		"read-cache": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+		"read-cache": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+			"dev": true,
+			"requires": {
+				"pify": "^2.3.0"
+			},
+			"dependencies": {
+				"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"
+			},
+			"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"
+					}
+				},
+				"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-up": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+			"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+			"dev": true,
+			"requires": {
+				"find-up": "^2.0.0",
+				"read-pkg": "^2.0.0"
+			},
+			"dependencies": {
+				"find-up": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+					"dev": true,
+					"requires": {
+						"locate-path": "^2.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+					"dev": true,
+					"requires": {
+						"p-locate": "^2.0.0",
+						"path-exists": "^3.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+					"dev": true,
+					"requires": {
+						"p-limit": "^1.1.0"
+					}
+				}
+			}
+		},
+		"readable-stream": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+			"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 			"dev": true,
 			"requires": {
-				"pify": "^2.3.0"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
+				"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"
 			}
 		},
 		"readdirp": {
@@ -17390,15 +13860,6 @@
 			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
 			"dev": true
 		},
-		"regex-cache": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-			"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-			"dev": true,
-			"requires": {
-				"is-equal-shallow": "^0.1.3"
-			}
-		},
 		"regex-not": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -17420,9 +13881,9 @@
 			}
 		},
 		"registry-auth-token": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-			"integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+			"integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
 			"dev": true,
 			"requires": {
 				"rc": "^1.1.6",
@@ -17484,6 +13945,35 @@
 				"is-finite": "^1.0.0"
 			}
 		},
+		"request": {
+			"version": "2.88.0",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+			"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"aws-sign2": "~0.7.0",
+				"aws4": "^1.8.0",
+				"caseless": "~0.12.0",
+				"combined-stream": "~1.0.6",
+				"extend": "~3.0.2",
+				"forever-agent": "~0.6.1",
+				"form-data": "~2.3.2",
+				"har-validator": "~5.1.0",
+				"http-signature": "~1.2.0",
+				"is-typedarray": "~1.0.0",
+				"isstream": "~0.1.2",
+				"json-stringify-safe": "~5.0.1",
+				"mime-types": "~2.1.19",
+				"oauth-sign": "~0.9.0",
+				"performance-now": "^2.1.0",
+				"qs": "~6.5.2",
+				"safe-buffer": "^5.1.2",
+				"tough-cookie": "~2.4.3",
+				"tunnel-agent": "^0.6.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -17507,10 +13997,13 @@
 			"dev": true
 		},
 		"resolve": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-			"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-			"dev": true
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+			"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+			"dev": true,
+			"requires": {
+				"path-parse": "^1.0.6"
+			}
 		},
 		"resolve-cwd": {
 			"version": "2.0.0",
@@ -17542,6 +14035,23 @@
 				"signal-exit": "^3.0.2"
 			}
 		},
+		"restructure": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/restructure/-/restructure-0.5.4.tgz",
+			"integrity": "sha1-9U591WNZD7NP1r9Vh2EJrsyyjeg=",
+			"dev": true,
+			"requires": {
+				"browserify-optional": "^1.0.0"
+			}
+		},
+		"resumer": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+			"integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
+			"requires": {
+				"through": "~2.3.4"
+			}
+		},
 		"ret": {
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -17592,6 +14102,36 @@
 			"integrity": "sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==",
 			"dev": true
 		},
+		"rollup-plugin-commonjs": {
+			"version": "8.2.6",
+			"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
+			"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.2.1",
+				"estree-walker": "^0.5.0",
+				"magic-string": "^0.22.4",
+				"resolve": "^1.4.0",
+				"rollup-pluginutils": "^2.0.1"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				}
+			}
+		},
 		"rollup-plugin-node-resolve": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz",
@@ -17605,94 +14145,20 @@
 			}
 		},
 		"rollup-pluginutils": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz",
-			"integrity": "sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==",
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.5.0.tgz",
+			"integrity": "sha512-9Muh1H+XB5f5ONmKMayUoTYR1EZwHbwJJ9oZLrKT5yuTf/RLIQ5mYIGsrERquVucJmjmaAW0Y7+6Qo1Ep+5w3Q==",
 			"dev": true,
 			"requires": {
-				"estree-walker": "^0.5.2",
-				"micromatch": "^2.3.11"
+				"estree-walker": "^0.6.0",
+				"micromatch": "^3.1.10"
 			},
 			"dependencies": {
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+				"estree-walker": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz",
+					"integrity": "sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==",
 					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
 				}
 			}
 		},
@@ -17781,6 +14247,12 @@
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
+		"saslprep": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.1.tgz",
+			"integrity": "sha512-ntN6SbE3hRqd45PKKadRPgA+xHPWg5lPSj2JWJdJvjTwXDDfkPVtXWvP8jJojvnm+rAsZ2b299C5NwZqq818EA==",
+			"dev": true
+		},
 		"sass-loader": {
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
@@ -17907,7 +14379,6 @@
 			"version": "0.16.2",
 			"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
 			"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"depd": "~1.1.2",
@@ -17927,8 +14398,7 @@
 				"mime": {
 					"version": "1.4.1",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
 				}
 			}
 		},
@@ -17957,7 +14427,6 @@
 			"version": "1.13.2",
 			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
 			"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-			"dev": true,
 			"requires": {
 				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
@@ -18000,8 +14469,7 @@
 		"setprototypeof": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-			"dev": true
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
 		},
 		"sha.js": {
 			"version": "2.4.11",
@@ -18030,6 +14498,12 @@
 				}
 			}
 		},
+		"shallow-copy": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+			"integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=",
+			"dev": true
+		},
 		"shebang-command": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -18082,6 +14556,39 @@
 			"integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==",
 			"dev": true
 		},
+		"snapdragon": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+			"requires": {
+				"base": "^0.11.1",
+				"debug": "^2.2.0",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"map-cache": "^0.2.2",
+				"source-map": "^0.5.6",
+				"source-map-resolve": "^0.5.0",
+				"use": "^3.1.0"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				},
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
 		"snapdragon-node": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
@@ -18141,6 +14648,53 @@
 				"kind-of": "^3.2.0"
 			}
 		},
+		"socket.io": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+			"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+			"dev": true,
+			"requires": {
+				"debug": "~3.1.0",
+				"engine.io": "~3.2.0",
+				"has-binary2": "~1.0.2",
+				"socket.io-adapter": "~1.1.0",
+				"socket.io-client": "2.1.1",
+				"socket.io-parser": "~3.2.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"socket.io-client": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+					"dev": true,
+					"requires": {
+						"backo2": "1.0.2",
+						"base64-arraybuffer": "0.1.5",
+						"component-bind": "1.0.0",
+						"component-emitter": "1.2.1",
+						"debug": "~3.1.0",
+						"engine.io-client": "~3.2.0",
+						"has-binary2": "~1.0.2",
+						"has-cors": "1.1.0",
+						"indexof": "0.0.1",
+						"object-component": "0.0.3",
+						"parseqs": "0.0.5",
+						"parseuri": "0.0.5",
+						"socket.io-parser": "~3.2.0",
+						"to-array": "0.1.4"
+					}
+				}
+			}
+		},
 		"socket.io-adapter": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
@@ -18239,10 +14793,60 @@
 				}
 			}
 		},
+		"sockjs": {
+			"version": "0.3.19",
+			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+			"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+			"dev": true,
+			"requires": {
+				"faye-websocket": "^0.10.0",
+				"uuid": "^3.0.1"
+			}
+		},
+		"sockjs-client": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
+			"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.2.5",
+				"eventsource": "^1.0.7",
+				"faye-websocket": "~0.11.1",
+				"inherits": "^2.0.3",
+				"json3": "^3.3.2",
+				"url-parse": "^1.4.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"socks": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/socks/-/socks-2.2.3.tgz",
-			"integrity": "sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
+			"integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
 			"dev": true,
 			"requires": {
 				"ip": "^1.1.5",
@@ -18250,13 +14854,13 @@
 			}
 		},
 		"socks-proxy-agent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz",
-			"integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+			"integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
 			"dev": true,
 			"requires": {
-				"agent-base": "~4.2.0",
-				"socks": "~2.2.0"
+				"agent-base": "~4.2.1",
+				"socks": "~2.3.2"
 			}
 		},
 		"source-list-map": {
@@ -18280,6 +14884,18 @@
 				"loader-utils": "^1.1.0"
 			}
 		},
+		"source-map-resolve": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+			"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+			"requires": {
+				"atob": "^2.1.1",
+				"decode-uri-component": "^0.2.0",
+				"resolve-url": "^0.2.1",
+				"source-map-url": "^0.4.0",
+				"urix": "^0.1.0"
+			}
+		},
 		"source-map-support": {
 			"version": "0.5.10",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
@@ -18318,29 +14934,101 @@
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-exceptions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
-		},
-		"spdx-expression-parse": {
+		"spdx-exceptions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+		},
+		"spdx-expression-parse": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"requires": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-license-ids": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+		},
+		"spdy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+			"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.0",
+				"handle-thing": "^2.0.0",
+				"http-deceiver": "^1.2.7",
+				"select-hose": "^2.0.0",
+				"spdy-transport": "^3.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"spdy-transport": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+			"dev": true,
 			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
+				"debug": "^4.1.0",
+				"detect-node": "^2.0.4",
+				"hpack.js": "^2.1.6",
+				"obuf": "^1.1.2",
+				"readable-stream": "^3.0.6",
+				"wbuf": "^1.7.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
 			}
 		},
-		"spdx-license-ids": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
-		},
 		"speed-measure-webpack-plugin": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz",
-			"integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
+			"integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
 			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1"
@@ -18363,18 +15051,18 @@
 			}
 		},
 		"split2": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.0.tgz",
-			"integrity": "sha512-ePE1otNQVMnBRyqf3INbZvZwBPGsdBDThgrOWZ6z8zXGNVQNVCSEoOO9aBMTzDN1mXoNSZJ2kHSFH7AA5SPWww==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz",
+			"integrity": "sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==",
 			"dev": true,
 			"requires": {
 				"readable-stream": "^3.0.0"
 			},
 			"dependencies": {
 				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
 						"inherits": "^2.0.3",
@@ -18426,6 +15114,15 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
+		"static-eval": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+			"integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+			"dev": true,
+			"requires": {
+				"escodegen": "^1.8.1"
+			}
+		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -18445,6 +15142,45 @@
 				}
 			}
 		},
+		"static-module": {
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/static-module/-/static-module-2.2.5.tgz",
+			"integrity": "sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==",
+			"dev": true,
+			"requires": {
+				"concat-stream": "~1.6.0",
+				"convert-source-map": "^1.5.1",
+				"duplexer2": "~0.1.4",
+				"escodegen": "~1.9.0",
+				"falafel": "^2.1.0",
+				"has": "^1.0.1",
+				"magic-string": "^0.22.4",
+				"merge-source-map": "1.0.4",
+				"object-inspect": "~1.4.0",
+				"quote-stream": "~1.0.2",
+				"readable-stream": "~2.3.3",
+				"shallow-copy": "~0.0.1",
+				"static-eval": "^2.0.0",
+				"through2": "~2.0.3"
+			},
+			"dependencies": {
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				},
+				"object-inspect": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz",
+					"integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==",
+					"dev": true
+				}
+			}
+		},
 		"stats-webpack-plugin": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz",
@@ -18457,8 +15193,7 @@
 		"statuses": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-			"dev": true
+			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
 		},
 		"stdout-stream": {
 			"version": "1.4.1",
@@ -18500,32 +15235,6 @@
 			"requires": {
 				"inherits": "~2.0.1",
 				"readable-stream": "^2.0.2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"stream-combiner": {
@@ -18594,40 +15303,44 @@
 				"readable-stream": "^2.3.6",
 				"to-arraybuffer": "^1.0.0",
 				"xtend": "^4.0.0"
+			}
+		},
+		"stream-shift": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+			"dev": true
+		},
+		"streamroller": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz",
+			"integrity": "sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"date-format": "^2.0.0",
+				"debug": "^3.1.0",
+				"fs-extra": "^7.0.0",
+				"lodash": "^4.17.10"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"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"
+						"ms": "^2.1.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"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-			"dev": true
-		},
 		"string-template": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
@@ -18658,10 +15371,20 @@
 				}
 			}
 		},
+		"string.prototype.trim": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
+			"integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
+			"requires": {
+				"define-properties": "^1.1.2",
+				"es-abstract": "^1.5.0",
+				"function-bind": "^1.0.2"
+			}
+		},
 		"string_decoder": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
-			"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+			"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"
@@ -18678,8 +15401,7 @@
 		"strip-bom": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-			"dev": true
+			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
 		},
 		"strip-eof": {
 			"version": "1.0.0",
@@ -18701,13 +15423,21 @@
 			"dev": true
 		},
 		"stripe": {
-			"version": "6.23.0",
-			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.23.0.tgz",
-			"integrity": "sha512-o3rkli0B0O05Z6BwdiNpzCxQ16J1YmUlQB2JAjNC2dTwjg3koF74qhWUY0Rbb8Xisd/Wbgi8DODzNpD9JKG/FA==",
+			"version": "6.28.0",
+			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.28.0.tgz",
+			"integrity": "sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==",
 			"requires": {
 				"lodash.isplainobject": "^4.0.6",
-				"qs": "~6.5.1",
-				"safe-buffer": "^5.1.1"
+				"qs": "^6.6.0",
+				"safe-buffer": "^5.1.1",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+				}
 			}
 		},
 		"style-loader": {
@@ -18720,10 +15450,60 @@
 				"schema-utils": "^1.0.0"
 			}
 		},
+		"stylus": {
+			"version": "0.54.5",
+			"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+			"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+			"dev": true,
+			"requires": {
+				"css-parse": "1.7.x",
+				"debug": "*",
+				"glob": "7.0.x",
+				"mkdirp": "0.5.x",
+				"sax": "0.5.x",
+				"source-map": "0.1.x"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.0.6",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+					"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.2",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
+		"stylus-loader": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+			"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"lodash.clonedeep": "^4.5.0",
+				"when": "~3.6.x"
+			}
+		},
 		"subscriptions-transport-ws": {
-			"version": "0.9.15",
-			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz",
-			"integrity": "sha512-f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ==",
+			"version": "0.9.16",
+			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz",
+			"integrity": "sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==",
 			"requires": {
 				"backo2": "^1.0.2",
 				"eventemitter3": "^3.1.0",
@@ -18742,6 +15522,90 @@
 				}
 			}
 		},
+		"superagent": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
+			"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "^1.2.0",
+				"cookiejar": "^2.1.2",
+				"debug": "^4.1.0",
+				"form-data": "^2.3.3",
+				"formidable": "^1.2.0",
+				"methods": "^1.1.1",
+				"mime": "^2.4.0",
+				"qs": "^6.6.0",
+				"readable-stream": "^3.0.6"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
+		},
+		"superagent-proxy": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
+			"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.1.0",
+				"proxy-agent": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"supports-color": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -18752,11 +15616,11 @@
 			}
 		},
 		"swiper": {
-			"version": "4.4.6",
-			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.4.6.tgz",
-			"integrity": "sha512-F9NDtijQt+etiOe6JAEH+Cb+QKzwwFpi08FlOIQv8ALdoQ8tvAX/38a/28E5XxalAkChsHCutwkBCzDxDXTGiA==",
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.0.tgz",
+			"integrity": "sha512-jRCd/CGet9kaHwthHdd/sL/YU8CI157PWLyItnIcn/o/jP4haVky3zTF6f9F3JDpmQIw7jdWihISiYx0/oTHsg==",
 			"requires": {
-				"dom7": "^2.1.2",
+				"dom7": "^2.1.3",
 				"ssr-window": "^1.0.1"
 			}
 		},
@@ -18771,6 +15635,51 @@
 			"integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
 			"dev": true
 		},
+		"tape": {
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/tape/-/tape-4.10.1.tgz",
+			"integrity": "sha512-G0DywYV1jQeY3axeYnXUOt6ktnxS9OPJh97FGR3nrua8lhWi1zPflLxcAHavZ7Jf3qUfY7cxcVIVFa4mY2IY1w==",
+			"requires": {
+				"deep-equal": "~1.0.1",
+				"defined": "~1.0.0",
+				"for-each": "~0.3.3",
+				"function-bind": "~1.1.1",
+				"glob": "~7.1.3",
+				"has": "~1.0.3",
+				"inherits": "~2.0.3",
+				"minimist": "~1.2.0",
+				"object-inspect": "~1.6.0",
+				"resolve": "~1.10.0",
+				"resumer": "~0.0.0",
+				"string.prototype.trim": "~1.1.2",
+				"through": "~2.3.8"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.10.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"tar": {
+			"version": "4.4.8",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+			"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+			"dev": true,
+			"requires": {
+				"chownr": "^1.1.1",
+				"fs-minipass": "^1.2.5",
+				"minipass": "^2.3.4",
+				"minizlib": "^1.1.1",
+				"mkdirp": "^0.5.0",
+				"safe-buffer": "^5.1.2",
+				"yallist": "^3.0.2"
+			}
+		},
 		"term-size": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
@@ -18809,14 +15718,14 @@
 			}
 		},
 		"terser": {
-			"version": "3.16.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-3.16.0.tgz",
-			"integrity": "sha512-Ua8BhyibmsQBFXDZZ3Es7GASB2yFrQJr0jgAlZK1FBLbFarrHoCuMHPCro5MbX4jidcaFGiV+uTc3wxodmGjUg==",
+			"version": "3.17.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+			"integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
 			"dev": true,
 			"requires": {
-				"commander": "~2.17.1",
+				"commander": "^2.19.0",
 				"source-map": "~0.6.1",
-				"source-map-support": "~0.5.9"
+				"source-map-support": "~0.5.10"
 			},
 			"dependencies": {
 				"source-map": {
@@ -18827,853 +15736,993 @@
 				}
 			}
 		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-		},
-		"through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+		"terser-webpack-plugin": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
+			"integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
 			"dev": true,
 			"requires": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+				"cacache": "^11.0.2",
+				"find-cache-dir": "^2.0.0",
+				"schema-utils": "^1.0.0",
+				"serialize-javascript": "^1.4.0",
+				"source-map": "^0.6.1",
+				"terser": "^3.16.1",
+				"webpack-sources": "^1.1.0",
+				"worker-farm": "^1.5.2"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"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"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
-				}
-			}
-		},
-		"thunkify": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
-			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
-			"dev": true
-		},
-		"thunky": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
-			"dev": true
-		},
-		"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.10",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-			"dev": true,
-			"requires": {
-				"setimmediate": "^1.0.4"
-			}
-		},
-		"tmp": {
-			"version": "0.0.33",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "~1.0.2"
-			}
-		},
-		"to-array": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
-		},
-		"to-arraybuffer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-			"dev": true
-		},
-		"to-fast-properties": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-			"dev": true
-		},
-		"to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			}
-		},
-		"to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
-			}
-		},
-		"tough-cookie": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-			"requires": {
-				"psl": "^1.1.24",
-				"punycode": "^1.4.1"
-			}
-		},
-		"traverse": {
-			"version": "0.6.6",
-			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
-			"dev": true
-		},
-		"tree-kill": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
-			"dev": true
-		},
-		"trim-newlines": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
-		},
-		"trim-right": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-			"dev": true
-		},
-		"true-case-path": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-			"requires": {
-				"glob": "^7.1.2"
-			}
-		},
-		"tryer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-			"dev": true
-		},
-		"ts-node": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.2.tgz",
-			"integrity": "sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==",
-			"dev": true,
-			"requires": {
-				"arg": "^4.1.0",
-				"diff": "^3.1.0",
-				"make-error": "^1.1.1",
-				"source-map-support": "^0.5.6",
-				"yn": "^3.0.0"
-			}
-		},
-		"tslib": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-		},
-		"tslint": {
-			"version": "5.12.1",
-			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz",
-			"integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==",
-			"dev": true,
-			"requires": {
-				"babel-code-frame": "^6.22.0",
-				"builtin-modules": "^1.1.1",
-				"chalk": "^2.3.0",
-				"commander": "^2.12.1",
-				"diff": "^3.2.0",
-				"glob": "^7.1.1",
-				"js-yaml": "^3.7.0",
-				"minimatch": "^3.0.4",
-				"resolve": "^1.3.2",
-				"semver": "^5.3.0",
-				"tslib": "^1.8.0",
-				"tsutils": "^2.27.2"
-			},
-			"dependencies": {
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+				},
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
+				},
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+					"dev": true,
+					"requires": {
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"path-parse": "^1.0.6"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
+				},
+				"pkg-dir": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+					"dev": true,
+					"requires": {
+						"find-up": "^3.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
 					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
-		"tslint-eslint-rules": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
-			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
+		"through": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+		},
+		"through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
 			"dev": true,
 			"requires": {
-				"doctrine": "^0.7.2",
-				"tslib": "^1.0.0",
-				"tsutils": "^1.4.0"
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
 			},
 			"dependencies": {
-				"tsutils": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
-					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
-					"dev": true
+				"readable-stream": {
+					"version": "2.3.6",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "~1.0.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"
+					}
 				}
 			}
 		},
-		"tsutils": {
-			"version": "2.29.0",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-			"dev": true,
-			"requires": {
-				"tslib": "^1.8.1"
-			}
-		},
-		"tty-browserify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+		"thunkify": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
+			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
 			"dev": true
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
+		"thunky": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+			"dev": true
 		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		"time-stamp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+			"dev": true
 		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2"
-			}
+		"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
 		},
-		"type-is": {
-			"version": "1.6.16",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+		"timers-browserify": {
+			"version": "2.0.10",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 			"dev": true,
 			"requires": {
-				"media-typer": "0.3.0",
-				"mime-types": "~2.1.18"
+				"setimmediate": "^1.0.4"
 			}
 		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-			"dev": true
-		},
-		"typescript": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
-			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
+		"tiny-inflate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.2.tgz",
+			"integrity": "sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=",
 			"dev": true
 		},
-		"uglify-js": {
-			"version": "3.4.9",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-			"integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+		"tiny-lr": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+			"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"commander": "~2.17.1",
-				"source-map": "~0.6.1"
+				"body": "^5.1.0",
+				"debug": "^3.1.0",
+				"faye-websocket": "~0.10.0",
+				"livereload-js": "^2.3.0",
+				"object-assign": "^4.1.0",
+				"qs": "^6.4.0"
 			},
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"uglify-to-browserify": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+		"tmp": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
 			"dev": true,
-			"optional": true
+			"requires": {
+				"os-tmpdir": "~1.0.2"
+			}
 		},
-		"ultron": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-			"dev": true
+		"to-array": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
 		},
-		"unc-path-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+		"to-arraybuffer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
 			"dev": true
 		},
-		"union-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
-			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^0.4.3"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"set-value": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-extendable": "^0.1.1",
-						"is-plain-object": "^2.0.1",
-						"to-object-path": "^0.3.0"
-					}
-				}
+		"to-fast-properties": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+			"dev": true
+		},
+		"to-object-path": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+			"requires": {
+				"kind-of": "^3.0.2"
 			}
 		},
-		"unique-filename": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-			"dev": true,
+		"to-regex": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
 			"requires": {
-				"unique-slug": "^2.0.0"
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"regex-not": "^1.0.2",
+				"safe-regex": "^1.1.0"
 			}
 		},
-		"unique-slug": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
-			"dev": true,
+		"to-regex-range": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 			"requires": {
-				"imurmurhash": "^0.1.4"
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1"
 			}
 		},
-		"unique-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-			"dev": true,
+		"tough-cookie": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
 			"requires": {
-				"crypto-random-string": "^1.0.0"
+				"psl": "^1.1.24",
+				"punycode": "^1.4.1"
 			}
 		},
-		"universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+		"traverse": {
+			"version": "0.6.6",
+			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
+			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
 			"dev": true
 		},
-		"unix-crypt-td-js": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
-			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+		"tree-kill": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
 			"dev": true
 		},
-		"unpipe": {
+		"trim-newlines": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
+		},
+		"trim-right": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
 			"dev": true
 		},
-		"unset-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+		"true-case-path": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
 			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
-				}
+				"glob": "^7.1.2"
 			}
 		},
-		"untildify": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
-			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
-			"dev": true
-		},
-		"unzip-response": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+		"tryer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
 			"dev": true
 		},
-		"upath": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
-		},
-		"uri-js": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+		"ts-invariant": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz",
+			"integrity": "sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==",
 			"requires": {
-				"punycode": "^2.1.0"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-				}
+				"tslib": "^1.9.3"
 			}
 		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		"ts-node": {
+			"version": "8.0.3",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.3.tgz",
+			"integrity": "sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==",
+			"dev": true,
+			"requires": {
+				"arg": "^4.1.0",
+				"diff": "^3.1.0",
+				"make-error": "^1.1.1",
+				"source-map-support": "^0.5.6",
+				"yn": "^3.0.0"
+			}
 		},
-		"url": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+		"ts-simple-ast": {
+			"version": "12.4.0",
+			"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
+			"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
 			"dev": true,
 			"requires": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
+				"@dsherret/to-absolute-glob": "^2.0.2",
+				"code-block-writer": "^7.2.0",
+				"fs-extra": "^6.0.1",
+				"glob-parent": "^3.1.0",
+				"globby": "^8.0.1",
+				"is-negated-glob": "^1.0.0",
+				"multimatch": "^2.1.0",
+				"object-assign": "^4.1.1",
+				"tslib": "^1.9.0",
+				"typescript": "2.9.1"
 			},
 			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+				"dir-glob": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+					"dev": true,
+					"requires": {
+						"arrify": "^1.0.1",
+						"path-type": "^3.0.0"
+					}
+				},
+				"fs-extra": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+					"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
+					}
+				},
+				"globby": {
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"dir-glob": "2.0.0",
+						"fast-glob": "^2.0.2",
+						"glob": "^7.1.2",
+						"ignore": "^3.3.5",
+						"pify": "^3.0.0",
+						"slash": "^1.0.0"
+					}
+				},
+				"typescript": {
+					"version": "2.9.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
+					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
 					"dev": true
 				}
 			}
 		},
-		"url-parse": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
-			"dev": true,
-			"requires": {
-				"querystringify": "^2.0.0",
-				"requires-port": "^1.0.0"
-			}
+		"tslib": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
 		},
-		"url-parse-lax": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+		"tslint": {
+			"version": "5.14.0",
+			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.14.0.tgz",
+			"integrity": "sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==",
 			"dev": true,
 			"requires": {
-				"prepend-http": "^1.0.1"
+				"babel-code-frame": "^6.22.0",
+				"builtin-modules": "^1.1.1",
+				"chalk": "^2.3.0",
+				"commander": "^2.12.1",
+				"diff": "^3.2.0",
+				"glob": "^7.1.1",
+				"js-yaml": "^3.7.0",
+				"minimatch": "^3.0.4",
+				"mkdirp": "^0.5.1",
+				"resolve": "^1.3.2",
+				"semver": "^5.3.0",
+				"tslib": "^1.8.0",
+				"tsutils": "^2.29.0"
 			}
 		},
-		"use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-		},
-		"useragent": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+		"tslint-eslint-rules": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
+			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
 			"dev": true,
 			"requires": {
-				"lru-cache": "4.1.x",
-				"tmp": "0.0.x"
+				"doctrine": "^0.7.2",
+				"tslib": "^1.0.0",
+				"tsutils": "^1.4.0"
+			},
+			"dependencies": {
+				"tsutils": {
+					"version": "1.9.1",
+					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
+					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
+					"dev": true
+				}
 			}
 		},
-		"util": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+		"tsutils": {
+			"version": "2.29.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
 			"dev": true,
 			"requires": {
-				"inherits": "2.0.3"
+				"tslib": "^1.8.1"
 			}
 		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-		},
-		"utils-merge": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+		"tty-browserify": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
 			"dev": true
 		},
-		"uuid": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-		},
-		"validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+		"tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"validate-npm-package-name": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+		"tweetnacl": {
+			"version": "0.14.5",
+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		},
+		"type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
 			"dev": true,
 			"requires": {
-				"builtins": "^1.0.3"
+				"prelude-ls": "~1.1.2"
 			}
 		},
-		"vary": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-			"dev": true
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+		"type-is": {
+			"version": "1.6.16",
+			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
+				"media-typer": "0.3.0",
+				"mime-types": "~2.1.18"
 			}
 		},
-		"viz.js": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
-			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
-			"dev": true
-		},
-		"vlq": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+		"typedarray": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
 			"dev": true
 		},
-		"vm-browserify": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-			"dev": true,
-			"requires": {
-				"indexof": "0.0.1"
-			}
-		},
-		"void-elements": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-			"dev": true
+		"typescript": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
+			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="
 		},
-		"watchpack": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-			"dev": true,
-			"requires": {
-				"chokidar": "^2.0.2",
-				"graceful-fs": "^4.1.2",
-				"neo-async": "^2.5.0"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+		"uglify-js": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.2.tgz",
+			"integrity": "sha512-imog1WIsi9Yb56yRt5TfYVxGmnWs3WSGU73ieSOlMVFwhJCA9W8fqFFMMj4kgDqiS/80LGdsYnWL7O9UcjEBlg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"commander": "~2.19.0",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
+					"optional": true
+				}
+			}
+		},
+		"uglify-to-browserify": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+			"dev": true,
+			"optional": true
+		},
+		"uglifyjs-webpack-plugin": {
+			"version": "0.4.6",
+			"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+			"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6",
+				"uglify-js": "^2.8.29",
+				"webpack-sources": "^1.0.1"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"cliui": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"center-align": "^0.1.1",
+						"right-align": "^0.1.1",
+						"wordwrap": "0.0.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"uglify-js": {
+					"version": "2.8.29",
+					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"source-map": "~0.5.1",
+						"uglify-to-browserify": "~1.0.0",
+						"yargs": "~3.10.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"wordwrap": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+					"dev": true
+				},
+				"yargs": {
+					"version": "3.10.0",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"camelcase": "^1.0.2",
+						"cliui": "^2.1.0",
+						"decamelize": "^1.0.0",
+						"window-size": "0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				}
+			}
+		},
+		"ultron": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+			"dev": true
+		},
+		"unc-path-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+			"dev": true
+		},
+		"underscore": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+			"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+		},
+		"unicode-properties": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.1.0.tgz",
+			"integrity": "sha1-epbu9J91aC6mnSMV7smsQ//fAME=",
+			"dev": true,
+			"requires": {
+				"brfs": "^1.4.0",
+				"unicode-trie": "^0.3.0"
+			}
+		},
+		"unicode-trie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-0.3.1.tgz",
+			"integrity": "sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=",
+			"dev": true,
+			"requires": {
+				"pako": "^0.2.5",
+				"tiny-inflate": "^1.0.0"
+			},
+			"dependencies": {
+				"pako": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+					"integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
 					"dev": true
+				}
+			}
+		},
+		"union-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+			"requires": {
+				"arr-union": "^3.1.0",
+				"get-value": "^2.0.6",
+				"is-extendable": "^0.1.1",
+				"set-value": "^0.4.3"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
+				"set-value": {
+					"version": "0.4.3",
+					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
 						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
+						"is-extendable": "^0.1.1",
+						"is-plain-object": "^2.0.1",
+						"to-object-path": "^0.3.0"
+					}
+				}
+			}
+		},
+		"unique-filename": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+			"dev": true,
+			"requires": {
+				"unique-slug": "^2.0.0"
+			}
+		},
+		"unique-slug": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+			"dev": true,
+			"requires": {
+				"imurmurhash": "^0.1.4"
+			}
+		},
+		"unique-string": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+			"dev": true,
+			"requires": {
+				"crypto-random-string": "^1.0.0"
+			}
+		},
+		"universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+		},
+		"unix-crypt-td-js": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
+			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+			"dev": true
+		},
+		"unpipe": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+		},
+		"unset-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+			"requires": {
+				"has-value": "^0.3.1",
+				"isobject": "^3.0.0"
+			},
+			"dependencies": {
+				"has-value": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+					"requires": {
+						"get-value": "^2.0.3",
+						"has-values": "^0.1.4",
+						"isobject": "^2.0.0"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "2.1.0",
+							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+							"requires": {
+								"isarray": "1.0.0"
+							}
+						}
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"has-values": {
+					"version": "0.1.4",
+					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+				}
+			}
+		},
+		"untildify": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
+			"dev": true
+		},
+		"unzip-response": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+			"dev": true
+		},
+		"upath": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
+		},
+		"update-notifier": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+			"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+			"dev": true,
+			"requires": {
+				"boxen": "^1.2.1",
+				"chalk": "^2.0.1",
+				"configstore": "^3.0.0",
+				"import-lazy": "^2.1.0",
+				"is-ci": "^1.0.10",
+				"is-installed-globally": "^0.1.0",
+				"is-npm": "^1.0.0",
+				"latest-version": "^3.0.0",
+				"semver-diff": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			},
+			"dependencies": {
+				"ci-info": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+					"dev": true
+				},
+				"is-ci": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ci-info": "^1.5.0"
 					}
 				}
 			}
 		},
+		"uri-js": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+			"requires": {
+				"punycode": "^2.1.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+				}
+			}
+		},
+		"urix": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		},
+		"url": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+			"dev": true,
+			"requires": {
+				"punycode": "1.3.2",
+				"querystring": "0.2.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "1.3.2",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+					"dev": true
+				}
+			}
+		},
+		"url-parse": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
+			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+			"dev": true,
+			"requires": {
+				"querystringify": "^2.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"url-parse-lax": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+			"dev": true,
+			"requires": {
+				"prepend-http": "^1.0.1"
+			}
+		},
+		"use": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+		},
+		"useragent": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "4.1.x",
+				"tmp": "0.0.x"
+			}
+		},
+		"util": {
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+			"dev": true,
+			"requires": {
+				"inherits": "2.0.3"
+			}
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+		},
+		"utils-merge": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+		},
+		"uuid": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+		},
+		"validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"requires": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"validate-npm-package-name": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+			"dev": true,
+			"requires": {
+				"builtins": "^1.0.3"
+			}
+		},
+		"validator": {
+			"version": "10.11.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+			"integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+			"dev": true
+		},
+		"vary": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+		},
+		"verror": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"core-util-is": "1.0.2",
+				"extsprintf": "^1.2.0"
+			}
+		},
+		"viz.js": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
+			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
+			"dev": true
+		},
+		"vlq": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+			"dev": true
+		},
+		"vm-browserify": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+			"dev": true,
+			"requires": {
+				"indexof": "0.0.1"
+			}
+		},
+		"void-elements": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+			"dev": true
+		},
+		"watchpack": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.2",
+				"graceful-fs": "^4.1.2",
+				"neo-async": "^2.5.0"
+			}
+		},
 		"wbuf": {
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
@@ -19767,13 +16816,58 @@
 				}
 			}
 		},
+		"webpack": {
+			"version": "4.29.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
+			"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+			"dev": true,
+			"requires": {
+				"@webassemblyjs/ast": "1.7.11",
+				"@webassemblyjs/helper-module-context": "1.7.11",
+				"@webassemblyjs/wasm-edit": "1.7.11",
+				"@webassemblyjs/wasm-parser": "1.7.11",
+				"acorn": "^6.0.5",
+				"acorn-dynamic-import": "^4.0.0",
+				"ajv": "^6.1.0",
+				"ajv-keywords": "^3.1.0",
+				"chrome-trace-event": "^1.0.0",
+				"enhanced-resolve": "^4.1.0",
+				"eslint-scope": "^4.0.0",
+				"json-parse-better-errors": "^1.0.2",
+				"loader-runner": "^2.3.0",
+				"loader-utils": "^1.1.0",
+				"memory-fs": "~0.4.1",
+				"micromatch": "^3.1.8",
+				"mkdirp": "~0.5.0",
+				"neo-async": "^2.5.0",
+				"node-libs-browser": "^2.0.0",
+				"schema-utils": "^0.4.4",
+				"tapable": "^1.1.0",
+				"terser-webpack-plugin": "^1.1.0",
+				"watchpack": "^1.5.0",
+				"webpack-sources": "^1.3.0"
+			},
+			"dependencies": {
+				"schema-utils": {
+					"version": "0.4.7",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+					"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+					"dev": true,
+					"requires": {
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0"
+					}
+				}
+			}
+		},
 		"webpack-bundle-analyzer": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz",
-			"integrity": "sha512-naLWiRfmtH4UJgtUktRTLw6FdoZJ2RvCR9ePbwM9aRMsS/KjFerkPZG9epEvXRAw5d5oPdrs9+3p+afNjxW8Xw==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz",
+			"integrity": "sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==",
 			"dev": true,
 			"requires": {
-				"acorn": "^5.7.3",
+				"acorn": "^6.0.7",
+				"acorn-walk": "^6.1.1",
 				"bfj": "^6.1.1",
 				"chalk": "^2.4.1",
 				"commander": "^2.18.0",
@@ -19785,93 +16879,176 @@
 				"mkdirp": "^0.5.1",
 				"opener": "^1.5.1",
 				"ws": "^6.0.0"
+			}
+		},
+		"webpack-core": {
+			"version": "0.6.9",
+			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+			"dev": true,
+			"requires": {
+				"source-list-map": "~0.1.7",
+				"source-map": "~0.4.1"
 			},
 			"dependencies": {
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+				"source-list-map": {
+					"version": "0.1.8",
+					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
 					"dev": true
 				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+				"source-map": {
+					"version": "0.4.4",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
 					"dev": true,
 					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
+						"amdefine": ">=0.0.4"
 					}
 				}
 			}
 		},
-		"webpack-core": {
-			"version": "0.6.9",
-			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+		"webpack-dev-middleware": {
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
+			"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+			"dev": true,
+			"requires": {
+				"memory-fs": "~0.4.1",
+				"mime": "^2.3.1",
+				"range-parser": "^1.0.3",
+				"webpack-log": "^2.0.0"
+			},
+			"dependencies": {
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				}
+			}
+		},
+		"webpack-dev-server": {
+			"version": "3.1.14",
+			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
+			"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
 			"dev": true,
 			"requires": {
-				"source-list-map": "~0.1.7",
-				"source-map": "~0.4.1"
+				"ansi-html": "0.0.7",
+				"bonjour": "^3.5.0",
+				"chokidar": "^2.0.0",
+				"compression": "^1.5.2",
+				"connect-history-api-fallback": "^1.3.0",
+				"debug": "^3.1.0",
+				"del": "^3.0.0",
+				"express": "^4.16.2",
+				"html-entities": "^1.2.0",
+				"http-proxy-middleware": "~0.18.0",
+				"import-local": "^2.0.0",
+				"internal-ip": "^3.0.1",
+				"ip": "^1.1.5",
+				"killable": "^1.0.0",
+				"loglevel": "^1.4.1",
+				"opn": "^5.1.0",
+				"portfinder": "^1.0.9",
+				"schema-utils": "^1.0.0",
+				"selfsigned": "^1.9.1",
+				"semver": "^5.6.0",
+				"serve-index": "^1.7.2",
+				"sockjs": "0.3.19",
+				"sockjs-client": "1.3.0",
+				"spdy": "^4.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^5.1.0",
+				"url": "^0.11.0",
+				"webpack-dev-middleware": "3.4.0",
+				"webpack-log": "^2.0.0",
+				"yargs": "12.0.2"
 			},
 			"dependencies": {
-				"source-list-map": {
-					"version": "0.1.8",
-					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"decamelize": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+					"dev": true,
+					"requires": {
+						"xregexp": "4.0.0"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"source-map": {
-					"version": "0.4.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 					"dev": true,
 					"requires": {
-						"amdefine": ">=0.0.4"
+						"has-flag": "^3.0.0"
+					}
+				},
+				"webpack-dev-middleware": {
+					"version": "3.4.0",
+					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
+					"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
+					"dev": true,
+					"requires": {
+						"memory-fs": "~0.4.1",
+						"mime": "^2.3.1",
+						"range-parser": "^1.0.3",
+						"webpack-log": "^2.0.0"
+					}
+				},
+				"yargs": {
+					"version": "12.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
+					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+					"dev": true,
+					"requires": {
+						"cliui": "^4.0.0",
+						"decamelize": "^2.0.0",
+						"find-up": "^3.0.0",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^3.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1 || ^4.0.0",
+						"yargs-parser": "^10.1.0"
 					}
 				}
 			}
 		},
+		"webpack-log": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+			"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^3.0.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"webpack-merge": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
@@ -19899,6 +17076,15 @@
 				}
 			}
 		},
+		"webpack-subresource-integrity": {
+			"version": "1.1.0-rc.6",
+			"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
+			"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
+			"dev": true,
+			"requires": {
+				"webpack-core": "^0.6.8"
+			}
+		},
 		"websocket-driver": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
@@ -19930,9 +17116,10 @@
 			}
 		},
 		"which-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-			"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+			"dev": true
 		},
 		"wide-align": {
 			"version": "1.1.3",
@@ -19951,6 +17138,15 @@
 				"string-width": "^2.1.1"
 			}
 		},
+		"win-release": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
+			"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
+			"dev": true,
+			"requires": {
+				"semver": "^5.0.1"
+			}
+		},
 		"window-or-global": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/window-or-global/-/window-or-global-1.0.1.tgz",
@@ -19969,36 +17165,6 @@
 			"dev": true,
 			"requires": {
 				"execa": "^0.10.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"wordwrap": {
@@ -20007,6 +17173,15 @@
 			"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
 			"dev": true
 		},
+		"worker-farm": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+			"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+			"dev": true,
+			"requires": {
+				"errno": "~0.1.7"
+			}
+		},
 		"wrap-ansi": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -20087,6 +17262,11 @@
 			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
 			"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
 		},
+		"xmldom": {
+			"version": "0.1.27",
+			"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+			"integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+		},
 		"xmlhttprequest-ssl": {
 			"version": "1.5.5",
 			"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
@@ -20116,143 +17296,93 @@
 			"dev": true
 		},
 		"yargs": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-			"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-			"requires": {
-				"camelcase": "^3.0.0",
-				"cliui": "^3.2.0",
-				"decamelize": "^1.1.1",
-				"get-caller-file": "^1.0.1",
-				"os-locale": "^1.4.0",
-				"read-pkg-up": "^1.0.1",
+			"version": "13.2.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
+			"integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+			"dev": true,
+			"requires": {
+				"cliui": "^4.0.0",
+				"find-up": "^3.0.0",
+				"get-caller-file": "^2.0.1",
+				"os-locale": "^3.1.0",
 				"require-directory": "^2.1.1",
-				"require-main-filename": "^1.0.1",
+				"require-main-filename": "^2.0.0",
 				"set-blocking": "^2.0.0",
-				"string-width": "^1.0.2",
-				"which-module": "^1.0.0",
-				"y18n": "^3.2.1",
-				"yargs-parser": "^5.0.0"
+				"string-width": "^3.0.0",
+				"which-module": "^2.0.0",
+				"y18n": "^4.0.0",
+				"yargs-parser": "^13.0.0"
 			},
 			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					}
-				},
-				"find-up": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
 				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
+				"camelcase": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
+					"integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
+					"dev": true
 				},
-				"os-locale": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-					"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-					"requires": {
-						"lcid": "^1.0.0"
-					}
+				"get-caller-file": {
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+					"dev": true
 				},
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"requires": {
-						"pinkie-promise": "^2.0.0"
-					}
+				"require-main-filename": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+					"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+					"dev": true
 				},
-				"path-type": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-					"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-				},
-				"read-pkg": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-					"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"load-json-file": "^1.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^1.0.0"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"read-pkg-up": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-					"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-					"requires": {
-						"find-up": "^1.0.0",
-						"read-pkg": "^1.0.0"
-					}
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"yargs-parser": {
+					"version": "13.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
+					"integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
+					"dev": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"camelcase": "^5.0.0",
+						"decamelize": "^1.2.0"
 					}
 				}
 			}
 		},
 		"yargs-parser": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-			"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+			"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+			"dev": true,
 			"requires": {
-				"camelcase": "^3.0.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				}
+				"camelcase": "^4.1.0"
 			}
 		},
 		"yeast": {
@@ -20272,17 +17402,18 @@
 			"integrity": "sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g=="
 		},
 		"zen-observable-ts": {
-			"version": "0.8.15",
-			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz",
-			"integrity": "sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==",
+			"version": "0.8.18",
+			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz",
+			"integrity": "sha512-q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A==",
 			"requires": {
+				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"zone.js": {
-			"version": "0.8.29",
-			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
-			"integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.9.0.tgz",
+			"integrity": "sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q=="
 		}
 	}
 }

From 0d27878ceffbb36d46233d48d4b41f5d1c794854 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:32:20 +0000
Subject: [PATCH 044/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 0d790856b..5adf41b67 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -14,7 +14,7 @@
   resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
   integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
 
-"@angular-devkit/architect@0.13.6", "@angular-devkit/architect@^0.13.6":
+"@angular-devkit/architect@0.13.6":
   version "0.13.6"
   resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.6.tgz#7758ab9f288cfd4f64d8b88b0700bac5c4961d06"
   integrity sha512-Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw==
@@ -22,6 +22,14 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
+"@angular-devkit/architect@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
+  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
 "@angular-devkit/build-angular@^0.13.6":
   version "0.13.6"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.6.tgz#7050a0367bb7646961d0bdc36aa083a6f3029dea"
@@ -135,6 +143,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"

From c6a4061fe21755a66815c27a7c1670af63ec53a1 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:59:59 +0000
Subject: [PATCH 045/382] chore(package): update @angular-devkit/build-angular
 to version 0.13.7

---
 admin/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index dd97e5d0d..f55e0bc41 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -148,7 +148,7 @@
 	},
 	"devDependencies": {
 		"conventional-changelog-cli": "^2.0.11",
-		"@angular-devkit/build-angular": "^0.13.1",
+		"@angular-devkit/build-angular": "^0.13.7",
 		"@angular/cli": "^7.3.1",
 		"@angular/compiler-cli": "^7.2.4",
 		"@angular/language-service": "^7.2.4",

From 82de9bd0eef3cfe040602013fcbc8d456981ed7e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:00:02 +0000
Subject: [PATCH 046/382] chore(package): update @angular-devkit/build-angular
 to version 0.13.7

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 3d778b353..29489c603 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -158,7 +158,7 @@
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
 		"@angular-devkit/architect": "~0.13.6",
-		"@angular-devkit/build-angular": "~0.13.6",
+		"@angular-devkit/build-angular": "~0.13.7",
 		"@angular-devkit/core": "~7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
 		"@angular/cli": "^7.3.6",

From b142005e4e353a678c367ef45a428591eac49437 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:00:05 +0000
Subject: [PATCH 047/382] chore(package): update @angular-devkit/build-angular
 to version 0.13.7

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 3c8c2f2a1..9f18d6bd9 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -171,7 +171,7 @@
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
 		"@angular-devkit/architect": "^0.13.6",
-		"@angular-devkit/build-angular": "^0.13.6",
+		"@angular-devkit/build-angular": "^0.13.7",
 		"@angular-devkit/core": "^7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
 		"@angular/cli": "^7.3.6",

From 4305deda01bd907e75a07b410f1c4b093be448fa Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:00:08 +0000
Subject: [PATCH 048/382] chore(package): update @angular-devkit/build-angular
 to version 0.13.7

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 7dd9334e2..d19b4db8a 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -146,7 +146,7 @@
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
 		"@angular-devkit/architect": "~0.13.6",
-		"@angular-devkit/build-angular": "~0.13.6",
+		"@angular-devkit/build-angular": "~0.13.7",
 		"@angular-devkit/core": "~7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
 		"@angular/cli": "^7.3.6",

From 771136095e604b406f20d398bf4c171be57a98b9 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:00:11 +0000
Subject: [PATCH 049/382] chore(package): update @angular-devkit/build-angular
 to version 0.13.7

---
 shop/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 976f104e3..a857f6c02 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -161,7 +161,7 @@
 		"zone.js": "^0.8.29"
 	},
 	"devDependencies": {
-		"@angular-devkit/build-angular": "^0.13.4",
+		"@angular-devkit/build-angular": "^0.13.7",
 		"@angular-devkit/build-optimizer": "^0.13.4",
 		"@angular-extensions/testing-library": "^3.1.0",
 		"@angular/cli": "^7.3.4",

From acdfd234017707ce579e534872444db802e932e1 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:00:15 +0000
Subject: [PATCH 050/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18357 +++++++++++---------------
 1 file changed, 7744 insertions(+), 10613 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index a46cfc435..9dc333b9c 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -5,25 +5,27 @@
 	"requires": true,
 	"dependencies": {
 		"@angular-builders/custom-webpack": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.2.0.tgz",
-			"integrity": "sha512-m6K1T7rDofyxxxgRdAHEUfjbvu8G3RL3XKeAieDbbHSRhsptEAgYdBx5BpkW+xrrfgX5TWG6AZaEgfPNlJtbAA==",
+			"version": "7.4.3",
+			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.4.3.tgz",
+			"integrity": "sha512-dizPcKBSdgM8ztVbhOdVxHnfV/FBkTi1ZirsxWaw1B0S0KuPTESnsJaZA15i8Y2l202hCPs5fJfqy5aCoRrs1Q==",
+			"dev": true,
 			"requires": {
 				"lodash": "^4.17.10"
 			}
 		},
 		"@angular-builders/dev-server": {
-			"version": "7.2.1",
-			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.2.1.tgz",
-			"integrity": "sha512-hQZD/aB/jMq4Yf3+lkkGpU8OFAQwZ+S+422P+m2NkZ40+UXLsJpVzDRFMcL0GGObjwTxhxrmw6wFUk+2V5TwIg=="
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.3.1.tgz",
+			"integrity": "sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==",
+			"dev": true
 		},
 		"@angular-devkit/architect": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.0.tgz",
-			"integrity": "sha512-oDBrWlfKh/0t2ag4T8gz9xzPMItxfctinlsHxhw7dPQ+etq1mIcWgQkiKiDrz4l46YiGipBRlC55j+6f37omAA==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.7.tgz",
+			"integrity": "sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
+				"@angular-devkit/core": "7.3.7",
 				"rxjs": "6.3.3"
 			},
 			"dependencies": {
@@ -39,24 +41,23 @@
 			}
 		},
 		"@angular-devkit/build-angular": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.0.tgz",
-			"integrity": "sha512-JjoSXbmwOsuDJxngyChr6aOSZ2qsrvSL1MHwqgXhZswmC/KghBF0aZ7y8Wzr27zDCQ174Axts7+IAk6b+aWIqw==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz",
+			"integrity": "sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/build-optimizer": "0.13.0",
-				"@angular-devkit/build-webpack": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@ngtools/webpack": "7.3.0",
-				"ajv": "6.7.0",
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/build-optimizer": "0.13.7",
+				"@angular-devkit/build-webpack": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@ngtools/webpack": "7.3.7",
+				"ajv": "6.9.1",
 				"autoprefixer": "9.4.6",
 				"circular-dependency-plugin": "5.0.2",
 				"clean-css": "4.2.1",
 				"copy-webpack-plugin": "4.6.0",
 				"file-loader": "3.0.1",
 				"glob": "7.1.3",
-				"istanbul": "0.4.5",
 				"istanbul-instrumenter-loader": "3.0.1",
 				"karma-source-map-support": "1.3.0",
 				"less": "3.9.0",
@@ -77,12 +78,12 @@
 				"semver": "5.6.0",
 				"source-map-loader": "0.2.4",
 				"source-map-support": "0.5.10",
-				"speed-measure-webpack-plugin": "1.3.0",
+				"speed-measure-webpack-plugin": "1.3.1",
 				"stats-webpack-plugin": "0.7.0",
 				"style-loader": "0.23.1",
 				"stylus": "0.54.5",
 				"stylus-loader": "3.0.2",
-				"terser-webpack-plugin": "1.2.1",
+				"terser-webpack-plugin": "1.2.2",
 				"tree-kill": "1.2.1",
 				"webpack": "4.29.0",
 				"webpack-dev-middleware": "3.5.1",
@@ -92,2094 +93,1378 @@
 				"webpack-subresource-integrity": "1.1.0-rc.6"
 			},
 			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.0.tgz",
-					"integrity": "sha512-fhWuzbMVV/UNYE7rHSKutrWTCZle34N5cdtFz6qhK1k/wn7Vmtg9cFOwzx0SPdIlOEn576NB4DS/4UG3B5WCUQ==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "1.2.3",
-						"source-map": "0.5.6",
-						"typescript": "3.2.4",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"@angular-devkit/build-webpack": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.0.tgz",
-					"integrity": "sha512-idtFoSbQ3Y3WqXlDlU7oTPV9TIU1kjLqce0nK1Kst+t40GTc+Q4iUJJ7KsKE3nV6TPyrL1N/IvIF7+hSJnYm8A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/architect": "0.13.0",
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
-					}
-				},
-				"@ngtools/webpack": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.0.tgz",
-					"integrity": "sha512-U/By0Jlwy7nYwrGNtFirTg1aAsEHBL/9DhfFxPI0iu27FWiMttROuN6hmKbbnOmpbiYAVl5qTy3WXPXUIJjG1A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"enhanced-resolve": "4.1.0",
-						"rxjs": "6.3.3",
-						"tree-kill": "1.2.1",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"abbrev": {
-					"version": "1.0.9",
-					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-					"integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
 				"cacache": {
-					"version": "10.0.4",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-					"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"bluebird": "^3.5.1",
-						"chownr": "^1.0.1",
-						"glob": "^7.1.2",
-						"graceful-fs": "^4.1.11",
-						"lru-cache": "^4.1.1",
-						"mississippi": "^2.0.0",
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
 						"mkdirp": "^0.5.1",
 						"move-concurrently": "^1.0.1",
 						"promise-inflight": "^1.0.1",
 						"rimraf": "^2.6.2",
-						"ssri": "^5.2.4",
-						"unique-filename": "^1.1.0",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
 						"y18n": "^4.0.0"
 					}
 				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
 				},
-				"cliui": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 					"dev": true,
 					"requires": {
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"yallist": "^3.0.2"
 					}
 				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
 					}
 				},
-				"copy-webpack-plugin": {
-					"version": "4.6.0",
-					"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
-					"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"cacache": "^10.0.4",
-						"find-cache-dir": "^1.0.0",
-						"globby": "^7.1.1",
-						"is-glob": "^4.0.0",
-						"loader-utils": "^1.1.0",
-						"minimatch": "^3.0.4",
-						"p-limit": "^1.0.0",
-						"serialize-javascript": "^1.4.0"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
 					}
 				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
+				"parse5": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+					"dev": true
 				},
-				"decamelize": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-					"dev": true,
-					"requires": {
-						"xregexp": "4.0.0"
-					}
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
 				},
-				"del": {
+				"pkg-dir": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-					"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
 					"dev": true,
 					"requires": {
-						"globby": "^6.1.0",
-						"is-path-cwd": "^1.0.0",
-						"is-path-in-cwd": "^1.0.0",
-						"p-map": "^1.1.1",
-						"pify": "^3.0.0",
-						"rimraf": "^2.2.8"
-					},
-					"dependencies": {
-						"globby": {
-							"version": "6.1.0",
-							"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-							"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-							"dev": true,
-							"requires": {
-								"array-union": "^1.0.1",
-								"glob": "^7.0.3",
-								"object-assign": "^4.0.1",
-								"pify": "^2.0.0",
-								"pinkie-promise": "^2.0.0"
-							},
-							"dependencies": {
-								"pify": {
-									"version": "2.3.0",
-									"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-									"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-									"dev": true
-								}
-							}
-						}
+						"find-up": "^3.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.8.1",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-					"integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"esprima": "^2.7.1",
-						"estraverse": "^1.9.1",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.2.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.2.0",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-							"integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"tslib": "^1.9.0"
 					}
 				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
 					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
+						"figgy-pudding": "^3.5.1"
 					}
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"terser-webpack-plugin": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz",
+					"integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"file-loader": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
-					"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.0.2",
-						"schema-utils": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
+						"cacache": "^11.0.2",
+						"find-cache-dir": "^2.0.0",
+						"schema-utils": "^1.0.0",
+						"serialize-javascript": "^1.4.0",
+						"source-map": "^0.6.1",
+						"terser": "^3.16.1",
+						"webpack-sources": "^1.1.0",
+						"worker-farm": "^1.5.2"
 					}
 				},
-				"has-flag": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
 					"dev": true
-				},
-				"http-signature": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-					"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+				}
+			}
+		},
+		"@angular-devkit/build-optimizer": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz",
+			"integrity": "sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "1.2.3",
+				"source-map": "0.5.6",
+				"typescript": "3.2.4",
+				"webpack-sources": "1.3.0"
+			}
+		},
+		"@angular-devkit/build-webpack": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz",
+			"integrity": "sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"assert-plus": "^1.0.0",
-						"jsprim": "^1.2.2",
-						"sshpk": "^1.7.0"
+						"tslib": "^1.9.0"
 					}
-				},
-				"invert-kv": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-					"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-					"dev": true
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				}
+			}
+		},
+		"@angular-devkit/core": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+			"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+			"dev": true,
+			"requires": {
+				"ajv": "6.9.1",
+				"chokidar": "2.0.4",
+				"fast-json-stable-stringify": "2.0.0",
+				"rxjs": "6.3.3",
+				"source-map": "0.7.3"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				}
+			}
+		},
+		"@angular-devkit/schematics": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+			"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"tslib": "^1.9.0"
 					}
-				},
-				"istanbul": {
-					"version": "0.4.5",
-					"resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-					"integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-					"dev": true,
-					"requires": {
-						"abbrev": "1.0.x",
-						"async": "1.x",
-						"escodegen": "1.8.x",
-						"esprima": "2.7.x",
-						"glob": "^5.0.15",
-						"handlebars": "^4.0.1",
-						"js-yaml": "3.x",
-						"mkdirp": "0.5.x",
-						"nopt": "3.x",
-						"once": "1.x",
-						"resolve": "1.1.x",
-						"supports-color": "^3.1.0",
-						"which": "^1.1.1",
-						"wordwrap": "^1.0.0"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "5.0.15",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-							"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-							"dev": true,
-							"requires": {
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "2 || 3",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						}
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"lcid": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-					"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+				}
+			}
+		},
+		"@angular/animations": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.11.tgz",
+			"integrity": "sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/cli": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.7.tgz",
+			"integrity": "sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"@schematics/update": "0.13.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"inquirer": "6.2.1",
+				"npm-package-arg": "6.1.0",
+				"opn": "5.4.0",
+				"pacote": "9.4.0",
+				"semver": "5.6.0",
+				"symbol-observable": "1.2.0"
+			}
+		},
+		"@angular/common": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.11.tgz",
+			"integrity": "sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.11.tgz",
+			"integrity": "sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler-cli": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz",
+			"integrity": "sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==",
+			"dev": true,
+			"requires": {
+				"canonical-path": "1.0.0",
+				"chokidar": "^2.1.1",
+				"convert-source-map": "^1.5.1",
+				"dependency-graph": "^0.7.2",
+				"magic-string": "^0.25.0",
+				"minimist": "^1.2.0",
+				"reflect-metadata": "^0.1.2",
+				"shelljs": "^0.8.1",
+				"source-map": "^0.6.1",
+				"tslib": "^1.9.0",
+				"yargs": "9.0.1"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"invert-kv": "^2.0.0"
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"less": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
-					"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
 					"dev": true,
 					"requires": {
-						"clone": "^2.1.2",
-						"errno": "^0.1.1",
-						"graceful-fs": "^4.1.2",
-						"image-size": "~0.5.0",
-						"mime": "^1.4.1",
-						"mkdirp": "^0.5.0",
-						"promise": "^7.1.1",
-						"request": "^2.83.0",
-						"source-map": "~0.6.0"
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
 					},
 					"dependencies": {
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 							"dev": true,
-							"optional": true
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
 						}
 					}
 				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+				"cross-spawn": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
 					"dev": true,
 					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
+						"lru-cache": "^4.0.1",
+						"shebang-command": "^1.2.0",
+						"which": "^1.2.9"
 					}
 				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+				"execa": {
+					"version": "0.7.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"cross-spawn": "^5.0.1",
+						"get-stream": "^3.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
 					}
 				},
-				"mini-css-extract-plugin": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
-					"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+				"invert-kv": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0",
-						"webpack-sources": "^1.1.0"
+						"number-is-nan": "^1.0.0"
 					}
 				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				"mem": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"mimic-fn": "^1.0.0"
 					}
 				},
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+					"dev": true
+				},
 				"os-locale": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-					"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
 					"dev": true,
 					"requires": {
-						"execa": "^1.0.0",
-						"lcid": "^2.0.0",
-						"mem": "^4.0.0"
+						"execa": "^0.7.0",
+						"lcid": "^1.0.0",
+						"mem": "^1.1.0"
 					}
 				},
-				"parse5": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
 				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+					"dev": true
 				},
-				"raw-loader": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
-					"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+				"yargs": {
+					"version": "9.0.1",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
+					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0"
+						"camelcase": "^4.1.0",
+						"cliui": "^3.2.0",
+						"decamelize": "^1.1.1",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^2.0.0",
+						"read-pkg-up": "^2.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1",
+						"yargs-parser": "^7.0.0"
 					}
 				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"yargs-parser": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
 					"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"
+						"camelcase": "^4.1.0"
 					}
-				},
-				"request": {
-					"version": "2.88.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-					"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"aws-sign2": "~0.7.0",
-						"aws4": "^1.8.0",
-						"caseless": "~0.12.0",
-						"combined-stream": "~1.0.6",
-						"extend": "~3.0.2",
-						"forever-agent": "~0.6.1",
-						"form-data": "~2.3.2",
-						"har-validator": "~5.1.0",
-						"http-signature": "~1.2.0",
-						"is-typedarray": "~1.0.0",
-						"isstream": "~0.1.2",
-						"json-stringify-safe": "~5.0.1",
-						"mime-types": "~2.1.19",
-						"oauth-sign": "~0.9.0",
-						"performance-now": "^2.1.0",
-						"qs": "~6.5.2",
-						"safe-buffer": "^5.1.2",
-						"tough-cookie": "~2.4.3",
-						"tunnel-agent": "^0.6.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"sockjs": {
-					"version": "0.3.19",
-					"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-					"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
-					"dev": true,
-					"requires": {
-						"faye-websocket": "^0.10.0",
-						"uuid": "^3.0.1"
-					}
-				},
-				"sockjs-client": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-					"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.2.5",
-						"eventsource": "^1.0.7",
-						"faye-websocket": "~0.11.1",
-						"inherits": "^2.0.3",
-						"json3": "^3.3.2",
-						"url-parse": "^1.4.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"faye-websocket": {
-							"version": "0.11.1",
-							"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-							"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-							"dev": true,
-							"requires": {
-								"websocket-driver": ">=0.5.1"
-							}
-						}
-					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"spdy": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
-					"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"handle-thing": "^2.0.0",
-						"http-deceiver": "^1.2.7",
-						"select-hose": "^2.0.0",
-						"spdy-transport": "^3.0.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"spdy-transport": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-					"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"detect-node": "^2.0.4",
-						"hpack.js": "^2.1.6",
-						"obuf": "^1.1.2",
-						"readable-stream": "^3.0.6",
-						"wbuf": "^1.7.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"readable-stream": {
-							"version": "3.1.1",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-							"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-							"dev": true,
-							"requires": {
-								"inherits": "^2.0.3",
-								"string_decoder": "^1.1.1",
-								"util-deprecate": "^1.0.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,
+				}
+			}
+		},
+		"@angular/core": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.11.tgz",
+			"integrity": "sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/forms": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.11.tgz",
+			"integrity": "sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/http": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.11.tgz",
+			"integrity": "sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/language-service": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.11.tgz",
+			"integrity": "sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==",
+			"dev": true
+		},
+		"@angular/platform-browser": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.11.tgz",
+			"integrity": "sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/platform-browser-dynamic": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz",
+			"integrity": "sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/pwa": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.7.tgz",
+			"integrity": "sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==",
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"parse5-html-rewriting-stream": "5.1.0",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
 					}
 				},
-				"stylus": {
-					"version": "0.54.5",
-					"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
-					"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
-					"dev": true,
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
 					"requires": {
-						"css-parse": "1.7.x",
-						"debug": "*",
-						"glob": "7.0.x",
-						"mkdirp": "0.5.x",
-						"sax": "0.5.x",
-						"source-map": "0.1.x"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "7.0.6",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-							"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-							"dev": true,
-							"requires": {
-								"fs.realpath": "^1.0.0",
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "^3.0.2",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.1.43",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-							"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
 					}
 				},
-				"stylus-loader": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-					"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
-					"dev": true,
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"requires": {
-						"loader-utils": "^1.0.2",
-						"lodash.clonedeep": "^4.5.0",
-						"when": "~3.6.x"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"supports-color": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"requires": {
-						"has-flag": "^1.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"terser-webpack-plugin": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz",
-					"integrity": "sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==",
-					"dev": true,
-					"requires": {
-						"cacache": "^11.0.2",
-						"find-cache-dir": "^2.0.0",
-						"schema-utils": "^1.0.0",
-						"serialize-javascript": "^1.4.0",
-						"source-map": "^0.6.1",
-						"terser": "^3.8.1",
-						"webpack-sources": "^1.1.0",
-						"worker-farm": "^1.5.2"
-					},
-					"dependencies": {
-						"cacache": {
-							"version": "11.3.2",
-							"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-							"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-							"dev": true,
-							"requires": {
-								"bluebird": "^3.5.3",
-								"chownr": "^1.1.1",
-								"figgy-pudding": "^3.5.1",
-								"glob": "^7.1.3",
-								"graceful-fs": "^4.1.15",
-								"lru-cache": "^5.1.1",
-								"mississippi": "^3.0.0",
-								"mkdirp": "^0.5.1",
-								"move-concurrently": "^1.0.1",
-								"promise-inflight": "^1.0.1",
-								"rimraf": "^2.6.2",
-								"ssri": "^6.0.1",
-								"unique-filename": "^1.1.1",
-								"y18n": "^4.0.0"
-							}
-						},
-						"find-cache-dir": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
-							"integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
-							"dev": true,
-							"requires": {
-								"commondir": "^1.0.1",
-								"make-dir": "^1.0.0",
-								"pkg-dir": "^3.0.0"
-							}
-						},
-						"lru-cache": {
-							"version": "5.1.1",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-							"dev": true,
-							"requires": {
-								"yallist": "^3.0.2"
-							}
-						},
-						"mississippi": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-							"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-							"dev": true,
-							"requires": {
-								"concat-stream": "^1.5.0",
-								"duplexify": "^3.4.2",
-								"end-of-stream": "^1.1.0",
-								"flush-write-stream": "^1.0.0",
-								"from2": "^2.1.0",
-								"parallel-transform": "^1.1.0",
-								"pump": "^3.0.0",
-								"pumpify": "^1.3.3",
-								"stream-each": "^1.1.0",
-								"through2": "^2.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-							"dev": true
-						},
-						"ssri": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-							"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-							"dev": true,
-							"requires": {
-								"figgy-pudding": "^3.5.1"
-							}
-						}
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
+			}
+		},
+		"@angular/router": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.11.tgz",
+			"integrity": "sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/service-worker": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
+			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@babel/code-frame": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.0.0"
+			}
+		},
+		"@babel/generator": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
+			"integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0",
+				"jsesc": "^2.5.1",
+				"lodash": "^4.17.11",
+				"source-map": "^0.5.0",
+				"trim-right": "^1.0.1"
+			},
+			"dependencies": {
+				"jsesc": {
+					"version": "2.5.2",
+					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.0.0",
+				"@babel/template": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+			"integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/highlight": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.0.0",
+				"esutils": "^2.0.2",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"js-tokens": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/parser": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz",
+			"integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==",
+			"dev": true
+		},
+		"@babel/runtime": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
+			"integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+			"dev": true,
+			"requires": {
+				"regenerator-runtime": "^0.13.2"
+			},
+			"dependencies": {
+				"regenerator-runtime": {
+					"version": "0.13.2",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+					"integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/template": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz",
+			"integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
+			"integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/generator": "^7.4.0",
+				"@babel/helper-function-name": "^7.1.0",
+				"@babel/helper-split-export-declaration": "^7.4.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0",
+				"lodash": "^4.17.11"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
 					}
 				},
-				"webpack": {
-					"version": "4.29.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
-					"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+				"globals": {
+					"version": "11.11.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+					"integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/types": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+			"integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2",
+				"lodash": "^4.17.11",
+				"to-fast-properties": "^2.0.0"
+			},
+			"dependencies": {
+				"to-fast-properties": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/compodoc": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.9.tgz",
+			"integrity": "sha512-LFdbF/fO9qOGgdrCHg4irMBrl3sD8ySIlL6XabFAz8QbUdf2+77xOVnZJ/PYdcuI8h8vXo4UGS7MFg0pDR2jsw==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-transformer": "^2.0.0",
+				"chalk": "^2.4.2",
+				"cheerio": "^1.0.0-rc.2",
+				"chokidar": "^2.1.2",
+				"colors": "^1.3.3",
+				"commander": "^2.19.0",
+				"cosmiconfig": "^5.1.0",
+				"fancy-log": "^1.3.3",
+				"findit2": "^2.2.3",
+				"fs-extra": "^7.0.1",
+				"glob": "^7.1.3",
+				"handlebars": "^4.1.0",
+				"html-entities": "^1.2.1",
+				"i18next": "^15.0.4",
+				"inside": "^1.0.0",
+				"json5": "^2.1.0",
+				"live-server": "^1.2.1",
+				"lodash": "^4.17.11",
+				"lunr": "^2.3.6",
+				"marked": "^0.6.1",
+				"minimist": "^1.2.0",
+				"opencollective": "^1.0.3",
+				"os-name": "^3.0.0",
+				"pdfmake": "^0.1.53",
+				"semver": "^5.6.0",
+				"traverse": "^0.6.6",
+				"ts-simple-ast": "12.4.0",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"@webassemblyjs/ast": "1.7.11",
-						"@webassemblyjs/helper-module-context": "1.7.11",
-						"@webassemblyjs/wasm-edit": "1.7.11",
-						"@webassemblyjs/wasm-parser": "1.7.11",
-						"acorn": "^6.0.5",
-						"acorn-dynamic-import": "^4.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"chrome-trace-event": "^1.0.0",
-						"enhanced-resolve": "^4.1.0",
-						"eslint-scope": "^4.0.0",
-						"json-parse-better-errors": "^1.0.2",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"micromatch": "^3.1.8",
-						"mkdirp": "~0.5.0",
-						"neo-async": "^2.5.0",
-						"node-libs-browser": "^2.0.0",
-						"schema-utils": "^0.4.4",
-						"tapable": "^1.1.0",
-						"terser-webpack-plugin": "^1.1.0",
-						"watchpack": "^1.5.0",
-						"webpack-sources": "^1.3.0"
-					},
-					"dependencies": {
-						"schema-utils": {
-							"version": "0.4.7",
-							"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-							"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-							"dev": true,
-							"requires": {
-								"ajv": "^6.1.0",
-								"ajv-keywords": "^3.1.0"
-							}
-						}
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"webpack-dev-middleware": {
-					"version": "3.5.1",
-					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
-					"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+				"cosmiconfig": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.0.tgz",
+					"integrity": "sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==",
 					"dev": true,
 					"requires": {
-						"memory-fs": "~0.4.1",
-						"mime": "^2.3.1",
-						"range-parser": "^1.0.3",
-						"webpack-log": "^2.0.0"
-					},
-					"dependencies": {
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						}
+						"import-fresh": "^2.0.0",
+						"is-directory": "^0.3.1",
+						"js-yaml": "^3.13.0",
+						"parse-json": "^4.0.0"
 					}
 				},
-				"webpack-dev-server": {
-					"version": "3.1.14",
-					"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
-					"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
+				"js-yaml": {
+					"version": "3.13.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+					"integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
 					"dev": true,
 					"requires": {
-						"ansi-html": "0.0.7",
-						"bonjour": "^3.5.0",
-						"chokidar": "^2.0.0",
-						"compression": "^1.5.2",
-						"connect-history-api-fallback": "^1.3.0",
-						"debug": "^3.1.0",
-						"del": "^3.0.0",
-						"express": "^4.16.2",
-						"html-entities": "^1.2.0",
-						"http-proxy-middleware": "~0.18.0",
-						"import-local": "^2.0.0",
-						"internal-ip": "^3.0.1",
-						"ip": "^1.1.5",
-						"killable": "^1.0.0",
-						"loglevel": "^1.4.1",
-						"opn": "^5.1.0",
-						"portfinder": "^1.0.9",
-						"schema-utils": "^1.0.0",
-						"selfsigned": "^1.9.1",
-						"semver": "^5.6.0",
-						"serve-index": "^1.7.2",
-						"sockjs": "0.3.19",
-						"sockjs-client": "1.3.0",
-						"spdy": "^4.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^5.1.0",
-						"url": "^0.11.0",
-						"webpack-dev-middleware": "3.4.0",
-						"webpack-log": "^2.0.0",
-						"yargs": "12.0.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-							"dev": true
-						},
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						},
-						"webpack-dev-middleware": {
-							"version": "3.4.0",
-							"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
-							"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
-							"dev": true,
-							"requires": {
-								"memory-fs": "~0.4.1",
-								"mime": "^2.3.1",
-								"range-parser": "^1.0.3",
-								"webpack-log": "^2.0.0"
-							}
-						}
-					}
-				},
-				"webpack-log": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-					"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-					"dev": true,
-					"requires": {
-						"ansi-colors": "^3.0.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"webpack-subresource-integrity": {
-					"version": "1.1.0-rc.6",
-					"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
-					"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
-					"dev": true,
-					"requires": {
-						"webpack-core": "^0.6.8"
+						"argparse": "^1.0.7",
+						"esprima": "^4.0.0"
 					}
 				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 					"dev": true
 				},
-				"worker-farm": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-					"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
-					"dev": true,
-					"requires": {
-						"errno": "~0.1.7"
-					}
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
 					"dev": true
-				},
-				"yargs": {
-					"version": "12.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
-					"dev": true,
-					"requires": {
-						"cliui": "^4.0.0",
-						"decamelize": "^2.0.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^3.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1 || ^4.0.0",
-						"yargs-parser": "^10.1.0"
-					}
-				},
-				"yargs-parser": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-					"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					}
 				}
 			}
 		},
-		"@angular-devkit/core": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-			"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+		"@compodoc/ngd-core": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
+			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
 			"dev": true,
 			"requires": {
-				"ajv": "6.7.0",
-				"chokidar": "2.0.4",
-				"fast-json-stable-stringify": "2.0.0",
-				"rxjs": "6.3.3",
-				"source-map": "0.7.3"
+				"ansi-colors": "^1.0.1",
+				"fancy-log": "^1.3.2",
+				"typescript": "^2.4.2"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"ansi-colors": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ansi-wrap": "^0.1.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"typescript": {
+					"version": "2.9.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/ngd-transformer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
+			"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-core": "~2.0.0",
+				"dot": "^1.1.1",
+				"fs-extra": "^4.0.1",
+				"viz.js": "^1.8.0"
+			},
+			"dependencies": {
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				}
 			}
 		},
-		"@angular-devkit/schematics": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-			"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+		"@dsherret/to-absolute-glob": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"rxjs": "6.3.3"
+				"is-absolute": "^1.0.0",
+				"is-negated-glob": "^1.0.0"
+			}
+		},
+		"@ionic-native/barcode-scanner": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz",
+			"integrity": "sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/animations": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.3.tgz",
-			"integrity": "sha512-5WoiDnVS2OhGgJ1oepFNF2UcfR4sJj97KRnTmLWQ0S4N4WpXX83CoOQVXvXwfotyb8uNtl4zRi2NuvN/MIuFuA==",
+		"@ionic-native/call-number": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.3.0.tgz",
+			"integrity": "sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/cli": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.0.tgz",
-			"integrity": "sha512-6+NoHsW1MYG7GBHUg71zaWIFeIRps/SVksCmRFCpW0RXqErCQmzf0GZuDTZZ2Yo4RzU01150sVp1R8wEvEZfZQ==",
-			"dev": true,
+		"@ionic-native/camera": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.3.0.tgz",
+			"integrity": "sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==",
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"@schematics/update": "0.13.0",
-				"@yarnpkg/lockfile": "1.1.0",
-				"ini": "1.3.5",
-				"inquirer": "6.2.1",
-				"npm-package-arg": "6.1.0",
-				"opn": "5.4.0",
-				"pacote": "9.4.0",
-				"semver": "5.6.0",
-				"symbol-observable": "1.2.0"
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					}
-				},
-				"@schematics/update": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.0.tgz",
-					"integrity": "sha512-HGpZdIL/0w46UyaxpnIAg6SBwzKfaRixHIEihmgJUqA0DG8GZUixRPr1L0YIWC1EZ81cQ+yWL85XhkKBYR+wQg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"@yarnpkg/lockfile": "1.1.0",
-						"ini": "1.3.5",
-						"pacote": "9.4.0",
-						"rxjs": "6.3.3",
-						"semver": "5.6.0",
-						"semver-intersect": "1.4.0"
-					}
-				},
-				"cacache": {
-					"version": "11.3.2",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"chownr": "^1.1.1",
-						"figgy-pudding": "^3.5.1",
-						"glob": "^7.1.3",
-						"graceful-fs": "^4.1.15",
-						"lru-cache": "^5.1.1",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"move-concurrently": "^1.0.1",
-						"promise-inflight": "^1.0.1",
-						"rimraf": "^2.6.2",
-						"ssri": "^6.0.1",
-						"unique-filename": "^1.1.1",
-						"y18n": "^4.0.0"
-					}
-				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"make-fetch-happen": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
-					"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
-					"dev": true,
-					"requires": {
-						"agentkeepalive": "^3.4.1",
-						"cacache": "^11.0.1",
-						"http-cache-semantics": "^3.8.1",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"mississippi": "^3.0.0",
-						"node-fetch-npm": "^2.0.2",
-						"promise-retry": "^1.1.1",
-						"socks-proxy-agent": "^4.0.0",
-						"ssri": "^6.0.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"mississippi": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-					"dev": true,
-					"requires": {
-						"concat-stream": "^1.5.0",
-						"duplexify": "^3.4.2",
-						"end-of-stream": "^1.1.0",
-						"flush-write-stream": "^1.0.0",
-						"from2": "^2.1.0",
-						"parallel-transform": "^1.1.0",
-						"pump": "^3.0.0",
-						"pumpify": "^1.3.3",
-						"stream-each": "^1.1.0",
-						"through2": "^2.0.0"
-					}
-				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"npm-package-arg": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
-					"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.6.0",
-						"osenv": "^0.1.5",
-						"semver": "^5.5.0",
-						"validate-npm-package-name": "^3.0.0"
-					}
-				},
-				"npm-pick-manifest": {
-					"version": "2.2.3",
-					"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
-					"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1",
-						"npm-package-arg": "^6.0.0",
-						"semver": "^5.4.1"
-					}
-				},
-				"npm-registry-fetch": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
-					"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
-					"dev": true,
-					"requires": {
-						"JSONStream": "^1.3.4",
-						"bluebird": "^3.5.1",
-						"figgy-pudding": "^3.4.1",
-						"lru-cache": "^4.1.3",
-						"make-fetch-happen": "^4.0.1",
-						"npm-package-arg": "^6.1.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"pacote": {
-					"version": "9.4.0",
-					"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
-					"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"cacache": "^11.3.2",
-						"figgy-pudding": "^3.5.1",
-						"get-stream": "^4.1.0",
-						"glob": "^7.1.3",
-						"lru-cache": "^5.1.1",
-						"make-fetch-happen": "^4.0.1",
-						"minimatch": "^3.0.4",
-						"minipass": "^2.3.5",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"normalize-package-data": "^2.4.0",
-						"npm-package-arg": "^6.1.0",
-						"npm-packlist": "^1.1.12",
-						"npm-pick-manifest": "^2.2.3",
-						"npm-registry-fetch": "^3.8.0",
-						"osenv": "^0.1.5",
-						"promise-inflight": "^1.0.1",
-						"promise-retry": "^1.1.1",
-						"protoduck": "^5.0.1",
-						"rimraf": "^2.6.2",
-						"safe-buffer": "^5.1.2",
-						"semver": "^5.6.0",
-						"ssri": "^6.0.1",
-						"tar": "^4.4.8",
-						"unique-filename": "^1.1.1",
-						"which": "^1.3.1"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"ssri": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1"
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
-					}
-				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-					"dev": true
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-					"dev": true
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/common": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.3.tgz",
-			"integrity": "sha512-VZOTZdvkitaKEhkxL6daHxPcKqAFwNJm0U4NFB4LRP9KspsFTE60QFVB63o129PTIH9iOQ2D3HRKSRl4o78ZKg==",
+		"@ionic-native/core": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.3.0.tgz",
+			"integrity": "sha512-oIsBvkB/Q63bjKvHGW7zAFMWSXIwnZ/U962UFyuqrF9dKvNSPI5cz8iPOaqKE+jzb2XhlcGKEbp5qAhTI0BcZQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.3.tgz",
-			"integrity": "sha512-UM6n4MyZkR5+VVjlwhLH8IfqdWBkdFcF5at4ckJXOJ/gkIUq97irbis9pGj1b0TO7MAl8uhF4b68xe5lk8b49g==",
-			"dev": true,
+		"@ionic-native/device": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.3.0.tgz",
+			"integrity": "sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler-cli": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.3.tgz",
-			"integrity": "sha512-31hcfTrU2GW66cvvaS629dNVPfiUrUWPncI28optvmKHBaH0mFqkdYNgabuslsXZV5AeidKMUJvR7GITjtvkQA==",
+		"@ionic-native/dialogs": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.3.0.tgz",
+			"integrity": "sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/geolocation": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.3.0.tgz",
+			"integrity": "sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/globalization": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.3.0.tgz",
+			"integrity": "sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-analytics": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz",
+			"integrity": "sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-maps": {
+			"version": "5.0.0-beta.26",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
+			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			}
+		},
+		"@ionic-native/in-app-browser": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz",
+			"integrity": "sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/intercom": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.3.0.tgz",
+			"integrity": "sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/local-notifications": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz",
+			"integrity": "sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/mixpanel": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz",
+			"integrity": "sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/network": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.3.0.tgz",
+			"integrity": "sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/splash-screen": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz",
+			"integrity": "sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/status-bar": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.3.0.tgz",
+			"integrity": "sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/unique-device-id": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz",
+			"integrity": "sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/vibration": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.3.0.tgz",
+			"integrity": "sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic/angular": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.1.2.tgz",
+			"integrity": "sha512-GVdtpPekPjAYo/3IiRg/EoVRw1/9RwW07ITW6TRorcX1XOPJlrRXVcQyWFTbHRD9TOikgE1XmMQd/+1Lk0TQFw==",
+			"requires": {
+				"@ionic/core": "4.1.2",
+				"tslib": "^1.9.3"
+			}
+		},
+		"@ionic/angular-toolkit": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.5.0.tgz",
+			"integrity": "sha512-KHUu7MHi+s1LKox+EBOSN6HO6Sk79qOmBIMGHQMboPbqHGzb5aqCbTmtwa/BJZ1kytZ+yQ8kEejv8YwvrJIZEQ==",
 			"dev": true,
 			"requires": {
-				"canonical-path": "1.0.0",
-				"chokidar": "^1.4.2",
-				"convert-source-map": "^1.5.1",
-				"dependency-graph": "^0.7.2",
-				"magic-string": "^0.25.0",
-				"minimist": "^1.2.0",
-				"reflect-metadata": "^0.1.2",
-				"shelljs": "^0.8.1",
-				"source-map": "^0.6.1",
+				"@schematics/angular": "^7.0.3",
 				"tslib": "^1.9.0",
-				"yargs": "9.0.1"
+				"typescript": "~3.3.3333",
+				"ws": "^6.1.4"
 			},
 			"dependencies": {
-				"anymatch": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-					"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-					"dev": true,
-					"requires": {
-						"micromatch": "^2.1.5",
-						"normalize-path": "^2.0.0"
-					}
-				},
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+				"typescript": {
+					"version": "3.3.4000",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz",
+					"integrity": "sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==",
 					"dev": true
 				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"chokidar": {
-					"version": "1.7.0",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-					"integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-					"dev": true,
-					"requires": {
-						"anymatch": "^1.3.0",
-						"async-each": "^1.0.0",
-						"fsevents": "^1.0.0",
-						"glob-parent": "^2.0.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^2.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0"
-					}
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+				"ws": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+					"integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
 					"dev": true,
 					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"string-width": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-							"dev": true,
-							"requires": {
-								"code-point-at": "^1.0.0",
-								"is-fullwidth-code-point": "^1.0.0",
-								"strip-ansi": "^3.0.0"
-							}
-						}
+						"async-limiter": "~1.0.0"
 					}
-				},
+				}
+			}
+		},
+		"@ionic/app-scripts": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.3.tgz",
+			"integrity": "sha512-t1kL9NqY/sVLfAIVKfN4VJigPqMWs5euKxig3sjsrakSQ9z4njmbDghzAC4taefIpYxLGMOeWgKwrrxOiLkdWQ==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/build-optimizer": "0.0.35",
+				"autoprefixer": "^7.2.6",
+				"chalk": "^2.4.0",
+				"chokidar": "^2.0.4",
+				"clean-css": "^4.1.11",
+				"cross-spawn": "^5.1.0",
+				"dotenv-webpack": "^1.5.7",
+				"express": "^4.16.3",
+				"fs-extra": "^4.0.2",
+				"glob": "^7.1.2",
+				"json-loader": "^0.5.7",
+				"node-sass": "^4.10.0",
+				"os-name": "^2.0.1",
+				"postcss": "^6.0.21",
+				"proxy-middleware": "^0.15.0",
+				"reflect-metadata": "^0.1.10",
+				"rollup": "0.50.0",
+				"rollup-plugin-commonjs": "8.2.6",
+				"rollup-plugin-node-resolve": "3.0.0",
+				"source-map": "^0.6.1",
+				"tiny-lr": "^1.1.1",
+				"tslint": "^5.8.0",
+				"tslint-eslint-rules": "^4.1.1",
+				"uglify-es": "3.2.2",
+				"webpack": "3.12.0",
+				"ws": "3.3.2",
+				"xml2js": "^0.4.19"
+			},
+			"dependencies": {
+				"@angular-devkit/build-optimizer": {
+					"version": "0.0.35",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
+					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
+					"dev": true,
+					"requires": {
+						"loader-utils": "^1.1.0",
+						"source-map": "^0.5.6",
+						"typescript": "~2.6.1",
+						"webpack-sources": "^1.0.1"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
+					}
+				},
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"acorn-dynamic-import": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+					"dev": true,
+					"requires": {
+						"acorn": "^4.0.3"
+					},
+					"dependencies": {
+						"acorn": {
+							"version": "4.0.13",
+							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+							"dev": true
+						}
+					}
+				},
+				"autoprefixer": {
+					"version": "7.2.6",
+					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+					"dev": true,
+					"requires": {
+						"browserslist": "^2.11.3",
+						"caniuse-lite": "^1.0.30000805",
+						"normalize-range": "^0.1.2",
+						"num2fraction": "^1.2.2",
+						"postcss": "^6.0.17",
+						"postcss-value-parser": "^3.2.3"
+					}
+				},
+				"browserslist": {
+					"version": "2.11.3",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30000792",
+						"electron-to-chromium": "^1.3.30"
+					}
+				},
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+					"dev": true,
+					"requires": {
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
+					},
+					"dependencies": {
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+							"dev": true,
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
+						}
+					}
+				},
+				"commander": {
+					"version": "2.12.2",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
+					"dev": true
+				},
 				"cross-spawn": {
 					"version": "5.1.0",
 					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -2191,6 +1476,18 @@
 						"which": "^1.2.9"
 					}
 				},
+				"enhanced-resolve": {
+					"version": "3.4.1",
+					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"memory-fs": "^0.4.0",
+						"object-assign": "^4.0.1",
+						"tapable": "^0.2.7"
+					}
+				},
 				"execa": {
 					"version": "0.7.0",
 					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
@@ -2206,46 +1503,21 @@
 						"strip-eof": "^1.0.0"
 					}
 				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				},
-				"is-extglob": {
+				"invert-kv": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
 					"dev": true
 				},
 				"is-fullwidth-code-point": {
@@ -2257,36 +1529,26 @@
 						"number-is-nan": "^1.0.0"
 					}
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
+				"json5": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+					"dev": true
 				},
-				"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=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^2.2.0",
-						"pify": "^2.0.0",
-						"strip-bom": "^3.0.0"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
+				"macos-release": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
+					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
+					"dev": true
 				},
 				"mem": {
 					"version": "1.1.0",
@@ -2297,39 +1559,6 @@
 						"mimic-fn": "^1.0.0"
 					}
 				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
 				"os-locale": {
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
@@ -2341,76 +1570,132 @@
 						"mem": "^1.1.0"
 					}
 				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+				"os-name": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
+					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
 					"dev": true,
 					"requires": {
-						"p-limit": "^1.1.0"
+						"macos-release": "^1.0.0",
+						"win-release": "^1.0.0"
 					}
 				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+				"postcss": {
+					"version": "6.0.23",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
 					"dev": true,
 					"requires": {
-						"error-ex": "^1.2.0"
+						"chalk": "^2.4.1",
+						"source-map": "^0.6.1",
+						"supports-color": "^5.4.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"
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+				"tapable": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
+					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
 					"dev": true
 				},
-				"read-pkg": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+				"typescript": {
+					"version": "2.6.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
+					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
+					"dev": true
+				},
+				"uglify-es": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
+					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
 					"dev": true,
 					"requires": {
-						"load-json-file": "^2.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^2.0.0"
+						"commander": "~2.12.1",
+						"source-map": "~0.6.1"
 					}
 				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+				"webpack": {
+					"version": "3.12.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
+					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
 					"dev": true,
 					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
+						"acorn": "^5.0.0",
+						"acorn-dynamic-import": "^2.0.0",
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0",
+						"async": "^2.1.2",
+						"enhanced-resolve": "^3.4.0",
+						"escope": "^3.6.0",
+						"interpret": "^1.0.0",
+						"json-loader": "^0.5.4",
+						"json5": "^0.5.1",
+						"loader-runner": "^2.3.0",
+						"loader-utils": "^1.1.0",
+						"memory-fs": "~0.4.1",
+						"mkdirp": "~0.5.0",
+						"node-libs-browser": "^2.0.0",
+						"source-map": "^0.5.3",
+						"supports-color": "^4.2.1",
+						"tapable": "^0.2.7",
+						"uglifyjs-webpack-plugin": "^0.4.6",
+						"watchpack": "^1.4.0",
+						"webpack-sources": "^1.0.1",
+						"yargs": "^8.0.2"
+					},
+					"dependencies": {
+						"has-flag": {
+							"version": "2.0.0",
+							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+							"dev": true
+						},
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						},
+						"supports-color": {
+							"version": "4.5.0",
+							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+							"dev": true,
+							"requires": {
+								"has-flag": "^2.0.0"
+							}
+						}
 					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
+				"ws": {
+					"version": "3.3.2",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
+					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
 				},
 				"yargs": {
-					"version": "9.0.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
 					"dev": true,
 					"requires": {
 						"camelcase": "^4.1.0",
@@ -2439,543 +1724,361 @@
 				}
 			}
 		},
-		"@angular/core": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.3.tgz",
-			"integrity": "sha512-6Ql+sJJnrsxh8O0/IgIP1GgT4eLOHk+dlBs7zBbjstmLuhaQdY+awO9WKoQow+TiD1Go7FW1J3vZ2PTWXKxqjQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/forms": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.3.tgz",
-			"integrity": "sha512-mZpyonfSmRwSvM6efvwFwkLJkK6wHQrm7X4OhVVu3s9i7BI253eLDY7WIRXFvoxJ/5jWIIarVnd/9UA7GINZGw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/http": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.3.tgz",
-			"integrity": "sha512-wzvBKbO/TcSR3U8AQbsGftH8x1OdAgVGHlfXQPmZL1KjIDHrM1VpnkSvgqIt8coG+4OPfWcNklUCrTdEGwqMqw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/language-service": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.3.tgz",
-			"integrity": "sha512-9FBVYbKaNx4Ap+Suz/2ZFBPca1voinZMOCN8LjXRYnfS2MHLQASQlTlK4qeZcomyRfy0FxWmO9R02S7YJ06cnw==",
-			"dev": true
-		},
-		"@angular/platform-browser": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.3.tgz",
-			"integrity": "sha512-DH0Y2lgEgcrP1I/DUQB/krL7Ob7yL685fu4sRapW17SndTQa2pqSFMBVf+mN3FupTXp7nJHSvlIktzedIk04+g==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/platform-browser-dynamic": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.3.tgz",
-			"integrity": "sha512-M8Kiz5FUhnFybJuk/mgOhBjVbRgKDC4bGWKWH9Z9SXBR2dS/FL3QOJsLIthQcWlHOzSoJdEoPBRhn0R4pyLBSw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/pwa": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.0.tgz",
-			"integrity": "sha512-E1rOMduecaUw6sZfm5u3nFWi2B90SD6NriGjciVTcKCjPmHKeIWmpWGhVdgGEzCbg1Gxj8ZhsvvBjJzfbDPF6g==",
+		"@ionic/cli-framework": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.7.0.tgz",
+			"integrity": "sha512-2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg==",
+			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"parse5-html-rewriting-stream": "5.1.0",
-				"rxjs": "6.3.3"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"inquirer": "^6.0.0",
+				"lodash": "^4.17.5",
+				"log-update": "^2.3.0",
+				"minimist": "^1.2.0",
+				"rimraf": "^2.6.2",
+				"slice-ansi": "^2.0.0",
+				"string-width": "^3.0.0",
+				"strip-ansi": "^5.0.0",
+				"tslib": "^1.9.0",
+				"untildify": "^3.0.2",
+				"wrap-ansi": "^4.0.0",
+				"write-file-atomic": "^2.3.0"
 			},
 			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-					"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"ajv": "6.7.0",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.3.3",
-						"source-map": "0.7.3"
+						"ms": "^2.1.1"
 					}
 				},
-				"@angular-devkit/schematics": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-					"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+				"wrap-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
 					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
 					},
 					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"string-width": {
+							"version": "2.1.1",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+							"dev": true,
 							"requires": {
-								"is-descriptor": "^1.0.0"
+								"is-fullwidth-code-point": "^2.0.0",
+								"strip-ansi": "^4.0.0"
+							}
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
 							}
 						}
 					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+				}
+			}
+		},
+		"@ionic/core": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.1.2.tgz",
+			"integrity": "sha512-QVJYpDAycmXgQL3mWdvjlIgrLEG0wVl9+NGZQATEBCTEsuDHrOw7BO28FKPlFCdfTjVA6HDJnSj1HwOUi3Yp4w==",
+			"requires": {
+				"ionicons": "4.5.5"
+			}
+		},
+		"@ionic/discover": {
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.13.tgz",
+			"integrity": "sha512-9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"netmask": "^1.0.6",
+				"tslib": "^1.9.0",
+				"ws": "^6.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-						}
+						"ms": "^2.1.1"
 					}
 				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@ionic/lab": {
+			"version": "1.0.24",
+			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.24.tgz",
+			"integrity": "sha512-sXUx0MZKC43bZ5ZJ1IRQ+yuvCgNGGJ6QPREI1AeHXZpkZRixrh0w14SLgxEzjxvFgW6ypQkdKlymY0nRoU8Gng==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/utils-fs": "1.2.0",
+				"chalk": "^2.3.0",
+				"express": "^4.16.2",
+				"tslib": "^1.9.0"
+			}
+		},
+		"@ionic/ng-toolkit": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
+			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.1.0",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"rxjs": "~6.2.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"@ionic/cli-framework": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
+					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
+					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"@ionic/utils-fs": "0.0.2",
+						"chalk": "^2.3.0",
+						"debug": "^4.0.0",
+						"inquirer": "^6.0.0",
+						"lodash": "^4.17.5",
+						"minimist": "^1.2.0",
+						"rimraf": "^2.6.2",
+						"slice-ansi": "^1.0.0",
+						"stream-combiner2": "^1.1.1",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^5.0.0",
+						"tree-kill": "1.2.0",
+						"tslib": "^1.9.0",
+						"untildify": "^3.0.2",
+						"wrap-ansi": "^4.0.0",
+						"write-file-atomic": "^2.3.0"
 					}
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"@ionic/utils-fs": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
+					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
+					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"debug": "^4.0.0",
+						"ncp": "^2.0.0",
+						"through2": "^2.0.3",
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+					"dev": true
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
 				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
+					"dev": true,
 					"requires": {
 						"tslib": "^1.9.0"
 					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				"slice-ansi": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-						}
+						"is-fullwidth-code-point": "^2.0.0"
 					}
 				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"strip-ansi": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ansi-regex": "^4.0.0"
 					}
 				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg=="
-				}
-			}
-		},
-		"@angular/router": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.3.tgz",
-			"integrity": "sha512-SH7H2I9WTj1puei4m4g5n0/Cp28HS14q4r8lOgW0gLWuT6Ls7MqH/nDjOMiW924iRR6zjQQs7G+WbhL1jmZc2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/service-worker": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
-			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@babel/code-frame": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.0.0"
-			}
-		},
-		"@babel/generator": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.0.tgz",
-			"integrity": "sha512-dZTwMvTgWfhmibq4V9X+LMf6Bgl7zAodRn9PvcPdhlzFMbvUutx74dbEv7Atz3ToeEpevYEJtAwfxq/bDCzHWg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.3.0",
-				"jsesc": "^2.5.1",
-				"lodash": "^4.17.10",
-				"source-map": "^0.5.0",
-				"trim-right": "^1.0.1"
-			},
-			"dependencies": {
-				"jsesc": {
-					"version": "2.5.2",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+				"tree-kill": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
+					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
 					"dev": true
-				}
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "^7.0.0",
-				"@babel/template": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
-			"integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/highlight": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.0.0",
-				"esutils": "^2.0.2",
-				"js-tokens": "^4.0.0"
-			},
-			"dependencies": {
-				"js-tokens": {
+				},
+				"wrap-ansi": {
 					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-					"dev": true
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
+							}
+						}
+					}
 				}
 			}
 		},
-		"@babel/parser": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.1.tgz",
-			"integrity": "sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA==",
-			"dev": true
-		},
-		"@babel/template": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
-			"integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/parser": "^7.2.2",
-				"@babel/types": "^7.2.2"
-			}
+		"@ionic/pro": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
+			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
 		},
-		"@babel/traverse": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
-			"integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
+		"@ionic/schematics-angular": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
+			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/generator": "^7.2.2",
-				"@babel/helper-function-name": "^7.1.0",
-				"@babel/helper-split-export-declaration": "^7.0.0",
-				"@babel/parser": "^7.2.3",
-				"@babel/types": "^7.2.2",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0",
-				"lodash": "^4.17.10"
+				"@schematics/angular": "0.9.0-beta.3",
+				"lodash": "^4.17.5",
+				"tslib": "^1.9.0",
+				"typescript": "3.0.1"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+				"@angular-devkit/core": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
+					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ajv": "6.5.3",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.2.2",
+						"source-map": "0.7.3"
 					}
 				},
-				"globals": {
-					"version": "11.10.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz",
-					"integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==",
-					"dev": true
+				"@angular-devkit/schematics": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
+					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
+					"dev": true,
+					"requires": {
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"rxjs": "6.2.2"
+					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/types": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.0.tgz",
-			"integrity": "sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw==",
-			"dev": true,
-			"requires": {
-				"esutils": "^2.0.2",
-				"lodash": "^4.17.10",
-				"to-fast-properties": "^2.0.0"
-			},
-			"dependencies": {
-				"to-fast-properties": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-					"dev": true
-				}
-			}
-		},
-		"@compodoc/compodoc": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.7.tgz",
-			"integrity": "sha512-bTqkv75T9b+3OxG517YL+5B0npAG0Q5nOMAk562Idr/fICTTHQ/xzSBsTptZ4QqYmtzRMV1OqOlk74FXfGPZWw==",
-			"dev": true,
-			"requires": {
-				"@compodoc/ngd-transformer": "^2.0.0",
-				"chalk": "^2.4.1",
-				"cheerio": "^1.0.0-rc.2",
-				"chokidar": "^2.0.4",
-				"colors": "^1.3.2",
-				"commander": "2.19.0",
-				"cosmiconfig": "^5.0.7",
-				"fancy-log": "^1.3.2",
-				"findit2": "^2.2.3",
-				"fs-extra": "^7.0.1",
-				"glob": "^7.1.3",
-				"handlebars": "4.0.10",
-				"html-entities": "^1.2.1",
-				"i18next": "^12.1.0",
-				"inside": "^1.0.0",
-				"json5": "^2.1.0",
-				"live-server": "1.2.1",
-				"lodash": "^4.17.11",
-				"lunr": "2.3.5",
-				"marked": "^0.4.0",
-				"opencollective": "^1.0.3",
-				"os-name": "^3.0.0",
-				"traverse": "^0.6.6",
-				"ts-simple-ast": "12.4.0",
-				"uuid": "^3.3.2"
-			},
-			"dependencies": {
-				"@compodoc/ngd-transformer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
-					"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+				"@schematics/angular": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
+					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
 					"dev": true,
 					"requires": {
-						"@compodoc/ngd-core": "~2.0.0",
-						"dot": "^1.1.1",
-						"fs-extra": "^4.0.1",
-						"viz.js": "^1.8.0"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "4.0.3",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-							"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"@angular-devkit/schematics": "0.9.0-beta.3",
+						"typescript": "3.0.1"
 					}
 				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
+				"ajv": {
+					"version": "6.5.3",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
+					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
 				},
 				"base": {
 					"version": "0.11.2",
@@ -3021,31 +2124,10 @@
 						"to-regex": "^3.0.1"
 					}
 				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true,
-					"optional": true
-				},
-				"cheerio": {
-					"version": "1.0.0-rc.2",
-					"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
-					"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
-					"dev": true,
-					"requires": {
-						"css-select": "~1.2.0",
-						"dom-serializer": "~0.1.0",
-						"entities": "~1.1.1",
-						"htmlparser2": "^3.9.1",
-						"lodash": "^4.15.0",
-						"parse5": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"chokidar": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
 					"dev": true,
 					"requires": {
 						"anymatch": "^2.0.0",
@@ -3063,48 +2145,6 @@
 						"upath": "^1.0.5"
 					}
 				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-					"dev": true
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"cosmiconfig": {
-					"version": "5.0.7",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz",
-					"integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^2.0.0",
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0"
-					}
-				},
 				"define-property": {
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -3173,31 +2213,6 @@
 						}
 					}
 				},
-				"dir-glob": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-					"dev": true,
-					"requires": {
-						"arrify": "^1.0.1",
-						"path-type": "^3.0.0"
-					}
-				},
-				"event-stream": {
-					"version": "3.3.4",
-					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-					"dev": true,
-					"requires": {
-						"duplexer": "~0.1.1",
-						"from": "~0",
-						"map-stream": "~0.1.0",
-						"pause-stream": "0.0.11",
-						"split": "0.3",
-						"stream-combiner": "~0.0.4",
-						"through": "~2.3.1"
-					}
-				},
 				"extend-shallow": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
@@ -3207,80 +2222,6 @@
 						"is-extendable": "^0.1.0"
 					}
 				},
-				"faye-websocket": {
-					"version": "0.11.1",
-					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-					"dev": true,
-					"requires": {
-						"websocket-driver": ">=0.5.1"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"globby": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"dir-glob": "2.0.0",
-						"fast-glob": "^2.0.2",
-						"glob": "^7.1.2",
-						"ignore": "^3.3.5",
-						"pify": "^3.0.0",
-						"slash": "^1.0.0"
-					}
-				},
-				"handlebars": {
-					"version": "4.0.10",
-					"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
-					"integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
-					"dev": true,
-					"requires": {
-						"async": "^1.4.0",
-						"optimist": "^0.6.1",
-						"source-map": "^0.4.4",
-						"uglify-js": "^2.6"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.4.4",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-							"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
-					}
-				},
-				"http-auth": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
-					"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
-					"dev": true,
-					"requires": {
-						"apache-crypt": "^1.1.2",
-						"apache-md5": "^1.0.6",
-						"bcryptjs": "^2.3.0",
-						"uuid": "^3.0.0"
-					}
-				},
 				"is-accessor-descriptor": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -3316,98 +2257,13 @@
 					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
 					"dev": true
 				},
-				"live-server": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
-					"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
-					"dev": true,
-					"requires": {
-						"chokidar": "^2.0.4",
-						"colors": "^1.3.3",
-						"connect": "^3.6.6",
-						"cors": "^2.8.5",
-						"event-stream": "3.3.4",
-						"faye-websocket": "0.11.x",
-						"http-auth": "3.1.x",
-						"morgan": "^1.9.1",
-						"object-assign": "^4.1.1",
-						"opn": "^5.4.0",
-						"proxy-middleware": "^0.15.0",
-						"send": "^0.16.2",
-						"serve-index": "^1.9.1"
-					},
-					"dependencies": {
-						"colors": {
-							"version": "1.3.3",
-							"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-							"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-							"dev": true
-						}
-					}
-				},
-				"map-stream": {
-					"version": "0.1.0",
-					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-					"dev": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				},
-				"opn": {
-					"version": "5.4.0",
-					"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-					"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-					"dev": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parse5": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-					"dev": true,
-					"requires": {
-						"@types/node": "*"
-					}
-				},
-				"send": {
-					"version": "0.16.2",
-					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+				"rxjs": {
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
 					"dev": true,
 					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					},
-					"dependencies": {
-						"statuses": {
-							"version": "1.4.0",
-							"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-							"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-							"dev": true
-						}
+						"tslib": "^1.9.0"
 					}
 				},
 				"snapdragon": {
@@ -3424,8 +2280,22 @@
 						"source-map": "^0.5.6",
 						"source-map-resolve": "^0.5.0",
 						"use": "^3.1.0"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
 					}
 				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				},
 				"source-map-resolve": {
 					"version": "0.5.2",
 					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
@@ -3439,2179 +2309,588 @@
 						"urix": "^0.1.0"
 					}
 				},
-				"split": {
-					"version": "0.3.3",
-					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-					"dev": true,
-					"requires": {
-						"through": "2"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+				"typescript": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
 					"dev": true
-				},
-				"stream-combiner": {
-					"version": "0.0.4",
-					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+				}
+			}
+		},
+		"@ionic/storage": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
+			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
+			"requires": {
+				"localforage": "1.7.1",
+				"localforage-cordovasqlitedriver": "1.7.0",
+				"tslib": "^1.7.1"
+			}
+		},
+		"@ionic/utils-array": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-0.0.1.tgz",
+			"integrity": "sha512-gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"duplexer": "~0.1.1"
+						"ms": "^2.1.1"
 					}
 				},
-				"ts-simple-ast": {
-					"version": "12.4.0",
-					"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
-					"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
-					"dev": true,
-					"requires": {
-						"@dsherret/to-absolute-glob": "^2.0.2",
-						"code-block-writer": "^7.2.0",
-						"fs-extra": "^6.0.1",
-						"glob-parent": "^3.1.0",
-						"globby": "^8.0.1",
-						"is-negated-glob": "^1.0.0",
-						"multimatch": "^2.1.0",
-						"object-assign": "^4.1.1",
-						"tslib": "^1.9.0",
-						"typescript": "2.9.1"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-							"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.9.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
-					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
-				},
-				"uglify-js": {
-					"version": "2.8.29",
-					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+				}
+			}
+		},
+		"@ionic/utils-fs": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.2.0.tgz",
+			"integrity": "sha512-31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"fs-extra": "^7.0.1",
+				"through2": "^3.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"source-map": "~0.5.1",
-						"uglify-to-browserify": "~1.0.0",
-						"yargs": "~3.10.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true,
-					"optional": true
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"yargs": {
-					"version": "3.10.0",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"camelcase": "^1.0.2",
-						"cliui": "^2.1.0",
-						"decamelize": "^1.0.0",
-						"window-size": "0.1.0"
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
 		},
-		"@compodoc/ngd-core": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
-			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
+		"@ionic/utils-network": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.8.tgz",
+			"integrity": "sha512-DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg==",
 			"dev": true,
 			"requires": {
-				"ansi-colors": "^1.0.1",
-				"fancy-log": "^1.3.2",
-				"typescript": "^2.4.2"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
 			},
 			"dependencies": {
-				"ansi-colors": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ansi-wrap": "^0.1.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"typescript": {
-					"version": "2.9.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
 		},
-		"@dsherret/to-absolute-glob": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
+		"@ionic/utils-object": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-0.0.1.tgz",
+			"integrity": "sha512-ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ==",
 			"dev": true,
 			"requires": {
-				"is-absolute": "^1.0.0",
-				"is-negated-glob": "^1.0.0"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/barcode-scanner": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.0.0.tgz",
-			"integrity": "sha512-DjTWPZan6s1easv6A6LgI/ZcPQ+HJX2PxZHBuJckwkNxJ+KAWwEZBpEQ5rbyntZyTHLUZLCUrOhgDq4Y/TOI+Q==",
+		"@ionic/utils-process": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-0.1.0.tgz",
+			"integrity": "sha512-CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-terminal": "0.0.1",
+				"debug": "^4.0.0",
+				"lodash": "^4.17.5",
+				"tree-kill": "1.2.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/call-number": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.0.0.tgz",
-			"integrity": "sha512-kzIAMs7+hTRL2A2wO6PyIOVAJYxhBFNDsYyuE5vLmDs1Um74mFq62CFdYhLNpF+/wovbuNG3+u/b1BFToXIUWw==",
+		"@ionic/utils-stream": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-0.0.1.tgz",
+			"integrity": "sha512-IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"stream-combiner2": "^1.1.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/core": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.0.0.tgz",
-			"integrity": "sha512-qtshWPo+CMq9ZoDGcg+1XF1+k2ASm0sLtZsIbXmYo5X82Q9cUhjk95X9BqHnjXHOdIWk4J/D3ot0/vzmMTNdbA==",
+		"@ionic/utils-subprocess": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz",
+			"integrity": "sha512-8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"cross-spawn": "^6.0.5",
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/device": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.0.0.tgz",
-			"integrity": "sha512-Mf8kLO+BbvsdYrDvgkpp2YTX4ygXQLEMrsnqPauibhE8ZGsAZUDmfH7+Mtv1OIN0z0ot0zhEOhsfF7y/QuWRzw==",
+		"@ionic/utils-terminal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz",
+			"integrity": "sha512-xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/dialogs": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.0.0.tgz",
-			"integrity": "sha512-DXhWE9tbEtBmEmbcRD+cmQ42zIGG6NbQCKL/Gs4YsAGrLVBhbhCJx7M/Yk8C2gn2ktczfl4h7KMne/NABbfbqA==",
+		"@mrmlnc/readdir-enhanced": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"call-me-maybe": "^1.0.1",
+				"glob-to-regexp": "^0.3.0"
 			}
 		},
-		"@ionic-native/geolocation": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.0.0.tgz",
-			"integrity": "sha512-gU3GNCEJgh+2KpK0Tg9l85HDMRkUWO9FAszF4UDnqAUihTQGCM0Nl+hpmEQowkM9+Him8FJ83rT82pPmnGERCA==",
+		"@ngtools/webpack": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.7.tgz",
+			"integrity": "sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"enhanced-resolve": "4.1.0",
+				"rxjs": "6.3.3",
+				"tree-kill": "1.2.1",
+				"webpack-sources": "1.3.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/globalization": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.0.0.tgz",
-			"integrity": "sha512-a3JsDwgwvzKyq2tda6FNIXmrVMeaZ9muXl9h1HKcG1ThqWHNGW9Zxmpakv3sO4onUv6KUEaP49rcim/xoeo9BA==",
+		"@ngx-progressbar/core": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.2.tgz",
+			"integrity": "sha512-z0VzsJpgWxoU7wLXviCutXPXDop1Ry/SPOlVOtXHlkUGFAzHs3soDeXpTyigSdBB8Q16Nisow4EVuOKCByp6PQ==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-analytics": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.0.0.tgz",
-			"integrity": "sha512-mYeP9QmHfjjJe3y5uHUz4atfR2EuRCf5TFRCyi+yoCs5WEwC4JbM7k4GxGyx6YY1MHqNDoUrDZu5F0NypqxsKg==",
+		"@ngx-translate/core": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
+			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-maps": {
-			"version": "5.0.0-beta.26",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
-			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+		"@ngx-translate/http-loader": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
+			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/intercom": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.0.0.tgz",
-			"integrity": "sha512-rXk3IEFbT3Ec/kmz53Xrkvicch1CFeL/0dSOKsM5mrIYoUWQJGV2qMP5Clbq7ZdMJ/8q2Bv2gF2b9L/UipAy/w==",
+		"@nodelib/fs.stat": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+			"dev": true
+		},
+		"@schematics/angular": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.7.tgz",
+			"integrity": "sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"typescript": "3.2.4"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+					"requires": {
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
+					}
+				},
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+					"requires": {
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
+					}
+				},
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
 			}
 		},
-		"@ionic-native/local-notifications": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.0.0.tgz",
-			"integrity": "sha512-lKdZ60rJncgCwwVeCYSfhHJGtrFUBqj9FkJpRcLUxeOZSxp9EVCN/ZGoGyeTlOKwunNBaw8a77hBZ7lbriBW6w==",
+		"@schematics/update": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.7.tgz",
+			"integrity": "sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"pacote": "9.4.0",
+				"rxjs": "6.3.3",
+				"semver": "5.6.0",
+				"semver-intersect": "1.4.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/mixpanel": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.0.0.tgz",
-			"integrity": "sha512-SqKHc5yCTJ2qnX1bk7GFcNQCpDzIqzg0+CNWptSkFPBxtais3qw07GYTASaEzQM1kjmPSPD++avkfWmUXT2CXg==",
+		"@types/bson": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.0.tgz",
+			"integrity": "sha512-pq/rqJwJWkbS10crsG5bgnrisL8pML79KlMKQMoQwLUjlPAkrUHMvHJ3oGwE7WHR61Lv/nadMwXVAD2b+fpD8Q==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/network": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.0.0.tgz",
-			"integrity": "sha512-Yb8c+U8GZOhL5qc6LdbzJdwzTclZ9w0QpPH5YTbFXLJOSzhmq+ibN2dzWbmWLjPZuwR0V7K+KrefoJNacFDejw==",
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
+		"@types/d3-color": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",
+			"integrity": "sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==",
+			"dev": true
+		},
+		"@types/geojson": {
+			"version": "7946.0.7",
+			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+			"integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==",
+			"dev": true
+		},
+		"@types/googlemaps": {
+			"version": "3.30.19",
+			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.19.tgz",
+			"integrity": "sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==",
+			"dev": true
+		},
+		"@types/graphql": {
+			"version": "14.2.0",
+			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.2.0.tgz",
+			"integrity": "sha512-lELg5m6eBOmATWyCZl8qULEOvnPIUG6B443yXKj930glXIgwQirIBPp5rthP2amJW0YSzUg2s5sfgba4mRRCNw==",
+			"dev": true
+		},
+		"@types/jasmine": {
+			"version": "3.3.12",
+			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.12.tgz",
+			"integrity": "sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==",
+			"dev": true
+		},
+		"@types/jasminewd2": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
+			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/jasmine": "*"
 			}
 		},
-		"@ionic-native/splash-screen": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.0.0.tgz",
-			"integrity": "sha512-+7QfXPkaosGsR3ohEiL/WJn23NHVDZYvnilYNrOMF7oohnj5ngH46fCNYp1Tpybe5GCV1iP++RzDvE5jghWLZg==",
+		"@types/leaflet": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.3.tgz",
+			"integrity": "sha512-jFRBSsPHi1EwQSwrN0cOJLdPhwOZsRl4IMxvm/2ShLh0YM5GfCtQXCzsrv8RE7DWL+AykXdYSAd9bFLWbZT4CQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/geojson": "*"
 			}
 		},
-		"@ionic-native/status-bar": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.0.0.tgz",
-			"integrity": "sha512-mJfj+VXTOgf9Og0S7QDlT9I8UVI+Wj4kpZUHdQizovA/R0m1HG2hLKtEMy00iDVbOBjRsXGcD6JXCOeyVjg7LA==",
+		"@types/mongodb": {
+			"version": "3.1.22",
+			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.22.tgz",
+			"integrity": "sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/bson": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/unique-device-id": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.0.0.tgz",
-			"integrity": "sha512-yfiQKkkh6N6ypZFBPqu2rDCsdYVUdy7W4ZezD3nCj33FkrNS7Xrdo9H76SQW2c7smXQ+fnSeH7prS//Yyc0KvQ==",
+		"@types/mongoose": {
+			"version": "5.3.24",
+			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.24.tgz",
+			"integrity": "sha512-Txa5C/veUJJG2o1sRbl8z1M7GhPjJz6J3JJQV76eYN0PyI9F2NO3gbVUj059ND5nlbvQjRhXuFLaqN6NH8nMNQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/mongodb": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/vibration": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.0.0.tgz",
-			"integrity": "sha512-XIAfp3oeizseetvnYPAMZ0kK+nyh2i/0Vy0FJkcEGM0fCD36PZkyNpx1Ai1bk3/Ln3nTMZddoBZket1aTXetNA==",
+		"@types/node": {
+			"version": "11.12.1",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-11.12.1.tgz",
+			"integrity": "sha512-sKDlqv6COJrR7ar0+GqqhrXQDzQlMcqMnF2iEU6m9hLo8kxozoAGUazwPyELHlRVmjsbvlnGXjnzyptSXVmceA==",
+			"dev": true
+		},
+		"@types/q": {
+			"version": "0.0.32",
+			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+			"dev": true
+		},
+		"@types/reflect-metadata": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
+			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"reflect-metadata": "*"
 			}
 		},
-		"@ionic/angular": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.0.0.tgz",
-			"integrity": "sha512-kxvlZN5daRql/VRcbB7YWMcmE4jKDgwlPRykzNvmYWFDr9vg1AbXirLHAPtR7BaKWJEN4dJwlibjBEJQw8kVYQ==",
+		"@types/selenium-webdriver": {
+			"version": "3.0.14",
+			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
+			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
+			"dev": true
+		},
+		"@types/socket.io-client": {
+			"version": "1.4.32",
+			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
+			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
+			"dev": true
+		},
+		"@types/source-list-map": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+			"dev": true
+		},
+		"@types/stripe": {
+			"version": "6.25.7",
+			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.25.7.tgz",
+			"integrity": "sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==",
+			"dev": true,
 			"requires": {
-				"@ionic/core": "4.0.0",
-				"tslib": "^1.9.3"
+				"@types/node": "*"
 			}
 		},
-		"@ionic/angular-toolkit": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.3.0.tgz",
-			"integrity": "sha512-GOoAx/cs6Hhl0FiOhZAFPCG3cgz2DbyfYflhWFbi08MLIQD2aCoVg6wIpcBoMHQf4eob5WDDIlbOO0t9LVn3dg==",
+		"@types/swiper": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.2.tgz",
+			"integrity": "sha512-bJzmpMwGaA6elG0/9M3H45Az0IwuuJoUGUXGgH/DVKZOJg3iBtu+djAlBnOXOonAHd5kDsrfdhdxFKOGjzM+Vw==",
+			"dev": true
+		},
+		"@types/uuid": {
+			"version": "3.4.4",
+			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
+			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
 			"dev": true,
 			"requires": {
-				"@schematics/angular": "^7.0.3",
-				"tslib": "^1.9.0",
-				"typescript": "^3.2.4"
+				"@types/node": "*"
+			}
+		},
+		"@types/webpack-sources": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
+			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/source-list-map": "*",
+				"source-map": "^0.6.1"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					},
-					"dependencies": {
-						"typescript": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-							"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-							"dev": true
-						}
-					}
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
 				}
 			}
 		},
-		"@ionic/app-scripts": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.2.tgz",
-			"integrity": "sha512-ZpeAafEboO/xHnmgy61ZOsaMGpoer621YX3q09x+BA2sbcuqOEsMKV91BRZmghoiHlwBB9woxXRyAwuYIAASHw==",
-			"dev": true,
-			"requires": {
-				"@angular-devkit/build-optimizer": "0.0.35",
-				"autoprefixer": "^7.2.6",
-				"chalk": "^2.4.0",
-				"chokidar": "^2.0.4",
-				"clean-css": "^4.1.11",
-				"cross-spawn": "^5.1.0",
-				"dotenv-webpack": "^1.5.7",
-				"express": "^4.16.3",
-				"fs-extra": "^4.0.2",
-				"glob": "^7.1.2",
-				"json-loader": "^0.5.7",
-				"node-sass": "^4.10.0",
-				"os-name": "^2.0.1",
-				"postcss": "^6.0.21",
-				"proxy-middleware": "^0.15.0",
-				"reflect-metadata": "^0.1.10",
-				"rollup": "0.50.0",
-				"rollup-plugin-commonjs": "8.2.6",
-				"rollup-plugin-node-resolve": "3.0.0",
-				"source-map": "^0.6.1",
-				"tiny-lr": "^1.1.1",
-				"tslint": "^5.8.0",
-				"tslint-eslint-rules": "^4.1.1",
-				"uglify-es": "3.2.2",
-				"webpack": "3.12.0",
-				"ws": "3.3.2",
-				"xml2js": "^0.4.19"
-			},
-			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.0.35",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
-					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.1.0",
-						"source-map": "^0.5.6",
-						"typescript": "~2.6.1",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"acorn-dynamic-import": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
-					"dev": true,
-					"requires": {
-						"acorn": "^4.0.3"
-					},
-					"dependencies": {
-						"acorn": {
-							"version": "4.0.13",
-							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-							"dev": true
-						}
-					}
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"autoprefixer": {
-					"version": "7.2.6",
-					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
-					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^2.11.3",
-						"caniuse-lite": "^1.0.30000805",
-						"normalize-range": "^0.1.2",
-						"num2fraction": "^1.2.2",
-						"postcss": "^6.0.17",
-						"postcss-value-parser": "^3.2.3"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"body": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-					"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-					"dev": true,
-					"requires": {
-						"continuable-cache": "^0.3.1",
-						"error": "^7.0.0",
-						"raw-body": "~1.1.0",
-						"safe-json-parse": "~1.0.1"
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"browserslist": {
-					"version": "2.11.3",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30000792",
-						"electron-to-chromium": "^1.3.30"
-					}
-				},
-				"bytes": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-					"dev": true
-				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.12.2",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
-					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^4.0.1",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"enhanced-resolve": {
-					"version": "3.4.1",
-					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"memory-fs": "^0.4.0",
-						"object-assign": "^4.0.1",
-						"tapable": "^0.2.7"
-					}
-				},
-				"execa": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"fs-extra": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"json5": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"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"
-					}
-				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"macos-release": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
-					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
-					"dev": true
-				},
-				"magic-string": {
-					"version": "0.22.5",
-					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
-					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
-					"dev": true,
-					"requires": {
-						"vlq": "^0.2.2"
-					}
-				},
-				"mem": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^1.0.0"
-					}
-				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"os-locale": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-					"dev": true,
-					"requires": {
-						"execa": "^0.7.0",
-						"lcid": "^1.0.0",
-						"mem": "^1.1.0"
-					}
-				},
-				"os-name": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
-					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
-					"dev": true,
-					"requires": {
-						"macos-release": "^1.0.0",
-						"win-release": "^1.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-					"dev": true,
-					"requires": {
-						"p-limit": "^1.1.0"
-					}
-				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.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
-				},
-				"postcss": {
-					"version": "6.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.1",
-						"source-map": "^0.6.1",
-						"supports-color": "^5.4.0"
-					}
-				},
-				"raw-body": {
-					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-					"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-					"dev": true,
-					"requires": {
-						"bytes": "1",
-						"string_decoder": "0.10"
-					}
-				},
-				"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"
-					}
-				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-					"dev": true,
-					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				},
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				},
-				"rollup-plugin-commonjs": {
-					"version": "8.2.6",
-					"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
-					"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.2.1",
-						"estree-walker": "^0.5.0",
-						"magic-string": "^0.22.4",
-						"resolve": "^1.4.0",
-						"rollup-pluginutils": "^2.0.1"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				},
-				"tapable": {
-					"version": "0.2.9",
-					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
-					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
-					"dev": true
-				},
-				"tiny-lr": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-					"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-					"dev": true,
-					"requires": {
-						"body": "^5.1.0",
-						"debug": "^3.1.0",
-						"faye-websocket": "~0.10.0",
-						"livereload-js": "^2.3.0",
-						"object-assign": "^4.1.0",
-						"qs": "^6.4.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.6.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
-					"dev": true
-				},
-				"uglify-es": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
-					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
-					"dev": true,
-					"requires": {
-						"commander": "~2.12.1",
-						"source-map": "~0.6.1"
-					}
-				},
-				"uglifyjs-webpack-plugin": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-					"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
-					"dev": true,
-					"requires": {
-						"source-map": "^0.5.6",
-						"uglify-js": "^2.8.29",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"uglify-js": {
-							"version": "2.8.29",
-							"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-							"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-							"dev": true,
-							"requires": {
-								"source-map": "~0.5.1",
-								"uglify-to-browserify": "~1.0.0",
-								"yargs": "~3.10.0"
-							}
-						},
-						"yargs": {
-							"version": "3.10.0",
-							"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-							"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-							"dev": true,
-							"requires": {
-								"camelcase": "^1.0.2",
-								"cliui": "^2.1.0",
-								"decamelize": "^1.0.0",
-								"window-size": "0.1.0"
-							}
-						}
-					}
-				},
-				"webpack": {
-					"version": "3.12.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
-					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.0.0",
-						"acorn-dynamic-import": "^2.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"async": "^2.1.2",
-						"enhanced-resolve": "^3.4.0",
-						"escope": "^3.6.0",
-						"interpret": "^1.0.0",
-						"json-loader": "^0.5.4",
-						"json5": "^0.5.1",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"mkdirp": "~0.5.0",
-						"node-libs-browser": "^2.0.0",
-						"source-map": "^0.5.3",
-						"supports-color": "^4.2.1",
-						"tapable": "^0.2.7",
-						"uglifyjs-webpack-plugin": "^0.4.6",
-						"watchpack": "^1.4.0",
-						"webpack-sources": "^1.0.1",
-						"yargs": "^8.0.2"
-					},
-					"dependencies": {
-						"has-flag": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-							"dev": true
-						},
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "4.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-							"dev": true,
-							"requires": {
-								"has-flag": "^2.0.0"
-							}
-						}
-					}
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
-				},
-				"win-release": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
-					"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
-					"dev": true,
-					"requires": {
-						"semver": "^5.0.1"
-					}
-				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true
-				},
-				"ws": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
-					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
-				},
-				"yargs": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0",
-						"cliui": "^3.2.0",
-						"decamelize": "^1.1.1",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^2.0.0",
-						"read-pkg-up": "^2.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1",
-						"yargs-parser": "^7.0.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						},
-						"cliui": {
-							"version": "3.2.0",
-							"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-							"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-							"dev": true,
-							"requires": {
-								"string-width": "^1.0.1",
-								"strip-ansi": "^3.0.1",
-								"wrap-ansi": "^2.0.0"
-							},
-							"dependencies": {
-								"string-width": {
-									"version": "1.0.2",
-									"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-									"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-									"dev": true,
-									"requires": {
-										"code-point-at": "^1.0.0",
-										"is-fullwidth-code-point": "^1.0.0",
-										"strip-ansi": "^3.0.0"
-									}
-								}
-							}
-						}
-					}
-				},
-				"yargs-parser": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						}
-					}
-				}
-			}
-		},
-		"@ionic/core": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.0.0.tgz",
-			"integrity": "sha512-/hW4882TyjcJTiNBYpoLGRYxkQhRidSuVjCL2RvfMS8a7FDQoS2dkje5KBGG+O2TCjtyXE5de1A6HvUgvDqjGA==",
-			"requires": {
-				"ionicons": "4.5.5"
-			}
-		},
-		"@ionic/lab": {
-			"version": "1.0.20",
-			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.20.tgz",
-			"integrity": "sha512-srSpTMb22BYk9qbEnyyb04KwBFpauBn5BksPmJnlPq8oAjNdNzZOuO/L95qKO9OqfIxRqFwpRVfzvI0TMWjCig==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/utils-fs": "1.0.0",
-				"chalk": "^2.3.0",
-				"express": "^4.16.2",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "2.6.9",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-							"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/ng-toolkit": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
-			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.1.0",
-				"chalk": "^2.3.0",
-				"debug": "^4.0.0",
-				"rxjs": "~6.2.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
-					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "0.0.2",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^1.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.0",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
-					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"ncp": "^2.0.0",
-						"through2": "^2.0.3",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"slice-ansi": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"tree-kill": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
-					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
-					"dev": true
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/pro": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
-			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
-		},
-		"@ionic/schematics-angular": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
-			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
-			"dev": true,
-			"requires": {
-				"@schematics/angular": "0.9.0-beta.3",
-				"lodash": "^4.17.5",
-				"tslib": "^1.9.0",
-				"typescript": "3.0.1"
-			},
-			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
-					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
-					"dev": true,
-					"requires": {
-						"ajv": "6.5.3",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.2.2",
-						"source-map": "0.7.3"
-					}
-				},
-				"@angular-devkit/schematics": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
-					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"rxjs": "6.2.2"
-					}
-				},
-				"@schematics/angular": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
-					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"@angular-devkit/schematics": "0.9.0-beta.3",
-						"typescript": "3.0.1"
-					}
-				},
-				"ajv": {
-					"version": "6.5.3",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
-					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^2.0.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"typescript": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
-					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
-					"dev": true
-				}
-			}
-		},
-		"@ionic/storage": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
-			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
-			"requires": {
-				"localforage": "1.7.1",
-				"localforage-cordovasqlitedriver": "1.7.0",
-				"tslib": "^1.7.1"
-			}
-		},
-		"@ionic/utils-network": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.6.tgz",
-			"integrity": "sha512-1aHXzL1PPJDdXLwicu5+Zv0QfWIrKxqGvat4A8zruAjm4oLvIOli5DnUb61VqP2ocAhiI3t39jxtBq9Fb/Gl9w==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.0.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@mrmlnc/readdir-enhanced": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-			"dev": true,
-			"requires": {
-				"call-me-maybe": "^1.0.1",
-				"glob-to-regexp": "^0.3.0"
-			}
-		},
-		"@ngx-progressbar/core": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.1.tgz",
-			"integrity": "sha512-IAbpPbv0RHwnLTqr8JpEOR2mDbia8jTyZdG0yWmyiGoVfIisSs/NkzMDph43pLvWl2aaJ+Bd2BJTdM2olYK4MQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/core": {
-			"version": "11.0.1",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
-			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/http-loader": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
-			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-			"dev": true
-		},
-		"@types/bson": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-1.0.11.tgz",
-			"integrity": "sha512-j+UcCWI+FsbI5/FQP/Kj2CXyplWAz39ktHFkXk84h7dNblKRSoNJs95PZFRd96NQGqsPEPgeclqnznWZr14ZDA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/cordova": {
-			"version": "0.0.34",
-			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-		},
-		"@types/d3-color": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.1.tgz",
-			"integrity": "sha512-xwb1tqvYNWllbHuhMFhiXk63Imf+QNq/dJdmbXmr2wQVnwGenCuj3/0IWJ9hdIFQIqzvhT7T37cvx93jtAsDbQ==",
-			"dev": true
-		},
-		"@types/geojson": {
-			"version": "7946.0.5",
-			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.5.tgz",
-			"integrity": "sha512-rLlMXpd3rdlrp0+xsrda/hFfOpIxgqFcRpk005UKbHtcdFK+QXAjhBAPnvO58qF4O1LdDXrcaiJxMgstCIlcaw==",
-			"dev": true
-		},
-		"@types/googlemaps": {
-			"version": "3.30.16",
-			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.16.tgz",
-			"integrity": "sha512-6OZ64ahLzYfzuSr71y4jAHZXiwxjvvEM2bfF2tzjIc9KUZVbO30SkYa8WewTsR8aM5BFz/uBiNlZ14eRLXYS0g==",
-			"dev": true
-		},
-		"@types/graphql": {
-			"version": "14.0.5",
-			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.0.5.tgz",
-			"integrity": "sha512-bwGYLE0SRy5ZraC91dqI2bxbspfm10kyJ2Yjuvk4OjdGznh7fkoWW+xXZHfFydJaqu9syZi099cpiZw3GlPDiA==",
-			"dev": true
-		},
-		"@types/jasmine": {
-			"version": "3.3.8",
-			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.8.tgz",
-			"integrity": "sha512-BaOFpaddRVV8qykJoWHrHtamml880oh0+DIZWbtJgx0pu+KhDF1gER5hSfCIfzyMrbjMuYFnLUfyo1l0JUVU3Q==",
-			"dev": true
-		},
-		"@types/jasminewd2": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
-			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
-			"dev": true,
-			"requires": {
-				"@types/jasmine": "*"
-			}
-		},
-		"@types/leaflet": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.0.tgz",
-			"integrity": "sha512-ZA+g6XyK/00labaNCWhbhahAOwEf9X4v9cAB0ZBwWjGOj5ewPC8qcdN/M2VsIAfP699Yz3+E7zaaClxmRaf4BQ==",
-			"dev": true,
-			"requires": {
-				"@types/geojson": "*"
-			}
-		},
-		"@types/mongodb": {
-			"version": "3.1.19",
-			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.19.tgz",
-			"integrity": "sha512-H54hQEovAhyLrIZOhPNfGyCCDoTqKsjb8GQBy8nptJqfxrYCp5WVcPJf9v0kfTPR72xOhaz9+WcYxOXWwEg1Vg==",
-			"dev": true,
-			"requires": {
-				"@types/bson": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/mongoose": {
-			"version": "5.3.12",
-			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.12.tgz",
-			"integrity": "sha512-dmZv3H9lXWhLY8XrxJNu+pVUecquReR3AtPxVsnPTcTH/T/YTgxE0zeTavNcqaBUD5XXKtlTy+2VhZxDkn/0Jw==",
-			"dev": true,
-			"requires": {
-				"@types/mongodb": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/node": {
-			"version": "10.12.21",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz",
-			"integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==",
-			"dev": true
-		},
-		"@types/q": {
-			"version": "0.0.32",
-			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
-			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
-			"dev": true
-		},
-		"@types/reflect-metadata": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
-			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
-			"dev": true,
-			"requires": {
-				"reflect-metadata": "*"
-			}
-		},
-		"@types/selenium-webdriver": {
-			"version": "3.0.14",
-			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
-			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
-			"dev": true
-		},
-		"@types/socket.io-client": {
-			"version": "1.4.32",
-			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
-			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
-			"dev": true
-		},
-		"@types/source-list-map": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-			"dev": true
-		},
-		"@types/stripe": {
-			"version": "6.19.5",
-			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.19.5.tgz",
-			"integrity": "sha512-NHSloxUEjergjDO3U5ZOJgURP6H9vPlJGWbwdUOCB/r24vMzZevjGfbUiwR0u51Yum9AId/7VG/qcbq5q/Hcng==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/swiper": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.1.tgz",
-			"integrity": "sha512-kG4moYcEEhAZH2l6ges7JyCit1tBMfQvAar6MLfZTfwZ1bvaTJQU8sxKiJavhoA69bc9A+lNYC2bhhEaVbp35w==",
-			"dev": true
-		},
-		"@types/uuid": {
-			"version": "3.4.4",
-			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
-			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/webpack-sources": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
-			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/source-list-map": "*",
-				"source-map": "^0.6.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"@types/zen-observable": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
-			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
-		},
-		"@webassemblyjs/ast": {
-			"version": "1.7.11",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
-			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
+		"@types/yargs": {
+			"version": "12.0.10",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.10.tgz",
+			"integrity": "sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==",
+			"dev": true
+		},
+		"@types/zen-observable": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
+			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
+		},
+		"@webassemblyjs/ast": {
+			"version": "1.7.11",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
+			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
 			"dev": true,
 			"requires": {
 				"@webassemblyjs/helper-module-context": "1.7.11",
@@ -5817,16 +3096,15 @@
 			"version": "1.3.5",
 			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
 			"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-			"dev": true,
 			"requires": {
 				"mime-types": "~2.1.18",
 				"negotiator": "0.6.1"
 			}
 		},
 		"acorn": {
-			"version": "6.0.6",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.6.tgz",
-			"integrity": "sha512-5M3G/A4uBSMIlfJ+h9W125vJvPFH/zirISsW5qfxF5YzEvXJCtolLoQvM5yZft0DvMcUrPGKPOlgEu55I6iUtA==",
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+			"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
 			"dev": true
 		},
 		"acorn-dynamic-import": {
@@ -5835,6 +3113,12 @@
 			"integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
 			"dev": true
 		},
+		"acorn-walk": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+			"integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+			"dev": true
+		},
 		"adm-zip": {
 			"version": "0.4.13",
 			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz",
@@ -5882,9 +3166,9 @@
 			"dev": true
 		},
 		"ajv-keywords": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.3.0.tgz",
-			"integrity": "sha512-CMzN9S62ZOO4sA/mJZIO4S++ZM7KFWzH3PPWkveLhy4OZ9i1/VatgwWMD46w/XbGCBy7Ye0gCk+Za6mmyfKK7g==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+			"integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
 			"dev": true
 		},
 		"align-text": {
@@ -5908,6 +3192,11 @@
 			"resolved": "https://registry.npmjs.org/angular2-logger/-/angular2-logger-0.7.0.tgz",
 			"integrity": "sha512-fB2ucBEKqJ6K+PyQEVKwIZhwcB2NvxPashHJEBGTG5Ex+NhC2xUNDhd1AILX+ZIRi3hz6QEKzbqGAxmusdUCkw=="
 		},
+		"ansi": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+			"integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
+		},
 		"ansi-align": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
@@ -5918,9 +3207,9 @@
 			}
 		},
 		"ansi-colors": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-			"integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+			"integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
 			"dev": true
 		},
 		"ansi-escapes": {
@@ -5953,7 +3242,6 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
 			"requires": {
 				"color-convert": "^1.9.0"
 			}
@@ -6332,102 +3620,121 @@
 			}
 		},
 		"apollo-angular-link-http": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.4.0.tgz",
-			"integrity": "sha512-YMtk4ZmmQ32kvQVnKNhkqk4QQQ+xb5aaq5XVxLv7AX6S7jDfHDLi18Hc25C4c8revM6gLoGV2Xj9ijvyGGbRCg==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz",
+			"integrity": "sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==",
 			"requires": {
-				"apollo-angular-link-http-common": "~1.4.0",
+				"apollo-angular-link-http-common": "~1.5.0",
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-angular-link-http-common": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.4.0.tgz",
-			"integrity": "sha512-VAneRp1YYwaggOKgbMGVSuLMpYroLL6tEgS5WH3iNBg4P7cBcubo3uajWRih7E4pZlzX+bCJ5GNqNDJ6xMFT7Q==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.1.tgz",
+			"integrity": "sha512-uSA7dDZpum9FCocxhrp24mL9EUGYWr2mgW9Tb5uea0eYU3UDmjYSKT/sBSLGQN87P5drXbYrmSj58PtCWmhIMA==",
 			"requires": {
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-cache": {
-			"version": "1.1.25",
-			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.25.tgz",
-			"integrity": "sha512-9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz",
+			"integrity": "sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==",
 			"requires": {
-				"apollo-utilities": "^1.1.2",
+				"apollo-utilities": "^1.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-cache-inmemory": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.2.tgz",
-			"integrity": "sha512-fDVmj5j1e3W+inyuSwjIcMgbQ4edcFgmiKTBMFAEKAq0jg33X7FrbDX8JT2t5Vuf75Mva50JDlt5wXdu7C6WuA==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz",
+			"integrity": "sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==",
 			"requires": {
-				"apollo-cache": "^1.1.25",
-				"apollo-utilities": "^1.1.2",
+				"apollo-cache": "^1.2.1",
+				"apollo-utilities": "^1.2.1",
 				"optimism": "^0.6.9",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-client": {
-			"version": "2.4.12",
-			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.12.tgz",
-			"integrity": "sha512-E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w==",
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz",
+			"integrity": "sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==",
 			"requires": {
 				"@types/zen-observable": "^0.8.0",
-				"apollo-cache": "1.1.25",
+				"apollo-cache": "1.2.1",
 				"apollo-link": "^1.0.0",
 				"apollo-link-dedup": "^1.0.0",
-				"apollo-utilities": "1.1.2",
+				"apollo-utilities": "1.2.1",
 				"symbol-observable": "^1.0.2",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"apollo-link": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.8.tgz",
-			"integrity": "sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==",
+			"version": "1.2.11",
+			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.11.tgz",
+			"integrity": "sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==",
 			"requires": {
-				"zen-observable-ts": "^0.8.15"
+				"apollo-utilities": "^1.2.1",
+				"ts-invariant": "^0.3.2",
+				"tslib": "^1.9.3",
+				"zen-observable-ts": "^0.8.18"
+			},
+			"dependencies": {
+				"ts-invariant": {
+					"version": "0.3.2",
+					"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz",
+					"integrity": "sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==",
+					"requires": {
+						"tslib": "^1.9.3"
+					}
+				}
 			}
 		},
 		"apollo-link-context": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.14.tgz",
-			"integrity": "sha512-l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.17.tgz",
+			"integrity": "sha512-W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-dedup": {
-			"version": "1.0.15",
-			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz",
-			"integrity": "sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==",
+			"version": "1.0.18",
+			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz",
+			"integrity": "sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-ws": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz",
-			"integrity": "sha512-KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz",
+			"integrity": "sha512-0PKgahM2BOcUiI3QSJMYXOoUylWKzar5NTZLgMLEW4K/CczOTzC4CTXvKMjh/cx57Jto/U2xzKRy9BEoNfnK5Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-utilities": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.2.tgz",
-			"integrity": "sha512-EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
+			"integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
 			"requires": {
 				"fast-json-stable-stringify": "^2.0.0",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"app-root-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
-			"integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=",
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+			"integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
 			"dev": true
 		},
 		"append-transform": {
@@ -6492,6 +3799,16 @@
 				"sprintf-js": "~1.0.2"
 			}
 		},
+		"aria-query": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+			"integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7",
+				"commander": "^2.11.0"
+			}
+		},
 		"arr-diff": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -6524,12 +3841,6 @@
 			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
 			"dev": true
 		},
-		"array-slice": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-			"integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-			"dev": true
-		},
 		"array-union": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -6623,10 +3934,69 @@
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
 			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
 		},
+		"ast-transform": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/ast-transform/-/ast-transform-0.0.0.tgz",
+			"integrity": "sha1-dJRAWIh9goPhidlUYAlHvJj+AGI=",
+			"dev": true,
+			"requires": {
+				"escodegen": "~1.2.0",
+				"esprima": "~1.0.4",
+				"through": "~2.3.4"
+			},
+			"dependencies": {
+				"escodegen": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz",
+					"integrity": "sha1-Cd55Z3kcyVi3+Jot220jRRrzJ+E=",
+					"dev": true,
+					"requires": {
+						"esprima": "~1.0.4",
+						"estraverse": "~1.5.0",
+						"esutils": "~1.0.0",
+						"source-map": "~0.1.30"
+					}
+				},
+				"esprima": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+					"integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=",
+					"dev": true
+				},
+				"estraverse": {
+					"version": "1.5.1",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+					"integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
+					"integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
 		"ast-types": {
-			"version": "0.11.7",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz",
-			"integrity": "sha512-2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw==",
+			"version": "0.7.8",
+			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.7.8.tgz",
+			"integrity": "sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=",
+			"dev": true
+		},
+		"ast-types-flow": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+			"integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
 			"dev": true
 		},
 		"astral-regex": {
@@ -6692,6 +4062,15 @@
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
 			"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
 		},
+		"axobject-query": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+			"integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7"
+			}
+		},
 		"babel-code-frame": {
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -6774,6 +4153,12 @@
 				"regenerator-runtime": "^0.10.0"
 			},
 			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				},
 				"regenerator-runtime": {
 					"version": "0.10.5",
 					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
@@ -6790,6 +4175,14 @@
 			"requires": {
 				"core-js": "^2.4.0",
 				"regenerator-runtime": "^0.11.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				}
 			}
 		},
 		"babel-template": {
@@ -6850,15 +4243,70 @@
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
 		},
+		"base": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"requires": {
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"requires": {
+						"is-descriptor": "^1.0.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				}
+			}
+		},
 		"base64-arraybuffer": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
 			"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
 		},
 		"base64-js": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
-			"integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+			"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
 			"dev": true
 		},
 		"base64id": {
@@ -6916,6 +4364,11 @@
 				"tryer": "^1.0.0"
 			}
 		},
+		"big-integer": {
+			"version": "1.6.43",
+			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz",
+			"integrity": "sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg=="
+		},
 		"big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -6960,11 +4413,22 @@
 			"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
 			"dev": true
 		},
+		"body": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+			"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+			"dev": true,
+			"requires": {
+				"continuable-cache": "^0.3.1",
+				"error": "^7.0.0",
+				"raw-body": "~1.1.0",
+				"safe-json-parse": "~1.0.1"
+			}
+		},
 		"body-parser": {
 			"version": "1.18.3",
 			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
 			"integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
-			"dev": true,
 			"requires": {
 				"bytes": "3.0.0",
 				"content-type": "~1.0.4",
@@ -6982,7 +4446,6 @@
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
 					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
-					"dev": true,
 					"requires": {
 						"bytes": "3.0.0",
 						"http-errors": "1.6.3",
@@ -7021,9 +4484,9 @@
 			}
 		},
 		"bootstrap": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.2.1.tgz",
-			"integrity": "sha512-tt/7vIv3Gm2mnd/WeDx36nfGGHleil0Wg8IeB7eMrVkY0fZ5iTaBisSh8oNANc2IBsCc6vCgCNTIM/IEN0+50Q=="
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+			"integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
 		},
 		"boxen": {
 			"version": "1.3.0",
@@ -7040,6 +4503,14 @@
 				"widest-line": "^2.0.0"
 			}
 		},
+		"bplist-parser": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+			"integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+			"requires": {
+				"big-integer": "^1.6.7"
+			}
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -7049,12 +4520,60 @@
 				"concat-map": "0.0.1"
 			}
 		},
+		"braces": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+			"requires": {
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"brfs": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz",
+			"integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==",
+			"dev": true,
+			"requires": {
+				"quote-stream": "^1.0.1",
+				"resolve": "^1.1.5",
+				"static-module": "^2.2.0",
+				"through2": "^2.0.0"
+			}
+		},
 		"brorand": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
 			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
 			"dev": true
 		},
+		"brotli": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz",
+			"integrity": "sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=",
+			"dev": true,
+			"requires": {
+				"base64-js": "^1.1.2"
+			}
+		},
 		"browser-resolve": {
 			"version": "1.11.3",
 			"resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
@@ -7062,6 +4581,14 @@
 			"dev": true,
 			"requires": {
 				"resolve": "1.1.7"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.1.7",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+					"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+					"dev": true
+				}
 			}
 		},
 		"browserify-aes": {
@@ -7101,6 +4628,17 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"browserify-optional": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/browserify-optional/-/browserify-optional-1.0.1.tgz",
+			"integrity": "sha1-HhNyLP3g2F8SFnbCpyztUzoBiGk=",
+			"dev": true,
+			"requires": {
+				"ast-transform": "0.0.0",
+				"ast-types": "^0.7.0",
+				"browser-resolve": "^1.8.1"
+			}
+		},
 		"browserify-rsa": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
@@ -7136,14 +4674,14 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz",
-			"integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==",
+			"version": "4.5.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.3.tgz",
+			"integrity": "sha512-Tx/Jtrmh6vFg24AelzLwCaCq1IUJiMDM1x/LPzqbmbktF8Zo7F9ONUpOWsFK6TtdON95mSMaQUWqi0ilc8xM6g==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30000929",
-				"electron-to-chromium": "^1.3.103",
-				"node-releases": "^1.1.3"
+				"caniuse-lite": "^1.0.30000955",
+				"electron-to-chromium": "^1.3.122",
+				"node-releases": "^1.1.12"
 			}
 		},
 		"browserstack": {
@@ -7182,6 +4720,12 @@
 			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
 			"dev": true
 		},
+		"buffer-equal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
+			"integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=",
+			"dev": true
+		},
 		"buffer-fill": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
@@ -7226,8 +4770,36 @@
 		"bytes": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-			"dev": true
+			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+		},
+		"cacache": {
+			"version": "10.0.4",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+			"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.1",
+				"chownr": "^1.0.1",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.1.11",
+				"lru-cache": "^4.1.1",
+				"mississippi": "^2.0.0",
+				"mkdirp": "^0.5.1",
+				"move-concurrently": "^1.0.1",
+				"promise-inflight": "^1.0.1",
+				"rimraf": "^2.6.2",
+				"ssri": "^5.2.4",
+				"unique-filename": "^1.1.0",
+				"y18n": "^4.0.0"
+			},
+			"dependencies": {
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
 		},
 		"cache-base": {
 			"version": "1.0.1",
@@ -7252,9 +4824,9 @@
 			"dev": true
 		},
 		"call-number": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/call-number/-/call-number-0.0.2.tgz",
-			"integrity": "sha1-GWnh1XQt42na7Q9EM4wawhKDcP8="
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/call-number/-/call-number-1.0.1.tgz",
+			"integrity": "sha1-v52q5If9alVz+JqjZV++ivA2r9I="
 		},
 		"caller-callsite": {
 			"version": "2.0.0",
@@ -7316,9 +4888,9 @@
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30000933",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000933.tgz",
-			"integrity": "sha512-d3QXv7eFTU40DSedSP81dV/ajcGSKpT+GW+uhtWmLvQm9bPk0KK++7i1e2NSW/CXGZhWFt2mFbFtCJ5I5bMuVA==",
+			"version": "1.0.30000955",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
+			"integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==",
 			"dev": true
 		},
 		"canonical-path": {
@@ -7352,7 +4924,6 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -7363,7 +4934,6 @@
 					"version": "5.5.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
 					"requires": {
 						"has-flag": "^3.0.0"
 					}
@@ -7382,6 +4952,51 @@
 			"integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
 			"dev": true
 		},
+		"cheerio": {
+			"version": "1.0.0-rc.2",
+			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
+			"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
+			"dev": true,
+			"requires": {
+				"css-select": "~1.2.0",
+				"dom-serializer": "~0.1.0",
+				"entities": "~1.1.1",
+				"htmlparser2": "^3.9.1",
+				"lodash": "^4.15.0",
+				"parse5": "^3.0.1"
+			},
+			"dependencies": {
+				"parse5": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+					"dev": true,
+					"requires": {
+						"@types/node": "*"
+					}
+				}
+			}
+		},
+		"chokidar": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+			"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+			"requires": {
+				"anymatch": "^2.0.0",
+				"async-each": "^1.0.0",
+				"braces": "^2.3.0",
+				"fsevents": "^1.2.2",
+				"glob-parent": "^3.1.0",
+				"inherits": "^2.0.1",
+				"is-binary-path": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"lodash.debounce": "^4.0.8",
+				"normalize-path": "^2.1.1",
+				"path-is-absolute": "^1.0.0",
+				"readdirp": "^2.0.0",
+				"upath": "^1.0.5"
+			}
+		},
 		"chownr": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
@@ -7419,12 +5034,6 @@
 			"integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
 			"dev": true
 		},
-		"circular-json": {
-			"version": "0.5.9",
-			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-			"integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
-			"dev": true
-		},
 		"class-utils": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -7484,6 +5093,34 @@
 			"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
 			"dev": true
 		},
+		"cliui": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+			"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^2.1.1",
+				"strip-ansi": "^4.0.0",
+				"wrap-ansi": "^2.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^3.0.0"
+					}
+				}
+			}
+		},
 		"clone": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
@@ -7515,9 +5152,9 @@
 			"dev": true
 		},
 		"code-block-writer": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.2.2.tgz",
-			"integrity": "sha512-8SyXM1bWsMDCzvCoTdnDBhnnUbHntxcba4ApBIO3S3QX0M2Iq0xZCzs6SYdBOGaSUi4drysvrAK15JoXhlpsvQ==",
+			"version": "7.3.0",
+			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.3.0.tgz",
+			"integrity": "sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==",
 			"dev": true
 		},
 		"code-point-at": {
@@ -7526,17 +5163,20 @@
 			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
 		},
 		"codelyzer": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz",
-			"integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.0.0.tgz",
+			"integrity": "sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==",
 			"dev": true,
 			"requires": {
 				"app-root-path": "^2.1.0",
-				"css-selector-tokenizer": "^0.7.0",
+				"aria-query": "^3.0.0",
+				"axobject-query": "^2.0.2",
+				"css-selector-tokenizer": "^0.7.1",
 				"cssauron": "^1.4.0",
+				"damerau-levenshtein": "^1.0.4",
 				"semver-dsl": "^1.0.1",
 				"source-map": "^0.5.7",
-				"sprintf-js": "^1.1.1"
+				"sprintf-js": "^1.1.2"
 			},
 			"dependencies": {
 				"source-map": {
@@ -7566,7 +5206,6 @@
 			"version": "1.9.3",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
 			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
 			"requires": {
 				"color-name": "1.1.3"
 			}
@@ -7574,550 +5213,290 @@
 		"color-name": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
 		"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
-		},
-		"colors": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-			"dev": true
-		},
-		"combine-lists": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-			"integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.5.0"
-			}
-		},
-		"combined-stream": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
-		"commander": {
-			"version": "2.17.1",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-			"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-			"dev": true
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-			"dev": true
-		},
-		"compare-versions": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
-			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
-			"dev": true
-		},
-		"component-bind": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
-		},
-		"component-emitter": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
-		},
-		"component-inherit": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
-		},
-		"compressible": {
-			"version": "2.0.15",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
-			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
-			"dev": true,
-			"requires": {
-				"mime-db": ">= 1.36.0 < 2"
-			},
-			"dependencies": {
-				"mime-db": {
-					"version": "1.37.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
-					"dev": true
-				}
-			}
-		},
-		"compression": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
-			"dev": true,
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.14",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.1",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			}
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"concat-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
-			}
-		},
-		"configstore": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-			"dev": true,
-			"requires": {
-				"dot-prop": "^4.1.0",
-				"graceful-fs": "^4.1.2",
-				"make-dir": "^1.0.0",
-				"unique-string": "^1.0.0",
-				"write-file-atomic": "^2.0.0",
-				"xdg-basedir": "^3.0.0"
-			}
-		},
-		"connect-history-api-fallback": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-			"dev": true
-		},
-		"console-browserify": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-			"dev": true,
-			"requires": {
-				"date-now": "^0.1.4"
-			}
-		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-		},
-		"constants-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-			"dev": true
-		},
-		"content-disposition": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-			"dev": true
-		},
-		"content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
 			"dev": true
 		},
-		"continuable-cache": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+		"colors": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
 			"dev": true
 		},
-		"convert-source-map": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
-			"dev": true,
+		"combined-stream": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
 			"requires": {
-				"safe-buffer": "~5.1.1"
+				"delayed-stream": "~1.0.0"
 			}
 		},
-		"cookie": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+		"commander": {
+			"version": "2.19.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+			"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
 			"dev": true
 		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+		"commondir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
 			"dev": true
 		},
-		"cookiejar": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+		"compare-versions": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
+			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
 			"dev": true
 		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		"component-bind": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
 		},
-		"cordova-android": {
-			"version": "7.1.4",
-			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
-			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
-			"requires": {
-				"abbrev": "*",
-				"android-versions": "1.4.0",
-				"ansi": "*",
-				"balanced-match": "*",
-				"base64-js": "1.2.0",
-				"big-integer": "1.6.32",
-				"bplist-parser": "*",
-				"brace-expansion": "*",
-				"concat-map": "*",
-				"cordova-common": "2.2.5",
-				"cordova-registry-mapper": "*",
-				"elementtree": "0.1.6",
-				"glob": "5.0.15",
-				"inflight": "*",
-				"inherits": "*",
-				"minimatch": "*",
-				"nopt": "3.0.1",
-				"once": "*",
-				"path-is-absolute": "1.0.1",
-				"plist": "2.1.0",
-				"properties-parser": "0.2.3",
-				"q": "1.4.1",
-				"sax": "0.3.5",
-				"semver": "5.5.0",
-				"shelljs": "0.5.3",
-				"underscore": "*",
-				"unorm": "*",
-				"wrappy": "*",
-				"xmlbuilder": "8.2.2",
-				"xmldom": "*"
-			},
-			"dependencies": {
-				"abbrev": {
-					"version": "1.1.1",
-					"bundled": true
-				},
-				"android-versions": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"semver": "^5.4.1"
-					}
-				},
-				"ansi": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"base64-js": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"bundled": true
-				},
-				"cordova-common": {
-					"version": "2.2.5",
-					"bundled": true,
-					"requires": {
-						"ansi": "^0.3.1",
-						"bplist-parser": "^0.1.0",
-						"cordova-registry-mapper": "^1.1.8",
-						"elementtree": "0.1.6",
-						"glob": "^5.0.13",
-						"minimatch": "^3.0.0",
-						"plist": "^2.1.0",
-						"q": "^1.4.1",
-						"shelljs": "^0.5.3",
-						"underscore": "^1.8.3",
-						"unorm": "^1.3.3"
-					}
-				},
-				"cordova-registry-mapper": {
-					"version": "1.1.15",
-					"bundled": true
-				},
-				"elementtree": {
-					"version": "0.1.6",
-					"bundled": true,
-					"requires": {
-						"sax": "0.3.5"
-					}
-				},
-				"glob": {
-					"version": "5.0.15",
-					"bundled": true,
-					"requires": {
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "2 || 3",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"inflight": {
-					"version": "1.0.6",
-					"bundled": true,
-					"requires": {
-						"once": "^1.3.0",
-						"wrappy": "1"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"bundled": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"bundled": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"nopt": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"abbrev": "1"
-					}
-				},
-				"once": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"properties-parser": {
-					"version": "0.2.3",
-					"bundled": true
-				},
-				"q": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"semver": {
-					"version": "5.5.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"underscore": {
-					"version": "1.9.1",
-					"bundled": true
-				},
-				"unorm": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"wrappy": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"xmlbuilder": {
-					"version": "8.2.2",
-					"bundled": true
-				},
-				"xmldom": {
-					"version": "0.1.27",
-					"bundled": true
+		"component-emitter": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+		},
+		"component-inherit": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
+		},
+		"compressible": {
+			"version": "2.0.15",
+			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
+			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
+			"requires": {
+				"mime-db": ">= 1.36.0 < 2"
+			},
+			"dependencies": {
+				"mime-db": {
+					"version": "1.37.0",
+					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
+					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
 				}
 			}
 		},
-		"cordova-android-support-gradle-release": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
-			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+		"compression": {
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
 			"requires": {
-				"semver": "5.1.0",
-				"xml2js": "~0.4.19"
+				"accepts": "~1.3.5",
+				"bytes": "3.0.0",
+				"compressible": "~2.0.14",
+				"debug": "2.6.9",
+				"on-headers": "~1.0.1",
+				"safe-buffer": "5.1.2",
+				"vary": "~1.1.2"
+			}
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+		},
+		"concat-stream": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+			"dev": true,
+			"requires": {
+				"buffer-from": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.2.2",
+				"typedarray": "^0.0.6"
+			}
+		},
+		"configstore": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
+			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+			"dev": true,
+			"requires": {
+				"dot-prop": "^4.1.0",
+				"graceful-fs": "^4.1.2",
+				"make-dir": "^1.0.0",
+				"unique-string": "^1.0.0",
+				"write-file-atomic": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			}
+		},
+		"connect": {
+			"version": "3.6.6",
+			"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+			"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+			"dev": true,
+			"requires": {
+				"debug": "2.6.9",
+				"finalhandler": "1.1.0",
+				"parseurl": "~1.3.2",
+				"utils-merge": "1.0.1"
 			},
 			"dependencies": {
-				"semver": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
-					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				"finalhandler": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"encodeurl": "~1.0.1",
+						"escape-html": "~1.0.3",
+						"on-finished": "~2.3.0",
+						"parseurl": "~1.3.2",
+						"statuses": "~1.3.1",
+						"unpipe": "~1.0.0"
+					}
+				},
+				"statuses": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+					"dev": true
 				}
 			}
 		},
-		"cordova-browser": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-5.0.4.tgz",
-			"integrity": "sha512-EDuG+9NGsaYpNSY6wF0kR34m1m38V+nRglGXxQ609fgMYrMHEYR2lg38nDr1Os4qeF0LJz8UQ7nq7Y+idg6Aig==",
+		"connect-history-api-fallback": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+			"dev": true
+		},
+		"console-browserify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+			"dev": true,
+			"requires": {
+				"date-now": "^0.1.4"
+			}
+		},
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+		},
+		"constants-browserify": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+			"dev": true
+		},
+		"content-disposition": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+		},
+		"content-type": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+		},
+		"continuable-cache": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+			"dev": true
+		},
+		"convert-source-map": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"cookie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+		},
+		"cookie-signature": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+		},
+		"cookiejar": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+			"dev": true
+		},
+		"copy-concurrently": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"fs-write-stream-atomic": "^1.0.8",
+				"iferr": "^0.1.5",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.0"
+			}
+		},
+		"copy-descriptor": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		},
+		"copy-webpack-plugin": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+			"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+			"dev": true,
+			"requires": {
+				"cacache": "^10.0.4",
+				"find-cache-dir": "^1.0.0",
+				"globby": "^7.1.1",
+				"is-glob": "^4.0.0",
+				"loader-utils": "^1.1.0",
+				"minimatch": "^3.0.4",
+				"p-limit": "^1.0.0",
+				"serialize-javascript": "^1.4.0"
+			}
+		},
+		"cordova-android": {
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
+			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
 			"requires": {
 				"abbrev": "*",
-				"accepts": "*",
+				"android-versions": "1.4.0",
 				"ansi": "*",
-				"ansi-regex": "2.1.1",
-				"ansi-styles": "2.2.1",
-				"array-flatten": "1.1.1",
 				"balanced-match": "*",
 				"base64-js": "1.2.0",
-				"big-integer": "*",
-				"body-parser": "1.18.2",
+				"big-integer": "1.6.32",
 				"bplist-parser": "*",
 				"brace-expansion": "*",
-				"bytes": "*",
-				"chalk": "1.1.3",
-				"compressible": "*",
-				"compression": "1.7.2",
 				"concat-map": "*",
-				"content-disposition": "*",
-				"content-type": "*",
-				"cookie": "*",
-				"cookie-signature": "1.0.6",
 				"cordova-common": "2.2.5",
 				"cordova-registry-mapper": "*",
-				"cordova-serve": "2.0.1",
-				"debug": "2.6.9",
-				"depd": "*",
-				"destroy": "*",
-				"ee-first": "*",
 				"elementtree": "0.1.6",
-				"encodeurl": "*",
-				"escape-html": "*",
-				"escape-string-regexp": "*",
-				"etag": "*",
-				"express": "*",
-				"finalhandler": "*",
-				"forwarded": "*",
-				"fresh": "*",
 				"glob": "5.0.15",
-				"has-ansi": "2.0.0",
-				"http-errors": "1.6.3",
-				"iconv-lite": "0.4.19",
 				"inflight": "*",
 				"inherits": "*",
-				"ipaddr.js": "1.6.0",
-				"is-wsl": "*",
-				"media-typer": "*",
-				"merge-descriptors": "*",
-				"methods": "*",
-				"mime": "1.4.1",
-				"mime-db": "1.33.0",
-				"mime-types": "2.1.18",
 				"minimatch": "*",
-				"ms": "2.0.0",
-				"negotiator": "*",
-				"nopt": "3.0.6",
-				"on-finished": "*",
-				"on-headers": "*",
+				"nopt": "3.0.1",
 				"once": "*",
-				"opn": "*",
-				"parseurl": "*",
-				"path-is-absolute": "*",
-				"path-to-regexp": "0.1.7",
+				"path-is-absolute": "1.0.1",
 				"plist": "2.1.0",
-				"proxy-addr": "2.0.3",
-				"q": "*",
-				"qs": "6.5.1",
-				"range-parser": "*",
-				"raw-body": "2.3.2",
-				"safe-buffer": "5.1.1",
+				"properties-parser": "0.2.3",
+				"q": "1.4.1",
 				"sax": "0.3.5",
-				"send": "*",
-				"serve-static": "*",
-				"setprototypeof": "*",
+				"semver": "5.5.0",
 				"shelljs": "0.5.3",
-				"statuses": "1.4.0",
-				"strip-ansi": "3.0.1",
-				"supports-color": "2.0.0",
-				"type-is": "*",
 				"underscore": "*",
 				"unorm": "*",
-				"unpipe": "*",
-				"utils-merge": "*",
-				"vary": "*",
 				"wrappy": "*",
 				"xmlbuilder": "8.2.2",
 				"xmldom": "*"
@@ -8127,30 +5506,17 @@
 					"version": "1.1.1",
 					"bundled": true
 				},
-				"accepts": {
-					"version": "1.3.5",
+				"android-versions": {
+					"version": "1.4.0",
 					"bundled": true,
 					"requires": {
-						"mime-types": "~2.1.18",
-						"negotiator": "0.6.1"
+						"semver": "^5.4.1"
 					}
 				},
 				"ansi": {
 					"version": "0.3.1",
 					"bundled": true
 				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"bundled": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"bundled": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true
@@ -8160,101 +5526,28 @@
 					"bundled": true
 				},
 				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"body-parser": {
-					"version": "1.18.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"content-type": "~1.0.4",
-						"debug": "2.6.9",
-						"depd": "~1.1.1",
-						"http-errors": "~1.6.2",
-						"iconv-lite": "0.4.19",
-						"on-finished": "~2.3.0",
-						"qs": "6.5.1",
-						"raw-body": "2.3.2",
-						"type-is": "~1.6.15"
-					}
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"bytes": {
-					"version": "3.0.0",
-					"bundled": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"bundled": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
+					"version": "1.6.32",
+					"bundled": true
 				},
-				"compressible": {
-					"version": "2.0.14",
+				"bplist-parser": {
+					"version": "0.1.1",
 					"bundled": true,
 					"requires": {
-						"mime-db": ">= 1.34.0 < 2"
-					},
-					"dependencies": {
-						"mime-db": {
-							"version": "1.34.0",
-							"bundled": true
-						}
+						"big-integer": "^1.6.7"
 					}
 				},
-				"compression": {
-					"version": "1.7.2",
+				"brace-expansion": {
+					"version": "1.1.11",
 					"bundled": true,
 					"requires": {
-						"accepts": "~1.3.4",
-						"bytes": "3.0.0",
-						"compressible": "~2.0.13",
-						"debug": "2.6.9",
-						"on-headers": "~1.0.1",
-						"safe-buffer": "5.1.1",
-						"vary": "~1.1.2"
+						"balanced-match": "^1.0.0",
+						"concat-map": "0.0.1"
 					}
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true
 				},
-				"content-disposition": {
-					"version": "0.5.2",
-					"bundled": true
-				},
-				"content-type": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"cookie": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"cookie-signature": {
-					"version": "1.0.6",
-					"bundled": true
-				},
 				"cordova-common": {
 					"version": "2.2.5",
 					"bundled": true,
@@ -8276,36 +5569,6 @@
 					"version": "1.1.15",
 					"bundled": true
 				},
-				"cordova-serve": {
-					"version": "2.0.1",
-					"bundled": true,
-					"requires": {
-						"chalk": "^1.1.1",
-						"compression": "^1.6.0",
-						"express": "^4.13.3",
-						"opn": "^5.3.0",
-						"shelljs": "^0.5.3"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"bundled": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"destroy": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"ee-first": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"elementtree": {
 					"version": "0.1.6",
 					"bundled": true,
@@ -8313,79 +5576,6 @@
 						"sax": "0.3.5"
 					}
 				},
-				"encodeurl": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"escape-html": {
-					"version": "1.0.3",
-					"bundled": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"bundled": true
-				},
-				"etag": {
-					"version": "1.8.1",
-					"bundled": true
-				},
-				"express": {
-					"version": "4.16.3",
-					"bundled": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.2",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.3",
-						"qs": "6.5.1",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.1",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.1",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.4.0",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"forwarded": {
-					"version": "0.1.2",
-					"bundled": true
-				},
-				"fresh": {
-					"version": "0.5.2",
-					"bundled": true
-				},
 				"glob": {
 					"version": "5.0.15",
 					"bundled": true,
@@ -8397,27 +5587,6 @@
 						"path-is-absolute": "^1.0.0"
 					}
 				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"bundled": true,
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"bundled": true
-				},
 				"inflight": {
 					"version": "1.0.6",
 					"bundled": true,
@@ -8430,41 +5599,6 @@
 					"version": "2.0.3",
 					"bundled": true
 				},
-				"ipaddr.js": {
-					"version": "1.6.0",
-					"bundled": true
-				},
-				"is-wsl": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"media-typer": {
-					"version": "0.3.0",
-					"bundled": true
-				},
-				"merge-descriptors": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"methods": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"mime-db": {
-					"version": "1.33.0",
-					"bundled": true
-				},
-				"mime-types": {
-					"version": "2.1.18",
-					"bundled": true,
-					"requires": {
-						"mime-db": "~1.33.0"
-					}
-				},
 				"minimatch": {
 					"version": "3.0.4",
 					"bundled": true,
@@ -8472,32 +5606,13 @@
 						"brace-expansion": "^1.1.7"
 					}
 				},
-				"ms": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"negotiator": {
-					"version": "0.6.1",
-					"bundled": true
-				},
 				"nopt": {
-					"version": "3.0.6",
+					"version": "3.0.1",
 					"bundled": true,
 					"requires": {
 						"abbrev": "1"
 					}
 				},
-				"on-finished": {
-					"version": "2.3.0",
-					"bundled": true,
-					"requires": {
-						"ee-first": "1.1.1"
-					}
-				},
-				"on-headers": {
-					"version": "1.0.1",
-					"bundled": true
-				},
 				"once": {
 					"version": "1.4.0",
 					"bundled": true,
@@ -8505,170 +5620,45 @@
 						"wrappy": "1"
 					}
 				},
-				"opn": {
-					"version": "5.3.0",
-					"bundled": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parseurl": {
-					"version": "1.3.2",
-					"bundled": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"path-to-regexp": {
-					"version": "0.1.7",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"proxy-addr": {
-					"version": "2.0.3",
-					"bundled": true,
-					"requires": {
-						"forwarded": "~0.1.2",
-						"ipaddr.js": "1.6.0"
-					}
-				},
-				"q": {
-					"version": "1.5.1",
-					"bundled": true
-				},
-				"qs": {
-					"version": "6.5.1",
-					"bundled": true
-				},
-				"range-parser": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"raw-body": {
-					"version": "2.3.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"http-errors": "1.6.2",
-						"iconv-lite": "0.4.19",
-						"unpipe": "1.0.0"
-					},
-					"dependencies": {
-						"depd": {
-							"version": "1.1.1",
-							"bundled": true
-						},
-						"http-errors": {
-							"version": "1.6.2",
-							"bundled": true,
-							"requires": {
-								"depd": "1.1.1",
-								"inherits": "2.0.3",
-								"setprototypeof": "1.0.3",
-								"statuses": ">= 1.3.1 < 2"
-							}
-						},
-						"setprototypeof": {
-							"version": "1.0.3",
-							"bundled": true
-						}
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"send": {
-					"version": "0.16.2",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					}
-				},
-				"serve-static": {
-					"version": "1.13.2",
-					"bundled": true,
-					"requires": {
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"parseurl": "~1.3.2",
-						"send": "0.16.2"
-					}
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"statuses": {
-					"version": "1.4.0",
-					"bundled": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
+				"path-is-absolute": {
+					"version": "1.0.1",
 					"bundled": true
 				},
-				"type-is": {
-					"version": "1.6.16",
+				"plist": {
+					"version": "2.1.0",
 					"bundled": true,
 					"requires": {
-						"media-typer": "0.3.0",
-						"mime-types": "~2.1.18"
+						"base64-js": "1.2.0",
+						"xmlbuilder": "8.2.2",
+						"xmldom": "0.1.x"
 					}
 				},
-				"underscore": {
-					"version": "1.9.1",
+				"properties-parser": {
+					"version": "0.2.3",
 					"bundled": true
 				},
-				"unorm": {
+				"q": {
 					"version": "1.4.1",
 					"bundled": true
 				},
-				"unpipe": {
-					"version": "1.0.0",
+				"sax": {
+					"version": "0.3.5",
 					"bundled": true
 				},
-				"utils-merge": {
-					"version": "1.0.1",
+				"semver": {
+					"version": "5.5.0",
 					"bundled": true
 				},
-				"vary": {
-					"version": "1.1.2",
+				"shelljs": {
+					"version": "0.5.3",
+					"bundled": true
+				},
+				"underscore": {
+					"version": "1.9.1",
+					"bundled": true
+				},
+				"unorm": {
+					"version": "1.4.1",
 					"bundled": true
 				},
 				"wrappy": {
@@ -8685,6 +5675,69 @@
 				}
 			}
 		},
+		"cordova-android-support-gradle-release": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
+			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+			"requires": {
+				"semver": "5.1.0",
+				"xml2js": "~0.4.19"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
+					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				}
+			}
+		},
+		"cordova-browser": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-6.0.0.tgz",
+			"integrity": "sha512-G61S7fhnVVJC98lvkGeKCVpfFtoW0a1P1Sg9TK+n03g3yupDMIM7XuecWuJ3KEMRhED4+CEc2hauruAff7oXrw==",
+			"requires": {
+				"cordova-common": "^3.1.0",
+				"cordova-serve": "^3.0.0",
+				"nopt": "^4.0.1",
+				"shelljs": "^0.5.3"
+			},
+			"dependencies": {
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				},
+				"shelljs": {
+					"version": "0.5.3",
+					"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+					"integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
+				}
+			}
+		},
+		"cordova-common": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.1.0.tgz",
+			"integrity": "sha512-J2MM1ioyLlBYdwdXH40OZL4hN7XEBOfurddKYifF4aTkb2PkbeM+KVORt53eyU+8ScA0QmRLuTG0EM55eLms0A==",
+			"requires": {
+				"ansi": "^0.3.1",
+				"bplist-parser": "^0.1.0",
+				"cross-spawn": "^6.0.5",
+				"elementtree": "0.1.7",
+				"endent": "^1.1.1",
+				"fs-extra": "^7.0.0",
+				"glob": "^7.1.2",
+				"minimatch": "^3.0.0",
+				"plist": "^3.0.1",
+				"q": "^1.4.1",
+				"strip-bom": "^3.0.0",
+				"underscore": "^1.8.3",
+				"which": "^1.3.0"
+			}
+		},
 		"cordova-plugin-appavailability": {
 			"version": "0.4.2",
 			"resolved": "https://registry.npmjs.org/cordova-plugin-appavailability/-/cordova-plugin-appavailability-0.4.2.tgz",
@@ -8731,9 +5784,9 @@
 			"integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ=="
 		},
 		"cordova-plugin-ionic-webview": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-3.1.1.tgz",
-			"integrity": "sha512-dVRTvotXa1c63P55ckE/uejVlNOQU+wCLp5KANAFEYW1fxNswWJ6AM/NMNh1q9rGSH/hl9Z3C3rTkgYfdqNqDA=="
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.1.tgz",
+			"integrity": "sha512-rJf7jFQNw7l0U4Y7P6DjxwmO/qQgS7xqiTgwDbNFS4z4+FZ3EZyupll7/cFEDnxGRNMgWsMKDhIABUo5mIDaUQ=="
 		},
 		"cordova-plugin-mixpanel": {
 			"version": "4.5.2",
@@ -8765,10 +5818,22 @@
 			"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
 			"integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q="
 		},
+		"cordova-serve": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-3.0.0.tgz",
+			"integrity": "sha512-h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w==",
+			"requires": {
+				"chalk": "^2.4.1",
+				"compression": "^1.6.0",
+				"express": "^4.13.3",
+				"opn": "^5.3.0",
+				"which": "^1.3.0"
+			}
+		},
 		"core-js": {
-			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
-			"integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ=="
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz",
+			"integrity": "sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ=="
 		},
 		"core-util-is": {
 			"version": "1.0.2",
@@ -8785,6 +5850,18 @@
 				"vary": "^1"
 			}
 		},
+		"cosmiconfig": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+			"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+			"dev": true,
+			"requires": {
+				"is-directory": "^0.3.1",
+				"js-yaml": "^3.9.0",
+				"parse-json": "^4.0.0",
+				"require-from-string": "^2.0.1"
+			}
+		},
 		"cpr": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz",
@@ -8843,6 +5920,28 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"cross-env": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz",
+			"integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.5",
+				"is-windows": "^1.0.0"
+			}
+		},
+		"cross-spawn": {
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"requires": {
+				"nice-try": "^1.0.4",
+				"path-key": "^2.0.1",
+				"semver": "^5.5.0",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			}
+		},
 		"cryptiles": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-4.1.3.tgz",
@@ -8870,6 +5969,12 @@
 				"randomfill": "^1.0.3"
 			}
 		},
+		"crypto-js": {
+			"version": "3.1.9-1",
+			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
+			"integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=",
+			"dev": true
+		},
 		"crypto-random-string": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -8906,9 +6011,9 @@
 			}
 		},
 		"css-what": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz",
-			"integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+			"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
 			"dev": true
 		},
 		"cssauron": {
@@ -8955,6 +6060,12 @@
 				"es5-ext": "^0.10.9"
 			}
 		},
+		"damerau-levenshtein": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
+			"integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=",
+			"dev": true
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -8973,17 +6084,17 @@
 			},
 			"dependencies": {
 				"@types/node": {
-					"version": "8.10.39",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.39.tgz",
-					"integrity": "sha512-rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA==",
+					"version": "8.10.45",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz",
+					"integrity": "sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==",
 					"dev": true
 				}
 			}
 		},
 		"date-format": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-			"integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
+			"integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==",
 			"dev": true
 		},
 		"date-now": {
@@ -9010,11 +6121,15 @@
 			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
 			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
 		},
+		"dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+		},
 		"deep-equal": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-			"dev": true
+			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
 		},
 		"deep-extend": {
 			"version": "0.6.0",
@@ -9036,36 +6151,6 @@
 			"requires": {
 				"execa": "^0.10.0",
 				"ip-regex": "^2.1.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"default-require-extensions": {
@@ -9077,6 +6162,14 @@
 				"strip-bom": "^3.0.0"
 			}
 		},
+		"define-properties": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+			"requires": {
+				"object-keys": "^1.0.12"
+			}
+		},
 		"define-property": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -9119,6 +6212,67 @@
 				}
 			}
 		},
+		"defined": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+			"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+		},
+		"degenerator": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
+			"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+			"dev": true,
+			"requires": {
+				"ast-types": "0.x.x",
+				"escodegen": "1.x.x",
+				"esprima": "3.x.x"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				}
+			}
+		},
+		"del": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+			"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+			"dev": true,
+			"requires": {
+				"globby": "^6.1.0",
+				"is-path-cwd": "^1.0.0",
+				"is-path-in-cwd": "^1.0.0",
+				"p-map": "^1.1.1",
+				"pify": "^3.0.0",
+				"rimraf": "^2.2.8"
+			},
+			"dependencies": {
+				"globby": {
+					"version": "6.1.0",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+					"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"glob": "^7.0.3",
+						"object-assign": "^4.0.1",
+						"pify": "^2.0.0",
+						"pinkie-promise": "^2.0.0"
+					},
+					"dependencies": {
+						"pify": {
+							"version": "2.3.0",
+							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+							"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+							"dev": true
+						}
+					}
+				}
+			}
+		},
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -9132,8 +6286,7 @@
 		"depd": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-			"dev": true
+			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
 		},
 		"dependency-graph": {
 			"version": "0.7.2",
@@ -9154,8 +6307,7 @@
 		"destroy": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-			"dev": true
+			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
 		},
 		"detect-indent": {
 			"version": "4.0.0",
@@ -9172,6 +6324,15 @@
 			"integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
 			"dev": true
 		},
+		"dfa": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/dfa/-/dfa-1.1.0.tgz",
+			"integrity": "sha1-0wIYvRDQMPpCHfPrvIIoVGOjF4E=",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6"
+			}
+		},
 		"di": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -9271,27 +6432,19 @@
 			}
 		},
 		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+			"integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "~1.1.1",
-				"entities": "~1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-					"dev": true
-				}
+				"domelementtype": "^1.3.0",
+				"entities": "^1.1.1"
 			}
 		},
 		"dom7": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.2.tgz",
-			"integrity": "sha512-cGwWtpu7KY3JnbREGqG4EGC/u+1hyLfWVMqrqRjmwiO8d5i4B+0imLZAQ/cJbiXnjbs0pdIUzcUyeI9BbnyKNg==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
+			"integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
 			"requires": {
 				"ssr-window": "^1.0.1"
 			}
@@ -9343,9 +6496,9 @@
 			}
 		},
 		"dotenv": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-			"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
+			"integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==",
 			"dev": true
 		},
 		"dotenv-defaults": {
@@ -9355,6 +6508,14 @@
 			"dev": true,
 			"requires": {
 				"dotenv": "^6.2.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
 			}
 		},
 		"dotenv-webpack": {
@@ -9413,41 +6574,15 @@
 			"dev": true
 		},
 		"duplexify": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
-			"integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
 			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.0.0",
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0",
 				"stream-shift": "^1.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ecc-jsbn": {
@@ -9462,8 +6597,7 @@
 		"ee-first": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-			"dev": true
+			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
 		},
 		"ejs": {
 			"version": "2.6.1",
@@ -9472,16 +6606,15 @@
 			"dev": true
 		},
 		"electron-to-chromium": {
-			"version": "1.3.112",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.112.tgz",
-			"integrity": "sha512-FyVLdiRZnLw2WE5ECtveN0JJ7klyiz/HMfKE1/Rjff3l7pe4vfkYtBlcCqTckvR8E7asjJGh0m9gRPR3Anp/UA==",
+			"version": "1.3.122",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
+			"integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw==",
 			"dev": true
 		},
 		"elementtree": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
 			"integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
-			"dev": true,
 			"requires": {
 				"sax": "1.1.4"
 			},
@@ -9489,8 +6622,7 @@
 				"sax": {
 					"version": "1.1.4",
 					"resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
-					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=",
-					"dev": true
+					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
 				}
 			}
 		},
@@ -9523,8 +6655,7 @@
 		"encodeurl": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-			"dev": true
+			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
 		},
 		"encoding": {
 			"version": "0.1.12",
@@ -9543,6 +6674,16 @@
 				"once": "^1.4.0"
 			}
 		},
+		"endent": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz",
+			"integrity": "sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==",
+			"requires": {
+				"dedent": "^0.7.0",
+				"fast-json-parse": "^1.0.3",
+				"objectorarray": "^1.0.3"
+			}
+		},
 		"engine.io": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
@@ -9579,6 +6720,47 @@
 				}
 			}
 		},
+		"engine.io-client": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+			"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "1.2.1",
+				"component-inherit": "0.0.3",
+				"debug": "~3.1.0",
+				"engine.io-parser": "~2.1.1",
+				"has-cors": "1.1.0",
+				"indexof": "0.0.1",
+				"parseqs": "0.0.5",
+				"parseuri": "0.0.5",
+				"ws": "~3.3.1",
+				"xmlhttprequest-ssl": "~1.5.4",
+				"yeast": "0.1.2"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"ws": {
+					"version": "3.3.3",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
+				}
+			}
+		},
 		"engine.io-parser": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
@@ -9600,42 +6782,6 @@
 				"graceful-fs": "^4.1.2",
 				"memory-fs": "^0.4.0",
 				"tapable": "^1.0.0"
-			},
-			"dependencies": {
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ent": {
@@ -9650,6 +6796,26 @@
 			"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
 			"dev": true
 		},
+		"envalid": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/envalid/-/envalid-4.2.2.tgz",
+			"integrity": "sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.4.1",
+				"dotenv": "^6.2.0",
+				"meant": "^1.0.1",
+				"validator": "^10.11.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
+			}
+		},
 		"err-code": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
@@ -9683,15 +6849,38 @@
 				"is-arrayish": "^0.2.1"
 			}
 		},
+		"es-abstract": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+			"integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+			"requires": {
+				"es-to-primitive": "^1.2.0",
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"is-callable": "^1.1.4",
+				"is-regex": "^1.0.4",
+				"object-keys": "^1.0.12"
+			}
+		},
+		"es-to-primitive": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+			"integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+			"requires": {
+				"is-callable": "^1.1.4",
+				"is-date-object": "^1.0.1",
+				"is-symbol": "^1.0.2"
+			}
+		},
 		"es5-ext": {
-			"version": "0.10.47",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz",
-			"integrity": "sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==",
+			"version": "0.10.49",
+			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz",
+			"integrity": "sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==",
 			"dev": true,
 			"requires": {
 				"es6-iterator": "~2.0.3",
 				"es6-symbol": "~3.1.1",
-				"next-tick": "1"
+				"next-tick": "^1.0.0"
 			}
 		},
 		"es6-iterator": {
@@ -9772,14 +6961,41 @@
 		"escape-html": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-			"dev": true
+			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
 		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
 		},
+		"escodegen": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
+			"integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+			"dev": true,
+			"requires": {
+				"esprima": "^3.1.3",
+				"estraverse": "^4.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"escope": {
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
@@ -9790,38 +7006,22 @@
 				"es6-weak-map": "^2.0.1",
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"eslint-scope": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-			"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
 			"dev": true,
 			"requires": {
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"esprima": {
-			"version": "2.7.3",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-			"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true
 		},
 		"esrecurse": {
@@ -9831,20 +7031,12 @@
 			"dev": true,
 			"requires": {
 				"estraverse": "^4.1.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"estraverse": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-			"integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
 			"dev": true
 		},
 		"estree-walker": {
@@ -9861,610 +7053,347 @@
 		},
 		"etag": {
 			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-			"dev": true
-		},
-		"event-emitter": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-			"dev": true,
-			"requires": {
-				"d": "1",
-				"es5-ext": "~0.10.14"
-			}
-		},
-		"event-stream": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
-			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
-			"requires": {
-				"duplexer": "^0.1.1",
-				"from": "^0.1.7",
-				"map-stream": "0.0.7",
-				"pause-stream": "^0.0.11",
-				"split": "^1.0.1",
-				"stream-combiner": "^0.2.2",
-				"through": "^2.3.8"
-			}
-		},
-		"eventemitter3": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
-		},
-		"events": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
-			"dev": true
-		},
-		"eventsource": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-			"dev": true,
-			"requires": {
-				"original": "^1.0.0"
-			}
-		},
-		"evp_bytestokey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-			"dev": true,
-			"requires": {
-				"md5.js": "^1.3.4",
-				"safe-buffer": "^5.1.1"
-			}
-		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
-		"expand-braces": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-			"integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
-			"dev": true,
-			"requires": {
-				"array-slice": "^0.2.3",
-				"array-unique": "^0.2.1",
-				"braces": "^0.1.2"
-			},
-			"dependencies": {
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-					"integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^0.1.0"
-					}
-				},
-				"expand-range": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-					"integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
-					"dev": true,
-					"requires": {
-						"is-number": "^0.1.1",
-						"repeat-string": "^0.2.2"
-					}
-				},
-				"is-number": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-					"integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-					"dev": true
-				},
-				"repeat-string": {
-					"version": "0.2.2",
-					"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-					"integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
-					"dev": true
-				}
-			}
-		},
-		"expand-range": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
-			"requires": {
-				"fill-range": "^2.1.0"
-			},
-			"dependencies": {
-				"fill-range": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-					"integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-					"dev": true,
-					"requires": {
-						"is-number": "^2.1.0",
-						"isobject": "^2.0.0",
-						"randomatic": "^3.0.0",
-						"repeat-element": "^1.1.2",
-						"repeat-string": "^1.5.2"
-					}
-				},
-				"is-number": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-					"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					}
-				},
-				"isobject": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-					"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-					"dev": true,
-					"requires": {
-						"isarray": "1.0.0"
-					}
-				}
-			}
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-		},
-		"extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
-			}
-		},
-		"external-editor": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
-			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
-			"dev": true,
-			"requires": {
-				"chardet": "^0.7.0",
-				"iconv-lite": "^0.4.24",
-				"tmp": "^0.0.33"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
-			}
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
 		},
-		"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==",
+		"event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
 			"dev": true,
 			"requires": {
-				"ansi-gray": "^0.1.1",
-				"color-support": "^1.1.3",
-				"parse-node-version": "^1.0.0",
-				"time-stamp": "^1.0.0"
+				"d": "1",
+				"es5-ext": "~0.10.14"
 			}
 		},
-		"fast-deep-equal": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		"event-stream": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
+			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
+			"requires": {
+				"duplexer": "^0.1.1",
+				"from": "^0.1.7",
+				"map-stream": "0.0.7",
+				"pause-stream": "^0.0.11",
+				"split": "^1.0.1",
+				"stream-combiner": "^0.2.2",
+				"through": "^2.3.8"
+			}
 		},
-		"fast-glob": {
-			"version": "2.2.6",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
-			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+		"eventemitter3": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
+		},
+		"events": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+			"dev": true
+		},
+		"eventsource": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
 			"dev": true,
-			"requires": {
-				"@mrmlnc/readdir-enhanced": "^2.2.1",
-				"@nodelib/fs.stat": "^1.1.2",
-				"glob-parent": "^3.1.0",
-				"is-glob": "^4.0.0",
-				"merge2": "^1.2.3",
-				"micromatch": "^3.1.10"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-					"dev": true,
-					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+			"requires": {
+				"original": "^1.0.0"
+			}
+		},
+		"evp_bytestokey": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+			"dev": true,
+			"requires": {
+				"md5.js": "^1.3.4",
+				"safe-buffer": "^5.1.1"
+			}
+		},
+		"execa": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+			"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.0",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			}
+		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
+		"expand-brackets": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+			"dev": true,
+			"requires": {
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"is-descriptor": "^0.1.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extendable": "^0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
+				}
+			}
+		},
+		"express": {
+			"version": "4.16.4",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
+			"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+			"requires": {
+				"accepts": "~1.3.5",
+				"array-flatten": "1.1.1",
+				"body-parser": "1.18.3",
+				"content-disposition": "0.5.2",
+				"content-type": "~1.0.4",
+				"cookie": "0.3.1",
+				"cookie-signature": "1.0.6",
+				"debug": "2.6.9",
+				"depd": "~1.1.2",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"finalhandler": "1.1.1",
+				"fresh": "0.5.2",
+				"merge-descriptors": "1.0.1",
+				"methods": "~1.1.2",
+				"on-finished": "~2.3.0",
+				"parseurl": "~1.3.2",
+				"path-to-regexp": "0.1.7",
+				"proxy-addr": "~2.0.4",
+				"qs": "6.5.2",
+				"range-parser": "~1.2.0",
+				"safe-buffer": "5.1.2",
+				"send": "0.16.2",
+				"serve-static": "1.13.2",
+				"setprototypeof": "1.1.0",
+				"statuses": "~1.4.0",
+				"type-is": "~1.6.16",
+				"utils-merge": "1.0.1",
+				"vary": "~1.1.2"
+			},
+			"dependencies": {
+				"array-flatten": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+				}
+			}
+		},
+		"extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		},
+		"extend-shallow": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+			"requires": {
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
+			},
+			"dependencies": {
+				"is-extendable": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"is-plain-object": "^2.0.4"
 					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				}
+			}
+		},
+		"external-editor": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+			"dev": true,
+			"requires": {
+				"chardet": "^0.7.0",
+				"iconv-lite": "^0.4.24",
+				"tmp": "^0.0.33"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"safer-buffer": ">= 2.1.2 < 3"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+				}
+			}
+		},
+		"extglob": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+			"dev": true,
+			"requires": {
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^1.0.0"
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"is-extendable": "^0.1.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
 					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
+		"extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+		},
+		"falafel": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz",
+			"integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.0.0",
+				"foreach": "^2.0.5",
+				"isarray": "0.0.1",
+				"object-keys": "^1.0.6"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				}
 			}
 		},
+		"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": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		},
+		"fast-glob": {
+			"version": "2.2.6",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
+			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+			"dev": true,
+			"requires": {
+				"@mrmlnc/readdir-enhanced": "^2.2.1",
+				"@nodelib/fs.stat": "^1.1.2",
+				"glob-parent": "^3.1.0",
+				"is-glob": "^4.0.0",
+				"merge2": "^1.2.3",
+				"micromatch": "^3.1.10"
+			}
+		},
+		"fast-json-parse": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+			"integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
+		},
 		"fast-json-stable-stringify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -10506,18 +7435,22 @@
 				"escape-string-regexp": "^1.0.5"
 			}
 		},
+		"file-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
+			"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"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==",
 			"dev": true
 		},
-		"filename-regex": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
-		},
 		"fileset": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
@@ -10559,7 +7492,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
 			"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"encodeurl": "~1.0.2",
@@ -10602,58 +7534,38 @@
 			"dev": true
 		},
 		"flush-write-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
 		"follow-redirects": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
-			"integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+			"integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
 			"dev": true,
 			"requires": {
-				"debug": "=3.1.0"
+				"debug": "^3.2.6"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
 					"requires": {
-						"ms": "2.0.0"
+						"ms": "^2.1.1"
 					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
@@ -10662,6 +7574,41 @@
 			"resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
 			"integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
 		},
+		"fontkit": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.8.0.tgz",
+			"integrity": "sha512-EFDRCca7khfQWYu1iFhsqeABpi87f03MBdkT93ZE6YhqCdMzb5Eojb6c4dlJikGv5liuhByyzA7ikpIPTSBWbQ==",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6",
+				"brfs": "^1.4.0",
+				"brotli": "^1.2.0",
+				"browserify-optional": "^1.0.0",
+				"clone": "^1.0.1",
+				"deep-equal": "^1.0.0",
+				"dfa": "^1.0.0",
+				"restructure": "^0.5.3",
+				"tiny-inflate": "^1.0.2",
+				"unicode-properties": "^1.0.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"clone": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+					"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+					"dev": true
+				}
+			}
+		},
+		"for-each": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+			"requires": {
+				"is-callable": "^1.1.3"
+			}
+		},
 		"for-in": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -10675,6 +7622,12 @@
 				"for-in": "^1.0.1"
 			}
 		},
+		"foreach": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+			"dev": true
+		},
 		"forever-agent": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -10699,8 +7652,7 @@
 		"forwarded": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-			"dev": true
+			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
 		},
 		"fragment-cache": {
 			"version": "0.2.1",
@@ -10713,8 +7665,7 @@
 		"fresh": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-			"dev": true
+			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
 		},
 		"from": {
 			"version": "0.1.7",
@@ -10729,32 +7680,6 @@
 			"requires": {
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"fs-access": {
@@ -10770,7 +7695,6 @@
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
 			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"jsonfile": "^4.0.0",
@@ -10785,43 +7709,17 @@
 			"requires": {
 				"minipass": "^2.2.1"
 			}
-		},
-		"fs-write-stream-atomic": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"iferr": "^0.1.5",
-				"imurmurhash": "^0.1.4",
-				"readable-stream": "1 || 2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+		},
+		"fs-write-stream-atomic": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"iferr": "^0.1.5",
+				"imurmurhash": "^0.1.4",
+				"readable-stream": "1 || 2"
 			}
 		},
 		"fs.realpath": {
@@ -10869,12 +7767,14 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
 					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+					"optional": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
@@ -10889,17 +7789,20 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -11016,7 +7919,8 @@
 				"inherits": {
 					"version": "2.0.3",
 					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"optional": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -11028,6 +7932,7 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+					"optional": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -11035,750 +7940,205 @@
 				"isarray": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"optional": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-				},
-				"minipass": {
-					"version": "2.3.5",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-					"requires": {
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.0"
-					}
-				},
-				"minizlib": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-					"optional": true,
-					"requires": {
-						"minipass": "^2.2.1"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"optional": true
-				},
-				"needle": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
-					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
-					"optional": true,
-					"requires": {
-						"debug": "^2.1.2",
-						"iconv-lite": "^0.4.4",
-						"sax": "^1.2.4"
-					}
-				},
-				"node-pre-gyp": {
-					"version": "0.10.3",
-					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
-					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
-					"optional": true,
-					"requires": {
-						"detect-libc": "^1.0.2",
-						"mkdirp": "^0.5.1",
-						"needle": "^2.2.1",
-						"nopt": "^4.0.1",
-						"npm-packlist": "^1.1.6",
-						"npmlog": "^4.0.2",
-						"rc": "^1.2.7",
-						"rimraf": "^2.6.1",
-						"semver": "^5.3.0",
-						"tar": "^4"
-					}
-				},
-				"nopt": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-					"optional": true,
-					"requires": {
-						"abbrev": "1",
-						"osenv": "^0.1.4"
-					}
-				},
-				"npm-bundled": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
-					"optional": true
-				},
-				"npm-packlist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
-					"optional": true,
-					"requires": {
-						"ignore-walk": "^3.0.1",
-						"npm-bundled": "^1.0.1"
-					}
-				},
-				"npmlog": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-					"optional": true,
-					"requires": {
-						"are-we-there-yet": "~1.1.2",
-						"console-control-strings": "~1.1.0",
-						"gauge": "~2.7.3",
-						"set-blocking": "~2.0.0"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"optional": true
-				},
-				"once": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-					"optional": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"optional": true
-				},
-				"osenv": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-					"optional": true,
-					"requires": {
-						"os-homedir": "^1.0.0",
-						"os-tmpdir": "^1.0.0"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"optional": true
-				},
-				"process-nextick-args": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-					"optional": true
-				},
-				"rc": {
-					"version": "1.2.8",
-					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-					"optional": true,
-					"requires": {
-						"deep-extend": "^0.6.0",
-						"ini": "~1.3.0",
-						"minimist": "^1.2.0",
-						"strip-json-comments": "~2.0.1"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-							"optional": true
-						}
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"optional": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"optional": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				},
-				"safer-buffer": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-					"optional": true
-				},
-				"sax": {
-					"version": "1.2.4",
-					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-					"optional": true
-				},
-				"semver": {
-					"version": "5.6.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-					"optional": true
-				},
-				"set-blocking": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"optional": true
 				},
-				"signal-exit": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"optional": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"optional": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"minipass": {
+					"version": "2.3.5",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+					"optional": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"minizlib": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
 					"optional": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"minipass": "^2.2.1"
 					}
 				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"optional": true,
 					"requires": {
-						"ansi-regex": "^2.0.0"
+						"minimist": "0.0.8"
 					}
 				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
 					"optional": true
 				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+				"needle": {
+					"version": "2.2.4",
+					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
+					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
 					"optional": true,
 					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"debug": "^2.1.2",
+						"iconv-lite": "^0.4.4",
+						"sax": "^1.2.4"
 					}
 				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"optional": true
+				"node-pre-gyp": {
+					"version": "0.10.3",
+					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
+					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
+					"optional": true,
+					"requires": {
+						"detect-libc": "^1.0.2",
+						"mkdirp": "^0.5.1",
+						"needle": "^2.2.1",
+						"nopt": "^4.0.1",
+						"npm-packlist": "^1.1.6",
+						"npmlog": "^4.0.2",
+						"rc": "^1.2.7",
+						"rimraf": "^2.6.1",
+						"semver": "^5.3.0",
+						"tar": "^4"
+					}
 				},
-				"wide-align": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"optional": true,
 					"requires": {
-						"string-width": "^1.0.2 || 2"
+						"abbrev": "1",
+						"osenv": "^0.1.4"
 					}
 				},
-				"wrappy": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				"npm-bundled": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
+					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+					"optional": true
 				},
-				"yallist": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-				}
-			}
-		},
-		"ftp": {
-			"version": "0.3.10",
-			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "1.1.x",
-				"xregexp": "2.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
+				"npm-packlist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
+					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+					"optional": true,
+					"requires": {
+						"ignore-walk": "^3.0.1",
+						"npm-bundled": "^1.0.1"
+					}
 				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-					"dev": true,
+				"npmlog": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+					"optional": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.1",
-						"isarray": "0.0.1",
-						"string_decoder": "~0.10.x"
+						"are-we-there-yet": "~1.1.2",
+						"console-control-strings": "~1.1.0",
+						"gauge": "~2.7.3",
+						"set-blocking": "~2.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
+				"number-is-nan": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+					"optional": true
 				},
-				"xregexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
-					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
-					"dev": true
-				}
-			}
-		},
-		"gaze": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-			"requires": {
-				"globule": "^1.0.0"
-			}
-		},
-		"genfun": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-			"dev": true
-		},
-		"get-caller-file": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-		},
-		"get-stdin": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
-		},
-		"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
-		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
-		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
-		"glob": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
-		"glob-base": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
-			"requires": {
-				"glob-parent": "^2.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-					"dev": true,
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"optional": true
+				},
+				"once": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+					"optional": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"wrappy": "1"
 					}
 				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+				"os-homedir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
-		"glob-parent": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-			"requires": {
-				"is-glob": "^3.1.0",
-				"path-dirname": "^1.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+				"osenv": {
+					"version": "0.1.5",
+					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+					"optional": true,
 					"requires": {
-						"is-extglob": "^2.1.0"
+						"os-homedir": "^1.0.0",
+						"os-tmpdir": "^1.0.0"
 					}
-				}
-			}
-		},
-		"glob-to-regexp": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-			"dev": true
-		},
-		"global-dirs": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-			"dev": true,
-			"requires": {
-				"ini": "^1.3.4"
-			}
-		},
-		"globals": {
-			"version": "9.18.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-			"dev": true
-		},
-		"globby": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-			"dev": true,
-			"requires": {
-				"array-union": "^1.0.1",
-				"dir-glob": "^2.0.0",
-				"glob": "^7.1.2",
-				"ignore": "^3.3.5",
-				"pify": "^3.0.0",
-				"slash": "^1.0.0"
-			}
-		},
-		"globule": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
-			"requires": {
-				"glob": "~7.1.1",
-				"lodash": "~4.17.10",
-				"minimatch": "~3.0.2"
-			}
-		},
-		"got": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-			"dev": true,
-			"requires": {
-				"create-error-class": "^3.0.0",
-				"duplexer3": "^0.1.4",
-				"get-stream": "^3.0.0",
-				"is-redirect": "^1.0.0",
-				"is-retry-allowed": "^1.0.0",
-				"is-stream": "^1.0.0",
-				"lowercase-keys": "^1.0.0",
-				"safe-buffer": "^5.0.1",
-				"timed-out": "^4.0.0",
-				"unzip-response": "^2.0.1",
-				"url-parse-lax": "^1.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.1.15",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
-		},
-		"graphql": {
-			"version": "14.1.1",
-			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
-			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
-			"requires": {
-				"iterall": "^1.2.2"
-			}
-		},
-		"graphql-tag": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
-			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
-		},
-		"gzip-size": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
-			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
-			"dev": true,
-			"requires": {
-				"duplexer": "^0.1.1",
-				"pify": "^3.0.0"
-			}
-		},
-		"handle-thing": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
-			"dev": true
-		},
-		"handlebars": {
-			"version": "4.0.12",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
-			"integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
-			"dev": true,
-			"requires": {
-				"async": "^2.5.0",
-				"optimist": "^0.6.1",
-				"source-map": "^0.6.1",
-				"uglify-js": "^3.1.4"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-		},
-		"har-validator": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-			"requires": {
-				"ajv": "^6.5.5",
-				"har-schema": "^2.0.0"
-			}
-		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"requires": {
-				"ansi-regex": "^2.0.0"
-			}
-		},
-		"has-binary2": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-			"requires": {
-				"isarray": "2.0.1"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
-				}
-			}
-		},
-		"has-cors": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
-		},
-		"has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-			"dev": true
-		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
-			}
-		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"optional": true
+				},
+				"process-nextick-args": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+					"optional": true
+				},
+				"rc": {
+					"version": "1.2.8",
+					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+					"optional": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"deep-extend": "^0.6.0",
+						"ini": "~1.3.0",
+						"minimist": "^1.2.0",
+						"strip-json-comments": "~2.0.1"
+					},
+					"dependencies": {
+						"minimist": {
+							"version": "1.2.0",
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+							"optional": true
+						}
 					}
-				}
-			}
-		},
-		"hash-base": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"hash.js": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"minimalistic-assert": "^1.0.1"
-			}
-		},
-		"hmac-drbg": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-			"dev": true,
-			"requires": {
-				"hash.js": "^1.0.3",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.1"
-			}
-		},
-		"hoek": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
-			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
-		},
-		"hoopy": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-			"dev": true
-		},
-		"hosted-git-info": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
-			},
-			"dependencies": {
+				},
 				"readable-stream": {
 					"version": "2.3.6",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"core-util-is": "~1.0.0",
 						"inherits": "~2.0.3",
@@ -11789,490 +8149,696 @@
 						"util-deprecate": "~1.0.1"
 					}
 				},
+				"rimraf": {
+					"version": "2.6.3",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+					"optional": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+				},
+				"safer-buffer": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+					"optional": true
+				},
+				"sax": {
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+					"optional": true
+				},
+				"semver": {
+					"version": "5.6.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+					"optional": true
+				},
+				"set-blocking": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"optional": true
+				},
+				"signal-exit": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+					"optional": true
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+					"optional": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
 				"string_decoder": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"safe-buffer": "~5.1.0"
 					}
-				}
-			}
-		},
-		"html-entities": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-			"dev": true
-		},
-		"htmlparser2": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
-			"integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^1.3.0",
-				"domhandler": "^2.3.0",
-				"domutils": "^1.5.1",
-				"entities": "^1.1.1",
-				"inherits": "^2.0.1",
-				"readable-stream": "^3.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
+						"ansi-regex": "^2.0.0"
 					}
-				}
-			}
-		},
-		"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",
-			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-			"dev": true
-		},
-		"http-errors": {
-			"version": "1.6.3",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-			"dev": true,
-			"requires": {
-				"depd": "~1.1.2",
-				"inherits": "2.0.3",
-				"setprototypeof": "1.1.0",
-				"statuses": ">= 1.4.0 < 2"
-			}
-		},
-		"http-parser-js": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
-			"dev": true
-		},
-		"http-proxy": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
-			"dev": true,
-			"requires": {
-				"eventemitter3": "^3.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
-			}
-		},
-		"http-proxy-agent": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-			"dev": true,
-			"requires": {
-				"agent-base": "4",
-				"debug": "3.1.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
+				},
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+					"optional": true
+				},
+				"tar": {
+					"version": "4.4.8",
+					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+					"optional": true,
+					"requires": {
+						"chownr": "^1.1.1",
+						"fs-minipass": "^1.2.5",
+						"minipass": "^2.3.4",
+						"minizlib": "^1.1.1",
+						"mkdirp": "^0.5.0",
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.2"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"optional": true
+				},
+				"wide-align": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+					"optional": true,
 					"requires": {
-						"ms": "2.0.0"
+						"string-width": "^1.0.2 || 2"
 					}
+				},
+				"wrappy": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				},
+				"yallist": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
 				}
 			}
 		},
-		"http-proxy-middleware": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
-			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+		"ftp": {
+			"version": "0.3.10",
+			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
 			"dev": true,
 			"requires": {
-				"http-proxy": "^1.16.2",
-				"is-glob": "^4.0.0",
-				"lodash": "^4.17.5",
-				"micromatch": "^3.1.9"
+				"readable-stream": "1.1.x",
+				"xregexp": "2.0.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"readable-stream": {
+					"version": "1.1.14",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
+						"isarray": "0.0.1",
+						"string_decoder": "~0.10.x"
 					}
 				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"xregexp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
+					"dev": true
+				}
+			}
+		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+		},
+		"gaze": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+			"requires": {
+				"globule": "^1.0.0"
+			}
+		},
+		"genfun": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+			"dev": true
+		},
+		"get-caller-file": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+		},
+		"get-stdin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+		},
+		"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
+		},
+		"get-uri": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
+			"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
+			"dev": true,
+			"requires": {
+				"data-uri-to-buffer": "2",
+				"debug": "4",
+				"extend": "~3.0.2",
+				"file-uri-to-path": "1",
+				"ftp": "~0.3.10",
+				"readable-stream": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
+				}
+			}
+		},
+		"get-value": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+		},
+		"getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+			"requires": {
+				"assert-plus": "^1.0.0"
+			}
+		},
+		"glob": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+			"requires": {
+				"is-glob": "^3.1.0",
+				"path-dirname": "^1.0.0"
+			},
+			"dependencies": {
+				"is-extglob": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
+				"is-glob": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extglob": "^2.1.0"
 					}
-				},
+				}
+			}
+		},
+		"glob-to-regexp": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+			"dev": true
+		},
+		"global-dirs": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+			"dev": true,
+			"requires": {
+				"ini": "^1.3.4"
+			}
+		},
+		"globals": {
+			"version": "9.18.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+			"dev": true
+		},
+		"globby": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+			"dev": true,
+			"requires": {
+				"array-union": "^1.0.1",
+				"dir-glob": "^2.0.0",
+				"glob": "^7.1.2",
+				"ignore": "^3.3.5",
+				"pify": "^3.0.0",
+				"slash": "^1.0.0"
+			}
+		},
+		"globule": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+			"requires": {
+				"glob": "~7.1.1",
+				"lodash": "~4.17.10",
+				"minimatch": "~3.0.2"
+			}
+		},
+		"got": {
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+			"dev": true,
+			"requires": {
+				"create-error-class": "^3.0.0",
+				"duplexer3": "^0.1.4",
+				"get-stream": "^3.0.0",
+				"is-redirect": "^1.0.0",
+				"is-retry-allowed": "^1.0.0",
+				"is-stream": "^1.0.0",
+				"lowercase-keys": "^1.0.0",
+				"safe-buffer": "^5.0.1",
+				"timed-out": "^4.0.0",
+				"unzip-response": "^2.0.1",
+				"url-parse-lax": "^1.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.1.15",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+		},
+		"graphql": {
+			"version": "14.1.1",
+			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
+			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
+			"requires": {
+				"iterall": "^1.2.2"
+			}
+		},
+		"graphql-tag": {
+			"version": "2.10.1",
+			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
+			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
+		},
+		"gzip-size": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
+			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
+			"dev": true,
+			"requires": {
+				"duplexer": "^0.1.1",
+				"pify": "^3.0.0"
+			}
+		},
+		"handle-thing": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+			"dev": true
+		},
+		"handlebars": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz",
+			"integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==",
+			"dev": true,
+			"requires": {
+				"neo-async": "^2.6.0",
+				"optimist": "^0.6.1",
+				"source-map": "^0.6.1",
+				"uglify-js": "^3.1.4"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"har-schema": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+		},
+		"har-validator": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+			"requires": {
+				"ajv": "^6.5.5",
+				"har-schema": "^2.0.0"
+			}
+		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
+		"has-ansi": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+			"requires": {
+				"ansi-regex": "^2.0.0"
+			}
+		},
+		"has-binary2": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+			"requires": {
+				"isarray": "2.0.1"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+				}
+			}
+		},
+		"has-cors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+		},
+		"has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+		},
+		"has-symbols": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+			"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+		},
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+		},
+		"has-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+			"requires": {
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
+			}
+		},
+		"has-values": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+			"requires": {
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
+			},
+			"dependencies": {
 				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-					"dev": true,
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"is-buffer": "^1.1.5"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				}
+			}
+		},
+		"hash-base": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"hash.js": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.3",
+				"minimalistic-assert": "^1.0.1"
+			}
+		},
+		"hmac-drbg": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+			"dev": true,
+			"requires": {
+				"hash.js": "^1.0.3",
+				"minimalistic-assert": "^1.0.0",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
+		},
+		"hoek": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
+			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
+		},
+		"hoopy": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+			"dev": true
+		},
+		"hosted-git-info": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+		},
+		"hpack.js": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"obuf": "^1.0.0",
+				"readable-stream": "^2.0.1",
+				"wbuf": "^1.1.0"
+			}
+		},
+		"html-entities": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+			"dev": true
+		},
+		"htmlparser2": {
+			"version": "3.10.1",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+			"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^1.3.1",
+				"domhandler": "^2.3.0",
+				"domutils": "^1.5.1",
+				"entities": "^1.1.1",
+				"inherits": "^2.0.1",
+				"readable-stream": "^3.1.1"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				}
+			}
+		},
+		"http-auth": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
+			"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
+			"dev": true,
+			"requires": {
+				"apache-crypt": "^1.1.2",
+				"apache-md5": "^1.0.6",
+				"bcryptjs": "^2.3.0",
+				"uuid": "^3.0.0"
+			}
+		},
+		"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",
+			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+			"dev": true
+		},
+		"http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+			"requires": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			}
+		},
+		"http-parser-js": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
+			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
+			"dev": true
+		},
+		"http-proxy": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+			"dev": true,
+			"requires": {
+				"eventemitter3": "^3.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"http-proxy-agent": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+			"dev": true,
+			"requires": {
+				"agent-base": "4",
+				"debug": "3.1.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ms": "2.0.0"
 					}
 				}
 			}
 		},
+		"http-proxy-middleware": {
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+			"dev": true,
+			"requires": {
+				"http-proxy": "^1.16.2",
+				"is-glob": "^4.0.0",
+				"lodash": "^4.17.5",
+				"micromatch": "^3.1.9"
+			}
+		},
+		"http-signature": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"jsprim": "^1.2.2",
+				"sshpk": "^1.7.0"
+			}
+		},
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -12429,24 +8995,26 @@
 			}
 		},
 		"i18next": {
-			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/i18next/-/i18next-12.1.0.tgz",
-			"integrity": "sha512-AexmwGkKxwKfo5fGeXTWEY4xqzRPigQ1S/0InOUUVziGO54cd4fKyYK8ED1Thx9fd+WA3fRSZ+1iekvFQMbsFw==",
-			"dev": true
+			"version": "15.0.8",
+			"resolved": "https://registry.npmjs.org/i18next/-/i18next-15.0.8.tgz",
+			"integrity": "sha512-ayzNwJ9NHtqEeAG0nQ6yKFbIpZULpDeesjVnfWQaPwbH7Anee8QwRAYPNWHtFCmDZV9FZaKiEbfo1scH8+KSDg==",
+			"dev": true,
+			"requires": {
+				"@babel/runtime": "^7.3.1"
+			}
 		},
 		"iconv-lite": {
 			"version": "0.4.23",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
 			"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-			"dev": true,
 			"requires": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
 		"ieee754": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-			"integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+			"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
 			"dev": true
 		},
 		"iferr": {
@@ -12656,20 +9224,26 @@
 			}
 		},
 		"invert-kv": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-			"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+			"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+			"dev": true
 		},
 		"ionic": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.10.1.tgz",
-			"integrity": "sha512-nqwFQ1Ec3Dtg9EqMQGXO003bNlVZuH+/hKU+asmX+DO5V6Am6E+KHrgBRRzSKqmuF+l5Wk81EvMD8L5tg2sLRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/discover": "1.0.11",
-				"@ionic/utils-fs": "1.0.0",
-				"@ionic/utils-network": "0.0.6",
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.12.0.tgz",
+			"integrity": "sha512-3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/discover": "1.0.13",
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-network": "0.0.8",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
 				"chalk": "^2.3.0",
 				"debug": "^4.0.0",
 				"diff": "^4.0.1",
@@ -12691,325 +9265,34 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/discover": {
-					"version": "1.0.11",
-					"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.11.tgz",
-					"integrity": "sha512-E2CYZsR2noHtUjYceUNP6w1DMYnjPqITyC8Ewiz1iaNWgEntr7xvt1/XbkMlnswn9QKNSItNL6iWY0Q91N+k2A==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"netmask": "^1.0.6",
-						"tslib": "^1.9.0",
-						"ws": "^6.0.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"ci-info": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-					"dev": true
-				},
 				"debug": {
 					"version": "4.1.1",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
 					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"diff": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
-					"dev": true
-				},
-				"get-uri": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
-					"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
-					"dev": true,
-					"requires": {
-						"data-uri-to-buffer": "2",
-						"debug": "4",
-						"extend": "~3.0.2",
-						"file-uri-to-path": "1",
-						"ftp": "~0.3.10",
-						"readable-stream": "3"
-					}
-				},
-				"is-ci": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-					"dev": true,
-					"requires": {
-						"ci-info": "^1.5.0"
-					}
-				},
-				"mime": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"pac-proxy-agent": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
-					"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"get-uri": "^2.0.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"pac-resolver": "^3.0.0",
-						"raw-body": "^2.2.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"proxy-agent": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz",
-					"integrity": "sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"pac-proxy-agent": "^3.0.0",
-						"proxy-from-env": "^1.0.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"qs": {
-					"version": "6.6.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.6.0.tgz",
-					"integrity": "sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"superagent": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
-					"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
-					"dev": true,
-					"requires": {
-						"component-emitter": "^1.2.0",
-						"cookiejar": "^2.1.2",
-						"debug": "^4.1.0",
-						"form-data": "^2.3.3",
-						"formidable": "^1.2.0",
-						"methods": "^1.1.1",
-						"mime": "^2.4.0",
-						"qs": "^6.6.0",
-						"readable-stream": "^3.0.6"
-					}
-				},
-				"superagent-proxy": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
-					"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"proxy-agent": "3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
+				"diff": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+					"dev": true
 				},
-				"update-notifier": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-					"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-					"dev": true,
-					"requires": {
-						"boxen": "^1.2.1",
-						"chalk": "^2.0.1",
-						"configstore": "^3.0.0",
-						"import-lazy": "^2.1.0",
-						"is-ci": "^1.0.10",
-						"is-installed-globally": "^0.1.0",
-						"is-npm": "^1.0.0",
-						"latest-version": "^3.0.0",
-						"semver-diff": "^2.0.0",
-						"xdg-basedir": "^3.0.0"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
@@ -13032,9 +9315,9 @@
 			"dev": true
 		},
 		"ipaddr.js": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
-			"integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=",
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+			"integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
 			"dev": true
 		},
 		"is-absolute": {
@@ -13081,6 +9364,11 @@
 				"builtin-modules": "^1.0.0"
 			}
 		},
+		"is-callable": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+			"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+		},
 		"is-ci": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -13098,6 +9386,11 @@
 				"kind-of": "^3.0.2"
 			}
 		},
+		"is-date-object": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+		},
 		"is-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -13121,21 +9414,6 @@
 			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
 			"dev": true
 		},
-		"is-dotfile": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-			"dev": true
-		},
-		"is-equal-shallow": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
-			"requires": {
-				"is-primitive": "^2.0.0"
-			}
-		},
 		"is-extendable": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -13200,907 +9478,550 @@
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
 			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-			"dev": true
-		},
-		"is-path-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "^1.0.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "^1.0.1"
-			}
-		},
-		"is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"requires": {
-				"isobject": "^3.0.1"
-			}
-		},
-		"is-posix-bracket": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
-		},
-		"is-primitive": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-			"dev": true
-		},
-		"is-redirect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-			"dev": true
-		},
-		"is-relative": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-			"dev": true,
-			"requires": {
-				"is-unc-path": "^1.0.0"
-			}
-		},
-		"is-retry-allowed": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-			"dev": true
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-		},
-		"is-unc-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-			"dev": true,
-			"requires": {
-				"unc-path-regex": "^0.1.2"
-			}
-		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-		},
-		"is-wsl": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-			"dev": true
-		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-		},
-		"isbinaryfile": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-			"dev": true,
-			"requires": {
-				"buffer-alloc": "^1.2.0"
-			}
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-		},
-		"istanbul-instrumenter-loader": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
-			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
-			"dev": true,
-			"requires": {
-				"convert-source-map": "^1.5.0",
-				"istanbul-lib-instrument": "^1.7.3",
-				"loader-utils": "^1.1.0",
-				"schema-utils": "^0.3.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.5.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-					"dev": true,
-					"requires": {
-						"co": "^4.6.0",
-						"fast-deep-equal": "^1.0.0",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.3.0"
-					}
-				},
-				"fast-deep-equal": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-					"dev": true,
-					"requires": {
-						"ajv": "^5.0.0"
-					}
-				}
+				"kind-of": "^3.0.2"
 			}
 		},
-		"istanbul-lib-coverage": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+		"is-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
 			"dev": true
 		},
-		"istanbul-lib-hook": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz",
-			"integrity": "sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==",
-			"dev": true,
-			"requires": {
-				"append-transform": "^1.0.0"
-			}
+		"is-path-cwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+			"dev": true
 		},
-		"istanbul-lib-instrument": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+		"is-path-in-cwd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
 			"dev": true,
 			"requires": {
-				"babel-generator": "^6.18.0",
-				"babel-template": "^6.16.0",
-				"babel-traverse": "^6.18.0",
-				"babel-types": "^6.18.0",
-				"babylon": "^6.18.0",
-				"istanbul-lib-coverage": "^1.2.1",
-				"semver": "^5.3.0"
+				"is-path-inside": "^1.0.0"
 			}
 		},
-		"istanbul-lib-report": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz",
-			"integrity": "sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==",
+		"is-path-inside": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
 			"dev": true,
 			"requires": {
-				"istanbul-lib-coverage": "^2.0.1",
-				"make-dir": "^1.3.0",
-				"supports-color": "^5.4.0"
-			},
-			"dependencies": {
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
+				"path-is-inside": "^1.0.1"
 			}
 		},
-		"istanbul-reports": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.0.1.tgz",
-			"integrity": "sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==",
-			"dev": true,
+		"is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"requires": {
-				"handlebars": "^4.0.11"
+				"isobject": "^3.0.1"
 			}
 		},
-		"iterall": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
-			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		"is-promise": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+			"dev": true
 		},
-		"jasmine": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
-			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+		"is-redirect": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+			"dev": true
+		},
+		"is-regex": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
 			"requires": {
-				"glob": "^7.0.6",
-				"jasmine-core": "~3.3.0"
+				"has": "^1.0.1"
 			}
 		},
-		"jasmine-core": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
-			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
-		},
-		"jasmine-spec-reporter": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+		"is-relative": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
 			"dev": true,
 			"requires": {
-				"colors": "1.1.2"
-			},
-			"dependencies": {
-				"colors": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-					"dev": true
-				}
+				"is-unc-path": "^1.0.0"
 			}
 		},
-		"jasminewd2": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
-			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+		"is-retry-allowed": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
 			"dev": true
 		},
-		"js-base64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
-		},
-		"js-tokens": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-			"dev": true
+		"is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
 		},
-		"js-yaml": {
-			"version": "3.12.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
-			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
-			"dev": true,
+		"is-symbol": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+			"integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
 			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"dependencies": {
-				"esprima": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-					"dev": true
-				}
+				"has-symbols": "^1.0.0"
 			}
 		},
-		"jsbarcode": {
-			"version": "4.0.0-alpha.5",
-			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-4.0.0-alpha.5.tgz",
-			"integrity": "sha512-YVBAjFgNKGzUGmSAmzU1dsNTR5omfwWhvusKR+SRRXcuSg4xT3Wl7hYfovt8eZK2LZyFJviQ+Glt9W6T7caQYw=="
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
 		},
-		"jsesc": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-			"dev": true
+		"is-unc-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+			"dev": true,
+			"requires": {
+				"unc-path-regex": "^0.1.2"
+			}
 		},
-		"json-loader": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-			"dev": true
+		"is-utf8": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
 		},
-		"json-parse-better-errors": {
+		"is-windows": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-			"dev": true
-		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 		},
-		"json3": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-			"dev": true
+		"is-wsl": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
 		},
-		"json5": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
-			"dev": true,
-			"requires": {
-				"minimist": "^1.2.0"
-			}
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 		},
-		"jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+		"isbinaryfile": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.6"
+				"buffer-alloc": "^1.2.0"
 			}
 		},
-		"jsonparse": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-			"dev": true
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
 		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			}
+		"isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
 		},
-		"karma": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.0.tgz",
-			"integrity": "sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==",
-			"dev": true,
-			"requires": {
-				"bluebird": "^3.3.0",
-				"body-parser": "^1.16.1",
-				"chokidar": "^2.0.3",
-				"colors": "^1.1.0",
-				"combine-lists": "^1.0.0",
-				"connect": "^3.6.0",
-				"core-js": "^2.2.0",
-				"di": "^0.0.1",
-				"dom-serialize": "^2.2.0",
-				"expand-braces": "^0.1.1",
-				"flatted": "^2.0.0",
-				"glob": "^7.1.1",
-				"graceful-fs": "^4.1.2",
-				"http-proxy": "^1.13.0",
-				"isbinaryfile": "^3.0.0",
-				"lodash": "^4.17.5",
-				"log4js": "^3.0.0",
-				"mime": "^2.3.1",
-				"minimatch": "^3.0.2",
-				"optimist": "^0.6.1",
-				"qjobs": "^1.1.4",
-				"range-parser": "^1.2.0",
-				"rimraf": "^2.6.0",
-				"safe-buffer": "^5.0.1",
-				"socket.io": "2.1.1",
-				"source-map": "^0.6.1",
-				"tmp": "0.0.33",
-				"useragent": "2.3.0"
+		"isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+		},
+		"istanbul-api": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.1.tgz",
+			"integrity": "sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"compare-versions": "^3.2.1",
+				"fileset": "^2.0.3",
+				"istanbul-lib-coverage": "^2.0.3",
+				"istanbul-lib-hook": "^2.0.3",
+				"istanbul-lib-instrument": "^3.1.0",
+				"istanbul-lib-report": "^2.0.4",
+				"istanbul-lib-source-maps": "^3.0.2",
+				"istanbul-reports": "^2.1.1",
+				"js-yaml": "^3.12.0",
+				"make-dir": "^1.3.0",
+				"minimatch": "^3.0.4",
+				"once": "^1.4.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"engine.io-client": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-					"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+				"istanbul-lib-instrument": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz",
+					"integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==",
 					"dev": true,
 					"requires": {
-						"component-emitter": "1.2.1",
-						"component-inherit": "0.0.3",
-						"debug": "~3.1.0",
-						"engine.io-parser": "~2.1.1",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"ws": "~3.3.1",
-						"xmlhttprequest-ssl": "~1.5.4",
-						"yeast": "0.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
+						"@babel/generator": "^7.0.0",
+						"@babel/parser": "^7.0.0",
+						"@babel/template": "^7.0.0",
+						"@babel/traverse": "^7.0.0",
+						"@babel/types": "^7.0.0",
+						"istanbul-lib-coverage": "^2.0.3",
+						"semver": "^5.5.0"
 					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				}
+			}
+		},
+		"istanbul-instrumenter-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
+			"dev": true,
+			"requires": {
+				"convert-source-map": "^1.5.0",
+				"istanbul-lib-instrument": "^1.7.3",
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^0.3.0"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "5.5.2",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"co": "^4.6.0",
+						"fast-deep-equal": "^1.0.0",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.3.0"
 					}
 				},
-				"finalhandler": {
+				"fast-deep-equal": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
+					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+					"dev": true
+				},
+				"json-schema-traverse": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"schema-utils": {
+					"version": "0.3.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ajv": "^5.0.0"
 					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				}
+			}
+		},
+		"istanbul-lib-coverage": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
+			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+			"dev": true
+		},
+		"istanbul-lib-hook": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz",
+			"integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==",
+			"dev": true,
+			"requires": {
+				"append-transform": "^1.0.0"
+			}
+		},
+		"istanbul-lib-instrument": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
+			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+			"dev": true,
+			"requires": {
+				"babel-generator": "^6.18.0",
+				"babel-template": "^6.16.0",
+				"babel-traverse": "^6.18.0",
+				"babel-types": "^6.18.0",
+				"babylon": "^6.18.0",
+				"istanbul-lib-coverage": "^1.2.1",
+				"semver": "^5.3.0"
+			}
+		},
+		"istanbul-lib-report": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz",
+			"integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==",
+			"dev": true,
+			"requires": {
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"supports-color": "^6.0.0"
+			},
+			"dependencies": {
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-lib-source-maps": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz",
+			"integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"rimraf": "^2.6.2",
+				"source-map": "^0.6.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-reports": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.1.1.tgz",
+			"integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==",
+			"dev": true,
+			"requires": {
+				"handlebars": "^4.1.0"
+			}
+		},
+		"iterall": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
+			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		},
+		"jasmine": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
+			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+			"requires": {
+				"glob": "^7.0.6",
+				"jasmine-core": "~3.3.0"
+			}
+		},
+		"jasmine-core": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
+			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
+		},
+		"jasmine-spec-reporter": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
+			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+			"dev": true,
+			"requires": {
+				"colors": "1.1.2"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+					"dev": true
+				}
+			}
+		},
+		"jasminewd2": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+			"dev": true
+		},
+		"js-base64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
+		},
+		"js-tokens": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.12.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
+			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+					"dev": true
+				}
+			}
+		},
+		"jsbarcode": {
+			"version": "3.11.0",
+			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.0.tgz",
+			"integrity": "sha512-/ozCd7wsa+VIHo9sUc03HneVEQrH7cVWfJolUT/WOW1m8mJ2e3iYZje6C9X3LFHdczlesqFHRpxLtbVsNtjyow=="
+		},
+		"jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		},
+		"jsesc": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+			"dev": true
+		},
+		"json-loader": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+			"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",
+			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+			"dev": true
+		},
+		"json-schema": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
+		"json-stringify-safe": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+		},
+		"json3": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+			"dev": true
+		},
+		"json5": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.0"
+			}
+		},
+		"jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"requires": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"jsonparse": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+			"dev": true
+		},
+		"jsprim": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+			"requires": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.2.3",
+				"verror": "1.10.0"
+			}
+		},
+		"karma": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz",
+			"integrity": "sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.3.0",
+				"body-parser": "^1.16.1",
+				"braces": "^2.3.2",
+				"chokidar": "^2.0.3",
+				"colors": "^1.1.0",
+				"connect": "^3.6.0",
+				"core-js": "^2.2.0",
+				"di": "^0.0.1",
+				"dom-serialize": "^2.2.0",
+				"flatted": "^2.0.0",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.1.2",
+				"http-proxy": "^1.13.0",
+				"isbinaryfile": "^3.0.0",
+				"lodash": "^4.17.11",
+				"log4js": "^4.0.0",
+				"mime": "^2.3.1",
+				"minimatch": "^3.0.2",
+				"optimist": "^0.6.1",
+				"qjobs": "^1.1.4",
+				"range-parser": "^1.2.0",
+				"rimraf": "^2.6.0",
+				"safe-buffer": "^5.0.1",
+				"socket.io": "2.1.1",
+				"source-map": "^0.6.1",
+				"tmp": "0.0.33",
+				"useragent": "2.3.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
 					"dev": true
 				},
-				"log4js": {
-					"version": "3.0.6",
-					"resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
-					"integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
-					"dev": true,
-					"requires": {
-						"circular-json": "^0.5.5",
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"rfdc": "^1.1.2",
-						"streamroller": "0.7.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
 				"mime": {
 					"version": "2.4.0",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
 					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-					"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
-					"dev": true,
-					"requires": {
-						"debug": "~3.1.0",
-						"engine.io": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"socket.io-adapter": "~1.1.0",
-						"socket.io-client": "2.1.1",
-						"socket.io-parser": "~3.2.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io-client": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
-					"dev": true,
-					"requires": {
-						"backo2": "1.0.2",
-						"base64-arraybuffer": "0.1.5",
-						"component-bind": "1.0.0",
-						"component-emitter": "1.2.1",
-						"debug": "~3.1.0",
-						"engine.io-client": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"object-component": "0.0.3",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"socket.io-parser": "~3.2.0",
-						"to-array": "0.1.4"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-					"dev": true
-				},
-				"streamroller": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-					"integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
-					"dev": true,
-					"requires": {
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"mkdirp": "^0.5.1",
-						"readable-stream": "^2.3.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"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"
-					}
-				},
-				"ws": {
-					"version": "3.3.3",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
 				}
 			}
 		},
@@ -14115,90 +10036,13 @@
 			}
 		},
 		"karma-coverage-istanbul-reporter": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz",
-			"integrity": "sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz",
+			"integrity": "sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==",
 			"dev": true,
 			"requires": {
-				"istanbul-api": "^2.0.5",
+				"istanbul-api": "^2.1.1",
 				"minimatch": "^3.0.4"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.6",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"istanbul-api": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.0.6.tgz",
-					"integrity": "sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==",
-					"dev": true,
-					"requires": {
-						"async": "^2.6.1",
-						"compare-versions": "^3.2.1",
-						"fileset": "^2.0.3",
-						"istanbul-lib-coverage": "^2.0.1",
-						"istanbul-lib-hook": "^2.0.1",
-						"istanbul-lib-instrument": "^3.0.0",
-						"istanbul-lib-report": "^2.0.2",
-						"istanbul-lib-source-maps": "^2.0.1",
-						"istanbul-reports": "^2.0.1",
-						"js-yaml": "^3.12.0",
-						"make-dir": "^1.3.0",
-						"once": "^1.4.0"
-					}
-				},
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"istanbul-lib-instrument": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz",
-					"integrity": "sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==",
-					"dev": true,
-					"requires": {
-						"@babel/generator": "^7.0.0",
-						"@babel/parser": "^7.0.0",
-						"@babel/template": "^7.0.0",
-						"@babel/traverse": "^7.0.0",
-						"@babel/types": "^7.0.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"semver": "^5.5.0"
-					}
-				},
-				"istanbul-lib-source-maps": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz",
-					"integrity": "sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"make-dir": "^1.3.0",
-						"rimraf": "^2.6.2",
-						"source-map": "^0.6.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
 			}
 		},
 		"karma-jasmine": {
@@ -14246,20 +10090,6 @@
 			"dev": true,
 			"requires": {
 				"package-json": "^4.0.0"
-			},
-			"dependencies": {
-				"package-json": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-					"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-					"dev": true,
-					"requires": {
-						"got": "^6.7.1",
-						"registry-auth-token": "^3.0.1",
-						"registry-url": "^3.0.3",
-						"semver": "^5.1.0"
-					}
-				}
 			}
 		},
 		"lazy-cache": {
@@ -14269,11 +10099,12 @@
 			"dev": true
 		},
 		"lcid": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+			"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+			"dev": true,
 			"requires": {
-				"invert-kv": "^1.0.0"
+				"invert-kv": "^2.0.0"
 			}
 		},
 		"leek": {
@@ -14300,6 +10131,32 @@
 				}
 			}
 		},
+		"less": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
+			"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+			"dev": true,
+			"requires": {
+				"clone": "^2.1.2",
+				"errno": "^0.1.1",
+				"graceful-fs": "^4.1.2",
+				"image-size": "~0.5.0",
+				"mime": "^1.4.1",
+				"mkdirp": "^0.5.0",
+				"promise": "^7.1.1",
+				"request": "^2.83.0",
+				"source-map": "~0.6.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"less-loader": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
@@ -14339,6 +10196,144 @@
 				"immediate": "~3.0.5"
 			}
 		},
+		"linebreak": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/linebreak/-/linebreak-0.3.0.tgz",
+			"integrity": "sha1-BSZICmLAW9Z58+nZmDDgnGp9DtY=",
+			"dev": true,
+			"requires": {
+				"base64-js": "0.0.8",
+				"brfs": "^1.3.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+					"integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+					"dev": true
+				}
+			}
+		},
+		"live-server": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
+			"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.4",
+				"colors": "^1.3.3",
+				"connect": "^3.6.6",
+				"cors": "^2.8.5",
+				"event-stream": "3.3.4",
+				"faye-websocket": "0.11.x",
+				"http-auth": "3.1.x",
+				"morgan": "^1.9.1",
+				"object-assign": "^4.1.1",
+				"opn": "^6.0.0",
+				"proxy-middleware": "^0.15.0",
+				"send": "^0.16.2",
+				"serve-index": "^1.9.1"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.3.3",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+					"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+					"dev": true
+				},
+				"event-stream": {
+					"version": "3.3.4",
+					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1",
+						"from": "~0",
+						"map-stream": "~0.1.0",
+						"pause-stream": "0.0.11",
+						"split": "0.3",
+						"stream-combiner": "~0.0.4",
+						"through": "~2.3.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"map-stream": {
+					"version": "0.1.0",
+					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+					"dev": true
+				},
+				"mime": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+					"dev": true
+				},
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"dev": true
+				},
+				"opn": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz",
+					"integrity": "sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==",
+					"dev": true,
+					"requires": {
+						"is-wsl": "^1.1.0"
+					}
+				},
+				"send": {
+					"version": "0.16.2",
+					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"depd": "~1.1.2",
+						"destroy": "~1.0.4",
+						"encodeurl": "~1.0.2",
+						"escape-html": "~1.0.3",
+						"etag": "~1.8.1",
+						"fresh": "0.5.2",
+						"http-errors": "~1.6.2",
+						"mime": "1.4.1",
+						"ms": "2.0.0",
+						"on-finished": "~2.3.0",
+						"range-parser": "~1.2.0",
+						"statuses": "~1.4.0"
+					}
+				},
+				"split": {
+					"version": "0.3.3",
+					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+					"dev": true,
+					"requires": {
+						"through": "2"
+					}
+				},
+				"stream-combiner": {
+					"version": "0.0.4",
+					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1"
+					}
+				}
+			}
+		},
 		"livereload-js": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
@@ -14578,6 +10573,36 @@
 				}
 			}
 		},
+		"log4js": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log4js/-/log4js-4.1.0.tgz",
+			"integrity": "sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==",
+			"dev": true,
+			"requires": {
+				"date-format": "^2.0.0",
+				"debug": "^4.1.1",
+				"flatted": "^2.0.0",
+				"rfdc": "^1.1.2",
+				"streamroller": "^1.0.4"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"loglevel": {
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
@@ -14631,24 +10656,24 @@
 			}
 		},
 		"lunr": {
-			"version": "2.3.5",
-			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.5.tgz",
-			"integrity": "sha512-EtnfmHsHJTr3u24sito9JctSxej5Ds0SgUD2Lm+qRHyLgM7BGesFlW14eNh1mil0fV5Muh8gf3dBBXzADlUlzQ==",
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.6.tgz",
+			"integrity": "sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==",
 			"dev": true
 		},
 		"macos-release": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.0.0.tgz",
-			"integrity": "sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.1.0.tgz",
+			"integrity": "sha512-8TCbwvN1mfNxbBv0yBtfyIFMo3m1QsNbKHv7PYIp/abRBKVQBXN7ecu3aeGGgT18VC/Tf397LBDGZF9KBGJFFw==",
 			"dev": true
 		},
 		"magic-string": {
-			"version": "0.25.1",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz",
-			"integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==",
+			"version": "0.25.2",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz",
+			"integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
 			"dev": true,
 			"requires": {
-				"sourcemap-codec": "^1.4.1"
+				"sourcemap-codec": "^1.4.4"
 			}
 		},
 		"make-dir": {
@@ -14666,6 +10691,93 @@
 			"integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
 			"dev": true
 		},
+		"make-fetch-happen": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
+			"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
+			"dev": true,
+			"requires": {
+				"agentkeepalive": "^3.4.1",
+				"cacache": "^11.0.1",
+				"http-cache-semantics": "^3.8.1",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"mississippi": "^3.0.0",
+				"node-fetch-npm": "^2.0.2",
+				"promise-retry": "^1.1.1",
+				"socks-proxy-agent": "^4.0.0",
+				"ssri": "^6.0.0"
+			},
+			"dependencies": {
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+					"dev": true,
+					"requires": {
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
+					},
+					"dependencies": {
+						"lru-cache": {
+							"version": "5.1.1",
+							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+							"dev": true,
+							"requires": {
+								"yallist": "^3.0.2"
+							}
+						}
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
+		},
 		"map-age-cleaner": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -14698,15 +10810,9 @@
 			}
 		},
 		"marked": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz",
-			"integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==",
-			"dev": true
-		},
-		"math-random": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-			"integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz",
+			"integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==",
 			"dev": true
 		},
 		"md5.js": {
@@ -14720,11 +10826,16 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"meant": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz",
+			"integrity": "sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg==",
+			"dev": true
+		},
 		"media-typer": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-			"dev": true
+			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
 		},
 		"mem": {
 			"version": "4.1.0",
@@ -14736,6 +10847,16 @@
 				"p-is-promise": "^2.0.0"
 			}
 		},
+		"memory-fs": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+			"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+			"dev": true,
+			"requires": {
+				"errno": "^0.1.3",
+				"readable-stream": "^2.0.1"
+			}
+		},
 		"meow": {
 			"version": "3.7.0",
 			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -14820,8 +10941,16 @@
 		"merge-descriptors": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-			"dev": true
+			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+		},
+		"merge-source-map": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
+			"integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6"
+			}
 		},
 		"merge2": {
 			"version": "1.2.3",
@@ -14832,8 +10961,36 @@
 		"methods": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-			"dev": true
+			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+		},
+		"micromatch": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"braces": "^2.3.1",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"extglob": "^2.0.4",
+				"fragment-cache": "^0.2.1",
+				"kind-of": "^6.0.2",
+				"nanomatch": "^1.2.9",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.2"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
 		},
 		"miller-rabin": {
 			"version": "4.0.1",
@@ -14877,6 +11034,17 @@
 			"resolved": "https://registry.npmjs.org/mingo/-/mingo-1.3.3.tgz",
 			"integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY="
 		},
+		"mini-css-extract-plugin": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
+			"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0",
+				"webpack-sources": "^1.1.0"
+			}
+		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -15014,6 +11182,20 @@
 				"on-headers": "~1.0.1"
 			}
 		},
+		"move-concurrently": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+			"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"copy-concurrently": "^1.0.0",
+				"fs-write-stream-atomic": "^1.0.8",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.3"
+			}
+		},
 		"ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -15063,6 +11245,33 @@
 			"resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
 			"integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
 		},
+		"nanomatch": {
+			"version": "1.2.13",
+			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"fragment-cache": "^0.2.1",
+				"is-windows": "^1.0.2",
+				"kind-of": "^6.0.2",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
 		"ncp": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
@@ -15072,8 +11281,7 @@
 		"negotiator": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-			"dev": true
+			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
 		},
 		"neo-async": {
 			"version": "2.6.0",
@@ -15153,40 +11361,12 @@
 				"url": "^0.11.0",
 				"util": "^0.11.0",
 				"vm-browserify": "0.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				}
 			}
 		},
 		"node-releases": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.6.tgz",
-			"integrity": "sha512-lODUVHEIZutZx+TDdOk47qLik8FJMXzJ+WnyUGci1MTvTOyzZrz5eVPIIpc5Hb3NfHZGeGHeuwrRYVI1PEITWg==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.12.tgz",
+			"integrity": "sha512-Y+AQ1xdjcgaEzpL65PBEF3fnl1FNKnDh9Zm+AUQLIlyyqtSc4u93jyMN4zrjMzdwKQ10RTr3tgY1x7qpsfF/xg==",
 			"dev": true,
 			"requires": {
 				"semver": "^5.3.0"
@@ -15318,8 +11498,7 @@
 					"requires": {
 						"glob": "^7.0.0",
 						"lodash": "^4.0.0",
-						"scss-tokenizer": "^0.2.3",
-						"yargs": "^7.0.0"
+						"scss-tokenizer": "^0.2.3"
 					}
 				},
 				"semver": {
@@ -15352,6 +11531,18 @@
 				"abbrev": "1"
 			}
 		},
+		"normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
 		"normalize-path": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -15367,21 +11558,58 @@
 			"dev": true
 		},
 		"npm-bundled": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-			"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+			"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
 			"dev": true
 		},
+		"npm-package-arg": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
+			"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.6.0",
+				"osenv": "^0.1.5",
+				"semver": "^5.5.0",
+				"validate-npm-package-name": "^3.0.0"
+			}
+		},
 		"npm-packlist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-			"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+			"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
 			"dev": true,
 			"requires": {
 				"ignore-walk": "^3.0.1",
 				"npm-bundled": "^1.0.1"
 			}
 		},
+		"npm-pick-manifest": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
+			"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+			"dev": true,
+			"requires": {
+				"figgy-pudding": "^3.5.1",
+				"npm-package-arg": "^6.0.0",
+				"semver": "^5.4.1"
+			}
+		},
+		"npm-registry-fetch": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
+			"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
+			"dev": true,
+			"requires": {
+				"JSONStream": "^1.3.4",
+				"bluebird": "^3.5.1",
+				"figgy-pudding": "^3.4.1",
+				"lru-cache": "^4.1.3",
+				"make-fetch-happen": "^4.0.1",
+				"npm-package-arg": "^6.1.0"
+			}
+		},
 		"npm-run-path": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -15497,6 +11725,16 @@
 				}
 			}
 		},
+		"object-inspect": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+			"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+		},
+		"object-keys": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+			"integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+		},
 		"object-visit": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -15505,27 +11743,6 @@
 				"isobject": "^3.0.0"
 			}
 		},
-		"object.omit": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
-			"requires": {
-				"for-own": "^0.1.4",
-				"is-extendable": "^0.1.1"
-			},
-			"dependencies": {
-				"for-own": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-					"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-					"dev": true,
-					"requires": {
-						"for-in": "^1.0.1"
-					}
-				}
-			}
-		},
 		"object.pick": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -15534,6 +11751,14 @@
 				"isobject": "^3.0.1"
 			}
 		},
+		"objectorarray": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz",
+			"integrity": "sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==",
+			"requires": {
+				"tape": "^4.8.0"
+			}
+		},
 		"obuf": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -15544,7 +11769,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
 			"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-			"dev": true,
 			"requires": {
 				"ee-first": "1.1.1"
 			}
@@ -15552,8 +11776,7 @@
 		"on-headers": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-			"dev": true
+			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
 		},
 		"once": {
 			"version": "1.4.0",
@@ -15677,7 +11900,6 @@
 			"version": "5.4.0",
 			"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
 			"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-			"dev": true,
 			"requires": {
 				"is-wsl": "^1.1.0"
 			}
@@ -15748,6 +11970,43 @@
 			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
 		},
+		"os-locale": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+			"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+			"dev": true,
+			"requires": {
+				"execa": "^1.0.0",
+				"lcid": "^2.0.0",
+				"mem": "^4.0.0"
+			},
+			"dependencies": {
+				"execa": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+					"dev": true,
+					"requires": {
+						"cross-spawn": "^6.0.0",
+						"get-stream": "^4.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
+					}
+				},
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+					"dev": true,
+					"requires": {
+						"pump": "^3.0.0"
+					}
+				}
+			}
+		},
 		"os-name": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz",
@@ -15831,6 +12090,51 @@
 			"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
 			"dev": true
 		},
+		"pac-proxy-agent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
+			"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"get-uri": "^2.0.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"pac-resolver": "^3.0.0",
+				"raw-body": "^2.2.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"raw-body": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+					"dev": true,
+					"requires": {
+						"bytes": "3.0.0",
+						"http-errors": "1.6.3",
+						"iconv-lite": "0.4.23",
+						"unpipe": "1.0.0"
+					}
+				}
+			}
+		},
 		"pac-resolver": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz",
@@ -15842,50 +12146,127 @@
 				"ip": "^1.1.5",
 				"netmask": "^1.0.6",
 				"thunkify": "^2.1.2"
+			}
+		},
+		"package-json": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+			"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+			"dev": true,
+			"requires": {
+				"got": "^6.7.1",
+				"registry-auth-token": "^3.0.1",
+				"registry-url": "^3.0.3",
+				"semver": "^5.1.0"
+			}
+		},
+		"pacote": {
+			"version": "9.4.0",
+			"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
+			"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.3",
+				"cacache": "^11.3.2",
+				"figgy-pudding": "^3.5.1",
+				"get-stream": "^4.1.0",
+				"glob": "^7.1.3",
+				"lru-cache": "^5.1.1",
+				"make-fetch-happen": "^4.0.1",
+				"minimatch": "^3.0.4",
+				"minipass": "^2.3.5",
+				"mississippi": "^3.0.0",
+				"mkdirp": "^0.5.1",
+				"normalize-package-data": "^2.4.0",
+				"npm-package-arg": "^6.1.0",
+				"npm-packlist": "^1.1.12",
+				"npm-pick-manifest": "^2.2.3",
+				"npm-registry-fetch": "^3.8.0",
+				"osenv": "^0.1.5",
+				"promise-inflight": "^1.0.1",
+				"promise-retry": "^1.1.1",
+				"protoduck": "^5.0.1",
+				"rimraf": "^2.6.2",
+				"safe-buffer": "^5.1.2",
+				"semver": "^5.6.0",
+				"ssri": "^6.0.1",
+				"tar": "^4.4.8",
+				"unique-filename": "^1.1.1",
+				"which": "^1.3.1"
 			},
 			"dependencies": {
-				"degenerator": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
-					"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"ast-types": "0.x.x",
-						"escodegen": "1.x.x",
-						"esprima": "3.x.x"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.11.0",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
-					"integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
 					"dev": true,
 					"requires": {
-						"esprima": "^3.1.3",
-						"estraverse": "^4.2.0",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.6.1"
+						"pump": "^3.0.0"
 					}
 				},
-				"esprima": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-					"dev": true
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
 				},
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
@@ -15904,38 +12285,12 @@
 				"cyclist": "~0.2.2",
 				"inherits": "^2.0.3",
 				"readable-stream": "^2.1.5"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"parse-asn1": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.3.tgz",
-			"integrity": "sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==",
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+			"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 			"dev": true,
 			"requires": {
 				"asn1.js": "^4.0.0",
@@ -15946,35 +12301,6 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"parse-glob": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
-			"requires": {
-				"glob-base": "^0.3.0",
-				"is-dotfile": "^1.0.0",
-				"is-extglob": "^1.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
 		"parse-json": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -16032,8 +12358,7 @@
 		"parseurl": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-			"dev": true
+			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
 		},
 		"pascalcase": {
 			"version": "0.1.1",
@@ -16075,14 +12400,12 @@
 		"path-parse": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-			"dev": true
+			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
 		},
 		"path-to-regexp": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-			"dev": true
+			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
 		},
 		"path-type": {
 			"version": "3.0.0",
@@ -16114,6 +12437,41 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"pdfkit": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/pdfkit/-/pdfkit-0.9.0.tgz",
+			"integrity": "sha512-j/tJvvoEM7qMiOfodNkz6XRNBvAhVohWP1mUvgg+Xy8X8S3aMBpVGXJGZWNCoCUH2ywLidZSbHyn5mJaqv9umw==",
+			"dev": true,
+			"requires": {
+				"crypto-js": "^3.1.9-1",
+				"fontkit": "^1.0.0",
+				"linebreak": "^0.3.0",
+				"png-js": ">=0.1.0",
+				"saslprep": "1.0.1"
+			}
+		},
+		"pdfmake": {
+			"version": "0.1.54",
+			"resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.1.54.tgz",
+			"integrity": "sha512-HO2FX+czmO+8LpWXQMFQfdUCCKnqwSvSEJExGkUKfsV34DRIV5PZjNg0xWS7ypGrnTY6RTTssWpdreX/pbyeyw==",
+			"dev": true,
+			"requires": {
+				"iconv-lite": "^0.4.24",
+				"linebreak": "^0.3.0",
+				"pdfkit": "^0.9.0"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+					"dev": true,
+					"requires": {
+						"safer-buffer": ">= 2.1.2 < 3"
+					}
+				}
+			}
+		},
 		"performance-now": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -16190,6 +12548,29 @@
 				"semver-compare": "^1.0.0"
 			}
 		},
+		"plist": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
+			"integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+			"requires": {
+				"base64-js": "^1.2.3",
+				"xmlbuilder": "^9.0.7",
+				"xmldom": "0.1.x"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
+				}
+			}
+		},
+		"png-js": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/png-js/-/png-js-0.1.1.tgz",
+			"integrity": "sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=",
+			"dev": true
+		},
 		"pngjs": {
 			"version": "3.3.3",
 			"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.3.tgz",
@@ -16258,20 +12639,6 @@
 			"requires": {
 				"cosmiconfig": "^4.0.0",
 				"import-cwd": "^2.0.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-					"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
-					"dev": true,
-					"requires": {
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0",
-						"require-from-string": "^2.0.1"
-					}
-				}
 			}
 		},
 		"postcss-loader": {
@@ -16304,12 +12671,6 @@
 			"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
 			"dev": true
 		},
-		"preserve": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
-		},
 		"process": {
 			"version": "0.11.10",
 			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -16601,7 +12962,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
 			"integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
-			"dev": true,
 			"requires": {
 				"forwarded": "~0.1.2",
 				"ipaddr.js": "1.8.0"
@@ -16610,7 +12970,39 @@
 				"ipaddr.js": {
 					"version": "1.8.0",
 					"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+				}
+			}
+		},
+		"proxy-agent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.0.tgz",
+			"integrity": "sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"pac-proxy-agent": "^3.0.0",
+				"proxy-from-env": "^1.0.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
@@ -16697,8 +13089,7 @@
 		"q": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-			"dev": true
+			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4="
 		},
 		"qjobs": {
 			"version": "1.2.0",
@@ -16861,40 +13252,26 @@
 			"dev": true
 		},
 		"querystringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
-			"integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+			"integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
 			"dev": true
 		},
-		"randomatic": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-			"integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+		"quote-stream": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
+			"integrity": "sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=",
 			"dev": true,
 			"requires": {
-				"is-number": "^4.0.0",
-				"kind-of": "^6.0.0",
-				"math-random": "^1.0.1"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				}
+				"buffer-equal": "0.0.1",
+				"minimist": "^1.1.3",
+				"through2": "^2.0.0"
 			}
 		},
 		"randombytes": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-			"integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.1.0"
@@ -16913,53 +13290,42 @@
 		"range-parser": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-			"dev": true
+			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
 		},
 		"raw-body": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-			"integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+			"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
 			"dev": true,
 			"requires": {
-				"bytes": "3.0.0",
-				"http-errors": "1.6.2",
-				"iconv-lite": "0.4.19",
-				"unpipe": "1.0.0"
+				"bytes": "1",
+				"string_decoder": "0.10"
 			},
 			"dependencies": {
-				"depd": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-					"integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-					"dev": true
-				},
-				"http-errors": {
-					"version": "1.6.2",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-					"integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-					"dev": true,
-					"requires": {
-						"depd": "1.1.1",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.0.3",
-						"statuses": ">= 1.3.1 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-					"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+				"bytes": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
 					"dev": true
 				},
-				"setprototypeof": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-					"integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
 					"dev": true
 				}
 			}
 		},
+		"raw-loader": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
+			"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"rc": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -16972,21 +13338,125 @@
 				"strip-json-comments": "~2.0.1"
 			}
 		},
-		"read-cache": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+		"read-cache": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+			"dev": true,
+			"requires": {
+				"pify": "^2.3.0"
+			},
+			"dependencies": {
+				"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"
+			},
+			"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"
+					}
+				},
+				"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-up": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+			"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+			"dev": true,
+			"requires": {
+				"find-up": "^2.0.0",
+				"read-pkg": "^2.0.0"
+			},
+			"dependencies": {
+				"find-up": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+					"dev": true,
+					"requires": {
+						"locate-path": "^2.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+					"dev": true,
+					"requires": {
+						"p-locate": "^2.0.0",
+						"path-exists": "^3.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+					"dev": true,
+					"requires": {
+						"p-limit": "^1.1.0"
+					}
+				}
+			}
+		},
+		"readable-stream": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+			"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 			"dev": true,
 			"requires": {
-				"pify": "^2.3.0"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
+				"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"
 			}
 		},
 		"readdirp": {
@@ -17390,15 +13860,6 @@
 			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
 			"dev": true
 		},
-		"regex-cache": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-			"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-			"dev": true,
-			"requires": {
-				"is-equal-shallow": "^0.1.3"
-			}
-		},
 		"regex-not": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -17420,9 +13881,9 @@
 			}
 		},
 		"registry-auth-token": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-			"integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+			"integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
 			"dev": true,
 			"requires": {
 				"rc": "^1.1.6",
@@ -17484,6 +13945,35 @@
 				"is-finite": "^1.0.0"
 			}
 		},
+		"request": {
+			"version": "2.88.0",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+			"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"aws-sign2": "~0.7.0",
+				"aws4": "^1.8.0",
+				"caseless": "~0.12.0",
+				"combined-stream": "~1.0.6",
+				"extend": "~3.0.2",
+				"forever-agent": "~0.6.1",
+				"form-data": "~2.3.2",
+				"har-validator": "~5.1.0",
+				"http-signature": "~1.2.0",
+				"is-typedarray": "~1.0.0",
+				"isstream": "~0.1.2",
+				"json-stringify-safe": "~5.0.1",
+				"mime-types": "~2.1.19",
+				"oauth-sign": "~0.9.0",
+				"performance-now": "^2.1.0",
+				"qs": "~6.5.2",
+				"safe-buffer": "^5.1.2",
+				"tough-cookie": "~2.4.3",
+				"tunnel-agent": "^0.6.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -17507,10 +13997,13 @@
 			"dev": true
 		},
 		"resolve": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-			"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-			"dev": true
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+			"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+			"dev": true,
+			"requires": {
+				"path-parse": "^1.0.6"
+			}
 		},
 		"resolve-cwd": {
 			"version": "2.0.0",
@@ -17542,6 +14035,23 @@
 				"signal-exit": "^3.0.2"
 			}
 		},
+		"restructure": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/restructure/-/restructure-0.5.4.tgz",
+			"integrity": "sha1-9U591WNZD7NP1r9Vh2EJrsyyjeg=",
+			"dev": true,
+			"requires": {
+				"browserify-optional": "^1.0.0"
+			}
+		},
+		"resumer": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+			"integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
+			"requires": {
+				"through": "~2.3.4"
+			}
+		},
 		"ret": {
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -17592,6 +14102,36 @@
 			"integrity": "sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==",
 			"dev": true
 		},
+		"rollup-plugin-commonjs": {
+			"version": "8.2.6",
+			"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
+			"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.2.1",
+				"estree-walker": "^0.5.0",
+				"magic-string": "^0.22.4",
+				"resolve": "^1.4.0",
+				"rollup-pluginutils": "^2.0.1"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				}
+			}
+		},
 		"rollup-plugin-node-resolve": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz",
@@ -17605,94 +14145,20 @@
 			}
 		},
 		"rollup-pluginutils": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz",
-			"integrity": "sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==",
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.5.0.tgz",
+			"integrity": "sha512-9Muh1H+XB5f5ONmKMayUoTYR1EZwHbwJJ9oZLrKT5yuTf/RLIQ5mYIGsrERquVucJmjmaAW0Y7+6Qo1Ep+5w3Q==",
 			"dev": true,
 			"requires": {
-				"estree-walker": "^0.5.2",
-				"micromatch": "^2.3.11"
+				"estree-walker": "^0.6.0",
+				"micromatch": "^3.1.10"
 			},
 			"dependencies": {
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+				"estree-walker": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz",
+					"integrity": "sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==",
 					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
 				}
 			}
 		},
@@ -17781,6 +14247,12 @@
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
+		"saslprep": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.1.tgz",
+			"integrity": "sha512-ntN6SbE3hRqd45PKKadRPgA+xHPWg5lPSj2JWJdJvjTwXDDfkPVtXWvP8jJojvnm+rAsZ2b299C5NwZqq818EA==",
+			"dev": true
+		},
 		"sass-loader": {
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
@@ -17907,7 +14379,6 @@
 			"version": "0.16.2",
 			"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
 			"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"depd": "~1.1.2",
@@ -17927,8 +14398,7 @@
 				"mime": {
 					"version": "1.4.1",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
 				}
 			}
 		},
@@ -17957,7 +14427,6 @@
 			"version": "1.13.2",
 			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
 			"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-			"dev": true,
 			"requires": {
 				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
@@ -18000,8 +14469,7 @@
 		"setprototypeof": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-			"dev": true
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
 		},
 		"sha.js": {
 			"version": "2.4.11",
@@ -18030,6 +14498,12 @@
 				}
 			}
 		},
+		"shallow-copy": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+			"integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=",
+			"dev": true
+		},
 		"shebang-command": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -18082,6 +14556,39 @@
 			"integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==",
 			"dev": true
 		},
+		"snapdragon": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+			"requires": {
+				"base": "^0.11.1",
+				"debug": "^2.2.0",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"map-cache": "^0.2.2",
+				"source-map": "^0.5.6",
+				"source-map-resolve": "^0.5.0",
+				"use": "^3.1.0"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				},
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
 		"snapdragon-node": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
@@ -18141,6 +14648,53 @@
 				"kind-of": "^3.2.0"
 			}
 		},
+		"socket.io": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+			"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+			"dev": true,
+			"requires": {
+				"debug": "~3.1.0",
+				"engine.io": "~3.2.0",
+				"has-binary2": "~1.0.2",
+				"socket.io-adapter": "~1.1.0",
+				"socket.io-client": "2.1.1",
+				"socket.io-parser": "~3.2.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"socket.io-client": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+					"dev": true,
+					"requires": {
+						"backo2": "1.0.2",
+						"base64-arraybuffer": "0.1.5",
+						"component-bind": "1.0.0",
+						"component-emitter": "1.2.1",
+						"debug": "~3.1.0",
+						"engine.io-client": "~3.2.0",
+						"has-binary2": "~1.0.2",
+						"has-cors": "1.1.0",
+						"indexof": "0.0.1",
+						"object-component": "0.0.3",
+						"parseqs": "0.0.5",
+						"parseuri": "0.0.5",
+						"socket.io-parser": "~3.2.0",
+						"to-array": "0.1.4"
+					}
+				}
+			}
+		},
 		"socket.io-adapter": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
@@ -18239,10 +14793,60 @@
 				}
 			}
 		},
+		"sockjs": {
+			"version": "0.3.19",
+			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+			"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+			"dev": true,
+			"requires": {
+				"faye-websocket": "^0.10.0",
+				"uuid": "^3.0.1"
+			}
+		},
+		"sockjs-client": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
+			"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.2.5",
+				"eventsource": "^1.0.7",
+				"faye-websocket": "~0.11.1",
+				"inherits": "^2.0.3",
+				"json3": "^3.3.2",
+				"url-parse": "^1.4.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"socks": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/socks/-/socks-2.2.3.tgz",
-			"integrity": "sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
+			"integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
 			"dev": true,
 			"requires": {
 				"ip": "^1.1.5",
@@ -18250,13 +14854,13 @@
 			}
 		},
 		"socks-proxy-agent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz",
-			"integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+			"integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
 			"dev": true,
 			"requires": {
-				"agent-base": "~4.2.0",
-				"socks": "~2.2.0"
+				"agent-base": "~4.2.1",
+				"socks": "~2.3.2"
 			}
 		},
 		"source-list-map": {
@@ -18280,6 +14884,18 @@
 				"loader-utils": "^1.1.0"
 			}
 		},
+		"source-map-resolve": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+			"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+			"requires": {
+				"atob": "^2.1.1",
+				"decode-uri-component": "^0.2.0",
+				"resolve-url": "^0.2.1",
+				"source-map-url": "^0.4.0",
+				"urix": "^0.1.0"
+			}
+		},
 		"source-map-support": {
 			"version": "0.5.10",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
@@ -18318,29 +14934,101 @@
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-exceptions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
-		},
-		"spdx-expression-parse": {
+		"spdx-exceptions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+		},
+		"spdx-expression-parse": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"requires": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-license-ids": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+		},
+		"spdy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+			"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.0",
+				"handle-thing": "^2.0.0",
+				"http-deceiver": "^1.2.7",
+				"select-hose": "^2.0.0",
+				"spdy-transport": "^3.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"spdy-transport": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+			"dev": true,
 			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
+				"debug": "^4.1.0",
+				"detect-node": "^2.0.4",
+				"hpack.js": "^2.1.6",
+				"obuf": "^1.1.2",
+				"readable-stream": "^3.0.6",
+				"wbuf": "^1.7.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
 			}
 		},
-		"spdx-license-ids": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
-		},
 		"speed-measure-webpack-plugin": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz",
-			"integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
+			"integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
 			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1"
@@ -18363,18 +15051,18 @@
 			}
 		},
 		"split2": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.0.tgz",
-			"integrity": "sha512-ePE1otNQVMnBRyqf3INbZvZwBPGsdBDThgrOWZ6z8zXGNVQNVCSEoOO9aBMTzDN1mXoNSZJ2kHSFH7AA5SPWww==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz",
+			"integrity": "sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==",
 			"dev": true,
 			"requires": {
 				"readable-stream": "^3.0.0"
 			},
 			"dependencies": {
 				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
 						"inherits": "^2.0.3",
@@ -18426,6 +15114,15 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
+		"static-eval": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+			"integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+			"dev": true,
+			"requires": {
+				"escodegen": "^1.8.1"
+			}
+		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -18445,6 +15142,45 @@
 				}
 			}
 		},
+		"static-module": {
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/static-module/-/static-module-2.2.5.tgz",
+			"integrity": "sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==",
+			"dev": true,
+			"requires": {
+				"concat-stream": "~1.6.0",
+				"convert-source-map": "^1.5.1",
+				"duplexer2": "~0.1.4",
+				"escodegen": "~1.9.0",
+				"falafel": "^2.1.0",
+				"has": "^1.0.1",
+				"magic-string": "^0.22.4",
+				"merge-source-map": "1.0.4",
+				"object-inspect": "~1.4.0",
+				"quote-stream": "~1.0.2",
+				"readable-stream": "~2.3.3",
+				"shallow-copy": "~0.0.1",
+				"static-eval": "^2.0.0",
+				"through2": "~2.0.3"
+			},
+			"dependencies": {
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				},
+				"object-inspect": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz",
+					"integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==",
+					"dev": true
+				}
+			}
+		},
 		"stats-webpack-plugin": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz",
@@ -18457,8 +15193,7 @@
 		"statuses": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-			"dev": true
+			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
 		},
 		"stdout-stream": {
 			"version": "1.4.1",
@@ -18500,32 +15235,6 @@
 			"requires": {
 				"inherits": "~2.0.1",
 				"readable-stream": "^2.0.2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"stream-combiner": {
@@ -18594,40 +15303,44 @@
 				"readable-stream": "^2.3.6",
 				"to-arraybuffer": "^1.0.0",
 				"xtend": "^4.0.0"
+			}
+		},
+		"stream-shift": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+			"dev": true
+		},
+		"streamroller": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz",
+			"integrity": "sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"date-format": "^2.0.0",
+				"debug": "^3.1.0",
+				"fs-extra": "^7.0.0",
+				"lodash": "^4.17.10"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"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"
+						"ms": "^2.1.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"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-			"dev": true
-		},
 		"string-template": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
@@ -18658,10 +15371,20 @@
 				}
 			}
 		},
+		"string.prototype.trim": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
+			"integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
+			"requires": {
+				"define-properties": "^1.1.2",
+				"es-abstract": "^1.5.0",
+				"function-bind": "^1.0.2"
+			}
+		},
 		"string_decoder": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
-			"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+			"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"
@@ -18678,8 +15401,7 @@
 		"strip-bom": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-			"dev": true
+			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
 		},
 		"strip-eof": {
 			"version": "1.0.0",
@@ -18701,13 +15423,21 @@
 			"dev": true
 		},
 		"stripe": {
-			"version": "6.23.0",
-			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.23.0.tgz",
-			"integrity": "sha512-o3rkli0B0O05Z6BwdiNpzCxQ16J1YmUlQB2JAjNC2dTwjg3koF74qhWUY0Rbb8Xisd/Wbgi8DODzNpD9JKG/FA==",
+			"version": "6.28.0",
+			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.28.0.tgz",
+			"integrity": "sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==",
 			"requires": {
 				"lodash.isplainobject": "^4.0.6",
-				"qs": "~6.5.1",
-				"safe-buffer": "^5.1.1"
+				"qs": "^6.6.0",
+				"safe-buffer": "^5.1.1",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+				}
 			}
 		},
 		"style-loader": {
@@ -18720,10 +15450,60 @@
 				"schema-utils": "^1.0.0"
 			}
 		},
+		"stylus": {
+			"version": "0.54.5",
+			"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+			"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+			"dev": true,
+			"requires": {
+				"css-parse": "1.7.x",
+				"debug": "*",
+				"glob": "7.0.x",
+				"mkdirp": "0.5.x",
+				"sax": "0.5.x",
+				"source-map": "0.1.x"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.0.6",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+					"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.2",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
+		"stylus-loader": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+			"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"lodash.clonedeep": "^4.5.0",
+				"when": "~3.6.x"
+			}
+		},
 		"subscriptions-transport-ws": {
-			"version": "0.9.15",
-			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz",
-			"integrity": "sha512-f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ==",
+			"version": "0.9.16",
+			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz",
+			"integrity": "sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==",
 			"requires": {
 				"backo2": "^1.0.2",
 				"eventemitter3": "^3.1.0",
@@ -18742,6 +15522,90 @@
 				}
 			}
 		},
+		"superagent": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
+			"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "^1.2.0",
+				"cookiejar": "^2.1.2",
+				"debug": "^4.1.0",
+				"form-data": "^2.3.3",
+				"formidable": "^1.2.0",
+				"methods": "^1.1.1",
+				"mime": "^2.4.0",
+				"qs": "^6.6.0",
+				"readable-stream": "^3.0.6"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
+		},
+		"superagent-proxy": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
+			"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.1.0",
+				"proxy-agent": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"supports-color": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -18752,11 +15616,11 @@
 			}
 		},
 		"swiper": {
-			"version": "4.4.6",
-			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.4.6.tgz",
-			"integrity": "sha512-F9NDtijQt+etiOe6JAEH+Cb+QKzwwFpi08FlOIQv8ALdoQ8tvAX/38a/28E5XxalAkChsHCutwkBCzDxDXTGiA==",
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.0.tgz",
+			"integrity": "sha512-jRCd/CGet9kaHwthHdd/sL/YU8CI157PWLyItnIcn/o/jP4haVky3zTF6f9F3JDpmQIw7jdWihISiYx0/oTHsg==",
 			"requires": {
-				"dom7": "^2.1.2",
+				"dom7": "^2.1.3",
 				"ssr-window": "^1.0.1"
 			}
 		},
@@ -18771,6 +15635,51 @@
 			"integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
 			"dev": true
 		},
+		"tape": {
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/tape/-/tape-4.10.1.tgz",
+			"integrity": "sha512-G0DywYV1jQeY3axeYnXUOt6ktnxS9OPJh97FGR3nrua8lhWi1zPflLxcAHavZ7Jf3qUfY7cxcVIVFa4mY2IY1w==",
+			"requires": {
+				"deep-equal": "~1.0.1",
+				"defined": "~1.0.0",
+				"for-each": "~0.3.3",
+				"function-bind": "~1.1.1",
+				"glob": "~7.1.3",
+				"has": "~1.0.3",
+				"inherits": "~2.0.3",
+				"minimist": "~1.2.0",
+				"object-inspect": "~1.6.0",
+				"resolve": "~1.10.0",
+				"resumer": "~0.0.0",
+				"string.prototype.trim": "~1.1.2",
+				"through": "~2.3.8"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.10.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"tar": {
+			"version": "4.4.8",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+			"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+			"dev": true,
+			"requires": {
+				"chownr": "^1.1.1",
+				"fs-minipass": "^1.2.5",
+				"minipass": "^2.3.4",
+				"minizlib": "^1.1.1",
+				"mkdirp": "^0.5.0",
+				"safe-buffer": "^5.1.2",
+				"yallist": "^3.0.2"
+			}
+		},
 		"term-size": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
@@ -18809,14 +15718,14 @@
 			}
 		},
 		"terser": {
-			"version": "3.16.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-3.16.0.tgz",
-			"integrity": "sha512-Ua8BhyibmsQBFXDZZ3Es7GASB2yFrQJr0jgAlZK1FBLbFarrHoCuMHPCro5MbX4jidcaFGiV+uTc3wxodmGjUg==",
+			"version": "3.17.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+			"integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
 			"dev": true,
 			"requires": {
-				"commander": "~2.17.1",
+				"commander": "^2.19.0",
 				"source-map": "~0.6.1",
-				"source-map-support": "~0.5.9"
+				"source-map-support": "~0.5.10"
 			},
 			"dependencies": {
 				"source-map": {
@@ -18827,853 +15736,993 @@
 				}
 			}
 		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-		},
-		"through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+		"terser-webpack-plugin": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
+			"integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
 			"dev": true,
 			"requires": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+				"cacache": "^11.0.2",
+				"find-cache-dir": "^2.0.0",
+				"schema-utils": "^1.0.0",
+				"serialize-javascript": "^1.4.0",
+				"source-map": "^0.6.1",
+				"terser": "^3.16.1",
+				"webpack-sources": "^1.1.0",
+				"worker-farm": "^1.5.2"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"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"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
-				}
-			}
-		},
-		"thunkify": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
-			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
-			"dev": true
-		},
-		"thunky": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
-			"dev": true
-		},
-		"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.10",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-			"dev": true,
-			"requires": {
-				"setimmediate": "^1.0.4"
-			}
-		},
-		"tmp": {
-			"version": "0.0.33",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "~1.0.2"
-			}
-		},
-		"to-array": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
-		},
-		"to-arraybuffer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-			"dev": true
-		},
-		"to-fast-properties": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-			"dev": true
-		},
-		"to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			}
-		},
-		"to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
-			}
-		},
-		"tough-cookie": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-			"requires": {
-				"psl": "^1.1.24",
-				"punycode": "^1.4.1"
-			}
-		},
-		"traverse": {
-			"version": "0.6.6",
-			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
-			"dev": true
-		},
-		"tree-kill": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
-			"dev": true
-		},
-		"trim-newlines": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
-		},
-		"trim-right": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-			"dev": true
-		},
-		"true-case-path": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-			"requires": {
-				"glob": "^7.1.2"
-			}
-		},
-		"tryer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-			"dev": true
-		},
-		"ts-node": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.2.tgz",
-			"integrity": "sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==",
-			"dev": true,
-			"requires": {
-				"arg": "^4.1.0",
-				"diff": "^3.1.0",
-				"make-error": "^1.1.1",
-				"source-map-support": "^0.5.6",
-				"yn": "^3.0.0"
-			}
-		},
-		"tslib": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-		},
-		"tslint": {
-			"version": "5.12.1",
-			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz",
-			"integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==",
-			"dev": true,
-			"requires": {
-				"babel-code-frame": "^6.22.0",
-				"builtin-modules": "^1.1.1",
-				"chalk": "^2.3.0",
-				"commander": "^2.12.1",
-				"diff": "^3.2.0",
-				"glob": "^7.1.1",
-				"js-yaml": "^3.7.0",
-				"minimatch": "^3.0.4",
-				"resolve": "^1.3.2",
-				"semver": "^5.3.0",
-				"tslib": "^1.8.0",
-				"tsutils": "^2.27.2"
-			},
-			"dependencies": {
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+				},
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
+				},
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+					"dev": true,
+					"requires": {
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"path-parse": "^1.0.6"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
+				},
+				"pkg-dir": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+					"dev": true,
+					"requires": {
+						"find-up": "^3.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
 					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
-		"tslint-eslint-rules": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
-			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
+		"through": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+		},
+		"through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
 			"dev": true,
 			"requires": {
-				"doctrine": "^0.7.2",
-				"tslib": "^1.0.0",
-				"tsutils": "^1.4.0"
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
 			},
 			"dependencies": {
-				"tsutils": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
-					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
-					"dev": true
+				"readable-stream": {
+					"version": "2.3.6",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "~1.0.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"
+					}
 				}
 			}
 		},
-		"tsutils": {
-			"version": "2.29.0",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-			"dev": true,
-			"requires": {
-				"tslib": "^1.8.1"
-			}
-		},
-		"tty-browserify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+		"thunkify": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
+			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
 			"dev": true
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
+		"thunky": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+			"dev": true
 		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		"time-stamp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+			"dev": true
 		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2"
-			}
+		"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
 		},
-		"type-is": {
-			"version": "1.6.16",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+		"timers-browserify": {
+			"version": "2.0.10",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 			"dev": true,
 			"requires": {
-				"media-typer": "0.3.0",
-				"mime-types": "~2.1.18"
+				"setimmediate": "^1.0.4"
 			}
 		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-			"dev": true
-		},
-		"typescript": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
-			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
+		"tiny-inflate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.2.tgz",
+			"integrity": "sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=",
 			"dev": true
 		},
-		"uglify-js": {
-			"version": "3.4.9",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-			"integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+		"tiny-lr": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+			"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"commander": "~2.17.1",
-				"source-map": "~0.6.1"
+				"body": "^5.1.0",
+				"debug": "^3.1.0",
+				"faye-websocket": "~0.10.0",
+				"livereload-js": "^2.3.0",
+				"object-assign": "^4.1.0",
+				"qs": "^6.4.0"
 			},
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"uglify-to-browserify": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+		"tmp": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
 			"dev": true,
-			"optional": true
+			"requires": {
+				"os-tmpdir": "~1.0.2"
+			}
 		},
-		"ultron": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-			"dev": true
+		"to-array": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
 		},
-		"unc-path-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+		"to-arraybuffer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
 			"dev": true
 		},
-		"union-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
-			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^0.4.3"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"set-value": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-extendable": "^0.1.1",
-						"is-plain-object": "^2.0.1",
-						"to-object-path": "^0.3.0"
-					}
-				}
+		"to-fast-properties": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+			"dev": true
+		},
+		"to-object-path": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+			"requires": {
+				"kind-of": "^3.0.2"
 			}
 		},
-		"unique-filename": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-			"dev": true,
+		"to-regex": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
 			"requires": {
-				"unique-slug": "^2.0.0"
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"regex-not": "^1.0.2",
+				"safe-regex": "^1.1.0"
 			}
 		},
-		"unique-slug": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
-			"dev": true,
+		"to-regex-range": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 			"requires": {
-				"imurmurhash": "^0.1.4"
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1"
 			}
 		},
-		"unique-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-			"dev": true,
+		"tough-cookie": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
 			"requires": {
-				"crypto-random-string": "^1.0.0"
+				"psl": "^1.1.24",
+				"punycode": "^1.4.1"
 			}
 		},
-		"universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+		"traverse": {
+			"version": "0.6.6",
+			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
+			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
 			"dev": true
 		},
-		"unix-crypt-td-js": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
-			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+		"tree-kill": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
 			"dev": true
 		},
-		"unpipe": {
+		"trim-newlines": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
+		},
+		"trim-right": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
 			"dev": true
 		},
-		"unset-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+		"true-case-path": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
 			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
-				}
+				"glob": "^7.1.2"
 			}
 		},
-		"untildify": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
-			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
-			"dev": true
-		},
-		"unzip-response": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+		"tryer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
 			"dev": true
 		},
-		"upath": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
-		},
-		"uri-js": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+		"ts-invariant": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz",
+			"integrity": "sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==",
 			"requires": {
-				"punycode": "^2.1.0"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-				}
+				"tslib": "^1.9.3"
 			}
 		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		"ts-node": {
+			"version": "8.0.3",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.3.tgz",
+			"integrity": "sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==",
+			"dev": true,
+			"requires": {
+				"arg": "^4.1.0",
+				"diff": "^3.1.0",
+				"make-error": "^1.1.1",
+				"source-map-support": "^0.5.6",
+				"yn": "^3.0.0"
+			}
 		},
-		"url": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+		"ts-simple-ast": {
+			"version": "12.4.0",
+			"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
+			"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
 			"dev": true,
 			"requires": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
+				"@dsherret/to-absolute-glob": "^2.0.2",
+				"code-block-writer": "^7.2.0",
+				"fs-extra": "^6.0.1",
+				"glob-parent": "^3.1.0",
+				"globby": "^8.0.1",
+				"is-negated-glob": "^1.0.0",
+				"multimatch": "^2.1.0",
+				"object-assign": "^4.1.1",
+				"tslib": "^1.9.0",
+				"typescript": "2.9.1"
 			},
 			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+				"dir-glob": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+					"dev": true,
+					"requires": {
+						"arrify": "^1.0.1",
+						"path-type": "^3.0.0"
+					}
+				},
+				"fs-extra": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+					"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
+					}
+				},
+				"globby": {
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"dir-glob": "2.0.0",
+						"fast-glob": "^2.0.2",
+						"glob": "^7.1.2",
+						"ignore": "^3.3.5",
+						"pify": "^3.0.0",
+						"slash": "^1.0.0"
+					}
+				},
+				"typescript": {
+					"version": "2.9.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
+					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
 					"dev": true
 				}
 			}
 		},
-		"url-parse": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
-			"dev": true,
-			"requires": {
-				"querystringify": "^2.0.0",
-				"requires-port": "^1.0.0"
-			}
+		"tslib": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
 		},
-		"url-parse-lax": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+		"tslint": {
+			"version": "5.14.0",
+			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.14.0.tgz",
+			"integrity": "sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==",
 			"dev": true,
 			"requires": {
-				"prepend-http": "^1.0.1"
+				"babel-code-frame": "^6.22.0",
+				"builtin-modules": "^1.1.1",
+				"chalk": "^2.3.0",
+				"commander": "^2.12.1",
+				"diff": "^3.2.0",
+				"glob": "^7.1.1",
+				"js-yaml": "^3.7.0",
+				"minimatch": "^3.0.4",
+				"mkdirp": "^0.5.1",
+				"resolve": "^1.3.2",
+				"semver": "^5.3.0",
+				"tslib": "^1.8.0",
+				"tsutils": "^2.29.0"
 			}
 		},
-		"use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-		},
-		"useragent": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+		"tslint-eslint-rules": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
+			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
 			"dev": true,
 			"requires": {
-				"lru-cache": "4.1.x",
-				"tmp": "0.0.x"
+				"doctrine": "^0.7.2",
+				"tslib": "^1.0.0",
+				"tsutils": "^1.4.0"
+			},
+			"dependencies": {
+				"tsutils": {
+					"version": "1.9.1",
+					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
+					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
+					"dev": true
+				}
 			}
 		},
-		"util": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+		"tsutils": {
+			"version": "2.29.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
 			"dev": true,
 			"requires": {
-				"inherits": "2.0.3"
+				"tslib": "^1.8.1"
 			}
 		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-		},
-		"utils-merge": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+		"tty-browserify": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
 			"dev": true
 		},
-		"uuid": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-		},
-		"validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+		"tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"validate-npm-package-name": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+		"tweetnacl": {
+			"version": "0.14.5",
+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		},
+		"type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
 			"dev": true,
 			"requires": {
-				"builtins": "^1.0.3"
+				"prelude-ls": "~1.1.2"
 			}
 		},
-		"vary": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-			"dev": true
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+		"type-is": {
+			"version": "1.6.16",
+			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
+				"media-typer": "0.3.0",
+				"mime-types": "~2.1.18"
 			}
 		},
-		"viz.js": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
-			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
-			"dev": true
-		},
-		"vlq": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+		"typedarray": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
 			"dev": true
 		},
-		"vm-browserify": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-			"dev": true,
-			"requires": {
-				"indexof": "0.0.1"
-			}
-		},
-		"void-elements": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-			"dev": true
+		"typescript": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
+			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="
 		},
-		"watchpack": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-			"dev": true,
-			"requires": {
-				"chokidar": "^2.0.2",
-				"graceful-fs": "^4.1.2",
-				"neo-async": "^2.5.0"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+		"uglify-js": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.2.tgz",
+			"integrity": "sha512-imog1WIsi9Yb56yRt5TfYVxGmnWs3WSGU73ieSOlMVFwhJCA9W8fqFFMMj4kgDqiS/80LGdsYnWL7O9UcjEBlg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"commander": "~2.19.0",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
+					"optional": true
+				}
+			}
+		},
+		"uglify-to-browserify": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+			"dev": true,
+			"optional": true
+		},
+		"uglifyjs-webpack-plugin": {
+			"version": "0.4.6",
+			"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+			"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6",
+				"uglify-js": "^2.8.29",
+				"webpack-sources": "^1.0.1"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"cliui": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"center-align": "^0.1.1",
+						"right-align": "^0.1.1",
+						"wordwrap": "0.0.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"uglify-js": {
+					"version": "2.8.29",
+					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"source-map": "~0.5.1",
+						"uglify-to-browserify": "~1.0.0",
+						"yargs": "~3.10.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"wordwrap": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+					"dev": true
+				},
+				"yargs": {
+					"version": "3.10.0",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"camelcase": "^1.0.2",
+						"cliui": "^2.1.0",
+						"decamelize": "^1.0.0",
+						"window-size": "0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				}
+			}
+		},
+		"ultron": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+			"dev": true
+		},
+		"unc-path-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+			"dev": true
+		},
+		"underscore": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+			"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+		},
+		"unicode-properties": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.1.0.tgz",
+			"integrity": "sha1-epbu9J91aC6mnSMV7smsQ//fAME=",
+			"dev": true,
+			"requires": {
+				"brfs": "^1.4.0",
+				"unicode-trie": "^0.3.0"
+			}
+		},
+		"unicode-trie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-0.3.1.tgz",
+			"integrity": "sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=",
+			"dev": true,
+			"requires": {
+				"pako": "^0.2.5",
+				"tiny-inflate": "^1.0.0"
+			},
+			"dependencies": {
+				"pako": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+					"integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
 					"dev": true
+				}
+			}
+		},
+		"union-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+			"requires": {
+				"arr-union": "^3.1.0",
+				"get-value": "^2.0.6",
+				"is-extendable": "^0.1.1",
+				"set-value": "^0.4.3"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
+				"set-value": {
+					"version": "0.4.3",
+					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
 						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
+						"is-extendable": "^0.1.1",
+						"is-plain-object": "^2.0.1",
+						"to-object-path": "^0.3.0"
+					}
+				}
+			}
+		},
+		"unique-filename": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+			"dev": true,
+			"requires": {
+				"unique-slug": "^2.0.0"
+			}
+		},
+		"unique-slug": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+			"dev": true,
+			"requires": {
+				"imurmurhash": "^0.1.4"
+			}
+		},
+		"unique-string": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+			"dev": true,
+			"requires": {
+				"crypto-random-string": "^1.0.0"
+			}
+		},
+		"universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+		},
+		"unix-crypt-td-js": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
+			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+			"dev": true
+		},
+		"unpipe": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+		},
+		"unset-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+			"requires": {
+				"has-value": "^0.3.1",
+				"isobject": "^3.0.0"
+			},
+			"dependencies": {
+				"has-value": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+					"requires": {
+						"get-value": "^2.0.3",
+						"has-values": "^0.1.4",
+						"isobject": "^2.0.0"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "2.1.0",
+							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+							"requires": {
+								"isarray": "1.0.0"
+							}
+						}
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"has-values": {
+					"version": "0.1.4",
+					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+				}
+			}
+		},
+		"untildify": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
+			"dev": true
+		},
+		"unzip-response": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+			"dev": true
+		},
+		"upath": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
+		},
+		"update-notifier": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+			"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+			"dev": true,
+			"requires": {
+				"boxen": "^1.2.1",
+				"chalk": "^2.0.1",
+				"configstore": "^3.0.0",
+				"import-lazy": "^2.1.0",
+				"is-ci": "^1.0.10",
+				"is-installed-globally": "^0.1.0",
+				"is-npm": "^1.0.0",
+				"latest-version": "^3.0.0",
+				"semver-diff": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			},
+			"dependencies": {
+				"ci-info": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+					"dev": true
+				},
+				"is-ci": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ci-info": "^1.5.0"
 					}
 				}
 			}
 		},
+		"uri-js": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+			"requires": {
+				"punycode": "^2.1.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+				}
+			}
+		},
+		"urix": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		},
+		"url": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+			"dev": true,
+			"requires": {
+				"punycode": "1.3.2",
+				"querystring": "0.2.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "1.3.2",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+					"dev": true
+				}
+			}
+		},
+		"url-parse": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
+			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+			"dev": true,
+			"requires": {
+				"querystringify": "^2.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"url-parse-lax": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+			"dev": true,
+			"requires": {
+				"prepend-http": "^1.0.1"
+			}
+		},
+		"use": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+		},
+		"useragent": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "4.1.x",
+				"tmp": "0.0.x"
+			}
+		},
+		"util": {
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+			"dev": true,
+			"requires": {
+				"inherits": "2.0.3"
+			}
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+		},
+		"utils-merge": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+		},
+		"uuid": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+		},
+		"validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"requires": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"validate-npm-package-name": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+			"dev": true,
+			"requires": {
+				"builtins": "^1.0.3"
+			}
+		},
+		"validator": {
+			"version": "10.11.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+			"integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+			"dev": true
+		},
+		"vary": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+		},
+		"verror": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"core-util-is": "1.0.2",
+				"extsprintf": "^1.2.0"
+			}
+		},
+		"viz.js": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
+			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
+			"dev": true
+		},
+		"vlq": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+			"dev": true
+		},
+		"vm-browserify": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+			"dev": true,
+			"requires": {
+				"indexof": "0.0.1"
+			}
+		},
+		"void-elements": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+			"dev": true
+		},
+		"watchpack": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.2",
+				"graceful-fs": "^4.1.2",
+				"neo-async": "^2.5.0"
+			}
+		},
 		"wbuf": {
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
@@ -19767,13 +16816,58 @@
 				}
 			}
 		},
+		"webpack": {
+			"version": "4.29.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
+			"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+			"dev": true,
+			"requires": {
+				"@webassemblyjs/ast": "1.7.11",
+				"@webassemblyjs/helper-module-context": "1.7.11",
+				"@webassemblyjs/wasm-edit": "1.7.11",
+				"@webassemblyjs/wasm-parser": "1.7.11",
+				"acorn": "^6.0.5",
+				"acorn-dynamic-import": "^4.0.0",
+				"ajv": "^6.1.0",
+				"ajv-keywords": "^3.1.0",
+				"chrome-trace-event": "^1.0.0",
+				"enhanced-resolve": "^4.1.0",
+				"eslint-scope": "^4.0.0",
+				"json-parse-better-errors": "^1.0.2",
+				"loader-runner": "^2.3.0",
+				"loader-utils": "^1.1.0",
+				"memory-fs": "~0.4.1",
+				"micromatch": "^3.1.8",
+				"mkdirp": "~0.5.0",
+				"neo-async": "^2.5.0",
+				"node-libs-browser": "^2.0.0",
+				"schema-utils": "^0.4.4",
+				"tapable": "^1.1.0",
+				"terser-webpack-plugin": "^1.1.0",
+				"watchpack": "^1.5.0",
+				"webpack-sources": "^1.3.0"
+			},
+			"dependencies": {
+				"schema-utils": {
+					"version": "0.4.7",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+					"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+					"dev": true,
+					"requires": {
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0"
+					}
+				}
+			}
+		},
 		"webpack-bundle-analyzer": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz",
-			"integrity": "sha512-naLWiRfmtH4UJgtUktRTLw6FdoZJ2RvCR9ePbwM9aRMsS/KjFerkPZG9epEvXRAw5d5oPdrs9+3p+afNjxW8Xw==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz",
+			"integrity": "sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==",
 			"dev": true,
 			"requires": {
-				"acorn": "^5.7.3",
+				"acorn": "^6.0.7",
+				"acorn-walk": "^6.1.1",
 				"bfj": "^6.1.1",
 				"chalk": "^2.4.1",
 				"commander": "^2.18.0",
@@ -19785,93 +16879,176 @@
 				"mkdirp": "^0.5.1",
 				"opener": "^1.5.1",
 				"ws": "^6.0.0"
+			}
+		},
+		"webpack-core": {
+			"version": "0.6.9",
+			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+			"dev": true,
+			"requires": {
+				"source-list-map": "~0.1.7",
+				"source-map": "~0.4.1"
 			},
 			"dependencies": {
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+				"source-list-map": {
+					"version": "0.1.8",
+					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
 					"dev": true
 				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+				"source-map": {
+					"version": "0.4.4",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
 					"dev": true,
 					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
+						"amdefine": ">=0.0.4"
 					}
 				}
 			}
 		},
-		"webpack-core": {
-			"version": "0.6.9",
-			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+		"webpack-dev-middleware": {
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
+			"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+			"dev": true,
+			"requires": {
+				"memory-fs": "~0.4.1",
+				"mime": "^2.3.1",
+				"range-parser": "^1.0.3",
+				"webpack-log": "^2.0.0"
+			},
+			"dependencies": {
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				}
+			}
+		},
+		"webpack-dev-server": {
+			"version": "3.1.14",
+			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
+			"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
 			"dev": true,
 			"requires": {
-				"source-list-map": "~0.1.7",
-				"source-map": "~0.4.1"
+				"ansi-html": "0.0.7",
+				"bonjour": "^3.5.0",
+				"chokidar": "^2.0.0",
+				"compression": "^1.5.2",
+				"connect-history-api-fallback": "^1.3.0",
+				"debug": "^3.1.0",
+				"del": "^3.0.0",
+				"express": "^4.16.2",
+				"html-entities": "^1.2.0",
+				"http-proxy-middleware": "~0.18.0",
+				"import-local": "^2.0.0",
+				"internal-ip": "^3.0.1",
+				"ip": "^1.1.5",
+				"killable": "^1.0.0",
+				"loglevel": "^1.4.1",
+				"opn": "^5.1.0",
+				"portfinder": "^1.0.9",
+				"schema-utils": "^1.0.0",
+				"selfsigned": "^1.9.1",
+				"semver": "^5.6.0",
+				"serve-index": "^1.7.2",
+				"sockjs": "0.3.19",
+				"sockjs-client": "1.3.0",
+				"spdy": "^4.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^5.1.0",
+				"url": "^0.11.0",
+				"webpack-dev-middleware": "3.4.0",
+				"webpack-log": "^2.0.0",
+				"yargs": "12.0.2"
 			},
 			"dependencies": {
-				"source-list-map": {
-					"version": "0.1.8",
-					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"decamelize": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+					"dev": true,
+					"requires": {
+						"xregexp": "4.0.0"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"source-map": {
-					"version": "0.4.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 					"dev": true,
 					"requires": {
-						"amdefine": ">=0.0.4"
+						"has-flag": "^3.0.0"
+					}
+				},
+				"webpack-dev-middleware": {
+					"version": "3.4.0",
+					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
+					"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
+					"dev": true,
+					"requires": {
+						"memory-fs": "~0.4.1",
+						"mime": "^2.3.1",
+						"range-parser": "^1.0.3",
+						"webpack-log": "^2.0.0"
+					}
+				},
+				"yargs": {
+					"version": "12.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
+					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+					"dev": true,
+					"requires": {
+						"cliui": "^4.0.0",
+						"decamelize": "^2.0.0",
+						"find-up": "^3.0.0",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^3.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1 || ^4.0.0",
+						"yargs-parser": "^10.1.0"
 					}
 				}
 			}
 		},
+		"webpack-log": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+			"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^3.0.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"webpack-merge": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
@@ -19899,6 +17076,15 @@
 				}
 			}
 		},
+		"webpack-subresource-integrity": {
+			"version": "1.1.0-rc.6",
+			"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
+			"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
+			"dev": true,
+			"requires": {
+				"webpack-core": "^0.6.8"
+			}
+		},
 		"websocket-driver": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
@@ -19930,9 +17116,10 @@
 			}
 		},
 		"which-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-			"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+			"dev": true
 		},
 		"wide-align": {
 			"version": "1.1.3",
@@ -19951,6 +17138,15 @@
 				"string-width": "^2.1.1"
 			}
 		},
+		"win-release": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
+			"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
+			"dev": true,
+			"requires": {
+				"semver": "^5.0.1"
+			}
+		},
 		"window-or-global": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/window-or-global/-/window-or-global-1.0.1.tgz",
@@ -19969,36 +17165,6 @@
 			"dev": true,
 			"requires": {
 				"execa": "^0.10.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"wordwrap": {
@@ -20007,6 +17173,15 @@
 			"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
 			"dev": true
 		},
+		"worker-farm": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+			"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+			"dev": true,
+			"requires": {
+				"errno": "~0.1.7"
+			}
+		},
 		"wrap-ansi": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -20087,6 +17262,11 @@
 			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
 			"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
 		},
+		"xmldom": {
+			"version": "0.1.27",
+			"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+			"integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+		},
 		"xmlhttprequest-ssl": {
 			"version": "1.5.5",
 			"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
@@ -20116,143 +17296,93 @@
 			"dev": true
 		},
 		"yargs": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-			"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-			"requires": {
-				"camelcase": "^3.0.0",
-				"cliui": "^3.2.0",
-				"decamelize": "^1.1.1",
-				"get-caller-file": "^1.0.1",
-				"os-locale": "^1.4.0",
-				"read-pkg-up": "^1.0.1",
+			"version": "13.2.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
+			"integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+			"dev": true,
+			"requires": {
+				"cliui": "^4.0.0",
+				"find-up": "^3.0.0",
+				"get-caller-file": "^2.0.1",
+				"os-locale": "^3.1.0",
 				"require-directory": "^2.1.1",
-				"require-main-filename": "^1.0.1",
+				"require-main-filename": "^2.0.0",
 				"set-blocking": "^2.0.0",
-				"string-width": "^1.0.2",
-				"which-module": "^1.0.0",
-				"y18n": "^3.2.1",
-				"yargs-parser": "^5.0.0"
+				"string-width": "^3.0.0",
+				"which-module": "^2.0.0",
+				"y18n": "^4.0.0",
+				"yargs-parser": "^13.0.0"
 			},
 			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					}
-				},
-				"find-up": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
 				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
+				"camelcase": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
+					"integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
+					"dev": true
 				},
-				"os-locale": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-					"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-					"requires": {
-						"lcid": "^1.0.0"
-					}
+				"get-caller-file": {
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+					"dev": true
 				},
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"requires": {
-						"pinkie-promise": "^2.0.0"
-					}
+				"require-main-filename": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+					"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+					"dev": true
 				},
-				"path-type": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-					"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-				},
-				"read-pkg": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-					"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"load-json-file": "^1.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^1.0.0"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"read-pkg-up": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-					"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-					"requires": {
-						"find-up": "^1.0.0",
-						"read-pkg": "^1.0.0"
-					}
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"yargs-parser": {
+					"version": "13.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
+					"integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
+					"dev": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"camelcase": "^5.0.0",
+						"decamelize": "^1.2.0"
 					}
 				}
 			}
 		},
 		"yargs-parser": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-			"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+			"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+			"dev": true,
 			"requires": {
-				"camelcase": "^3.0.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				}
+				"camelcase": "^4.1.0"
 			}
 		},
 		"yeast": {
@@ -20272,17 +17402,18 @@
 			"integrity": "sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g=="
 		},
 		"zen-observable-ts": {
-			"version": "0.8.15",
-			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz",
-			"integrity": "sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==",
+			"version": "0.8.18",
+			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz",
+			"integrity": "sha512-q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A==",
 			"requires": {
+				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"zone.js": {
-			"version": "0.8.29",
-			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
-			"integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.9.0.tgz",
+			"integrity": "sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q=="
 		}
 	}
 }

From 0e3ff589999fd601df5800c895c4069b0a9a98be Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:00:19 +0000
Subject: [PATCH 051/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 77 ++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 0d790856b..95737df7c 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -22,16 +22,24 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@^0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.6.tgz#7050a0367bb7646961d0bdc36aa083a6f3029dea"
-  integrity sha512-gdP856Z5tuQ69mJla5VPKm/uR86dcrPWYW41Jyu5oIhL2GAQ4JtDEuL2+ppwQO8i8hsXGIAbulGAbrlvU5I8OA==
+"@angular-devkit/architect@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
+  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/build-optimizer" "0.13.6"
-    "@angular-devkit/build-webpack" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@ngtools/webpack" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
+"@angular-devkit/build-angular@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
+  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
+  dependencies:
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/build-optimizer" "0.13.7"
+    "@angular-devkit/build-webpack" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@ngtools/webpack" "7.3.7"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -58,7 +66,7 @@
     semver "5.6.0"
     source-map-loader "0.2.4"
     source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.0"
+    speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
@@ -83,23 +91,23 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.6.tgz#846b6d0042de0102c6420ff86380ed961cc71956"
-  integrity sha512-/EOO0wxw7FIKfove4Fv/aKiKgvH0kFhRT2GOe3pW0yV2y2e1dfQdo2AqdGCfJ4rSbwsfWSGTUUFITc+9jgXFZw==
+"@angular-devkit/build-optimizer@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
+  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.6.tgz#c88691aa0259d124e2bdb78a492c44aa44ae148f"
-  integrity sha512-lQmYrhOHeBn/r7uw+FfpJUq9puApYe72+mrIfg/UtLwSEYt58n5d156jnuMcfWnCyhYUgYqLTaOUfSM0RV7akw==
+"@angular-devkit/build-webpack@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
+  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
 "@angular-devkit/core@0.9.0-beta.3":
@@ -135,6 +143,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
@@ -762,12 +781,12 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.6.tgz#3f90c60f7c1742fa4a557f90def8fe742304f4c5"
-  integrity sha512-gDMHybwe8B+1BSvtwM5z4qAkUnZ9b4PTyIVWWECgTLDp2x3WhJi2rMk2X8HTkpbZ52pLPue5GL1sfqlZIOcX7Q==
+"@ngtools/webpack@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
+  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -9816,10 +9835,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
-  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 

From f7db2ab3c3ef61f1020bb6097687badbcfc31864 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:00:23 +0000
Subject: [PATCH 052/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 110 +++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 48 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index f6366e309..ba4cd7238 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -22,16 +22,24 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@~0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.6.tgz#7050a0367bb7646961d0bdc36aa083a6f3029dea"
-  integrity sha512-gdP856Z5tuQ69mJla5VPKm/uR86dcrPWYW41Jyu5oIhL2GAQ4JtDEuL2+ppwQO8i8hsXGIAbulGAbrlvU5I8OA==
+"@angular-devkit/architect@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
+  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/build-optimizer" "0.13.6"
-    "@angular-devkit/build-webpack" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@ngtools/webpack" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
+"@angular-devkit/build-angular@~0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
+  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
+  dependencies:
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/build-optimizer" "0.13.7"
+    "@angular-devkit/build-webpack" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@ngtools/webpack" "7.3.7"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -58,7 +66,7 @@
     semver "5.6.0"
     source-map-loader "0.2.4"
     source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.0"
+    speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
@@ -83,23 +91,23 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.6.tgz#846b6d0042de0102c6420ff86380ed961cc71956"
-  integrity sha512-/EOO0wxw7FIKfove4Fv/aKiKgvH0kFhRT2GOe3pW0yV2y2e1dfQdo2AqdGCfJ4rSbwsfWSGTUUFITc+9jgXFZw==
+"@angular-devkit/build-optimizer@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
+  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.6.tgz#c88691aa0259d124e2bdb78a492c44aa44ae148f"
-  integrity sha512-lQmYrhOHeBn/r7uw+FfpJUq9puApYe72+mrIfg/UtLwSEYt58n5d156jnuMcfWnCyhYUgYqLTaOUfSM0RV7akw==
+"@angular-devkit/build-webpack@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
+  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
 "@angular-devkit/core@0.9.0-beta.3":
@@ -135,6 +143,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
@@ -823,12 +842,12 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.6.tgz#3f90c60f7c1742fa4a557f90def8fe742304f4c5"
-  integrity sha512-gDMHybwe8B+1BSvtwM5z4qAkUnZ9b4PTyIVWWECgTLDp2x3WhJi2rMk2X8HTkpbZ52pLPue5GL1sfqlZIOcX7Q==
+"@ngtools/webpack@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
+  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -1226,7 +1245,7 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@*, abbrev@1:
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
@@ -1444,7 +1463,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
-ansi@*, ansi@^0.3.1:
+ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
 
@@ -1913,7 +1932,7 @@ backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
 
-balanced-match@*, balanced-match@^1.0.0:
+balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
@@ -2121,13 +2140,13 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@*, bplist-parser@^0.1.0:
+bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@*, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
@@ -2864,7 +2883,7 @@ compression@^1.5.2, compression@^1.6.0:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@*, concat-map@0.0.1:
+concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
@@ -3175,7 +3194,7 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
 
@@ -5762,14 +5781,14 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
-inflight@*, inflight@^1.0.4:
+inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -7301,7 +7320,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -7906,7 +7925,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -10014,10 +10033,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
-  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 
@@ -10945,7 +10964,7 @@ unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
-underscore@*, underscore@^1.8.3:
+underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
 
@@ -11008,11 +11027,6 @@ unix-crypt-td-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
 
-unorm@*:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
-  integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
-
 unorm@^1.3.3:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.4.1.tgz#364200d5f13646ca8bcd44490271335614792300"
@@ -11515,7 +11529,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@*, wrappy@1:
+wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
@@ -11594,7 +11608,7 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
 
-xmldom@*, xmldom@0.1.x:
+xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
 

From b0e127bfec4186263bc6afe4220ccb9c3cee749d Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:00:27 +0000
Subject: [PATCH 053/382] chore(package): update lockfile
 admin/website-angular/yarn.lock

---
 admin/website-angular/yarn.lock | 99 ++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 40 deletions(-)

diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index d82a44409..feb39983d 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -15,17 +15,25 @@
     "@angular-devkit/core" "7.3.1"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@^0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.1.tgz#369febda48dd40e47a4f0077064e792612a8e1c1"
-  integrity sha512-vkKwMVQ+NNCcVR3HFMffS+Mq4b2afXeUjI+02N38hBuFTppnC83uivUB6Uu2NUk5NTSQA4BnJlG5CbMs6N4QYg==
+"@angular-devkit/architect@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
+  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
   dependencies:
-    "@angular-devkit/architect" "0.13.1"
-    "@angular-devkit/build-optimizer" "0.13.1"
-    "@angular-devkit/build-webpack" "0.13.1"
-    "@angular-devkit/core" "7.3.1"
-    "@ngtools/webpack" "7.3.1"
-    ajv "6.7.0"
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
+"@angular-devkit/build-angular@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
+  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
+  dependencies:
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/build-optimizer" "0.13.7"
+    "@angular-devkit/build-webpack" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@ngtools/webpack" "7.3.7"
+    ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
     clean-css "4.2.1"
@@ -51,7 +59,7 @@
     semver "5.6.0"
     source-map-loader "0.2.4"
     source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.0"
+    speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
@@ -67,23 +75,23 @@
   optionalDependencies:
     node-sass "4.11.0"
 
-"@angular-devkit/build-optimizer@0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.1.tgz#56151179bd6427918ba8e0f5a7e581e5daa00294"
-  integrity sha512-LmvHiI3H451aVWY5Ac6Fqz0i1eX/mUfWN+uJvo8NaL6Jc0HKYX2o3l4ODr8UUECWWctUC9AMD522ZMwAvnvsKQ==
+"@angular-devkit/build-optimizer@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
+  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.1.tgz#98d666765705e9379c9b2e0a3b6dfcd0347a2a32"
-  integrity sha512-OGwC7bAl3u+w7Glw+OqIrN7OD1BkDXgrWbeQSpKAmsx6VdNPCnI4NPS+JldWNp70LVlE2nQlJUhtEqMVfBMnlg==
+"@angular-devkit/build-webpack@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
+  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
   dependencies:
-    "@angular-devkit/architect" "0.13.1"
-    "@angular-devkit/core" "7.3.1"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
 "@angular-devkit/core@7.3.1":
@@ -97,6 +105,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@7.3.1":
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.1.tgz#7dc704005b966ea6c1ee62f380120183bb76eee6"
@@ -1051,12 +1070,12 @@
   dependencies:
     tslib "^1.9.0"
 
-"@ngtools/webpack@7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.1.tgz#4ff68007fd68fdc26f22e19115182f96fb6f7335"
-  integrity sha512-EGQRjgDf5XP+Fm1MdZNRFiPd9e1vhl11BhjkwqkAsewic4eoz6fqXfj/Osz1hQy8xU+2dPPf/byQ/+nY3E02Zg==
+"@ngtools/webpack@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
+  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
   dependencies:
-    "@angular-devkit/core" "7.3.1"
+    "@angular-devkit/core" "7.3.7"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -1791,6 +1810,16 @@ ajv@6.7.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@6.9.1, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
+  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@^5.0.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -1801,16 +1830,6 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
-  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -11484,10 +11503,10 @@ specificity@^0.4.1:
   resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
   integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
 
-speed-measure-webpack-plugin@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
-  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 

From 86e3560e43eec03a84f5a70013d5cf7dec97efee Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:07:19 +0000
Subject: [PATCH 054/382] chore(package): update
 @angular-devkit/build-optimizer to version 0.13.7

---
 shop/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 976f104e3..716786a57 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -162,7 +162,7 @@
 	},
 	"devDependencies": {
 		"@angular-devkit/build-angular": "^0.13.4",
-		"@angular-devkit/build-optimizer": "^0.13.4",
+		"@angular-devkit/build-optimizer": "^0.13.7",
 		"@angular-extensions/testing-library": "^3.1.0",
 		"@angular/cli": "^7.3.4",
 		"@angular/compiler-cli": "^7.2.7",

From 651c172dc97dfe53a28fa8a96c8d88eb86ed4db3 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:20:34 +0000
Subject: [PATCH 055/382] chore(package): update @angular-devkit/core to
 version 7.3.7

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 3d778b353..ed1067c11 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -159,7 +159,7 @@
 		"@angular-builders/dev-server": "^7.3.1",
 		"@angular-devkit/architect": "~0.13.6",
 		"@angular-devkit/build-angular": "~0.13.6",
-		"@angular-devkit/core": "~7.3.6",
+		"@angular-devkit/core": "~7.3.7",
 		"@angular-devkit/schematics": "^7.3.6",
 		"@angular/cli": "^7.3.6",
 		"@angular/compiler": "^7.2.10",

From 9d0bd477ad4b94704017de5fb7c242b8dc37dc7a Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:20:38 +0000
Subject: [PATCH 056/382] chore(package): update @angular-devkit/core to
 version 7.3.7

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 3c8c2f2a1..60e4bce88 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -172,7 +172,7 @@
 		"@angular-builders/dev-server": "^7.3.1",
 		"@angular-devkit/architect": "^0.13.6",
 		"@angular-devkit/build-angular": "^0.13.6",
-		"@angular-devkit/core": "^7.3.6",
+		"@angular-devkit/core": "^7.3.7",
 		"@angular-devkit/schematics": "^7.3.6",
 		"@angular/cli": "^7.3.6",
 		"@angular/compiler": "^7.2.9",

From 7da72a628368750f77f6d8115f78d59c2b3f5ebb Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:20:41 +0000
Subject: [PATCH 057/382] chore(package): update @angular-devkit/core to
 version 7.3.7

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 7dd9334e2..ab347c019 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -147,7 +147,7 @@
 		"@angular-builders/dev-server": "^7.3.1",
 		"@angular-devkit/architect": "~0.13.6",
 		"@angular-devkit/build-angular": "~0.13.6",
-		"@angular-devkit/core": "~7.3.6",
+		"@angular-devkit/core": "~7.3.7",
 		"@angular-devkit/schematics": "^7.3.6",
 		"@angular/cli": "^7.3.6",
 		"@angular/compiler": "~7.2.10",

From 81bc05010acf1b3d01f260636ed3da77aef8da0b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:20:44 +0000
Subject: [PATCH 058/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18357 +++++++++++---------------
 1 file changed, 7744 insertions(+), 10613 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index a46cfc435..9dc333b9c 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -5,25 +5,27 @@
 	"requires": true,
 	"dependencies": {
 		"@angular-builders/custom-webpack": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.2.0.tgz",
-			"integrity": "sha512-m6K1T7rDofyxxxgRdAHEUfjbvu8G3RL3XKeAieDbbHSRhsptEAgYdBx5BpkW+xrrfgX5TWG6AZaEgfPNlJtbAA==",
+			"version": "7.4.3",
+			"resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.4.3.tgz",
+			"integrity": "sha512-dizPcKBSdgM8ztVbhOdVxHnfV/FBkTi1ZirsxWaw1B0S0KuPTESnsJaZA15i8Y2l202hCPs5fJfqy5aCoRrs1Q==",
+			"dev": true,
 			"requires": {
 				"lodash": "^4.17.10"
 			}
 		},
 		"@angular-builders/dev-server": {
-			"version": "7.2.1",
-			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.2.1.tgz",
-			"integrity": "sha512-hQZD/aB/jMq4Yf3+lkkGpU8OFAQwZ+S+422P+m2NkZ40+UXLsJpVzDRFMcL0GGObjwTxhxrmw6wFUk+2V5TwIg=="
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/@angular-builders/dev-server/-/dev-server-7.3.1.tgz",
+			"integrity": "sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==",
+			"dev": true
 		},
 		"@angular-devkit/architect": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.0.tgz",
-			"integrity": "sha512-oDBrWlfKh/0t2ag4T8gz9xzPMItxfctinlsHxhw7dPQ+etq1mIcWgQkiKiDrz4l46YiGipBRlC55j+6f37omAA==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.7.tgz",
+			"integrity": "sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
+				"@angular-devkit/core": "7.3.7",
 				"rxjs": "6.3.3"
 			},
 			"dependencies": {
@@ -39,24 +41,23 @@
 			}
 		},
 		"@angular-devkit/build-angular": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.0.tgz",
-			"integrity": "sha512-JjoSXbmwOsuDJxngyChr6aOSZ2qsrvSL1MHwqgXhZswmC/KghBF0aZ7y8Wzr27zDCQ174Axts7+IAk6b+aWIqw==",
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz",
+			"integrity": "sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/build-optimizer": "0.13.0",
-				"@angular-devkit/build-webpack": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@ngtools/webpack": "7.3.0",
-				"ajv": "6.7.0",
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/build-optimizer": "0.13.7",
+				"@angular-devkit/build-webpack": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@ngtools/webpack": "7.3.7",
+				"ajv": "6.9.1",
 				"autoprefixer": "9.4.6",
 				"circular-dependency-plugin": "5.0.2",
 				"clean-css": "4.2.1",
 				"copy-webpack-plugin": "4.6.0",
 				"file-loader": "3.0.1",
 				"glob": "7.1.3",
-				"istanbul": "0.4.5",
 				"istanbul-instrumenter-loader": "3.0.1",
 				"karma-source-map-support": "1.3.0",
 				"less": "3.9.0",
@@ -77,12 +78,12 @@
 				"semver": "5.6.0",
 				"source-map-loader": "0.2.4",
 				"source-map-support": "0.5.10",
-				"speed-measure-webpack-plugin": "1.3.0",
+				"speed-measure-webpack-plugin": "1.3.1",
 				"stats-webpack-plugin": "0.7.0",
 				"style-loader": "0.23.1",
 				"stylus": "0.54.5",
 				"stylus-loader": "3.0.2",
-				"terser-webpack-plugin": "1.2.1",
+				"terser-webpack-plugin": "1.2.2",
 				"tree-kill": "1.2.1",
 				"webpack": "4.29.0",
 				"webpack-dev-middleware": "3.5.1",
@@ -92,2094 +93,1378 @@
 				"webpack-subresource-integrity": "1.1.0-rc.6"
 			},
 			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.0.tgz",
-					"integrity": "sha512-fhWuzbMVV/UNYE7rHSKutrWTCZle34N5cdtFz6qhK1k/wn7Vmtg9cFOwzx0SPdIlOEn576NB4DS/4UG3B5WCUQ==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "1.2.3",
-						"source-map": "0.5.6",
-						"typescript": "3.2.4",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"@angular-devkit/build-webpack": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.0.tgz",
-					"integrity": "sha512-idtFoSbQ3Y3WqXlDlU7oTPV9TIU1kjLqce0nK1Kst+t40GTc+Q4iUJJ7KsKE3nV6TPyrL1N/IvIF7+hSJnYm8A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/architect": "0.13.0",
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
-					}
-				},
-				"@ngtools/webpack": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.0.tgz",
-					"integrity": "sha512-U/By0Jlwy7nYwrGNtFirTg1aAsEHBL/9DhfFxPI0iu27FWiMttROuN6hmKbbnOmpbiYAVl5qTy3WXPXUIJjG1A==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"enhanced-resolve": "4.1.0",
-						"rxjs": "6.3.3",
-						"tree-kill": "1.2.1",
-						"webpack-sources": "1.3.0"
-					}
-				},
-				"abbrev": {
-					"version": "1.0.9",
-					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-					"integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
 				"cacache": {
-					"version": "10.0.4",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-					"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"bluebird": "^3.5.1",
-						"chownr": "^1.0.1",
-						"glob": "^7.1.2",
-						"graceful-fs": "^4.1.11",
-						"lru-cache": "^4.1.1",
-						"mississippi": "^2.0.0",
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
 						"mkdirp": "^0.5.1",
 						"move-concurrently": "^1.0.1",
 						"promise-inflight": "^1.0.1",
 						"rimraf": "^2.6.2",
-						"ssri": "^5.2.4",
-						"unique-filename": "^1.1.0",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
 						"y18n": "^4.0.0"
 					}
 				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
 				},
-				"cliui": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-					"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 					"dev": true,
 					"requires": {
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"yallist": "^3.0.2"
 					}
 				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
 					}
 				},
-				"copy-webpack-plugin": {
-					"version": "4.6.0",
-					"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
-					"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"cacache": "^10.0.4",
-						"find-cache-dir": "^1.0.0",
-						"globby": "^7.1.1",
-						"is-glob": "^4.0.0",
-						"loader-utils": "^1.1.0",
-						"minimatch": "^3.0.4",
-						"p-limit": "^1.0.0",
-						"serialize-javascript": "^1.4.0"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
 					}
 				},
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
+				"parse5": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+					"dev": true
 				},
-				"decamelize": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-					"dev": true,
-					"requires": {
-						"xregexp": "4.0.0"
-					}
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
 				},
-				"del": {
+				"pkg-dir": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-					"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
 					"dev": true,
 					"requires": {
-						"globby": "^6.1.0",
-						"is-path-cwd": "^1.0.0",
-						"is-path-in-cwd": "^1.0.0",
-						"p-map": "^1.1.1",
-						"pify": "^3.0.0",
-						"rimraf": "^2.2.8"
-					},
-					"dependencies": {
-						"globby": {
-							"version": "6.1.0",
-							"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-							"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-							"dev": true,
-							"requires": {
-								"array-union": "^1.0.1",
-								"glob": "^7.0.3",
-								"object-assign": "^4.0.1",
-								"pify": "^2.0.0",
-								"pinkie-promise": "^2.0.0"
-							},
-							"dependencies": {
-								"pify": {
-									"version": "2.3.0",
-									"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-									"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-									"dev": true
-								}
-							}
-						}
+						"find-up": "^3.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.8.1",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-					"integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"esprima": "^2.7.1",
-						"estraverse": "^1.9.1",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.2.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.2.0",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-							"integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-							"dev": true,
-							"optional": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"tslib": "^1.9.0"
 					}
 				},
-				"execa": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
 					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^4.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
+						"figgy-pudding": "^3.5.1"
 					}
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"terser-webpack-plugin": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz",
+					"integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"file-loader": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
-					"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.0.2",
-						"schema-utils": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
+						"cacache": "^11.0.2",
+						"find-cache-dir": "^2.0.0",
+						"schema-utils": "^1.0.0",
+						"serialize-javascript": "^1.4.0",
+						"source-map": "^0.6.1",
+						"terser": "^3.16.1",
+						"webpack-sources": "^1.1.0",
+						"worker-farm": "^1.5.2"
 					}
 				},
-				"has-flag": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-					"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
 					"dev": true
-				},
-				"http-signature": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-					"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+				}
+			}
+		},
+		"@angular-devkit/build-optimizer": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz",
+			"integrity": "sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "1.2.3",
+				"source-map": "0.5.6",
+				"typescript": "3.2.4",
+				"webpack-sources": "1.3.0"
+			}
+		},
+		"@angular-devkit/build-webpack": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz",
+			"integrity": "sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"assert-plus": "^1.0.0",
-						"jsprim": "^1.2.2",
-						"sshpk": "^1.7.0"
+						"tslib": "^1.9.0"
 					}
-				},
-				"invert-kv": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-					"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-					"dev": true
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				}
+			}
+		},
+		"@angular-devkit/core": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+			"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+			"dev": true,
+			"requires": {
+				"ajv": "6.9.1",
+				"chokidar": "2.0.4",
+				"fast-json-stable-stringify": "2.0.0",
+				"rxjs": "6.3.3",
+				"source-map": "0.7.3"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				}
+			}
+		},
+		"@angular-devkit/schematics": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+			"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"tslib": "^1.9.0"
 					}
-				},
-				"istanbul": {
-					"version": "0.4.5",
-					"resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-					"integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-					"dev": true,
-					"requires": {
-						"abbrev": "1.0.x",
-						"async": "1.x",
-						"escodegen": "1.8.x",
-						"esprima": "2.7.x",
-						"glob": "^5.0.15",
-						"handlebars": "^4.0.1",
-						"js-yaml": "3.x",
-						"mkdirp": "0.5.x",
-						"nopt": "3.x",
-						"once": "1.x",
-						"resolve": "1.1.x",
-						"supports-color": "^3.1.0",
-						"which": "^1.1.1",
-						"wordwrap": "^1.0.0"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "5.0.15",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-							"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-							"dev": true,
-							"requires": {
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "2 || 3",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						}
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"lcid": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-					"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+				}
+			}
+		},
+		"@angular/animations": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.11.tgz",
+			"integrity": "sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/cli": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.7.tgz",
+			"integrity": "sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/architect": "0.13.7",
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"@schematics/update": "0.13.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"inquirer": "6.2.1",
+				"npm-package-arg": "6.1.0",
+				"opn": "5.4.0",
+				"pacote": "9.4.0",
+				"semver": "5.6.0",
+				"symbol-observable": "1.2.0"
+			}
+		},
+		"@angular/common": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.11.tgz",
+			"integrity": "sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.11.tgz",
+			"integrity": "sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/compiler-cli": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz",
+			"integrity": "sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==",
+			"dev": true,
+			"requires": {
+				"canonical-path": "1.0.0",
+				"chokidar": "^2.1.1",
+				"convert-source-map": "^1.5.1",
+				"dependency-graph": "^0.7.2",
+				"magic-string": "^0.25.0",
+				"minimist": "^1.2.0",
+				"reflect-metadata": "^0.1.2",
+				"shelljs": "^0.8.1",
+				"source-map": "^0.6.1",
+				"tslib": "^1.9.0",
+				"yargs": "9.0.1"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"invert-kv": "^2.0.0"
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"less": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
-					"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
 					"dev": true,
 					"requires": {
-						"clone": "^2.1.2",
-						"errno": "^0.1.1",
-						"graceful-fs": "^4.1.2",
-						"image-size": "~0.5.0",
-						"mime": "^1.4.1",
-						"mkdirp": "^0.5.0",
-						"promise": "^7.1.1",
-						"request": "^2.83.0",
-						"source-map": "~0.6.0"
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
 					},
 					"dependencies": {
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 							"dev": true,
-							"optional": true
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
 						}
 					}
 				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+				"cross-spawn": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
 					"dev": true,
 					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
+						"lru-cache": "^4.0.1",
+						"shebang-command": "^1.2.0",
+						"which": "^1.2.9"
 					}
 				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+				"execa": {
+					"version": "0.7.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"cross-spawn": "^5.0.1",
+						"get-stream": "^3.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
 					}
 				},
-				"mini-css-extract-plugin": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
-					"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+				"invert-kv": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+					"dev": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0",
-						"webpack-sources": "^1.1.0"
+						"number-is-nan": "^1.0.0"
 					}
 				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				"mem": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"mimic-fn": "^1.0.0"
 					}
 				},
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+					"dev": true
+				},
 				"os-locale": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-					"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
 					"dev": true,
 					"requires": {
-						"execa": "^1.0.0",
-						"lcid": "^2.0.0",
-						"mem": "^4.0.0"
+						"execa": "^0.7.0",
+						"lcid": "^1.0.0",
+						"mem": "^1.1.0"
 					}
 				},
-				"parse5": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
 				},
-				"pkg-dir": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-					"dev": true,
-					"requires": {
-						"find-up": "^3.0.0"
-					}
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+					"dev": true
 				},
-				"raw-loader": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
-					"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+				"yargs": {
+					"version": "9.0.1",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
+					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
 					"dev": true,
 					"requires": {
-						"loader-utils": "^1.1.0",
-						"schema-utils": "^1.0.0"
+						"camelcase": "^4.1.0",
+						"cliui": "^3.2.0",
+						"decamelize": "^1.1.1",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^2.0.0",
+						"read-pkg-up": "^2.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1",
+						"yargs-parser": "^7.0.0"
 					}
 				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"yargs-parser": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
 					"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"
+						"camelcase": "^4.1.0"
 					}
-				},
-				"request": {
-					"version": "2.88.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-					"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"aws-sign2": "~0.7.0",
-						"aws4": "^1.8.0",
-						"caseless": "~0.12.0",
-						"combined-stream": "~1.0.6",
-						"extend": "~3.0.2",
-						"forever-agent": "~0.6.1",
-						"form-data": "~2.3.2",
-						"har-validator": "~5.1.0",
-						"http-signature": "~1.2.0",
-						"is-typedarray": "~1.0.0",
-						"isstream": "~0.1.2",
-						"json-stringify-safe": "~5.0.1",
-						"mime-types": "~2.1.19",
-						"oauth-sign": "~0.9.0",
-						"performance-now": "^2.1.0",
-						"qs": "~6.5.2",
-						"safe-buffer": "^5.1.2",
-						"tough-cookie": "~2.4.3",
-						"tunnel-agent": "^0.6.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"sockjs": {
-					"version": "0.3.19",
-					"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-					"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
-					"dev": true,
-					"requires": {
-						"faye-websocket": "^0.10.0",
-						"uuid": "^3.0.1"
-					}
-				},
-				"sockjs-client": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-					"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.2.5",
-						"eventsource": "^1.0.7",
-						"faye-websocket": "~0.11.1",
-						"inherits": "^2.0.3",
-						"json3": "^3.3.2",
-						"url-parse": "^1.4.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"faye-websocket": {
-							"version": "0.11.1",
-							"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-							"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-							"dev": true,
-							"requires": {
-								"websocket-driver": ">=0.5.1"
-							}
-						}
-					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"spdy": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
-					"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"handle-thing": "^2.0.0",
-						"http-deceiver": "^1.2.7",
-						"select-hose": "^2.0.0",
-						"spdy-transport": "^3.0.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"spdy-transport": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-					"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.1.0",
-						"detect-node": "^2.0.4",
-						"hpack.js": "^2.1.6",
-						"obuf": "^1.1.2",
-						"readable-stream": "^3.0.6",
-						"wbuf": "^1.7.3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "4.1.1",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-							"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"readable-stream": {
-							"version": "3.1.1",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-							"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-							"dev": true,
-							"requires": {
-								"inherits": "^2.0.3",
-								"string_decoder": "^1.1.1",
-								"util-deprecate": "^1.0.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,
+				}
+			}
+		},
+		"@angular/core": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.11.tgz",
+			"integrity": "sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/forms": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.11.tgz",
+			"integrity": "sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/http": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.11.tgz",
+			"integrity": "sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/language-service": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.11.tgz",
+			"integrity": "sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==",
+			"dev": true
+		},
+		"@angular/platform-browser": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.11.tgz",
+			"integrity": "sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/platform-browser-dynamic": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz",
+			"integrity": "sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/pwa": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.7.tgz",
+			"integrity": "sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==",
+			"requires": {
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@schematics/angular": "7.3.7",
+				"parse5-html-rewriting-stream": "5.1.0",
+				"rxjs": "6.3.3"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
 					}
 				},
-				"stylus": {
-					"version": "0.54.5",
-					"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
-					"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
-					"dev": true,
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
 					"requires": {
-						"css-parse": "1.7.x",
-						"debug": "*",
-						"glob": "7.0.x",
-						"mkdirp": "0.5.x",
-						"sax": "0.5.x",
-						"source-map": "0.1.x"
-					},
-					"dependencies": {
-						"glob": {
-							"version": "7.0.6",
-							"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-							"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-							"dev": true,
-							"requires": {
-								"fs.realpath": "^1.0.0",
-								"inflight": "^1.0.4",
-								"inherits": "2",
-								"minimatch": "^3.0.2",
-								"once": "^1.3.0",
-								"path-is-absolute": "^1.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.1.43",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-							"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
 					}
 				},
-				"stylus-loader": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-					"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
-					"dev": true,
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
 					"requires": {
-						"loader-utils": "^1.0.2",
-						"lodash.clonedeep": "^4.5.0",
-						"when": "~3.6.x"
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
 					}
 				},
-				"supports-color": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-					"dev": true,
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
 					"requires": {
-						"has-flag": "^1.0.0"
+						"tslib": "^1.9.0"
 					}
 				},
-				"terser-webpack-plugin": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz",
-					"integrity": "sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==",
-					"dev": true,
-					"requires": {
-						"cacache": "^11.0.2",
-						"find-cache-dir": "^2.0.0",
-						"schema-utils": "^1.0.0",
-						"serialize-javascript": "^1.4.0",
-						"source-map": "^0.6.1",
-						"terser": "^3.8.1",
-						"webpack-sources": "^1.1.0",
-						"worker-farm": "^1.5.2"
-					},
-					"dependencies": {
-						"cacache": {
-							"version": "11.3.2",
-							"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-							"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-							"dev": true,
-							"requires": {
-								"bluebird": "^3.5.3",
-								"chownr": "^1.1.1",
-								"figgy-pudding": "^3.5.1",
-								"glob": "^7.1.3",
-								"graceful-fs": "^4.1.15",
-								"lru-cache": "^5.1.1",
-								"mississippi": "^3.0.0",
-								"mkdirp": "^0.5.1",
-								"move-concurrently": "^1.0.1",
-								"promise-inflight": "^1.0.1",
-								"rimraf": "^2.6.2",
-								"ssri": "^6.0.1",
-								"unique-filename": "^1.1.1",
-								"y18n": "^4.0.0"
-							}
-						},
-						"find-cache-dir": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
-							"integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
-							"dev": true,
-							"requires": {
-								"commondir": "^1.0.1",
-								"make-dir": "^1.0.0",
-								"pkg-dir": "^3.0.0"
-							}
-						},
-						"lru-cache": {
-							"version": "5.1.1",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-							"dev": true,
-							"requires": {
-								"yallist": "^3.0.2"
-							}
-						},
-						"mississippi": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-							"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-							"dev": true,
-							"requires": {
-								"concat-stream": "^1.5.0",
-								"duplexify": "^3.4.2",
-								"end-of-stream": "^1.1.0",
-								"flush-write-stream": "^1.0.0",
-								"from2": "^2.1.0",
-								"parallel-transform": "^1.1.0",
-								"pump": "^3.0.0",
-								"pumpify": "^1.3.3",
-								"stream-each": "^1.1.0",
-								"through2": "^2.0.0"
-							}
-						},
-						"source-map": {
-							"version": "0.6.1",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-							"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-							"dev": true
-						},
-						"ssri": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-							"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-							"dev": true,
-							"requires": {
-								"figgy-pudding": "^3.5.1"
-							}
-						}
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
+			}
+		},
+		"@angular/router": {
+			"version": "7.2.11",
+			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.11.tgz",
+			"integrity": "sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@angular/service-worker": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
+			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
+			"requires": {
+				"tslib": "^1.9.0"
+			}
+		},
+		"@babel/code-frame": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+			"dev": true,
+			"requires": {
+				"@babel/highlight": "^7.0.0"
+			}
+		},
+		"@babel/generator": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
+			"integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0",
+				"jsesc": "^2.5.1",
+				"lodash": "^4.17.11",
+				"source-map": "^0.5.0",
+				"trim-right": "^1.0.1"
+			},
+			"dependencies": {
+				"jsesc": {
+					"version": "2.5.2",
+					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.0.0",
+				"@babel/template": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+			"integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/highlight": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.0.0",
+				"esutils": "^2.0.2",
+				"js-tokens": "^4.0.0"
+			},
+			"dependencies": {
+				"js-tokens": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/parser": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz",
+			"integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==",
+			"dev": true
+		},
+		"@babel/runtime": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz",
+			"integrity": "sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==",
+			"dev": true,
+			"requires": {
+				"regenerator-runtime": "^0.13.2"
+			},
+			"dependencies": {
+				"regenerator-runtime": {
+					"version": "0.13.2",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+					"integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/template": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz",
+			"integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0"
+			}
+		},
+		"@babel/traverse": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
+			"integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.0.0",
+				"@babel/generator": "^7.4.0",
+				"@babel/helper-function-name": "^7.1.0",
+				"@babel/helper-split-export-declaration": "^7.4.0",
+				"@babel/parser": "^7.4.0",
+				"@babel/types": "^7.4.0",
+				"debug": "^4.1.0",
+				"globals": "^11.1.0",
+				"lodash": "^4.17.11"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
 					}
 				},
-				"webpack": {
-					"version": "4.29.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
-					"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+				"globals": {
+					"version": "11.11.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+					"integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@babel/types": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+			"integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+			"dev": true,
+			"requires": {
+				"esutils": "^2.0.2",
+				"lodash": "^4.17.11",
+				"to-fast-properties": "^2.0.0"
+			},
+			"dependencies": {
+				"to-fast-properties": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/compodoc": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.9.tgz",
+			"integrity": "sha512-LFdbF/fO9qOGgdrCHg4irMBrl3sD8ySIlL6XabFAz8QbUdf2+77xOVnZJ/PYdcuI8h8vXo4UGS7MFg0pDR2jsw==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-transformer": "^2.0.0",
+				"chalk": "^2.4.2",
+				"cheerio": "^1.0.0-rc.2",
+				"chokidar": "^2.1.2",
+				"colors": "^1.3.3",
+				"commander": "^2.19.0",
+				"cosmiconfig": "^5.1.0",
+				"fancy-log": "^1.3.3",
+				"findit2": "^2.2.3",
+				"fs-extra": "^7.0.1",
+				"glob": "^7.1.3",
+				"handlebars": "^4.1.0",
+				"html-entities": "^1.2.1",
+				"i18next": "^15.0.4",
+				"inside": "^1.0.0",
+				"json5": "^2.1.0",
+				"live-server": "^1.2.1",
+				"lodash": "^4.17.11",
+				"lunr": "^2.3.6",
+				"marked": "^0.6.1",
+				"minimist": "^1.2.0",
+				"opencollective": "^1.0.3",
+				"os-name": "^3.0.0",
+				"pdfmake": "^0.1.53",
+				"semver": "^5.6.0",
+				"traverse": "^0.6.6",
+				"ts-simple-ast": "12.4.0",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"chokidar": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+					"integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
 					"dev": true,
 					"requires": {
-						"@webassemblyjs/ast": "1.7.11",
-						"@webassemblyjs/helper-module-context": "1.7.11",
-						"@webassemblyjs/wasm-edit": "1.7.11",
-						"@webassemblyjs/wasm-parser": "1.7.11",
-						"acorn": "^6.0.5",
-						"acorn-dynamic-import": "^4.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"chrome-trace-event": "^1.0.0",
-						"enhanced-resolve": "^4.1.0",
-						"eslint-scope": "^4.0.0",
-						"json-parse-better-errors": "^1.0.2",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"micromatch": "^3.1.8",
-						"mkdirp": "~0.5.0",
-						"neo-async": "^2.5.0",
-						"node-libs-browser": "^2.0.0",
-						"schema-utils": "^0.4.4",
-						"tapable": "^1.1.0",
-						"terser-webpack-plugin": "^1.1.0",
-						"watchpack": "^1.5.0",
-						"webpack-sources": "^1.3.0"
-					},
-					"dependencies": {
-						"schema-utils": {
-							"version": "0.4.7",
-							"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-							"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-							"dev": true,
-							"requires": {
-								"ajv": "^6.1.0",
-								"ajv-keywords": "^3.1.0"
-							}
-						}
+						"anymatch": "^2.0.0",
+						"async-each": "^1.0.1",
+						"braces": "^2.3.2",
+						"fsevents": "^1.2.7",
+						"glob-parent": "^3.1.0",
+						"inherits": "^2.0.3",
+						"is-binary-path": "^1.0.0",
+						"is-glob": "^4.0.0",
+						"normalize-path": "^3.0.0",
+						"path-is-absolute": "^1.0.0",
+						"readdirp": "^2.2.1",
+						"upath": "^1.1.1"
 					}
 				},
-				"webpack-dev-middleware": {
-					"version": "3.5.1",
-					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
-					"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+				"cosmiconfig": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.0.tgz",
+					"integrity": "sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==",
 					"dev": true,
 					"requires": {
-						"memory-fs": "~0.4.1",
-						"mime": "^2.3.1",
-						"range-parser": "^1.0.3",
-						"webpack-log": "^2.0.0"
-					},
-					"dependencies": {
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						}
+						"import-fresh": "^2.0.0",
+						"is-directory": "^0.3.1",
+						"js-yaml": "^3.13.0",
+						"parse-json": "^4.0.0"
 					}
 				},
-				"webpack-dev-server": {
-					"version": "3.1.14",
-					"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
-					"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
+				"js-yaml": {
+					"version": "3.13.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+					"integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
 					"dev": true,
 					"requires": {
-						"ansi-html": "0.0.7",
-						"bonjour": "^3.5.0",
-						"chokidar": "^2.0.0",
-						"compression": "^1.5.2",
-						"connect-history-api-fallback": "^1.3.0",
-						"debug": "^3.1.0",
-						"del": "^3.0.0",
-						"express": "^4.16.2",
-						"html-entities": "^1.2.0",
-						"http-proxy-middleware": "~0.18.0",
-						"import-local": "^2.0.0",
-						"internal-ip": "^3.0.1",
-						"ip": "^1.1.5",
-						"killable": "^1.0.0",
-						"loglevel": "^1.4.1",
-						"opn": "^5.1.0",
-						"portfinder": "^1.0.9",
-						"schema-utils": "^1.0.0",
-						"selfsigned": "^1.9.1",
-						"semver": "^5.6.0",
-						"serve-index": "^1.7.2",
-						"sockjs": "0.3.19",
-						"sockjs-client": "1.3.0",
-						"spdy": "^4.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^5.1.0",
-						"url": "^0.11.0",
-						"webpack-dev-middleware": "3.4.0",
-						"webpack-log": "^2.0.0",
-						"yargs": "12.0.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-							"dev": true
-						},
-						"mime": {
-							"version": "2.4.0",
-							"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-							"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						},
-						"webpack-dev-middleware": {
-							"version": "3.4.0",
-							"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
-							"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
-							"dev": true,
-							"requires": {
-								"memory-fs": "~0.4.1",
-								"mime": "^2.3.1",
-								"range-parser": "^1.0.3",
-								"webpack-log": "^2.0.0"
-							}
-						}
-					}
-				},
-				"webpack-log": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-					"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-					"dev": true,
-					"requires": {
-						"ansi-colors": "^3.0.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"webpack-subresource-integrity": {
-					"version": "1.1.0-rc.6",
-					"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
-					"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
-					"dev": true,
-					"requires": {
-						"webpack-core": "^0.6.8"
+						"argparse": "^1.0.7",
+						"esprima": "^4.0.0"
 					}
 				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 					"dev": true
 				},
-				"worker-farm": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-					"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
-					"dev": true,
-					"requires": {
-						"errno": "~0.1.7"
-					}
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+				"upath": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+					"integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
 					"dev": true
-				},
-				"yargs": {
-					"version": "12.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
-					"dev": true,
-					"requires": {
-						"cliui": "^4.0.0",
-						"decamelize": "^2.0.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^3.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1 || ^4.0.0",
-						"yargs-parser": "^10.1.0"
-					}
-				},
-				"yargs-parser": {
-					"version": "10.1.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-					"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					}
 				}
 			}
 		},
-		"@angular-devkit/core": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-			"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+		"@compodoc/ngd-core": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
+			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
 			"dev": true,
 			"requires": {
-				"ajv": "6.7.0",
-				"chokidar": "2.0.4",
-				"fast-json-stable-stringify": "2.0.0",
-				"rxjs": "6.3.3",
-				"source-map": "0.7.3"
+				"ansi-colors": "^1.0.1",
+				"fancy-log": "^1.3.2",
+				"typescript": "^2.4.2"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"ansi-colors": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ansi-wrap": "^0.1.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"typescript": {
+					"version": "2.9.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+					"dev": true
+				}
+			}
+		},
+		"@compodoc/ngd-transformer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
+			"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+			"dev": true,
+			"requires": {
+				"@compodoc/ngd-core": "~2.0.0",
+				"dot": "^1.1.1",
+				"fs-extra": "^4.0.1",
+				"viz.js": "^1.8.0"
+			},
+			"dependencies": {
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				}
 			}
 		},
-		"@angular-devkit/schematics": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-			"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+		"@dsherret/to-absolute-glob": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"rxjs": "6.3.3"
+				"is-absolute": "^1.0.0",
+				"is-negated-glob": "^1.0.0"
+			}
+		},
+		"@ionic-native/barcode-scanner": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz",
+			"integrity": "sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/animations": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.3.tgz",
-			"integrity": "sha512-5WoiDnVS2OhGgJ1oepFNF2UcfR4sJj97KRnTmLWQ0S4N4WpXX83CoOQVXvXwfotyb8uNtl4zRi2NuvN/MIuFuA==",
+		"@ionic-native/call-number": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.3.0.tgz",
+			"integrity": "sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/cli": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.0.tgz",
-			"integrity": "sha512-6+NoHsW1MYG7GBHUg71zaWIFeIRps/SVksCmRFCpW0RXqErCQmzf0GZuDTZZ2Yo4RzU01150sVp1R8wEvEZfZQ==",
-			"dev": true,
+		"@ionic-native/camera": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.3.0.tgz",
+			"integrity": "sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==",
 			"requires": {
-				"@angular-devkit/architect": "0.13.0",
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"@schematics/update": "0.13.0",
-				"@yarnpkg/lockfile": "1.1.0",
-				"ini": "1.3.5",
-				"inquirer": "6.2.1",
-				"npm-package-arg": "6.1.0",
-				"opn": "5.4.0",
-				"pacote": "9.4.0",
-				"semver": "5.6.0",
-				"symbol-observable": "1.2.0"
+				"@types/cordova": "^0.0.34"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					}
-				},
-				"@schematics/update": {
-					"version": "0.13.0",
-					"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.0.tgz",
-					"integrity": "sha512-HGpZdIL/0w46UyaxpnIAg6SBwzKfaRixHIEihmgJUqA0DG8GZUixRPr1L0YIWC1EZ81cQ+yWL85XhkKBYR+wQg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"@yarnpkg/lockfile": "1.1.0",
-						"ini": "1.3.5",
-						"pacote": "9.4.0",
-						"rxjs": "6.3.3",
-						"semver": "5.6.0",
-						"semver-intersect": "1.4.0"
-					}
-				},
-				"cacache": {
-					"version": "11.3.2",
-					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"chownr": "^1.1.1",
-						"figgy-pudding": "^3.5.1",
-						"glob": "^7.1.3",
-						"graceful-fs": "^4.1.15",
-						"lru-cache": "^5.1.1",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"move-concurrently": "^1.0.1",
-						"promise-inflight": "^1.0.1",
-						"rimraf": "^2.6.2",
-						"ssri": "^6.0.1",
-						"unique-filename": "^1.1.1",
-						"y18n": "^4.0.0"
-					}
-				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-					"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"lru-cache": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-					"dev": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"make-fetch-happen": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
-					"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
-					"dev": true,
-					"requires": {
-						"agentkeepalive": "^3.4.1",
-						"cacache": "^11.0.1",
-						"http-cache-semantics": "^3.8.1",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"mississippi": "^3.0.0",
-						"node-fetch-npm": "^2.0.2",
-						"promise-retry": "^1.1.1",
-						"socks-proxy-agent": "^4.0.0",
-						"ssri": "^6.0.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"mississippi": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-					"dev": true,
-					"requires": {
-						"concat-stream": "^1.5.0",
-						"duplexify": "^3.4.2",
-						"end-of-stream": "^1.1.0",
-						"flush-write-stream": "^1.0.0",
-						"from2": "^2.1.0",
-						"parallel-transform": "^1.1.0",
-						"pump": "^3.0.0",
-						"pumpify": "^1.3.3",
-						"stream-each": "^1.1.0",
-						"through2": "^2.0.0"
-					}
-				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-					"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-					"dev": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"npm-package-arg": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
-					"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.6.0",
-						"osenv": "^0.1.5",
-						"semver": "^5.5.0",
-						"validate-npm-package-name": "^3.0.0"
-					}
-				},
-				"npm-pick-manifest": {
-					"version": "2.2.3",
-					"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
-					"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1",
-						"npm-package-arg": "^6.0.0",
-						"semver": "^5.4.1"
-					}
-				},
-				"npm-registry-fetch": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
-					"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
-					"dev": true,
-					"requires": {
-						"JSONStream": "^1.3.4",
-						"bluebird": "^3.5.1",
-						"figgy-pudding": "^3.4.1",
-						"lru-cache": "^4.1.3",
-						"make-fetch-happen": "^4.0.1",
-						"npm-package-arg": "^6.1.0"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-							"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-							"dev": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-							"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-							"dev": true
-						}
-					}
-				},
-				"pacote": {
-					"version": "9.4.0",
-					"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
-					"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
-					"dev": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"cacache": "^11.3.2",
-						"figgy-pudding": "^3.5.1",
-						"get-stream": "^4.1.0",
-						"glob": "^7.1.3",
-						"lru-cache": "^5.1.1",
-						"make-fetch-happen": "^4.0.1",
-						"minimatch": "^3.0.4",
-						"minipass": "^2.3.5",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"normalize-package-data": "^2.4.0",
-						"npm-package-arg": "^6.1.0",
-						"npm-packlist": "^1.1.12",
-						"npm-pick-manifest": "^2.2.3",
-						"npm-registry-fetch": "^3.8.0",
-						"osenv": "^0.1.5",
-						"promise-inflight": "^1.0.1",
-						"promise-retry": "^1.1.1",
-						"protoduck": "^5.0.1",
-						"rimraf": "^2.6.2",
-						"safe-buffer": "^5.1.2",
-						"semver": "^5.6.0",
-						"ssri": "^6.0.1",
-						"tar": "^4.4.8",
-						"unique-filename": "^1.1.1",
-						"which": "^1.3.1"
-					}
-				},
-				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"ssri": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-					"dev": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1"
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
-					}
-				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-					"dev": true
-				},
-				"y18n": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-					"dev": true
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
 				}
 			}
 		},
-		"@angular/common": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.3.tgz",
-			"integrity": "sha512-VZOTZdvkitaKEhkxL6daHxPcKqAFwNJm0U4NFB4LRP9KspsFTE60QFVB63o129PTIH9iOQ2D3HRKSRl4o78ZKg==",
+		"@ionic-native/core": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.3.0.tgz",
+			"integrity": "sha512-oIsBvkB/Q63bjKvHGW7zAFMWSXIwnZ/U962UFyuqrF9dKvNSPI5cz8iPOaqKE+jzb2XhlcGKEbp5qAhTI0BcZQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.3.tgz",
-			"integrity": "sha512-UM6n4MyZkR5+VVjlwhLH8IfqdWBkdFcF5at4ckJXOJ/gkIUq97irbis9pGj1b0TO7MAl8uhF4b68xe5lk8b49g==",
-			"dev": true,
+		"@ionic-native/device": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.3.0.tgz",
+			"integrity": "sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==",
 			"requires": {
-				"tslib": "^1.9.0"
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
 			}
 		},
-		"@angular/compiler-cli": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.3.tgz",
-			"integrity": "sha512-31hcfTrU2GW66cvvaS629dNVPfiUrUWPncI28optvmKHBaH0mFqkdYNgabuslsXZV5AeidKMUJvR7GITjtvkQA==",
+		"@ionic-native/dialogs": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.3.0.tgz",
+			"integrity": "sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/geolocation": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.3.0.tgz",
+			"integrity": "sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/globalization": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.3.0.tgz",
+			"integrity": "sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-analytics": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz",
+			"integrity": "sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/google-maps": {
+			"version": "5.0.0-beta.26",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
+			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			}
+		},
+		"@ionic-native/in-app-browser": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz",
+			"integrity": "sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/intercom": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.3.0.tgz",
+			"integrity": "sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/local-notifications": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz",
+			"integrity": "sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/mixpanel": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz",
+			"integrity": "sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/network": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.3.0.tgz",
+			"integrity": "sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/splash-screen": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz",
+			"integrity": "sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/status-bar": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.3.0.tgz",
+			"integrity": "sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/unique-device-id": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz",
+			"integrity": "sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic-native/vibration": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.3.0.tgz",
+			"integrity": "sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==",
+			"requires": {
+				"@types/cordova": "^0.0.34"
+			},
+			"dependencies": {
+				"@types/cordova": {
+					"version": "0.0.34",
+					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+				}
+			}
+		},
+		"@ionic/angular": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.1.2.tgz",
+			"integrity": "sha512-GVdtpPekPjAYo/3IiRg/EoVRw1/9RwW07ITW6TRorcX1XOPJlrRXVcQyWFTbHRD9TOikgE1XmMQd/+1Lk0TQFw==",
+			"requires": {
+				"@ionic/core": "4.1.2",
+				"tslib": "^1.9.3"
+			}
+		},
+		"@ionic/angular-toolkit": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.5.0.tgz",
+			"integrity": "sha512-KHUu7MHi+s1LKox+EBOSN6HO6Sk79qOmBIMGHQMboPbqHGzb5aqCbTmtwa/BJZ1kytZ+yQ8kEejv8YwvrJIZEQ==",
 			"dev": true,
 			"requires": {
-				"canonical-path": "1.0.0",
-				"chokidar": "^1.4.2",
-				"convert-source-map": "^1.5.1",
-				"dependency-graph": "^0.7.2",
-				"magic-string": "^0.25.0",
-				"minimist": "^1.2.0",
-				"reflect-metadata": "^0.1.2",
-				"shelljs": "^0.8.1",
-				"source-map": "^0.6.1",
+				"@schematics/angular": "^7.0.3",
 				"tslib": "^1.9.0",
-				"yargs": "9.0.1"
+				"typescript": "~3.3.3333",
+				"ws": "^6.1.4"
 			},
 			"dependencies": {
-				"anymatch": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-					"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-					"dev": true,
-					"requires": {
-						"micromatch": "^2.1.5",
-						"normalize-path": "^2.0.0"
-					}
-				},
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+				"typescript": {
+					"version": "3.3.4000",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz",
+					"integrity": "sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==",
 					"dev": true
 				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"chokidar": {
-					"version": "1.7.0",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-					"integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-					"dev": true,
-					"requires": {
-						"anymatch": "^1.3.0",
-						"async-each": "^1.0.0",
-						"fsevents": "^1.0.0",
-						"glob-parent": "^2.0.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^2.0.0",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0"
-					}
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+				"ws": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+					"integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
 					"dev": true,
 					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					},
-					"dependencies": {
-						"string-width": {
-							"version": "1.0.2",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-							"dev": true,
-							"requires": {
-								"code-point-at": "^1.0.0",
-								"is-fullwidth-code-point": "^1.0.0",
-								"strip-ansi": "^3.0.0"
-							}
-						}
+						"async-limiter": "~1.0.0"
 					}
-				},
+				}
+			}
+		},
+		"@ionic/app-scripts": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.3.tgz",
+			"integrity": "sha512-t1kL9NqY/sVLfAIVKfN4VJigPqMWs5euKxig3sjsrakSQ9z4njmbDghzAC4taefIpYxLGMOeWgKwrrxOiLkdWQ==",
+			"dev": true,
+			"requires": {
+				"@angular-devkit/build-optimizer": "0.0.35",
+				"autoprefixer": "^7.2.6",
+				"chalk": "^2.4.0",
+				"chokidar": "^2.0.4",
+				"clean-css": "^4.1.11",
+				"cross-spawn": "^5.1.0",
+				"dotenv-webpack": "^1.5.7",
+				"express": "^4.16.3",
+				"fs-extra": "^4.0.2",
+				"glob": "^7.1.2",
+				"json-loader": "^0.5.7",
+				"node-sass": "^4.10.0",
+				"os-name": "^2.0.1",
+				"postcss": "^6.0.21",
+				"proxy-middleware": "^0.15.0",
+				"reflect-metadata": "^0.1.10",
+				"rollup": "0.50.0",
+				"rollup-plugin-commonjs": "8.2.6",
+				"rollup-plugin-node-resolve": "3.0.0",
+				"source-map": "^0.6.1",
+				"tiny-lr": "^1.1.1",
+				"tslint": "^5.8.0",
+				"tslint-eslint-rules": "^4.1.1",
+				"uglify-es": "3.2.2",
+				"webpack": "3.12.0",
+				"ws": "3.3.2",
+				"xml2js": "^0.4.19"
+			},
+			"dependencies": {
+				"@angular-devkit/build-optimizer": {
+					"version": "0.0.35",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
+					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
+					"dev": true,
+					"requires": {
+						"loader-utils": "^1.1.0",
+						"source-map": "^0.5.6",
+						"typescript": "~2.6.1",
+						"webpack-sources": "^1.0.1"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
+					}
+				},
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"acorn-dynamic-import": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+					"dev": true,
+					"requires": {
+						"acorn": "^4.0.3"
+					},
+					"dependencies": {
+						"acorn": {
+							"version": "4.0.13",
+							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+							"dev": true
+						}
+					}
+				},
+				"autoprefixer": {
+					"version": "7.2.6",
+					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+					"dev": true,
+					"requires": {
+						"browserslist": "^2.11.3",
+						"caniuse-lite": "^1.0.30000805",
+						"normalize-range": "^0.1.2",
+						"num2fraction": "^1.2.2",
+						"postcss": "^6.0.17",
+						"postcss-value-parser": "^3.2.3"
+					}
+				},
+				"browserslist": {
+					"version": "2.11.3",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30000792",
+						"electron-to-chromium": "^1.3.30"
+					}
+				},
+				"cliui": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+					"dev": true,
+					"requires": {
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wrap-ansi": "^2.0.0"
+					},
+					"dependencies": {
+						"string-width": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+							"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+							"dev": true,
+							"requires": {
+								"code-point-at": "^1.0.0",
+								"is-fullwidth-code-point": "^1.0.0",
+								"strip-ansi": "^3.0.0"
+							}
+						}
+					}
+				},
+				"commander": {
+					"version": "2.12.2",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
+					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
+					"dev": true
+				},
 				"cross-spawn": {
 					"version": "5.1.0",
 					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -2191,6 +1476,18 @@
 						"which": "^1.2.9"
 					}
 				},
+				"enhanced-resolve": {
+					"version": "3.4.1",
+					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"memory-fs": "^0.4.0",
+						"object-assign": "^4.0.1",
+						"tapable": "^0.2.7"
+					}
+				},
 				"execa": {
 					"version": "0.7.0",
 					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
@@ -2206,46 +1503,21 @@
 						"strip-eof": "^1.0.0"
 					}
 				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+				"fs-extra": {
+					"version": "4.0.3",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
 					}
 				},
-				"is-extglob": {
+				"invert-kv": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+					"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
 					"dev": true
 				},
 				"is-fullwidth-code-point": {
@@ -2257,36 +1529,26 @@
 						"number-is-nan": "^1.0.0"
 					}
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
+				"json5": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+					"dev": true
 				},
-				"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=",
+				"lcid": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+					"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^2.2.0",
-						"pify": "^2.0.0",
-						"strip-bom": "^3.0.0"
+						"invert-kv": "^1.0.0"
 					}
 				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
+				"macos-release": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
+					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
+					"dev": true
 				},
 				"mem": {
 					"version": "1.1.0",
@@ -2297,39 +1559,6 @@
 						"mimic-fn": "^1.0.0"
 					}
 				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
 				"os-locale": {
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
@@ -2341,76 +1570,132 @@
 						"mem": "^1.1.0"
 					}
 				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+				"os-name": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
+					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
 					"dev": true,
 					"requires": {
-						"p-limit": "^1.1.0"
+						"macos-release": "^1.0.0",
+						"win-release": "^1.0.0"
 					}
 				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+				"postcss": {
+					"version": "6.0.23",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
 					"dev": true,
 					"requires": {
-						"error-ex": "^1.2.0"
+						"chalk": "^2.4.1",
+						"source-map": "^0.6.1",
+						"supports-color": "^5.4.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"
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+				"tapable": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
+					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
 					"dev": true
 				},
-				"read-pkg": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+				"typescript": {
+					"version": "2.6.2",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
+					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
+					"dev": true
+				},
+				"uglify-es": {
+					"version": "3.2.2",
+					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
+					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
 					"dev": true,
 					"requires": {
-						"load-json-file": "^2.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^2.0.0"
+						"commander": "~2.12.1",
+						"source-map": "~0.6.1"
 					}
 				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+				"webpack": {
+					"version": "3.12.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
+					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
 					"dev": true,
 					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
+						"acorn": "^5.0.0",
+						"acorn-dynamic-import": "^2.0.0",
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0",
+						"async": "^2.1.2",
+						"enhanced-resolve": "^3.4.0",
+						"escope": "^3.6.0",
+						"interpret": "^1.0.0",
+						"json-loader": "^0.5.4",
+						"json5": "^0.5.1",
+						"loader-runner": "^2.3.0",
+						"loader-utils": "^1.1.0",
+						"memory-fs": "~0.4.1",
+						"mkdirp": "~0.5.0",
+						"node-libs-browser": "^2.0.0",
+						"source-map": "^0.5.3",
+						"supports-color": "^4.2.1",
+						"tapable": "^0.2.7",
+						"uglifyjs-webpack-plugin": "^0.4.6",
+						"watchpack": "^1.4.0",
+						"webpack-sources": "^1.0.1",
+						"yargs": "^8.0.2"
+					},
+					"dependencies": {
+						"has-flag": {
+							"version": "2.0.0",
+							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+							"dev": true
+						},
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						},
+						"supports-color": {
+							"version": "4.5.0",
+							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+							"dev": true,
+							"requires": {
+								"has-flag": "^2.0.0"
+							}
+						}
 					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
+				"ws": {
+					"version": "3.3.2",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
+					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
 				},
 				"yargs": {
-					"version": "9.0.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-					"integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
 					"dev": true,
 					"requires": {
 						"camelcase": "^4.1.0",
@@ -2439,543 +1724,361 @@
 				}
 			}
 		},
-		"@angular/core": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.3.tgz",
-			"integrity": "sha512-6Ql+sJJnrsxh8O0/IgIP1GgT4eLOHk+dlBs7zBbjstmLuhaQdY+awO9WKoQow+TiD1Go7FW1J3vZ2PTWXKxqjQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/forms": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.3.tgz",
-			"integrity": "sha512-mZpyonfSmRwSvM6efvwFwkLJkK6wHQrm7X4OhVVu3s9i7BI253eLDY7WIRXFvoxJ/5jWIIarVnd/9UA7GINZGw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/http": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.3.tgz",
-			"integrity": "sha512-wzvBKbO/TcSR3U8AQbsGftH8x1OdAgVGHlfXQPmZL1KjIDHrM1VpnkSvgqIt8coG+4OPfWcNklUCrTdEGwqMqw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/language-service": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.3.tgz",
-			"integrity": "sha512-9FBVYbKaNx4Ap+Suz/2ZFBPca1voinZMOCN8LjXRYnfS2MHLQASQlTlK4qeZcomyRfy0FxWmO9R02S7YJ06cnw==",
-			"dev": true
-		},
-		"@angular/platform-browser": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.3.tgz",
-			"integrity": "sha512-DH0Y2lgEgcrP1I/DUQB/krL7Ob7yL685fu4sRapW17SndTQa2pqSFMBVf+mN3FupTXp7nJHSvlIktzedIk04+g==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/platform-browser-dynamic": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.3.tgz",
-			"integrity": "sha512-M8Kiz5FUhnFybJuk/mgOhBjVbRgKDC4bGWKWH9Z9SXBR2dS/FL3QOJsLIthQcWlHOzSoJdEoPBRhn0R4pyLBSw==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/pwa": {
-			"version": "0.13.0",
-			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.0.tgz",
-			"integrity": "sha512-E1rOMduecaUw6sZfm5u3nFWi2B90SD6NriGjciVTcKCjPmHKeIWmpWGhVdgGEzCbg1Gxj8ZhsvvBjJzfbDPF6g==",
+		"@ionic/cli-framework": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.7.0.tgz",
+			"integrity": "sha512-2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg==",
+			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.0",
-				"@angular-devkit/schematics": "7.3.0",
-				"@schematics/angular": "7.3.0",
-				"parse5-html-rewriting-stream": "5.1.0",
-				"rxjs": "6.3.3"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"inquirer": "^6.0.0",
+				"lodash": "^4.17.5",
+				"log-update": "^2.3.0",
+				"minimist": "^1.2.0",
+				"rimraf": "^2.6.2",
+				"slice-ansi": "^2.0.0",
+				"string-width": "^3.0.0",
+				"strip-ansi": "^5.0.0",
+				"tslib": "^1.9.0",
+				"untildify": "^3.0.2",
+				"wrap-ansi": "^4.0.0",
+				"write-file-atomic": "^2.3.0"
 			},
 			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz",
-					"integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==",
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
+				},
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"ajv": "6.7.0",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.3.3",
-						"source-map": "0.7.3"
+						"ms": "^2.1.1"
 					}
 				},
-				"@angular-devkit/schematics": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.0.tgz",
-					"integrity": "sha512-glOduymftH0LmJhITWgWUJK8QCDUltgTZ943/OyArIvLXTLL/8zCb+G6xL+3k33EQjwJicgQ3WIjonJmeTK/Ww==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"rxjs": "6.3.3"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+				"wrap-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
 					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
 					},
 					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"string-width": {
+							"version": "2.1.1",
+							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+							"dev": true,
 							"requires": {
-								"is-descriptor": "^1.0.0"
+								"is-fullwidth-code-point": "^2.0.0",
+								"strip-ansi": "^4.0.0"
+							}
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
 							}
 						}
 					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+				}
+			}
+		},
+		"@ionic/core": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.1.2.tgz",
+			"integrity": "sha512-QVJYpDAycmXgQL3mWdvjlIgrLEG0wVl9+NGZQATEBCTEsuDHrOw7BO28FKPlFCdfTjVA6HDJnSj1HwOUi3Yp4w==",
+			"requires": {
+				"ionicons": "4.5.5"
+			}
+		},
+		"@ionic/discover": {
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.13.tgz",
+			"integrity": "sha512-9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"netmask": "^1.0.6",
+				"tslib": "^1.9.0",
+				"ws": "^6.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-						}
+						"ms": "^2.1.1"
 					}
 				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"@ionic/lab": {
+			"version": "1.0.24",
+			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.24.tgz",
+			"integrity": "sha512-sXUx0MZKC43bZ5ZJ1IRQ+yuvCgNGGJ6QPREI1AeHXZpkZRixrh0w14SLgxEzjxvFgW6ypQkdKlymY0nRoU8Gng==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/utils-fs": "1.2.0",
+				"chalk": "^2.3.0",
+				"express": "^4.16.2",
+				"tslib": "^1.9.0"
+			}
+		},
+		"@ionic/ng-toolkit": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
+			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.1.0",
+				"chalk": "^2.3.0",
+				"debug": "^4.0.0",
+				"rxjs": "~6.2.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"@ionic/cli-framework": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
+					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
+					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"@ionic/utils-fs": "0.0.2",
+						"chalk": "^2.3.0",
+						"debug": "^4.0.0",
+						"inquirer": "^6.0.0",
+						"lodash": "^4.17.5",
+						"minimist": "^1.2.0",
+						"rimraf": "^2.6.2",
+						"slice-ansi": "^1.0.0",
+						"stream-combiner2": "^1.1.1",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^5.0.0",
+						"tree-kill": "1.2.0",
+						"tslib": "^1.9.0",
+						"untildify": "^3.0.2",
+						"wrap-ansi": "^4.0.0",
+						"write-file-atomic": "^2.3.0"
 					}
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"@ionic/utils-fs": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
+					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
+					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"debug": "^4.0.0",
+						"ncp": "^2.0.0",
+						"through2": "^2.0.3",
+						"tslib": "^1.9.0"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+					"dev": true
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
 				"rxjs": {
-					"version": "6.3.3",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
+					"dev": true,
 					"requires": {
 						"tslib": "^1.9.0"
 					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				"slice-ansi": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-						}
+						"is-fullwidth-code-point": "^2.0.0"
 					}
 				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"strip-ansi": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ansi-regex": "^4.0.0"
 					}
 				},
-				"typescript": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-					"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg=="
-				}
-			}
-		},
-		"@angular/router": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.3.tgz",
-			"integrity": "sha512-SH7H2I9WTj1puei4m4g5n0/Cp28HS14q4r8lOgW0gLWuT6Ls7MqH/nDjOMiW924iRR6zjQQs7G+WbhL1jmZc2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@angular/service-worker": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
-			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@babel/code-frame": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
-			"dev": true,
-			"requires": {
-				"@babel/highlight": "^7.0.0"
-			}
-		},
-		"@babel/generator": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.0.tgz",
-			"integrity": "sha512-dZTwMvTgWfhmibq4V9X+LMf6Bgl7zAodRn9PvcPdhlzFMbvUutx74dbEv7Atz3ToeEpevYEJtAwfxq/bDCzHWg==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.3.0",
-				"jsesc": "^2.5.1",
-				"lodash": "^4.17.10",
-				"source-map": "^0.5.0",
-				"trim-right": "^1.0.1"
-			},
-			"dependencies": {
-				"jsesc": {
-					"version": "2.5.2",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-					"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+				"tree-kill": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
+					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
 					"dev": true
-				}
-			}
-		},
-		"@babel/helper-function-name": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "^7.0.0",
-				"@babel/template": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/helper-split-export-declaration": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz",
-			"integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"@babel/highlight": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.0.0",
-				"esutils": "^2.0.2",
-				"js-tokens": "^4.0.0"
-			},
-			"dependencies": {
-				"js-tokens": {
+				},
+				"wrap-ansi": {
 					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-					"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-					"dev": true
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
+					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.0",
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+							"dev": true
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+							"dev": true,
+							"requires": {
+								"ansi-regex": "^3.0.0"
+							}
+						}
+					}
 				}
 			}
 		},
-		"@babel/parser": {
-			"version": "7.3.1",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.1.tgz",
-			"integrity": "sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA==",
-			"dev": true
-		},
-		"@babel/template": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
-			"integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==",
-			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/parser": "^7.2.2",
-				"@babel/types": "^7.2.2"
-			}
+		"@ionic/pro": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
+			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
 		},
-		"@babel/traverse": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
-			"integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
+		"@ionic/schematics-angular": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
+			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/generator": "^7.2.2",
-				"@babel/helper-function-name": "^7.1.0",
-				"@babel/helper-split-export-declaration": "^7.0.0",
-				"@babel/parser": "^7.2.3",
-				"@babel/types": "^7.2.2",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0",
-				"lodash": "^4.17.10"
+				"@schematics/angular": "0.9.0-beta.3",
+				"lodash": "^4.17.5",
+				"tslib": "^1.9.0",
+				"typescript": "3.0.1"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+				"@angular-devkit/core": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
+					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ajv": "6.5.3",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.2.2",
+						"source-map": "0.7.3"
 					}
 				},
-				"globals": {
-					"version": "11.10.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz",
-					"integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==",
-					"dev": true
+				"@angular-devkit/schematics": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
+					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
+					"dev": true,
+					"requires": {
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"rxjs": "6.2.2"
+					}
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@babel/types": {
-			"version": "7.3.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.0.tgz",
-			"integrity": "sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw==",
-			"dev": true,
-			"requires": {
-				"esutils": "^2.0.2",
-				"lodash": "^4.17.10",
-				"to-fast-properties": "^2.0.0"
-			},
-			"dependencies": {
-				"to-fast-properties": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-					"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-					"dev": true
-				}
-			}
-		},
-		"@compodoc/compodoc": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.7.tgz",
-			"integrity": "sha512-bTqkv75T9b+3OxG517YL+5B0npAG0Q5nOMAk562Idr/fICTTHQ/xzSBsTptZ4QqYmtzRMV1OqOlk74FXfGPZWw==",
-			"dev": true,
-			"requires": {
-				"@compodoc/ngd-transformer": "^2.0.0",
-				"chalk": "^2.4.1",
-				"cheerio": "^1.0.0-rc.2",
-				"chokidar": "^2.0.4",
-				"colors": "^1.3.2",
-				"commander": "2.19.0",
-				"cosmiconfig": "^5.0.7",
-				"fancy-log": "^1.3.2",
-				"findit2": "^2.2.3",
-				"fs-extra": "^7.0.1",
-				"glob": "^7.1.3",
-				"handlebars": "4.0.10",
-				"html-entities": "^1.2.1",
-				"i18next": "^12.1.0",
-				"inside": "^1.0.0",
-				"json5": "^2.1.0",
-				"live-server": "1.2.1",
-				"lodash": "^4.17.11",
-				"lunr": "2.3.5",
-				"marked": "^0.4.0",
-				"opencollective": "^1.0.3",
-				"os-name": "^3.0.0",
-				"traverse": "^0.6.6",
-				"ts-simple-ast": "12.4.0",
-				"uuid": "^3.3.2"
-			},
-			"dependencies": {
-				"@compodoc/ngd-transformer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
-					"integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+				"@schematics/angular": {
+					"version": "0.9.0-beta.3",
+					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
+					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
 					"dev": true,
 					"requires": {
-						"@compodoc/ngd-core": "~2.0.0",
-						"dot": "^1.1.1",
-						"fs-extra": "^4.0.1",
-						"viz.js": "^1.8.0"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "4.0.3",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-							"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
+						"@angular-devkit/core": "0.9.0-beta.3",
+						"@angular-devkit/schematics": "0.9.0-beta.3",
+						"typescript": "3.0.1"
 					}
 				},
-				"async": {
-					"version": "1.5.2",
-					"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-					"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-					"dev": true
+				"ajv": {
+					"version": "6.5.3",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
+					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
 				},
 				"base": {
 					"version": "0.11.2",
@@ -3021,31 +2124,10 @@
 						"to-regex": "^3.0.1"
 					}
 				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true,
-					"optional": true
-				},
-				"cheerio": {
-					"version": "1.0.0-rc.2",
-					"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
-					"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
-					"dev": true,
-					"requires": {
-						"css-select": "~1.2.0",
-						"dom-serializer": "~0.1.0",
-						"entities": "~1.1.1",
-						"htmlparser2": "^3.9.1",
-						"lodash": "^4.15.0",
-						"parse5": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+				"chokidar": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
 					"dev": true,
 					"requires": {
 						"anymatch": "^2.0.0",
@@ -3063,48 +2145,6 @@
 						"upath": "^1.0.5"
 					}
 				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-					"dev": true
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"cosmiconfig": {
-					"version": "5.0.7",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz",
-					"integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^2.0.0",
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0"
-					}
-				},
 				"define-property": {
 					"version": "0.2.5",
 					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -3173,31 +2213,6 @@
 						}
 					}
 				},
-				"dir-glob": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-					"dev": true,
-					"requires": {
-						"arrify": "^1.0.1",
-						"path-type": "^3.0.0"
-					}
-				},
-				"event-stream": {
-					"version": "3.3.4",
-					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-					"dev": true,
-					"requires": {
-						"duplexer": "~0.1.1",
-						"from": "~0",
-						"map-stream": "~0.1.0",
-						"pause-stream": "0.0.11",
-						"split": "0.3",
-						"stream-combiner": "~0.0.4",
-						"through": "~2.3.1"
-					}
-				},
 				"extend-shallow": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
@@ -3207,80 +2222,6 @@
 						"is-extendable": "^0.1.0"
 					}
 				},
-				"faye-websocket": {
-					"version": "0.11.1",
-					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-					"dev": true,
-					"requires": {
-						"websocket-driver": ">=0.5.1"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"globby": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"dir-glob": "2.0.0",
-						"fast-glob": "^2.0.2",
-						"glob": "^7.1.2",
-						"ignore": "^3.3.5",
-						"pify": "^3.0.0",
-						"slash": "^1.0.0"
-					}
-				},
-				"handlebars": {
-					"version": "4.0.10",
-					"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
-					"integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
-					"dev": true,
-					"requires": {
-						"async": "^1.4.0",
-						"optimist": "^0.6.1",
-						"source-map": "^0.4.4",
-						"uglify-js": "^2.6"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.4.4",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-							"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-							"dev": true,
-							"requires": {
-								"amdefine": ">=0.0.4"
-							}
-						}
-					}
-				},
-				"http-auth": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
-					"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
-					"dev": true,
-					"requires": {
-						"apache-crypt": "^1.1.2",
-						"apache-md5": "^1.0.6",
-						"bcryptjs": "^2.3.0",
-						"uuid": "^3.0.0"
-					}
-				},
 				"is-accessor-descriptor": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -3316,98 +2257,13 @@
 					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
 					"dev": true
 				},
-				"live-server": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
-					"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
-					"dev": true,
-					"requires": {
-						"chokidar": "^2.0.4",
-						"colors": "^1.3.3",
-						"connect": "^3.6.6",
-						"cors": "^2.8.5",
-						"event-stream": "3.3.4",
-						"faye-websocket": "0.11.x",
-						"http-auth": "3.1.x",
-						"morgan": "^1.9.1",
-						"object-assign": "^4.1.1",
-						"opn": "^5.4.0",
-						"proxy-middleware": "^0.15.0",
-						"send": "^0.16.2",
-						"serve-index": "^1.9.1"
-					},
-					"dependencies": {
-						"colors": {
-							"version": "1.3.3",
-							"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-							"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-							"dev": true
-						}
-					}
-				},
-				"map-stream": {
-					"version": "0.1.0",
-					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-					"dev": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true
-				},
-				"opn": {
-					"version": "5.4.0",
-					"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-					"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-					"dev": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parse5": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-					"dev": true,
-					"requires": {
-						"@types/node": "*"
-					}
-				},
-				"send": {
-					"version": "0.16.2",
-					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+				"rxjs": {
+					"version": "6.2.2",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
+					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
 					"dev": true,
 					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					},
-					"dependencies": {
-						"statuses": {
-							"version": "1.4.0",
-							"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-							"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-							"dev": true
-						}
+						"tslib": "^1.9.0"
 					}
 				},
 				"snapdragon": {
@@ -3424,8 +2280,22 @@
 						"source-map": "^0.5.6",
 						"source-map-resolve": "^0.5.0",
 						"use": "^3.1.0"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.5.7",
+							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+							"dev": true
+						}
 					}
 				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				},
 				"source-map-resolve": {
 					"version": "0.5.2",
 					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
@@ -3439,2179 +2309,588 @@
 						"urix": "^0.1.0"
 					}
 				},
-				"split": {
-					"version": "0.3.3",
-					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-					"dev": true,
-					"requires": {
-						"through": "2"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+				"typescript": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
 					"dev": true
-				},
-				"stream-combiner": {
-					"version": "0.0.4",
-					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+				}
+			}
+		},
+		"@ionic/storage": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
+			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
+			"requires": {
+				"localforage": "1.7.1",
+				"localforage-cordovasqlitedriver": "1.7.0",
+				"tslib": "^1.7.1"
+			}
+		},
+		"@ionic/utils-array": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-0.0.1.tgz",
+			"integrity": "sha512-gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"duplexer": "~0.1.1"
+						"ms": "^2.1.1"
 					}
 				},
-				"ts-simple-ast": {
-					"version": "12.4.0",
-					"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
-					"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
-					"dev": true,
-					"requires": {
-						"@dsherret/to-absolute-glob": "^2.0.2",
-						"code-block-writer": "^7.2.0",
-						"fs-extra": "^6.0.1",
-						"glob-parent": "^3.1.0",
-						"globby": "^8.0.1",
-						"is-negated-glob": "^1.0.0",
-						"multimatch": "^2.1.0",
-						"object-assign": "^4.1.1",
-						"tslib": "^1.9.0",
-						"typescript": "2.9.1"
-					},
-					"dependencies": {
-						"fs-extra": {
-							"version": "6.0.1",
-							"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-							"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-							"dev": true,
-							"requires": {
-								"graceful-fs": "^4.1.2",
-								"jsonfile": "^4.0.0",
-								"universalify": "^0.1.0"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.9.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
-					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
-				},
-				"uglify-js": {
-					"version": "2.8.29",
-					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+				}
+			}
+		},
+		"@ionic/utils-fs": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.2.0.tgz",
+			"integrity": "sha512-31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"fs-extra": "^7.0.1",
+				"through2": "^3.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"source-map": "~0.5.1",
-						"uglify-to-browserify": "~1.0.0",
-						"yargs": "~3.10.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true,
-					"optional": true
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"yargs": {
-					"version": "3.10.0",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
-					"optional": true,
 					"requires": {
-						"camelcase": "^1.0.2",
-						"cliui": "^2.1.0",
-						"decamelize": "^1.0.0",
-						"window-size": "0.1.0"
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
 		},
-		"@compodoc/ngd-core": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
-			"integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
+		"@ionic/utils-network": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.8.tgz",
+			"integrity": "sha512-DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg==",
 			"dev": true,
 			"requires": {
-				"ansi-colors": "^1.0.1",
-				"fancy-log": "^1.3.2",
-				"typescript": "^2.4.2"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
 			},
 			"dependencies": {
-				"ansi-colors": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-					"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ansi-wrap": "^0.1.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"typescript": {
-					"version": "2.9.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-					"integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
 		},
-		"@dsherret/to-absolute-glob": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-			"integrity": "sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=",
+		"@ionic/utils-object": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-0.0.1.tgz",
+			"integrity": "sha512-ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ==",
 			"dev": true,
 			"requires": {
-				"is-absolute": "^1.0.0",
-				"is-negated-glob": "^1.0.0"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/barcode-scanner": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.0.0.tgz",
-			"integrity": "sha512-DjTWPZan6s1easv6A6LgI/ZcPQ+HJX2PxZHBuJckwkNxJ+KAWwEZBpEQ5rbyntZyTHLUZLCUrOhgDq4Y/TOI+Q==",
+		"@ionic/utils-process": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-0.1.0.tgz",
+			"integrity": "sha512-CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-object": "0.0.1",
+				"@ionic/utils-terminal": "0.0.1",
+				"debug": "^4.0.0",
+				"lodash": "^4.17.5",
+				"tree-kill": "1.2.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/call-number": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.0.0.tgz",
-			"integrity": "sha512-kzIAMs7+hTRL2A2wO6PyIOVAJYxhBFNDsYyuE5vLmDs1Um74mFq62CFdYhLNpF+/wovbuNG3+u/b1BFToXIUWw==",
+		"@ionic/utils-stream": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-0.0.1.tgz",
+			"integrity": "sha512-IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"stream-combiner2": "^1.1.1",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/core": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.0.0.tgz",
-			"integrity": "sha512-qtshWPo+CMq9ZoDGcg+1XF1+k2ASm0sLtZsIbXmYo5X82Q9cUhjk95X9BqHnjXHOdIWk4J/D3ot0/vzmMTNdbA==",
+		"@ionic/utils-subprocess": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz",
+			"integrity": "sha512-8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"cross-spawn": "^6.0.5",
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/device": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.0.0.tgz",
-			"integrity": "sha512-Mf8kLO+BbvsdYrDvgkpp2YTX4ygXQLEMrsnqPauibhE8ZGsAZUDmfH7+Mtv1OIN0z0ot0zhEOhsfF7y/QuWRzw==",
+		"@ionic/utils-terminal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz",
+			"integrity": "sha512-xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"debug": "^4.0.0",
+				"tslib": "^1.9.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
 			}
 		},
-		"@ionic-native/dialogs": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.0.0.tgz",
-			"integrity": "sha512-DXhWE9tbEtBmEmbcRD+cmQ42zIGG6NbQCKL/Gs4YsAGrLVBhbhCJx7M/Yk8C2gn2ktczfl4h7KMne/NABbfbqA==",
+		"@mrmlnc/readdir-enhanced": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"call-me-maybe": "^1.0.1",
+				"glob-to-regexp": "^0.3.0"
 			}
 		},
-		"@ionic-native/geolocation": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.0.0.tgz",
-			"integrity": "sha512-gU3GNCEJgh+2KpK0Tg9l85HDMRkUWO9FAszF4UDnqAUihTQGCM0Nl+hpmEQowkM9+Him8FJ83rT82pPmnGERCA==",
+		"@ngtools/webpack": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.7.tgz",
+			"integrity": "sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"enhanced-resolve": "4.1.0",
+				"rxjs": "6.3.3",
+				"tree-kill": "1.2.1",
+				"webpack-sources": "1.3.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/globalization": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/globalization/-/globalization-5.0.0.tgz",
-			"integrity": "sha512-a3JsDwgwvzKyq2tda6FNIXmrVMeaZ9muXl9h1HKcG1ThqWHNGW9Zxmpakv3sO4onUv6KUEaP49rcim/xoeo9BA==",
+		"@ngx-progressbar/core": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.2.tgz",
+			"integrity": "sha512-z0VzsJpgWxoU7wLXviCutXPXDop1Ry/SPOlVOtXHlkUGFAzHs3soDeXpTyigSdBB8Q16Nisow4EVuOKCByp6PQ==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-analytics": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.0.0.tgz",
-			"integrity": "sha512-mYeP9QmHfjjJe3y5uHUz4atfR2EuRCf5TFRCyi+yoCs5WEwC4JbM7k4GxGyx6YY1MHqNDoUrDZu5F0NypqxsKg==",
+		"@ngx-translate/core": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
+			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/google-maps": {
-			"version": "5.0.0-beta.26",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
-			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
+		"@ngx-translate/http-loader": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
+			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic-native/intercom": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.0.0.tgz",
-			"integrity": "sha512-rXk3IEFbT3Ec/kmz53Xrkvicch1CFeL/0dSOKsM5mrIYoUWQJGV2qMP5Clbq7ZdMJ/8q2Bv2gF2b9L/UipAy/w==",
+		"@nodelib/fs.stat": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+			"dev": true
+		},
+		"@schematics/angular": {
+			"version": "7.3.7",
+			"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.7.tgz",
+			"integrity": "sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==",
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"typescript": "3.2.4"
+			},
+			"dependencies": {
+				"@angular-devkit/core": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
+					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+					"requires": {
+						"ajv": "6.9.1",
+						"chokidar": "2.0.4",
+						"fast-json-stable-stringify": "2.0.0",
+						"rxjs": "6.3.3",
+						"source-map": "0.7.3"
+					}
+				},
+				"@angular-devkit/schematics": {
+					"version": "7.3.7",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
+					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+					"requires": {
+						"@angular-devkit/core": "7.3.7",
+						"rxjs": "6.3.3"
+					}
+				},
+				"ajv": {
+					"version": "6.9.1",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+					"integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+					"requires": {
+						"fast-deep-equal": "^2.0.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				},
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+				}
 			}
 		},
-		"@ionic-native/local-notifications": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.0.0.tgz",
-			"integrity": "sha512-lKdZ60rJncgCwwVeCYSfhHJGtrFUBqj9FkJpRcLUxeOZSxp9EVCN/ZGoGyeTlOKwunNBaw8a77hBZ7lbriBW6w==",
+		"@schematics/update": {
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.7.tgz",
+			"integrity": "sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/schematics": "7.3.7",
+				"@yarnpkg/lockfile": "1.1.0",
+				"ini": "1.3.5",
+				"pacote": "9.4.0",
+				"rxjs": "6.3.3",
+				"semver": "5.6.0",
+				"semver-intersect": "1.4.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "6.3.3",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+					"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+					"dev": true,
+					"requires": {
+						"tslib": "^1.9.0"
+					}
+				}
 			}
 		},
-		"@ionic-native/mixpanel": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.0.0.tgz",
-			"integrity": "sha512-SqKHc5yCTJ2qnX1bk7GFcNQCpDzIqzg0+CNWptSkFPBxtais3qw07GYTASaEzQM1kjmPSPD++avkfWmUXT2CXg==",
+		"@types/bson": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.0.tgz",
+			"integrity": "sha512-pq/rqJwJWkbS10crsG5bgnrisL8pML79KlMKQMoQwLUjlPAkrUHMvHJ3oGwE7WHR61Lv/nadMwXVAD2b+fpD8Q==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/network": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.0.0.tgz",
-			"integrity": "sha512-Yb8c+U8GZOhL5qc6LdbzJdwzTclZ9w0QpPH5YTbFXLJOSzhmq+ibN2dzWbmWLjPZuwR0V7K+KrefoJNacFDejw==",
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
+		"@types/d3-color": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",
+			"integrity": "sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==",
+			"dev": true
+		},
+		"@types/geojson": {
+			"version": "7946.0.7",
+			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+			"integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==",
+			"dev": true
+		},
+		"@types/googlemaps": {
+			"version": "3.30.19",
+			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.19.tgz",
+			"integrity": "sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==",
+			"dev": true
+		},
+		"@types/graphql": {
+			"version": "14.2.0",
+			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.2.0.tgz",
+			"integrity": "sha512-lELg5m6eBOmATWyCZl8qULEOvnPIUG6B443yXKj930glXIgwQirIBPp5rthP2amJW0YSzUg2s5sfgba4mRRCNw==",
+			"dev": true
+		},
+		"@types/jasmine": {
+			"version": "3.3.12",
+			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.12.tgz",
+			"integrity": "sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==",
+			"dev": true
+		},
+		"@types/jasminewd2": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
+			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/jasmine": "*"
 			}
 		},
-		"@ionic-native/splash-screen": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.0.0.tgz",
-			"integrity": "sha512-+7QfXPkaosGsR3ohEiL/WJn23NHVDZYvnilYNrOMF7oohnj5ngH46fCNYp1Tpybe5GCV1iP++RzDvE5jghWLZg==",
+		"@types/leaflet": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.3.tgz",
+			"integrity": "sha512-jFRBSsPHi1EwQSwrN0cOJLdPhwOZsRl4IMxvm/2ShLh0YM5GfCtQXCzsrv8RE7DWL+AykXdYSAd9bFLWbZT4CQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/geojson": "*"
 			}
 		},
-		"@ionic-native/status-bar": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.0.0.tgz",
-			"integrity": "sha512-mJfj+VXTOgf9Og0S7QDlT9I8UVI+Wj4kpZUHdQizovA/R0m1HG2hLKtEMy00iDVbOBjRsXGcD6JXCOeyVjg7LA==",
+		"@types/mongodb": {
+			"version": "3.1.22",
+			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.22.tgz",
+			"integrity": "sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/bson": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/unique-device-id": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/unique-device-id/-/unique-device-id-5.0.0.tgz",
-			"integrity": "sha512-yfiQKkkh6N6ypZFBPqu2rDCsdYVUdy7W4ZezD3nCj33FkrNS7Xrdo9H76SQW2c7smXQ+fnSeH7prS//Yyc0KvQ==",
+		"@types/mongoose": {
+			"version": "5.3.24",
+			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.24.tgz",
+			"integrity": "sha512-Txa5C/veUJJG2o1sRbl8z1M7GhPjJz6J3JJQV76eYN0PyI9F2NO3gbVUj059ND5nlbvQjRhXuFLaqN6NH8nMNQ==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"@types/mongodb": "*",
+				"@types/node": "*"
 			}
 		},
-		"@ionic-native/vibration": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.0.0.tgz",
-			"integrity": "sha512-XIAfp3oeizseetvnYPAMZ0kK+nyh2i/0Vy0FJkcEGM0fCD36PZkyNpx1Ai1bk3/Ln3nTMZddoBZket1aTXetNA==",
+		"@types/node": {
+			"version": "11.12.1",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-11.12.1.tgz",
+			"integrity": "sha512-sKDlqv6COJrR7ar0+GqqhrXQDzQlMcqMnF2iEU6m9hLo8kxozoAGUazwPyELHlRVmjsbvlnGXjnzyptSXVmceA==",
+			"dev": true
+		},
+		"@types/q": {
+			"version": "0.0.32",
+			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+			"dev": true
+		},
+		"@types/reflect-metadata": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
+			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
+			"dev": true,
 			"requires": {
-				"@types/cordova": "^0.0.34"
+				"reflect-metadata": "*"
 			}
 		},
-		"@ionic/angular": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.0.0.tgz",
-			"integrity": "sha512-kxvlZN5daRql/VRcbB7YWMcmE4jKDgwlPRykzNvmYWFDr9vg1AbXirLHAPtR7BaKWJEN4dJwlibjBEJQw8kVYQ==",
+		"@types/selenium-webdriver": {
+			"version": "3.0.14",
+			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
+			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
+			"dev": true
+		},
+		"@types/socket.io-client": {
+			"version": "1.4.32",
+			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
+			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
+			"dev": true
+		},
+		"@types/source-list-map": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+			"dev": true
+		},
+		"@types/stripe": {
+			"version": "6.25.7",
+			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.25.7.tgz",
+			"integrity": "sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==",
+			"dev": true,
 			"requires": {
-				"@ionic/core": "4.0.0",
-				"tslib": "^1.9.3"
+				"@types/node": "*"
 			}
 		},
-		"@ionic/angular-toolkit": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.3.0.tgz",
-			"integrity": "sha512-GOoAx/cs6Hhl0FiOhZAFPCG3cgz2DbyfYflhWFbi08MLIQD2aCoVg6wIpcBoMHQf4eob5WDDIlbOO0t9LVn3dg==",
+		"@types/swiper": {
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.2.tgz",
+			"integrity": "sha512-bJzmpMwGaA6elG0/9M3H45Az0IwuuJoUGUXGgH/DVKZOJg3iBtu+djAlBnOXOonAHd5kDsrfdhdxFKOGjzM+Vw==",
+			"dev": true
+		},
+		"@types/uuid": {
+			"version": "3.4.4",
+			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
+			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
 			"dev": true,
 			"requires": {
-				"@schematics/angular": "^7.0.3",
-				"tslib": "^1.9.0",
-				"typescript": "^3.2.4"
+				"@types/node": "*"
+			}
+		},
+		"@types/webpack-sources": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
+			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"@types/source-list-map": "*",
+				"source-map": "^0.6.1"
 			},
 			"dependencies": {
-				"@schematics/angular": {
-					"version": "7.3.0",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.0.tgz",
-					"integrity": "sha512-fOjP/3Rz+Nqrgc+YVaiN88uhPX0FZgUjmMKgMp06lc3xmoc1ScGxoz8AF1fV50Zkvh0Etykzy1LTUczzEUJQqw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "7.3.0",
-						"@angular-devkit/schematics": "7.3.0",
-						"typescript": "3.2.2"
-					},
-					"dependencies": {
-						"typescript": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-							"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
-							"dev": true
-						}
-					}
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
 				}
 			}
 		},
-		"@ionic/app-scripts": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-3.2.2.tgz",
-			"integrity": "sha512-ZpeAafEboO/xHnmgy61ZOsaMGpoer621YX3q09x+BA2sbcuqOEsMKV91BRZmghoiHlwBB9woxXRyAwuYIAASHw==",
-			"dev": true,
-			"requires": {
-				"@angular-devkit/build-optimizer": "0.0.35",
-				"autoprefixer": "^7.2.6",
-				"chalk": "^2.4.0",
-				"chokidar": "^2.0.4",
-				"clean-css": "^4.1.11",
-				"cross-spawn": "^5.1.0",
-				"dotenv-webpack": "^1.5.7",
-				"express": "^4.16.3",
-				"fs-extra": "^4.0.2",
-				"glob": "^7.1.2",
-				"json-loader": "^0.5.7",
-				"node-sass": "^4.10.0",
-				"os-name": "^2.0.1",
-				"postcss": "^6.0.21",
-				"proxy-middleware": "^0.15.0",
-				"reflect-metadata": "^0.1.10",
-				"rollup": "0.50.0",
-				"rollup-plugin-commonjs": "8.2.6",
-				"rollup-plugin-node-resolve": "3.0.0",
-				"source-map": "^0.6.1",
-				"tiny-lr": "^1.1.1",
-				"tslint": "^5.8.0",
-				"tslint-eslint-rules": "^4.1.1",
-				"uglify-es": "3.2.2",
-				"webpack": "3.12.0",
-				"ws": "3.3.2",
-				"xml2js": "^0.4.19"
-			},
-			"dependencies": {
-				"@angular-devkit/build-optimizer": {
-					"version": "0.0.35",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz",
-					"integrity": "sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==",
-					"dev": true,
-					"requires": {
-						"loader-utils": "^1.1.0",
-						"source-map": "^0.5.6",
-						"typescript": "~2.6.1",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"acorn-dynamic-import": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-					"integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
-					"dev": true,
-					"requires": {
-						"acorn": "^4.0.3"
-					},
-					"dependencies": {
-						"acorn": {
-							"version": "4.0.13",
-							"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-							"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-							"dev": true
-						}
-					}
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"autoprefixer": {
-					"version": "7.2.6",
-					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
-					"integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^2.11.3",
-						"caniuse-lite": "^1.0.30000805",
-						"normalize-range": "^0.1.2",
-						"num2fraction": "^1.2.2",
-						"postcss": "^6.0.17",
-						"postcss-value-parser": "^3.2.3"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"body": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-					"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-					"dev": true,
-					"requires": {
-						"continuable-cache": "^0.3.1",
-						"error": "^7.0.0",
-						"raw-body": "~1.1.0",
-						"safe-json-parse": "~1.0.1"
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"browserslist": {
-					"version": "2.11.3",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-					"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30000792",
-						"electron-to-chromium": "^1.3.30"
-					}
-				},
-				"bytes": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-					"dev": true
-				},
-				"camelcase": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-					"dev": true
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"cliui": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-					"dev": true,
-					"requires": {
-						"center-align": "^0.1.1",
-						"right-align": "^0.1.1",
-						"wordwrap": "0.0.2"
-					}
-				},
-				"commander": {
-					"version": "2.12.2",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz",
-					"integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-					"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^4.0.1",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"enhanced-resolve": {
-					"version": "3.4.1",
-					"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-					"integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"memory-fs": "^0.4.0",
-						"object-assign": "^4.0.1",
-						"tapable": "^0.2.7"
-					}
-				},
-				"execa": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"find-up": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
-					"requires": {
-						"locate-path": "^2.0.0"
-					}
-				},
-				"fs-extra": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"json5": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-					"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"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"
-					}
-				},
-				"locate-path": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
-					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"macos-release": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
-					"integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==",
-					"dev": true
-				},
-				"magic-string": {
-					"version": "0.22.5",
-					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
-					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
-					"dev": true,
-					"requires": {
-						"vlq": "^0.2.2"
-					}
-				},
-				"mem": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-					"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^1.0.0"
-					}
-				},
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"os-locale": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-					"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-					"dev": true,
-					"requires": {
-						"execa": "^0.7.0",
-						"lcid": "^1.0.0",
-						"mem": "^1.1.0"
-					}
-				},
-				"os-name": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
-					"integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
-					"dev": true,
-					"requires": {
-						"macos-release": "^1.0.0",
-						"win-release": "^1.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-					"dev": true,
-					"requires": {
-						"p-limit": "^1.1.0"
-					}
-				},
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.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
-				},
-				"postcss": {
-					"version": "6.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.1",
-						"source-map": "^0.6.1",
-						"supports-color": "^5.4.0"
-					}
-				},
-				"raw-body": {
-					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-					"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-					"dev": true,
-					"requires": {
-						"bytes": "1",
-						"string_decoder": "0.10"
-					}
-				},
-				"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"
-					}
-				},
-				"read-pkg-up": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-					"dev": true,
-					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				},
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
-					"dev": true,
-					"requires": {
-						"path-parse": "^1.0.6"
-					}
-				},
-				"rollup-plugin-commonjs": {
-					"version": "8.2.6",
-					"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
-					"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.2.1",
-						"estree-walker": "^0.5.0",
-						"magic-string": "^0.22.4",
-						"resolve": "^1.4.0",
-						"rollup-pluginutils": "^2.0.1"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				},
-				"tapable": {
-					"version": "0.2.9",
-					"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
-					"integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
-					"dev": true
-				},
-				"tiny-lr": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-					"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-					"dev": true,
-					"requires": {
-						"body": "^5.1.0",
-						"debug": "^3.1.0",
-						"faye-websocket": "~0.10.0",
-						"livereload-js": "^2.3.0",
-						"object-assign": "^4.1.0",
-						"qs": "^6.4.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"typescript": {
-					"version": "2.6.2",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-					"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
-					"dev": true
-				},
-				"uglify-es": {
-					"version": "3.2.2",
-					"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
-					"integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
-					"dev": true,
-					"requires": {
-						"commander": "~2.12.1",
-						"source-map": "~0.6.1"
-					}
-				},
-				"uglifyjs-webpack-plugin": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-					"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
-					"dev": true,
-					"requires": {
-						"source-map": "^0.5.6",
-						"uglify-js": "^2.8.29",
-						"webpack-sources": "^1.0.1"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"uglify-js": {
-							"version": "2.8.29",
-							"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-							"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-							"dev": true,
-							"requires": {
-								"source-map": "~0.5.1",
-								"uglify-to-browserify": "~1.0.0",
-								"yargs": "~3.10.0"
-							}
-						},
-						"yargs": {
-							"version": "3.10.0",
-							"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-							"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-							"dev": true,
-							"requires": {
-								"camelcase": "^1.0.2",
-								"cliui": "^2.1.0",
-								"decamelize": "^1.0.0",
-								"window-size": "0.1.0"
-							}
-						}
-					}
-				},
-				"webpack": {
-					"version": "3.12.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
-					"integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
-					"dev": true,
-					"requires": {
-						"acorn": "^5.0.0",
-						"acorn-dynamic-import": "^2.0.0",
-						"ajv": "^6.1.0",
-						"ajv-keywords": "^3.1.0",
-						"async": "^2.1.2",
-						"enhanced-resolve": "^3.4.0",
-						"escope": "^3.6.0",
-						"interpret": "^1.0.0",
-						"json-loader": "^0.5.4",
-						"json5": "^0.5.1",
-						"loader-runner": "^2.3.0",
-						"loader-utils": "^1.1.0",
-						"memory-fs": "~0.4.1",
-						"mkdirp": "~0.5.0",
-						"node-libs-browser": "^2.0.0",
-						"source-map": "^0.5.3",
-						"supports-color": "^4.2.1",
-						"tapable": "^0.2.7",
-						"uglifyjs-webpack-plugin": "^0.4.6",
-						"watchpack": "^1.4.0",
-						"webpack-sources": "^1.0.1",
-						"yargs": "^8.0.2"
-					},
-					"dependencies": {
-						"has-flag": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-							"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-							"dev": true
-						},
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "4.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-							"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-							"dev": true,
-							"requires": {
-								"has-flag": "^2.0.0"
-							}
-						}
-					}
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-					"dev": true
-				},
-				"win-release": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
-					"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
-					"dev": true,
-					"requires": {
-						"semver": "^5.0.1"
-					}
-				},
-				"wordwrap": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-					"dev": true
-				},
-				"ws": {
-					"version": "3.3.2",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
-					"integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
-				},
-				"yargs": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-					"integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0",
-						"cliui": "^3.2.0",
-						"decamelize": "^1.1.1",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^2.0.0",
-						"read-pkg-up": "^2.0.0",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^2.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^3.2.1",
-						"yargs-parser": "^7.0.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						},
-						"cliui": {
-							"version": "3.2.0",
-							"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-							"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-							"dev": true,
-							"requires": {
-								"string-width": "^1.0.1",
-								"strip-ansi": "^3.0.1",
-								"wrap-ansi": "^2.0.0"
-							},
-							"dependencies": {
-								"string-width": {
-									"version": "1.0.2",
-									"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-									"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-									"dev": true,
-									"requires": {
-										"code-point-at": "^1.0.0",
-										"is-fullwidth-code-point": "^1.0.0",
-										"strip-ansi": "^3.0.0"
-									}
-								}
-							}
-						}
-					}
-				},
-				"yargs-parser": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-					"integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-					"dev": true,
-					"requires": {
-						"camelcase": "^4.1.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "4.1.0",
-							"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-							"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-							"dev": true
-						}
-					}
-				}
-			}
-		},
-		"@ionic/core": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.0.0.tgz",
-			"integrity": "sha512-/hW4882TyjcJTiNBYpoLGRYxkQhRidSuVjCL2RvfMS8a7FDQoS2dkje5KBGG+O2TCjtyXE5de1A6HvUgvDqjGA==",
-			"requires": {
-				"ionicons": "4.5.5"
-			}
-		},
-		"@ionic/lab": {
-			"version": "1.0.20",
-			"resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-1.0.20.tgz",
-			"integrity": "sha512-srSpTMb22BYk9qbEnyyb04KwBFpauBn5BksPmJnlPq8oAjNdNzZOuO/L95qKO9OqfIxRqFwpRVfzvI0TMWjCig==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/utils-fs": "1.0.0",
-				"chalk": "^2.3.0",
-				"express": "^4.16.2",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-					"dev": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "2.6.9",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-							"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/ng-toolkit": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
-			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.1.0",
-				"chalk": "^2.3.0",
-				"debug": "^4.0.0",
-				"rxjs": "~6.2.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
-					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "0.0.2",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^1.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.0",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
-					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"ncp": "^2.0.0",
-						"through2": "^2.0.3",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"slice-ansi": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"tree-kill": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
-					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
-					"dev": true
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
-		"@ionic/pro": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
-			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
-		},
-		"@ionic/schematics-angular": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
-			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
-			"dev": true,
-			"requires": {
-				"@schematics/angular": "0.9.0-beta.3",
-				"lodash": "^4.17.5",
-				"tslib": "^1.9.0",
-				"typescript": "3.0.1"
-			},
-			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
-					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
-					"dev": true,
-					"requires": {
-						"ajv": "6.5.3",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.2.2",
-						"source-map": "0.7.3"
-					}
-				},
-				"@angular-devkit/schematics": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
-					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"rxjs": "6.2.2"
-					}
-				},
-				"@schematics/angular": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
-					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"@angular-devkit/schematics": "0.9.0-beta.3",
-						"typescript": "3.0.1"
-					}
-				},
-				"ajv": {
-					"version": "6.5.3",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
-					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^2.0.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"typescript": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
-					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
-					"dev": true
-				}
-			}
-		},
-		"@ionic/storage": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
-			"integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
-			"requires": {
-				"localforage": "1.7.1",
-				"localforage-cordovasqlitedriver": "1.7.0",
-				"tslib": "^1.7.1"
-			}
-		},
-		"@ionic/utils-network": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.6.tgz",
-			"integrity": "sha512-1aHXzL1PPJDdXLwicu5+Zv0QfWIrKxqGvat4A8zruAjm4oLvIOli5DnUb61VqP2ocAhiI3t39jxtBq9Fb/Gl9w==",
-			"dev": true,
-			"requires": {
-				"debug": "^4.0.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				}
-			}
-		},
-		"@mrmlnc/readdir-enhanced": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-			"dev": true,
-			"requires": {
-				"call-me-maybe": "^1.0.1",
-				"glob-to-regexp": "^0.3.0"
-			}
-		},
-		"@ngx-progressbar/core": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/@ngx-progressbar/core/-/core-5.3.1.tgz",
-			"integrity": "sha512-IAbpPbv0RHwnLTqr8JpEOR2mDbia8jTyZdG0yWmyiGoVfIisSs/NkzMDph43pLvWl2aaJ+Bd2BJTdM2olYK4MQ==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/core": {
-			"version": "11.0.1",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz",
-			"integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@ngx-translate/http-loader": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz",
-			"integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
-			"requires": {
-				"tslib": "^1.9.0"
-			}
-		},
-		"@nodelib/fs.stat": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-			"dev": true
-		},
-		"@types/bson": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/@types/bson/-/bson-1.0.11.tgz",
-			"integrity": "sha512-j+UcCWI+FsbI5/FQP/Kj2CXyplWAz39ktHFkXk84h7dNblKRSoNJs95PZFRd96NQGqsPEPgeclqnznWZr14ZDA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/cordova": {
-			"version": "0.0.34",
-			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-		},
-		"@types/d3-color": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.1.tgz",
-			"integrity": "sha512-xwb1tqvYNWllbHuhMFhiXk63Imf+QNq/dJdmbXmr2wQVnwGenCuj3/0IWJ9hdIFQIqzvhT7T37cvx93jtAsDbQ==",
-			"dev": true
-		},
-		"@types/geojson": {
-			"version": "7946.0.5",
-			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.5.tgz",
-			"integrity": "sha512-rLlMXpd3rdlrp0+xsrda/hFfOpIxgqFcRpk005UKbHtcdFK+QXAjhBAPnvO58qF4O1LdDXrcaiJxMgstCIlcaw==",
-			"dev": true
-		},
-		"@types/googlemaps": {
-			"version": "3.30.16",
-			"resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.16.tgz",
-			"integrity": "sha512-6OZ64ahLzYfzuSr71y4jAHZXiwxjvvEM2bfF2tzjIc9KUZVbO30SkYa8WewTsR8aM5BFz/uBiNlZ14eRLXYS0g==",
-			"dev": true
-		},
-		"@types/graphql": {
-			"version": "14.0.5",
-			"resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-14.0.5.tgz",
-			"integrity": "sha512-bwGYLE0SRy5ZraC91dqI2bxbspfm10kyJ2Yjuvk4OjdGznh7fkoWW+xXZHfFydJaqu9syZi099cpiZw3GlPDiA==",
-			"dev": true
-		},
-		"@types/jasmine": {
-			"version": "3.3.8",
-			"resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.8.tgz",
-			"integrity": "sha512-BaOFpaddRVV8qykJoWHrHtamml880oh0+DIZWbtJgx0pu+KhDF1gER5hSfCIfzyMrbjMuYFnLUfyo1l0JUVU3Q==",
-			"dev": true
-		},
-		"@types/jasminewd2": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
-			"integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
-			"dev": true,
-			"requires": {
-				"@types/jasmine": "*"
-			}
-		},
-		"@types/leaflet": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.4.0.tgz",
-			"integrity": "sha512-ZA+g6XyK/00labaNCWhbhahAOwEf9X4v9cAB0ZBwWjGOj5ewPC8qcdN/M2VsIAfP699Yz3+E7zaaClxmRaf4BQ==",
-			"dev": true,
-			"requires": {
-				"@types/geojson": "*"
-			}
-		},
-		"@types/mongodb": {
-			"version": "3.1.19",
-			"resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.1.19.tgz",
-			"integrity": "sha512-H54hQEovAhyLrIZOhPNfGyCCDoTqKsjb8GQBy8nptJqfxrYCp5WVcPJf9v0kfTPR72xOhaz9+WcYxOXWwEg1Vg==",
-			"dev": true,
-			"requires": {
-				"@types/bson": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/mongoose": {
-			"version": "5.3.12",
-			"resolved": "https://registry.npmjs.org/@types/mongoose/-/mongoose-5.3.12.tgz",
-			"integrity": "sha512-dmZv3H9lXWhLY8XrxJNu+pVUecquReR3AtPxVsnPTcTH/T/YTgxE0zeTavNcqaBUD5XXKtlTy+2VhZxDkn/0Jw==",
-			"dev": true,
-			"requires": {
-				"@types/mongodb": "*",
-				"@types/node": "*"
-			}
-		},
-		"@types/node": {
-			"version": "10.12.21",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz",
-			"integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==",
-			"dev": true
-		},
-		"@types/q": {
-			"version": "0.0.32",
-			"resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
-			"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
-			"dev": true
-		},
-		"@types/reflect-metadata": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz",
-			"integrity": "sha512-bXltFLY3qhzCnVYP5iUpeSICagQ8rc9K2liS+8M0lBcz54BHs3O6W5UvqespVSuebo1BXLi+/y9ioELAW9SC2A==",
-			"dev": true,
-			"requires": {
-				"reflect-metadata": "*"
-			}
-		},
-		"@types/selenium-webdriver": {
-			"version": "3.0.14",
-			"resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.14.tgz",
-			"integrity": "sha512-4GbNCDs98uHCT/OMv40qQC/OpoPbYn9XdXeTiFwHBBFO6eJhYEPUu2zDKirXSbHlvDV8oZ9l8EQ+HrEx/YS9DQ==",
-			"dev": true
-		},
-		"@types/socket.io-client": {
-			"version": "1.4.32",
-			"resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.32.tgz",
-			"integrity": "sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==",
-			"dev": true
-		},
-		"@types/source-list-map": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-			"dev": true
-		},
-		"@types/stripe": {
-			"version": "6.19.5",
-			"resolved": "https://registry.npmjs.org/@types/stripe/-/stripe-6.19.5.tgz",
-			"integrity": "sha512-NHSloxUEjergjDO3U5ZOJgURP6H9vPlJGWbwdUOCB/r24vMzZevjGfbUiwR0u51Yum9AId/7VG/qcbq5q/Hcng==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/swiper": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.1.tgz",
-			"integrity": "sha512-kG4moYcEEhAZH2l6ges7JyCit1tBMfQvAar6MLfZTfwZ1bvaTJQU8sxKiJavhoA69bc9A+lNYC2bhhEaVbp35w==",
-			"dev": true
-		},
-		"@types/uuid": {
-			"version": "3.4.4",
-			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
-			"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
-		"@types/webpack-sources": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
-			"integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/source-list-map": "*",
-				"source-map": "^0.6.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"@types/zen-observable": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
-			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
-		},
-		"@webassemblyjs/ast": {
-			"version": "1.7.11",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
-			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
+		"@types/yargs": {
+			"version": "12.0.10",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.10.tgz",
+			"integrity": "sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==",
+			"dev": true
+		},
+		"@types/zen-observable": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
+			"integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
+		},
+		"@webassemblyjs/ast": {
+			"version": "1.7.11",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
+			"integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
 			"dev": true,
 			"requires": {
 				"@webassemblyjs/helper-module-context": "1.7.11",
@@ -5817,16 +3096,15 @@
 			"version": "1.3.5",
 			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
 			"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-			"dev": true,
 			"requires": {
 				"mime-types": "~2.1.18",
 				"negotiator": "0.6.1"
 			}
 		},
 		"acorn": {
-			"version": "6.0.6",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.6.tgz",
-			"integrity": "sha512-5M3G/A4uBSMIlfJ+h9W125vJvPFH/zirISsW5qfxF5YzEvXJCtolLoQvM5yZft0DvMcUrPGKPOlgEu55I6iUtA==",
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+			"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
 			"dev": true
 		},
 		"acorn-dynamic-import": {
@@ -5835,6 +3113,12 @@
 			"integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
 			"dev": true
 		},
+		"acorn-walk": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+			"integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+			"dev": true
+		},
 		"adm-zip": {
 			"version": "0.4.13",
 			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz",
@@ -5882,9 +3166,9 @@
 			"dev": true
 		},
 		"ajv-keywords": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.3.0.tgz",
-			"integrity": "sha512-CMzN9S62ZOO4sA/mJZIO4S++ZM7KFWzH3PPWkveLhy4OZ9i1/VatgwWMD46w/XbGCBy7Ye0gCk+Za6mmyfKK7g==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+			"integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
 			"dev": true
 		},
 		"align-text": {
@@ -5908,6 +3192,11 @@
 			"resolved": "https://registry.npmjs.org/angular2-logger/-/angular2-logger-0.7.0.tgz",
 			"integrity": "sha512-fB2ucBEKqJ6K+PyQEVKwIZhwcB2NvxPashHJEBGTG5Ex+NhC2xUNDhd1AILX+ZIRi3hz6QEKzbqGAxmusdUCkw=="
 		},
+		"ansi": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+			"integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
+		},
 		"ansi-align": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
@@ -5918,9 +3207,9 @@
 			}
 		},
 		"ansi-colors": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-			"integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+			"integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
 			"dev": true
 		},
 		"ansi-escapes": {
@@ -5953,7 +3242,6 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
 			"requires": {
 				"color-convert": "^1.9.0"
 			}
@@ -6332,102 +3620,121 @@
 			}
 		},
 		"apollo-angular-link-http": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.4.0.tgz",
-			"integrity": "sha512-YMtk4ZmmQ32kvQVnKNhkqk4QQQ+xb5aaq5XVxLv7AX6S7jDfHDLi18Hc25C4c8revM6gLoGV2Xj9ijvyGGbRCg==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz",
+			"integrity": "sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==",
 			"requires": {
-				"apollo-angular-link-http-common": "~1.4.0",
+				"apollo-angular-link-http-common": "~1.5.0",
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-angular-link-http-common": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.4.0.tgz",
-			"integrity": "sha512-VAneRp1YYwaggOKgbMGVSuLMpYroLL6tEgS5WH3iNBg4P7cBcubo3uajWRih7E4pZlzX+bCJ5GNqNDJ6xMFT7Q==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.1.tgz",
+			"integrity": "sha512-uSA7dDZpum9FCocxhrp24mL9EUGYWr2mgW9Tb5uea0eYU3UDmjYSKT/sBSLGQN87P5drXbYrmSj58PtCWmhIMA==",
 			"requires": {
 				"tslib": "^1.9.0"
 			}
 		},
 		"apollo-cache": {
-			"version": "1.1.25",
-			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.25.tgz",
-			"integrity": "sha512-9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz",
+			"integrity": "sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==",
 			"requires": {
-				"apollo-utilities": "^1.1.2",
+				"apollo-utilities": "^1.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-cache-inmemory": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.2.tgz",
-			"integrity": "sha512-fDVmj5j1e3W+inyuSwjIcMgbQ4edcFgmiKTBMFAEKAq0jg33X7FrbDX8JT2t5Vuf75Mva50JDlt5wXdu7C6WuA==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz",
+			"integrity": "sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==",
 			"requires": {
-				"apollo-cache": "^1.1.25",
-				"apollo-utilities": "^1.1.2",
+				"apollo-cache": "^1.2.1",
+				"apollo-utilities": "^1.2.1",
 				"optimism": "^0.6.9",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-client": {
-			"version": "2.4.12",
-			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.12.tgz",
-			"integrity": "sha512-E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w==",
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz",
+			"integrity": "sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==",
 			"requires": {
 				"@types/zen-observable": "^0.8.0",
-				"apollo-cache": "1.1.25",
+				"apollo-cache": "1.2.1",
 				"apollo-link": "^1.0.0",
 				"apollo-link-dedup": "^1.0.0",
-				"apollo-utilities": "1.1.2",
+				"apollo-utilities": "1.2.1",
 				"symbol-observable": "^1.0.2",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"apollo-link": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.8.tgz",
-			"integrity": "sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==",
+			"version": "1.2.11",
+			"resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.11.tgz",
+			"integrity": "sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==",
 			"requires": {
-				"zen-observable-ts": "^0.8.15"
+				"apollo-utilities": "^1.2.1",
+				"ts-invariant": "^0.3.2",
+				"tslib": "^1.9.3",
+				"zen-observable-ts": "^0.8.18"
+			},
+			"dependencies": {
+				"ts-invariant": {
+					"version": "0.3.2",
+					"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz",
+					"integrity": "sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==",
+					"requires": {
+						"tslib": "^1.9.3"
+					}
+				}
 			}
 		},
 		"apollo-link-context": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.14.tgz",
-			"integrity": "sha512-l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.17.tgz",
+			"integrity": "sha512-W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-dedup": {
-			"version": "1.0.15",
-			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz",
-			"integrity": "sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==",
+			"version": "1.0.18",
+			"resolved": "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz",
+			"integrity": "sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-link-ws": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz",
-			"integrity": "sha512-KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A==",
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz",
+			"integrity": "sha512-0PKgahM2BOcUiI3QSJMYXOoUylWKzar5NTZLgMLEW4K/CczOTzC4CTXvKMjh/cx57Jto/U2xzKRy9BEoNfnK5Q==",
 			"requires": {
-				"apollo-link": "^1.2.8"
+				"apollo-link": "^1.2.11",
+				"tslib": "^1.9.3"
 			}
 		},
 		"apollo-utilities": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.2.tgz",
-			"integrity": "sha512-EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz",
+			"integrity": "sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==",
 			"requires": {
 				"fast-json-stable-stringify": "^2.0.0",
+				"ts-invariant": "^0.2.1",
 				"tslib": "^1.9.3"
 			}
 		},
 		"app-root-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
-			"integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=",
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+			"integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
 			"dev": true
 		},
 		"append-transform": {
@@ -6492,6 +3799,16 @@
 				"sprintf-js": "~1.0.2"
 			}
 		},
+		"aria-query": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+			"integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7",
+				"commander": "^2.11.0"
+			}
+		},
 		"arr-diff": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -6524,12 +3841,6 @@
 			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
 			"dev": true
 		},
-		"array-slice": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-			"integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-			"dev": true
-		},
 		"array-union": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -6623,10 +3934,69 @@
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
 			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
 		},
+		"ast-transform": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/ast-transform/-/ast-transform-0.0.0.tgz",
+			"integrity": "sha1-dJRAWIh9goPhidlUYAlHvJj+AGI=",
+			"dev": true,
+			"requires": {
+				"escodegen": "~1.2.0",
+				"esprima": "~1.0.4",
+				"through": "~2.3.4"
+			},
+			"dependencies": {
+				"escodegen": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.2.0.tgz",
+					"integrity": "sha1-Cd55Z3kcyVi3+Jot220jRRrzJ+E=",
+					"dev": true,
+					"requires": {
+						"esprima": "~1.0.4",
+						"estraverse": "~1.5.0",
+						"esutils": "~1.0.0",
+						"source-map": "~0.1.30"
+					}
+				},
+				"esprima": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+					"integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=",
+					"dev": true
+				},
+				"estraverse": {
+					"version": "1.5.1",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
+					"integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=",
+					"dev": true
+				},
+				"esutils": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
+					"integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
 		"ast-types": {
-			"version": "0.11.7",
-			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.7.tgz",
-			"integrity": "sha512-2mP3TwtkY/aTv5X3ZsMpNAbOnyoC/aMJwJSoaELPkHId0nSQgFcnU4dRW3isxiz7+zBexk0ym3WNVjMiQBnJSw==",
+			"version": "0.7.8",
+			"resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.7.8.tgz",
+			"integrity": "sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=",
+			"dev": true
+		},
+		"ast-types-flow": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+			"integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
 			"dev": true
 		},
 		"astral-regex": {
@@ -6692,6 +4062,15 @@
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
 			"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
 		},
+		"axobject-query": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+			"integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+			"dev": true,
+			"requires": {
+				"ast-types-flow": "0.0.7"
+			}
+		},
 		"babel-code-frame": {
 			"version": "6.26.0",
 			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -6774,6 +4153,12 @@
 				"regenerator-runtime": "^0.10.0"
 			},
 			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				},
 				"regenerator-runtime": {
 					"version": "0.10.5",
 					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
@@ -6790,6 +4175,14 @@
 			"requires": {
 				"core-js": "^2.4.0",
 				"regenerator-runtime": "^0.11.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
+					"dev": true
+				}
 			}
 		},
 		"babel-template": {
@@ -6850,15 +4243,70 @@
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
 		},
+		"base": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"requires": {
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"requires": {
+						"is-descriptor": "^1.0.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				}
+			}
+		},
 		"base64-arraybuffer": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
 			"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
 		},
 		"base64-js": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
-			"integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+			"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
 			"dev": true
 		},
 		"base64id": {
@@ -6916,6 +4364,11 @@
 				"tryer": "^1.0.0"
 			}
 		},
+		"big-integer": {
+			"version": "1.6.43",
+			"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz",
+			"integrity": "sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg=="
+		},
 		"big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -6960,11 +4413,22 @@
 			"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
 			"dev": true
 		},
+		"body": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+			"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+			"dev": true,
+			"requires": {
+				"continuable-cache": "^0.3.1",
+				"error": "^7.0.0",
+				"raw-body": "~1.1.0",
+				"safe-json-parse": "~1.0.1"
+			}
+		},
 		"body-parser": {
 			"version": "1.18.3",
 			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
 			"integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
-			"dev": true,
 			"requires": {
 				"bytes": "3.0.0",
 				"content-type": "~1.0.4",
@@ -6982,7 +4446,6 @@
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
 					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
-					"dev": true,
 					"requires": {
 						"bytes": "3.0.0",
 						"http-errors": "1.6.3",
@@ -7021,9 +4484,9 @@
 			}
 		},
 		"bootstrap": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.2.1.tgz",
-			"integrity": "sha512-tt/7vIv3Gm2mnd/WeDx36nfGGHleil0Wg8IeB7eMrVkY0fZ5iTaBisSh8oNANc2IBsCc6vCgCNTIM/IEN0+50Q=="
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+			"integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
 		},
 		"boxen": {
 			"version": "1.3.0",
@@ -7040,6 +4503,14 @@
 				"widest-line": "^2.0.0"
 			}
 		},
+		"bplist-parser": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+			"integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+			"requires": {
+				"big-integer": "^1.6.7"
+			}
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -7049,12 +4520,60 @@
 				"concat-map": "0.0.1"
 			}
 		},
+		"braces": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+			"requires": {
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
+		"brfs": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz",
+			"integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==",
+			"dev": true,
+			"requires": {
+				"quote-stream": "^1.0.1",
+				"resolve": "^1.1.5",
+				"static-module": "^2.2.0",
+				"through2": "^2.0.0"
+			}
+		},
 		"brorand": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
 			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
 			"dev": true
 		},
+		"brotli": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz",
+			"integrity": "sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=",
+			"dev": true,
+			"requires": {
+				"base64-js": "^1.1.2"
+			}
+		},
 		"browser-resolve": {
 			"version": "1.11.3",
 			"resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
@@ -7062,6 +4581,14 @@
 			"dev": true,
 			"requires": {
 				"resolve": "1.1.7"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.1.7",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+					"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+					"dev": true
+				}
 			}
 		},
 		"browserify-aes": {
@@ -7101,6 +4628,17 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"browserify-optional": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/browserify-optional/-/browserify-optional-1.0.1.tgz",
+			"integrity": "sha1-HhNyLP3g2F8SFnbCpyztUzoBiGk=",
+			"dev": true,
+			"requires": {
+				"ast-transform": "0.0.0",
+				"ast-types": "^0.7.0",
+				"browser-resolve": "^1.8.1"
+			}
+		},
 		"browserify-rsa": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
@@ -7136,14 +4674,14 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz",
-			"integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==",
+			"version": "4.5.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.3.tgz",
+			"integrity": "sha512-Tx/Jtrmh6vFg24AelzLwCaCq1IUJiMDM1x/LPzqbmbktF8Zo7F9ONUpOWsFK6TtdON95mSMaQUWqi0ilc8xM6g==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30000929",
-				"electron-to-chromium": "^1.3.103",
-				"node-releases": "^1.1.3"
+				"caniuse-lite": "^1.0.30000955",
+				"electron-to-chromium": "^1.3.122",
+				"node-releases": "^1.1.12"
 			}
 		},
 		"browserstack": {
@@ -7182,6 +4720,12 @@
 			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
 			"dev": true
 		},
+		"buffer-equal": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
+			"integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=",
+			"dev": true
+		},
 		"buffer-fill": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
@@ -7226,8 +4770,36 @@
 		"bytes": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-			"dev": true
+			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+		},
+		"cacache": {
+			"version": "10.0.4",
+			"resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+			"integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.1",
+				"chownr": "^1.0.1",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.1.11",
+				"lru-cache": "^4.1.1",
+				"mississippi": "^2.0.0",
+				"mkdirp": "^0.5.1",
+				"move-concurrently": "^1.0.1",
+				"promise-inflight": "^1.0.1",
+				"rimraf": "^2.6.2",
+				"ssri": "^5.2.4",
+				"unique-filename": "^1.1.0",
+				"y18n": "^4.0.0"
+			},
+			"dependencies": {
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
 		},
 		"cache-base": {
 			"version": "1.0.1",
@@ -7252,9 +4824,9 @@
 			"dev": true
 		},
 		"call-number": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/call-number/-/call-number-0.0.2.tgz",
-			"integrity": "sha1-GWnh1XQt42na7Q9EM4wawhKDcP8="
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/call-number/-/call-number-1.0.1.tgz",
+			"integrity": "sha1-v52q5If9alVz+JqjZV++ivA2r9I="
 		},
 		"caller-callsite": {
 			"version": "2.0.0",
@@ -7316,9 +4888,9 @@
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30000933",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000933.tgz",
-			"integrity": "sha512-d3QXv7eFTU40DSedSP81dV/ajcGSKpT+GW+uhtWmLvQm9bPk0KK++7i1e2NSW/CXGZhWFt2mFbFtCJ5I5bMuVA==",
+			"version": "1.0.30000955",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
+			"integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==",
 			"dev": true
 		},
 		"canonical-path": {
@@ -7352,7 +4924,6 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -7363,7 +4934,6 @@
 					"version": "5.5.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
 					"requires": {
 						"has-flag": "^3.0.0"
 					}
@@ -7382,6 +4952,51 @@
 			"integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
 			"dev": true
 		},
+		"cheerio": {
+			"version": "1.0.0-rc.2",
+			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
+			"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
+			"dev": true,
+			"requires": {
+				"css-select": "~1.2.0",
+				"dom-serializer": "~0.1.0",
+				"entities": "~1.1.1",
+				"htmlparser2": "^3.9.1",
+				"lodash": "^4.15.0",
+				"parse5": "^3.0.1"
+			},
+			"dependencies": {
+				"parse5": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+					"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+					"dev": true,
+					"requires": {
+						"@types/node": "*"
+					}
+				}
+			}
+		},
+		"chokidar": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+			"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+			"requires": {
+				"anymatch": "^2.0.0",
+				"async-each": "^1.0.0",
+				"braces": "^2.3.0",
+				"fsevents": "^1.2.2",
+				"glob-parent": "^3.1.0",
+				"inherits": "^2.0.1",
+				"is-binary-path": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"lodash.debounce": "^4.0.8",
+				"normalize-path": "^2.1.1",
+				"path-is-absolute": "^1.0.0",
+				"readdirp": "^2.0.0",
+				"upath": "^1.0.5"
+			}
+		},
 		"chownr": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
@@ -7419,12 +5034,6 @@
 			"integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
 			"dev": true
 		},
-		"circular-json": {
-			"version": "0.5.9",
-			"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-			"integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
-			"dev": true
-		},
 		"class-utils": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -7484,6 +5093,34 @@
 			"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
 			"dev": true
 		},
+		"cliui": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+			"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+			"dev": true,
+			"requires": {
+				"string-width": "^2.1.1",
+				"strip-ansi": "^4.0.0",
+				"wrap-ansi": "^2.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+					"dev": true
+				},
+				"strip-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^3.0.0"
+					}
+				}
+			}
+		},
 		"clone": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
@@ -7515,9 +5152,9 @@
 			"dev": true
 		},
 		"code-block-writer": {
-			"version": "7.2.2",
-			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.2.2.tgz",
-			"integrity": "sha512-8SyXM1bWsMDCzvCoTdnDBhnnUbHntxcba4ApBIO3S3QX0M2Iq0xZCzs6SYdBOGaSUi4drysvrAK15JoXhlpsvQ==",
+			"version": "7.3.0",
+			"resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-7.3.0.tgz",
+			"integrity": "sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==",
 			"dev": true
 		},
 		"code-point-at": {
@@ -7526,17 +5163,20 @@
 			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
 		},
 		"codelyzer": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz",
-			"integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.0.0.tgz",
+			"integrity": "sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==",
 			"dev": true,
 			"requires": {
 				"app-root-path": "^2.1.0",
-				"css-selector-tokenizer": "^0.7.0",
+				"aria-query": "^3.0.0",
+				"axobject-query": "^2.0.2",
+				"css-selector-tokenizer": "^0.7.1",
 				"cssauron": "^1.4.0",
+				"damerau-levenshtein": "^1.0.4",
 				"semver-dsl": "^1.0.1",
 				"source-map": "^0.5.7",
-				"sprintf-js": "^1.1.1"
+				"sprintf-js": "^1.1.2"
 			},
 			"dependencies": {
 				"source-map": {
@@ -7566,7 +5206,6 @@
 			"version": "1.9.3",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
 			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
 			"requires": {
 				"color-name": "1.1.3"
 			}
@@ -7574,550 +5213,290 @@
 		"color-name": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
 		"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
-		},
-		"colors": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
-			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
-			"dev": true
-		},
-		"combine-lists": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
-			"integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.5.0"
-			}
-		},
-		"combined-stream": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-			"requires": {
-				"delayed-stream": "~1.0.0"
-			}
-		},
-		"commander": {
-			"version": "2.17.1",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-			"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-			"dev": true
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-			"dev": true
-		},
-		"compare-versions": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
-			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
-			"dev": true
-		},
-		"component-bind": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
-		},
-		"component-emitter": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
-		},
-		"component-inherit": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
-		},
-		"compressible": {
-			"version": "2.0.15",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
-			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
-			"dev": true,
-			"requires": {
-				"mime-db": ">= 1.36.0 < 2"
-			},
-			"dependencies": {
-				"mime-db": {
-					"version": "1.37.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
-					"dev": true
-				}
-			}
-		},
-		"compression": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
-			"dev": true,
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.14",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.1",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			}
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"concat-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
-			}
-		},
-		"configstore": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
-			"dev": true,
-			"requires": {
-				"dot-prop": "^4.1.0",
-				"graceful-fs": "^4.1.2",
-				"make-dir": "^1.0.0",
-				"unique-string": "^1.0.0",
-				"write-file-atomic": "^2.0.0",
-				"xdg-basedir": "^3.0.0"
-			}
-		},
-		"connect-history-api-fallback": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-			"dev": true
-		},
-		"console-browserify": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-			"dev": true,
-			"requires": {
-				"date-now": "^0.1.4"
-			}
-		},
-		"console-control-strings": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-		},
-		"constants-browserify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-			"dev": true
-		},
-		"content-disposition": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-			"dev": true
-		},
-		"content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+			"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
 			"dev": true
 		},
-		"continuable-cache": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+		"colors": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+			"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
 			"dev": true
 		},
-		"convert-source-map": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
-			"dev": true,
+		"combined-stream": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+			"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
 			"requires": {
-				"safe-buffer": "~5.1.1"
+				"delayed-stream": "~1.0.0"
 			}
 		},
-		"cookie": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+		"commander": {
+			"version": "2.19.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+			"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
 			"dev": true
 		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+		"commondir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
 			"dev": true
 		},
-		"cookiejar": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+		"compare-versions": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
+			"integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
 			"dev": true
 		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		"component-bind": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+			"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
 		},
-		"cordova-android": {
-			"version": "7.1.4",
-			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
-			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
-			"requires": {
-				"abbrev": "*",
-				"android-versions": "1.4.0",
-				"ansi": "*",
-				"balanced-match": "*",
-				"base64-js": "1.2.0",
-				"big-integer": "1.6.32",
-				"bplist-parser": "*",
-				"brace-expansion": "*",
-				"concat-map": "*",
-				"cordova-common": "2.2.5",
-				"cordova-registry-mapper": "*",
-				"elementtree": "0.1.6",
-				"glob": "5.0.15",
-				"inflight": "*",
-				"inherits": "*",
-				"minimatch": "*",
-				"nopt": "3.0.1",
-				"once": "*",
-				"path-is-absolute": "1.0.1",
-				"plist": "2.1.0",
-				"properties-parser": "0.2.3",
-				"q": "1.4.1",
-				"sax": "0.3.5",
-				"semver": "5.5.0",
-				"shelljs": "0.5.3",
-				"underscore": "*",
-				"unorm": "*",
-				"wrappy": "*",
-				"xmlbuilder": "8.2.2",
-				"xmldom": "*"
-			},
-			"dependencies": {
-				"abbrev": {
-					"version": "1.1.1",
-					"bundled": true
-				},
-				"android-versions": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"semver": "^5.4.1"
-					}
-				},
-				"ansi": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"base64-js": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"bundled": true
-				},
-				"cordova-common": {
-					"version": "2.2.5",
-					"bundled": true,
-					"requires": {
-						"ansi": "^0.3.1",
-						"bplist-parser": "^0.1.0",
-						"cordova-registry-mapper": "^1.1.8",
-						"elementtree": "0.1.6",
-						"glob": "^5.0.13",
-						"minimatch": "^3.0.0",
-						"plist": "^2.1.0",
-						"q": "^1.4.1",
-						"shelljs": "^0.5.3",
-						"underscore": "^1.8.3",
-						"unorm": "^1.3.3"
-					}
-				},
-				"cordova-registry-mapper": {
-					"version": "1.1.15",
-					"bundled": true
-				},
-				"elementtree": {
-					"version": "0.1.6",
-					"bundled": true,
-					"requires": {
-						"sax": "0.3.5"
-					}
-				},
-				"glob": {
-					"version": "5.0.15",
-					"bundled": true,
-					"requires": {
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "2 || 3",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"inflight": {
-					"version": "1.0.6",
-					"bundled": true,
-					"requires": {
-						"once": "^1.3.0",
-						"wrappy": "1"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"bundled": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"bundled": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"nopt": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"abbrev": "1"
-					}
-				},
-				"once": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"properties-parser": {
-					"version": "0.2.3",
-					"bundled": true
-				},
-				"q": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"semver": {
-					"version": "5.5.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"underscore": {
-					"version": "1.9.1",
-					"bundled": true
-				},
-				"unorm": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"wrappy": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"xmlbuilder": {
-					"version": "8.2.2",
-					"bundled": true
-				},
-				"xmldom": {
-					"version": "0.1.27",
-					"bundled": true
+		"component-emitter": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+			"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+		},
+		"component-inherit": {
+			"version": "0.0.3",
+			"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+			"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
+		},
+		"compressible": {
+			"version": "2.0.15",
+			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
+			"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
+			"requires": {
+				"mime-db": ">= 1.36.0 < 2"
+			},
+			"dependencies": {
+				"mime-db": {
+					"version": "1.37.0",
+					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
+					"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
 				}
 			}
 		},
-		"cordova-android-support-gradle-release": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
-			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+		"compression": {
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+			"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
 			"requires": {
-				"semver": "5.1.0",
-				"xml2js": "~0.4.19"
+				"accepts": "~1.3.5",
+				"bytes": "3.0.0",
+				"compressible": "~2.0.14",
+				"debug": "2.6.9",
+				"on-headers": "~1.0.1",
+				"safe-buffer": "5.1.2",
+				"vary": "~1.1.2"
+			}
+		},
+		"concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+		},
+		"concat-stream": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+			"dev": true,
+			"requires": {
+				"buffer-from": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.2.2",
+				"typedarray": "^0.0.6"
+			}
+		},
+		"configstore": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
+			"integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+			"dev": true,
+			"requires": {
+				"dot-prop": "^4.1.0",
+				"graceful-fs": "^4.1.2",
+				"make-dir": "^1.0.0",
+				"unique-string": "^1.0.0",
+				"write-file-atomic": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			}
+		},
+		"connect": {
+			"version": "3.6.6",
+			"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+			"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+			"dev": true,
+			"requires": {
+				"debug": "2.6.9",
+				"finalhandler": "1.1.0",
+				"parseurl": "~1.3.2",
+				"utils-merge": "1.0.1"
 			},
 			"dependencies": {
-				"semver": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
-					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				"finalhandler": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"encodeurl": "~1.0.1",
+						"escape-html": "~1.0.3",
+						"on-finished": "~2.3.0",
+						"parseurl": "~1.3.2",
+						"statuses": "~1.3.1",
+						"unpipe": "~1.0.0"
+					}
+				},
+				"statuses": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+					"dev": true
 				}
 			}
 		},
-		"cordova-browser": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-5.0.4.tgz",
-			"integrity": "sha512-EDuG+9NGsaYpNSY6wF0kR34m1m38V+nRglGXxQ609fgMYrMHEYR2lg38nDr1Os4qeF0LJz8UQ7nq7Y+idg6Aig==",
+		"connect-history-api-fallback": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+			"integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+			"dev": true
+		},
+		"console-browserify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+			"dev": true,
+			"requires": {
+				"date-now": "^0.1.4"
+			}
+		},
+		"console-control-strings": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+			"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+		},
+		"constants-browserify": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+			"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+			"dev": true
+		},
+		"content-disposition": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+			"integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+		},
+		"content-type": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+		},
+		"continuable-cache": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+			"dev": true
+		},
+		"convert-source-map": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+			"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+			"dev": true,
+			"requires": {
+				"safe-buffer": "~5.1.1"
+			}
+		},
+		"cookie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+			"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+		},
+		"cookie-signature": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+		},
+		"cookiejar": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+			"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+			"dev": true
+		},
+		"copy-concurrently": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"fs-write-stream-atomic": "^1.0.8",
+				"iferr": "^0.1.5",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.0"
+			}
+		},
+		"copy-descriptor": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+		},
+		"copy-webpack-plugin": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+			"integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+			"dev": true,
+			"requires": {
+				"cacache": "^10.0.4",
+				"find-cache-dir": "^1.0.0",
+				"globby": "^7.1.1",
+				"is-glob": "^4.0.0",
+				"loader-utils": "^1.1.0",
+				"minimatch": "^3.0.4",
+				"p-limit": "^1.0.0",
+				"serialize-javascript": "^1.4.0"
+			}
+		},
+		"cordova-android": {
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-7.1.4.tgz",
+			"integrity": "sha512-Rtvu002I83uzfVyCsE6p2krFKVHt9TSAqZUATes+zH+o9cdxYGrLHY+PKCQo4SLCdSMdrkIHCDnQPTYTp/d7+g==",
 			"requires": {
 				"abbrev": "*",
-				"accepts": "*",
+				"android-versions": "1.4.0",
 				"ansi": "*",
-				"ansi-regex": "2.1.1",
-				"ansi-styles": "2.2.1",
-				"array-flatten": "1.1.1",
 				"balanced-match": "*",
 				"base64-js": "1.2.0",
-				"big-integer": "*",
-				"body-parser": "1.18.2",
+				"big-integer": "1.6.32",
 				"bplist-parser": "*",
 				"brace-expansion": "*",
-				"bytes": "*",
-				"chalk": "1.1.3",
-				"compressible": "*",
-				"compression": "1.7.2",
 				"concat-map": "*",
-				"content-disposition": "*",
-				"content-type": "*",
-				"cookie": "*",
-				"cookie-signature": "1.0.6",
 				"cordova-common": "2.2.5",
 				"cordova-registry-mapper": "*",
-				"cordova-serve": "2.0.1",
-				"debug": "2.6.9",
-				"depd": "*",
-				"destroy": "*",
-				"ee-first": "*",
 				"elementtree": "0.1.6",
-				"encodeurl": "*",
-				"escape-html": "*",
-				"escape-string-regexp": "*",
-				"etag": "*",
-				"express": "*",
-				"finalhandler": "*",
-				"forwarded": "*",
-				"fresh": "*",
 				"glob": "5.0.15",
-				"has-ansi": "2.0.0",
-				"http-errors": "1.6.3",
-				"iconv-lite": "0.4.19",
 				"inflight": "*",
 				"inherits": "*",
-				"ipaddr.js": "1.6.0",
-				"is-wsl": "*",
-				"media-typer": "*",
-				"merge-descriptors": "*",
-				"methods": "*",
-				"mime": "1.4.1",
-				"mime-db": "1.33.0",
-				"mime-types": "2.1.18",
 				"minimatch": "*",
-				"ms": "2.0.0",
-				"negotiator": "*",
-				"nopt": "3.0.6",
-				"on-finished": "*",
-				"on-headers": "*",
+				"nopt": "3.0.1",
 				"once": "*",
-				"opn": "*",
-				"parseurl": "*",
-				"path-is-absolute": "*",
-				"path-to-regexp": "0.1.7",
+				"path-is-absolute": "1.0.1",
 				"plist": "2.1.0",
-				"proxy-addr": "2.0.3",
-				"q": "*",
-				"qs": "6.5.1",
-				"range-parser": "*",
-				"raw-body": "2.3.2",
-				"safe-buffer": "5.1.1",
+				"properties-parser": "0.2.3",
+				"q": "1.4.1",
 				"sax": "0.3.5",
-				"send": "*",
-				"serve-static": "*",
-				"setprototypeof": "*",
+				"semver": "5.5.0",
 				"shelljs": "0.5.3",
-				"statuses": "1.4.0",
-				"strip-ansi": "3.0.1",
-				"supports-color": "2.0.0",
-				"type-is": "*",
 				"underscore": "*",
 				"unorm": "*",
-				"unpipe": "*",
-				"utils-merge": "*",
-				"vary": "*",
 				"wrappy": "*",
 				"xmlbuilder": "8.2.2",
 				"xmldom": "*"
@@ -8127,30 +5506,17 @@
 					"version": "1.1.1",
 					"bundled": true
 				},
-				"accepts": {
-					"version": "1.3.5",
+				"android-versions": {
+					"version": "1.4.0",
 					"bundled": true,
 					"requires": {
-						"mime-types": "~2.1.18",
-						"negotiator": "0.6.1"
+						"semver": "^5.4.1"
 					}
 				},
 				"ansi": {
 					"version": "0.3.1",
 					"bundled": true
 				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"bundled": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"bundled": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true
@@ -8160,101 +5526,28 @@
 					"bundled": true
 				},
 				"big-integer": {
-					"version": "1.6.32",
-					"bundled": true
-				},
-				"body-parser": {
-					"version": "1.18.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"content-type": "~1.0.4",
-						"debug": "2.6.9",
-						"depd": "~1.1.1",
-						"http-errors": "~1.6.2",
-						"iconv-lite": "0.4.19",
-						"on-finished": "~2.3.0",
-						"qs": "6.5.1",
-						"raw-body": "2.3.2",
-						"type-is": "~1.6.15"
-					}
-				},
-				"bplist-parser": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"big-integer": "^1.6.7"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"bytes": {
-					"version": "3.0.0",
-					"bundled": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"bundled": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
+					"version": "1.6.32",
+					"bundled": true
 				},
-				"compressible": {
-					"version": "2.0.14",
+				"bplist-parser": {
+					"version": "0.1.1",
 					"bundled": true,
 					"requires": {
-						"mime-db": ">= 1.34.0 < 2"
-					},
-					"dependencies": {
-						"mime-db": {
-							"version": "1.34.0",
-							"bundled": true
-						}
+						"big-integer": "^1.6.7"
 					}
 				},
-				"compression": {
-					"version": "1.7.2",
+				"brace-expansion": {
+					"version": "1.1.11",
 					"bundled": true,
 					"requires": {
-						"accepts": "~1.3.4",
-						"bytes": "3.0.0",
-						"compressible": "~2.0.13",
-						"debug": "2.6.9",
-						"on-headers": "~1.0.1",
-						"safe-buffer": "5.1.1",
-						"vary": "~1.1.2"
+						"balanced-match": "^1.0.0",
+						"concat-map": "0.0.1"
 					}
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true
 				},
-				"content-disposition": {
-					"version": "0.5.2",
-					"bundled": true
-				},
-				"content-type": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"cookie": {
-					"version": "0.3.1",
-					"bundled": true
-				},
-				"cookie-signature": {
-					"version": "1.0.6",
-					"bundled": true
-				},
 				"cordova-common": {
 					"version": "2.2.5",
 					"bundled": true,
@@ -8276,36 +5569,6 @@
 					"version": "1.1.15",
 					"bundled": true
 				},
-				"cordova-serve": {
-					"version": "2.0.1",
-					"bundled": true,
-					"requires": {
-						"chalk": "^1.1.1",
-						"compression": "^1.6.0",
-						"express": "^4.13.3",
-						"opn": "^5.3.0",
-						"shelljs": "^0.5.3"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"bundled": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"destroy": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"ee-first": {
-					"version": "1.1.1",
-					"bundled": true
-				},
 				"elementtree": {
 					"version": "0.1.6",
 					"bundled": true,
@@ -8313,79 +5576,6 @@
 						"sax": "0.3.5"
 					}
 				},
-				"encodeurl": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"escape-html": {
-					"version": "1.0.3",
-					"bundled": true
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"bundled": true
-				},
-				"etag": {
-					"version": "1.8.1",
-					"bundled": true
-				},
-				"express": {
-					"version": "4.16.3",
-					"bundled": true,
-					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.2",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.3",
-						"qs": "6.5.1",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.1",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
-					}
-				},
-				"finalhandler": {
-					"version": "1.1.1",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.4.0",
-						"unpipe": "~1.0.0"
-					}
-				},
-				"forwarded": {
-					"version": "0.1.2",
-					"bundled": true
-				},
-				"fresh": {
-					"version": "0.5.2",
-					"bundled": true
-				},
 				"glob": {
 					"version": "5.0.15",
 					"bundled": true,
@@ -8397,27 +5587,6 @@
 						"path-is-absolute": "^1.0.0"
 					}
 				},
-				"has-ansi": {
-					"version": "2.0.0",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"bundled": true,
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"bundled": true
-				},
 				"inflight": {
 					"version": "1.0.6",
 					"bundled": true,
@@ -8430,41 +5599,6 @@
 					"version": "2.0.3",
 					"bundled": true
 				},
-				"ipaddr.js": {
-					"version": "1.6.0",
-					"bundled": true
-				},
-				"is-wsl": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"media-typer": {
-					"version": "0.3.0",
-					"bundled": true
-				},
-				"merge-descriptors": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"methods": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"mime": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"mime-db": {
-					"version": "1.33.0",
-					"bundled": true
-				},
-				"mime-types": {
-					"version": "2.1.18",
-					"bundled": true,
-					"requires": {
-						"mime-db": "~1.33.0"
-					}
-				},
 				"minimatch": {
 					"version": "3.0.4",
 					"bundled": true,
@@ -8472,32 +5606,13 @@
 						"brace-expansion": "^1.1.7"
 					}
 				},
-				"ms": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"negotiator": {
-					"version": "0.6.1",
-					"bundled": true
-				},
 				"nopt": {
-					"version": "3.0.6",
+					"version": "3.0.1",
 					"bundled": true,
 					"requires": {
 						"abbrev": "1"
 					}
 				},
-				"on-finished": {
-					"version": "2.3.0",
-					"bundled": true,
-					"requires": {
-						"ee-first": "1.1.1"
-					}
-				},
-				"on-headers": {
-					"version": "1.0.1",
-					"bundled": true
-				},
 				"once": {
 					"version": "1.4.0",
 					"bundled": true,
@@ -8505,170 +5620,45 @@
 						"wrappy": "1"
 					}
 				},
-				"opn": {
-					"version": "5.3.0",
-					"bundled": true,
-					"requires": {
-						"is-wsl": "^1.1.0"
-					}
-				},
-				"parseurl": {
-					"version": "1.3.2",
-					"bundled": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"path-to-regexp": {
-					"version": "0.1.7",
-					"bundled": true
-				},
-				"plist": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"base64-js": "1.2.0",
-						"xmlbuilder": "8.2.2",
-						"xmldom": "0.1.x"
-					}
-				},
-				"proxy-addr": {
-					"version": "2.0.3",
-					"bundled": true,
-					"requires": {
-						"forwarded": "~0.1.2",
-						"ipaddr.js": "1.6.0"
-					}
-				},
-				"q": {
-					"version": "1.5.1",
-					"bundled": true
-				},
-				"qs": {
-					"version": "6.5.1",
-					"bundled": true
-				},
-				"range-parser": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"raw-body": {
-					"version": "2.3.2",
-					"bundled": true,
-					"requires": {
-						"bytes": "3.0.0",
-						"http-errors": "1.6.2",
-						"iconv-lite": "0.4.19",
-						"unpipe": "1.0.0"
-					},
-					"dependencies": {
-						"depd": {
-							"version": "1.1.1",
-							"bundled": true
-						},
-						"http-errors": {
-							"version": "1.6.2",
-							"bundled": true,
-							"requires": {
-								"depd": "1.1.1",
-								"inherits": "2.0.3",
-								"setprototypeof": "1.0.3",
-								"statuses": ">= 1.3.1 < 2"
-							}
-						},
-						"setprototypeof": {
-							"version": "1.0.3",
-							"bundled": true
-						}
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.1",
-					"bundled": true
-				},
-				"sax": {
-					"version": "0.3.5",
-					"bundled": true
-				},
-				"send": {
-					"version": "0.16.2",
-					"bundled": true,
-					"requires": {
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"destroy": "~1.0.4",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"fresh": "0.5.2",
-						"http-errors": "~1.6.2",
-						"mime": "1.4.1",
-						"ms": "2.0.0",
-						"on-finished": "~2.3.0",
-						"range-parser": "~1.2.0",
-						"statuses": "~1.4.0"
-					}
-				},
-				"serve-static": {
-					"version": "1.13.2",
-					"bundled": true,
-					"requires": {
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"parseurl": "~1.3.2",
-						"send": "0.16.2"
-					}
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"shelljs": {
-					"version": "0.5.3",
-					"bundled": true
-				},
-				"statuses": {
-					"version": "1.4.0",
-					"bundled": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
+				"path-is-absolute": {
+					"version": "1.0.1",
 					"bundled": true
 				},
-				"type-is": {
-					"version": "1.6.16",
+				"plist": {
+					"version": "2.1.0",
 					"bundled": true,
 					"requires": {
-						"media-typer": "0.3.0",
-						"mime-types": "~2.1.18"
+						"base64-js": "1.2.0",
+						"xmlbuilder": "8.2.2",
+						"xmldom": "0.1.x"
 					}
 				},
-				"underscore": {
-					"version": "1.9.1",
+				"properties-parser": {
+					"version": "0.2.3",
 					"bundled": true
 				},
-				"unorm": {
+				"q": {
 					"version": "1.4.1",
 					"bundled": true
 				},
-				"unpipe": {
-					"version": "1.0.0",
+				"sax": {
+					"version": "0.3.5",
 					"bundled": true
 				},
-				"utils-merge": {
-					"version": "1.0.1",
+				"semver": {
+					"version": "5.5.0",
 					"bundled": true
 				},
-				"vary": {
-					"version": "1.1.2",
+				"shelljs": {
+					"version": "0.5.3",
+					"bundled": true
+				},
+				"underscore": {
+					"version": "1.9.1",
+					"bundled": true
+				},
+				"unorm": {
+					"version": "1.4.1",
 					"bundled": true
 				},
 				"wrappy": {
@@ -8685,6 +5675,69 @@
 				}
 			}
 		},
+		"cordova-android-support-gradle-release": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz",
+			"integrity": "sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==",
+			"requires": {
+				"semver": "5.1.0",
+				"xml2js": "~0.4.19"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
+					"integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+				}
+			}
+		},
+		"cordova-browser": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-6.0.0.tgz",
+			"integrity": "sha512-G61S7fhnVVJC98lvkGeKCVpfFtoW0a1P1Sg9TK+n03g3yupDMIM7XuecWuJ3KEMRhED4+CEc2hauruAff7oXrw==",
+			"requires": {
+				"cordova-common": "^3.1.0",
+				"cordova-serve": "^3.0.0",
+				"nopt": "^4.0.1",
+				"shelljs": "^0.5.3"
+			},
+			"dependencies": {
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				},
+				"shelljs": {
+					"version": "0.5.3",
+					"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+					"integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
+				}
+			}
+		},
+		"cordova-common": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.1.0.tgz",
+			"integrity": "sha512-J2MM1ioyLlBYdwdXH40OZL4hN7XEBOfurddKYifF4aTkb2PkbeM+KVORt53eyU+8ScA0QmRLuTG0EM55eLms0A==",
+			"requires": {
+				"ansi": "^0.3.1",
+				"bplist-parser": "^0.1.0",
+				"cross-spawn": "^6.0.5",
+				"elementtree": "0.1.7",
+				"endent": "^1.1.1",
+				"fs-extra": "^7.0.0",
+				"glob": "^7.1.2",
+				"minimatch": "^3.0.0",
+				"plist": "^3.0.1",
+				"q": "^1.4.1",
+				"strip-bom": "^3.0.0",
+				"underscore": "^1.8.3",
+				"which": "^1.3.0"
+			}
+		},
 		"cordova-plugin-appavailability": {
 			"version": "0.4.2",
 			"resolved": "https://registry.npmjs.org/cordova-plugin-appavailability/-/cordova-plugin-appavailability-0.4.2.tgz",
@@ -8731,9 +5784,9 @@
 			"integrity": "sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ=="
 		},
 		"cordova-plugin-ionic-webview": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-3.1.1.tgz",
-			"integrity": "sha512-dVRTvotXa1c63P55ckE/uejVlNOQU+wCLp5KANAFEYW1fxNswWJ6AM/NMNh1q9rGSH/hl9Z3C3rTkgYfdqNqDA=="
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.1.tgz",
+			"integrity": "sha512-rJf7jFQNw7l0U4Y7P6DjxwmO/qQgS7xqiTgwDbNFS4z4+FZ3EZyupll7/cFEDnxGRNMgWsMKDhIABUo5mIDaUQ=="
 		},
 		"cordova-plugin-mixpanel": {
 			"version": "4.5.2",
@@ -8765,10 +5818,22 @@
 			"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
 			"integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q="
 		},
+		"cordova-serve": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-3.0.0.tgz",
+			"integrity": "sha512-h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w==",
+			"requires": {
+				"chalk": "^2.4.1",
+				"compression": "^1.6.0",
+				"express": "^4.13.3",
+				"opn": "^5.3.0",
+				"which": "^1.3.0"
+			}
+		},
 		"core-js": {
-			"version": "2.6.3",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
-			"integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ=="
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz",
+			"integrity": "sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ=="
 		},
 		"core-util-is": {
 			"version": "1.0.2",
@@ -8785,6 +5850,18 @@
 				"vary": "^1"
 			}
 		},
+		"cosmiconfig": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+			"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+			"dev": true,
+			"requires": {
+				"is-directory": "^0.3.1",
+				"js-yaml": "^3.9.0",
+				"parse-json": "^4.0.0",
+				"require-from-string": "^2.0.1"
+			}
+		},
 		"cpr": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/cpr/-/cpr-3.0.1.tgz",
@@ -8843,6 +5920,28 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"cross-env": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz",
+			"integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.5",
+				"is-windows": "^1.0.0"
+			}
+		},
+		"cross-spawn": {
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"requires": {
+				"nice-try": "^1.0.4",
+				"path-key": "^2.0.1",
+				"semver": "^5.5.0",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			}
+		},
 		"cryptiles": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-4.1.3.tgz",
@@ -8870,6 +5969,12 @@
 				"randomfill": "^1.0.3"
 			}
 		},
+		"crypto-js": {
+			"version": "3.1.9-1",
+			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
+			"integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=",
+			"dev": true
+		},
 		"crypto-random-string": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@@ -8906,9 +6011,9 @@
 			}
 		},
 		"css-what": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz",
-			"integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+			"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
 			"dev": true
 		},
 		"cssauron": {
@@ -8955,6 +6060,12 @@
 				"es5-ext": "^0.10.9"
 			}
 		},
+		"damerau-levenshtein": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
+			"integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=",
+			"dev": true
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -8973,17 +6084,17 @@
 			},
 			"dependencies": {
 				"@types/node": {
-					"version": "8.10.39",
-					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.39.tgz",
-					"integrity": "sha512-rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA==",
+					"version": "8.10.45",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz",
+					"integrity": "sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==",
 					"dev": true
 				}
 			}
 		},
 		"date-format": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-			"integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz",
+			"integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==",
 			"dev": true
 		},
 		"date-now": {
@@ -9010,11 +6121,15 @@
 			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
 			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
 		},
+		"dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+		},
 		"deep-equal": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-			"dev": true
+			"integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
 		},
 		"deep-extend": {
 			"version": "0.6.0",
@@ -9036,36 +6151,6 @@
 			"requires": {
 				"execa": "^0.10.0",
 				"ip-regex": "^2.1.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"default-require-extensions": {
@@ -9077,6 +6162,14 @@
 				"strip-bom": "^3.0.0"
 			}
 		},
+		"define-properties": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+			"requires": {
+				"object-keys": "^1.0.12"
+			}
+		},
 		"define-property": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -9119,6 +6212,67 @@
 				}
 			}
 		},
+		"defined": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+			"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+		},
+		"degenerator": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
+			"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+			"dev": true,
+			"requires": {
+				"ast-types": "0.x.x",
+				"escodegen": "1.x.x",
+				"esprima": "3.x.x"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				}
+			}
+		},
+		"del": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+			"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+			"dev": true,
+			"requires": {
+				"globby": "^6.1.0",
+				"is-path-cwd": "^1.0.0",
+				"is-path-in-cwd": "^1.0.0",
+				"p-map": "^1.1.1",
+				"pify": "^3.0.0",
+				"rimraf": "^2.2.8"
+			},
+			"dependencies": {
+				"globby": {
+					"version": "6.1.0",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+					"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"glob": "^7.0.3",
+						"object-assign": "^4.0.1",
+						"pify": "^2.0.0",
+						"pinkie-promise": "^2.0.0"
+					},
+					"dependencies": {
+						"pify": {
+							"version": "2.3.0",
+							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+							"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+							"dev": true
+						}
+					}
+				}
+			}
+		},
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -9132,8 +6286,7 @@
 		"depd": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-			"dev": true
+			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
 		},
 		"dependency-graph": {
 			"version": "0.7.2",
@@ -9154,8 +6307,7 @@
 		"destroy": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-			"dev": true
+			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
 		},
 		"detect-indent": {
 			"version": "4.0.0",
@@ -9172,6 +6324,15 @@
 			"integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
 			"dev": true
 		},
+		"dfa": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/dfa/-/dfa-1.1.0.tgz",
+			"integrity": "sha1-0wIYvRDQMPpCHfPrvIIoVGOjF4E=",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6"
+			}
+		},
 		"di": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -9271,27 +6432,19 @@
 			}
 		},
 		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+			"integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "~1.1.1",
-				"entities": "~1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-					"dev": true
-				}
+				"domelementtype": "^1.3.0",
+				"entities": "^1.1.1"
 			}
 		},
 		"dom7": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.2.tgz",
-			"integrity": "sha512-cGwWtpu7KY3JnbREGqG4EGC/u+1hyLfWVMqrqRjmwiO8d5i4B+0imLZAQ/cJbiXnjbs0pdIUzcUyeI9BbnyKNg==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
+			"integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
 			"requires": {
 				"ssr-window": "^1.0.1"
 			}
@@ -9343,9 +6496,9 @@
 			}
 		},
 		"dotenv": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-			"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
+			"integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==",
 			"dev": true
 		},
 		"dotenv-defaults": {
@@ -9355,6 +6508,14 @@
 			"dev": true,
 			"requires": {
 				"dotenv": "^6.2.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
 			}
 		},
 		"dotenv-webpack": {
@@ -9413,41 +6574,15 @@
 			"dev": true
 		},
 		"duplexify": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
-			"integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
 			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.0.0",
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0",
 				"stream-shift": "^1.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ecc-jsbn": {
@@ -9462,8 +6597,7 @@
 		"ee-first": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-			"dev": true
+			"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
 		},
 		"ejs": {
 			"version": "2.6.1",
@@ -9472,16 +6606,15 @@
 			"dev": true
 		},
 		"electron-to-chromium": {
-			"version": "1.3.112",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.112.tgz",
-			"integrity": "sha512-FyVLdiRZnLw2WE5ECtveN0JJ7klyiz/HMfKE1/Rjff3l7pe4vfkYtBlcCqTckvR8E7asjJGh0m9gRPR3Anp/UA==",
+			"version": "1.3.122",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
+			"integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw==",
 			"dev": true
 		},
 		"elementtree": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
 			"integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
-			"dev": true,
 			"requires": {
 				"sax": "1.1.4"
 			},
@@ -9489,8 +6622,7 @@
 				"sax": {
 					"version": "1.1.4",
 					"resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
-					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=",
-					"dev": true
+					"integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
 				}
 			}
 		},
@@ -9523,8 +6655,7 @@
 		"encodeurl": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-			"dev": true
+			"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
 		},
 		"encoding": {
 			"version": "0.1.12",
@@ -9543,6 +6674,16 @@
 				"once": "^1.4.0"
 			}
 		},
+		"endent": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz",
+			"integrity": "sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==",
+			"requires": {
+				"dedent": "^0.7.0",
+				"fast-json-parse": "^1.0.3",
+				"objectorarray": "^1.0.3"
+			}
+		},
 		"engine.io": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
@@ -9579,6 +6720,47 @@
 				}
 			}
 		},
+		"engine.io-client": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+			"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "1.2.1",
+				"component-inherit": "0.0.3",
+				"debug": "~3.1.0",
+				"engine.io-parser": "~2.1.1",
+				"has-cors": "1.1.0",
+				"indexof": "0.0.1",
+				"parseqs": "0.0.5",
+				"parseuri": "0.0.5",
+				"ws": "~3.3.1",
+				"xmlhttprequest-ssl": "~1.5.4",
+				"yeast": "0.1.2"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"ws": {
+					"version": "3.3.3",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "~1.0.0",
+						"safe-buffer": "~5.1.0",
+						"ultron": "~1.1.0"
+					}
+				}
+			}
+		},
 		"engine.io-parser": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
@@ -9600,42 +6782,6 @@
 				"graceful-fs": "^4.1.2",
 				"memory-fs": "^0.4.0",
 				"tapable": "^1.0.0"
-			},
-			"dependencies": {
-				"memory-fs": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-					"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-					"dev": true,
-					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"ent": {
@@ -9650,6 +6796,26 @@
 			"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
 			"dev": true
 		},
+		"envalid": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/envalid/-/envalid-4.2.2.tgz",
+			"integrity": "sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==",
+			"dev": true,
+			"requires": {
+				"chalk": "^2.4.1",
+				"dotenv": "^6.2.0",
+				"meant": "^1.0.1",
+				"validator": "^10.11.0"
+			},
+			"dependencies": {
+				"dotenv": {
+					"version": "6.2.0",
+					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+					"dev": true
+				}
+			}
+		},
 		"err-code": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
@@ -9683,15 +6849,38 @@
 				"is-arrayish": "^0.2.1"
 			}
 		},
+		"es-abstract": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+			"integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+			"requires": {
+				"es-to-primitive": "^1.2.0",
+				"function-bind": "^1.1.1",
+				"has": "^1.0.3",
+				"is-callable": "^1.1.4",
+				"is-regex": "^1.0.4",
+				"object-keys": "^1.0.12"
+			}
+		},
+		"es-to-primitive": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+			"integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+			"requires": {
+				"is-callable": "^1.1.4",
+				"is-date-object": "^1.0.1",
+				"is-symbol": "^1.0.2"
+			}
+		},
 		"es5-ext": {
-			"version": "0.10.47",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz",
-			"integrity": "sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==",
+			"version": "0.10.49",
+			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz",
+			"integrity": "sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==",
 			"dev": true,
 			"requires": {
 				"es6-iterator": "~2.0.3",
 				"es6-symbol": "~3.1.1",
-				"next-tick": "1"
+				"next-tick": "^1.0.0"
 			}
 		},
 		"es6-iterator": {
@@ -9772,14 +6961,41 @@
 		"escape-html": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-			"dev": true
+			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
 		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
 			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
 		},
+		"escodegen": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
+			"integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+			"dev": true,
+			"requires": {
+				"esprima": "^3.1.3",
+				"estraverse": "^4.2.0",
+				"esutils": "^2.0.2",
+				"optionator": "^0.8.1",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "3.1.3",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"escope": {
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
@@ -9790,38 +7006,22 @@
 				"es6-weak-map": "^2.0.1",
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"eslint-scope": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-			"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+			"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
 			"dev": true,
 			"requires": {
 				"esrecurse": "^4.1.0",
 				"estraverse": "^4.1.1"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"esprima": {
-			"version": "2.7.3",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-			"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true
 		},
 		"esrecurse": {
@@ -9831,20 +7031,12 @@
 			"dev": true,
 			"requires": {
 				"estraverse": "^4.1.0"
-			},
-			"dependencies": {
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
-				}
 			}
 		},
 		"estraverse": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-			"integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
 			"dev": true
 		},
 		"estree-walker": {
@@ -9861,610 +7053,347 @@
 		},
 		"etag": {
 			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-			"dev": true
-		},
-		"event-emitter": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-			"dev": true,
-			"requires": {
-				"d": "1",
-				"es5-ext": "~0.10.14"
-			}
-		},
-		"event-stream": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
-			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
-			"requires": {
-				"duplexer": "^0.1.1",
-				"from": "^0.1.7",
-				"map-stream": "0.0.7",
-				"pause-stream": "^0.0.11",
-				"split": "^1.0.1",
-				"stream-combiner": "^0.2.2",
-				"through": "^2.3.8"
-			}
-		},
-		"eventemitter3": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
-		},
-		"events": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
-			"dev": true
-		},
-		"eventsource": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-			"dev": true,
-			"requires": {
-				"original": "^1.0.0"
-			}
-		},
-		"evp_bytestokey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-			"dev": true,
-			"requires": {
-				"md5.js": "^1.3.4",
-				"safe-buffer": "^5.1.1"
-			}
-		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
-		"expand-braces": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
-			"integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
-			"dev": true,
-			"requires": {
-				"array-slice": "^0.2.3",
-				"array-unique": "^0.2.1",
-				"braces": "^0.1.2"
-			},
-			"dependencies": {
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
-					"integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^0.1.0"
-					}
-				},
-				"expand-range": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-					"integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
-					"dev": true,
-					"requires": {
-						"is-number": "^0.1.1",
-						"repeat-string": "^0.2.2"
-					}
-				},
-				"is-number": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-					"integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
-					"dev": true
-				},
-				"repeat-string": {
-					"version": "0.2.2",
-					"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
-					"integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
-					"dev": true
-				}
-			}
-		},
-		"expand-range": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
-			"requires": {
-				"fill-range": "^2.1.0"
-			},
-			"dependencies": {
-				"fill-range": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-					"integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-					"dev": true,
-					"requires": {
-						"is-number": "^2.1.0",
-						"isobject": "^2.0.0",
-						"randomatic": "^3.0.0",
-						"repeat-element": "^1.1.2",
-						"repeat-string": "^1.5.2"
-					}
-				},
-				"is-number": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-					"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-					"dev": true,
-					"requires": {
-						"kind-of": "^3.0.2"
-					}
-				},
-				"isobject": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-					"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-					"dev": true,
-					"requires": {
-						"isarray": "1.0.0"
-					}
-				}
-			}
-		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-		},
-		"extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
-			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
-			}
-		},
-		"external-editor": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
-			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
-			"dev": true,
-			"requires": {
-				"chardet": "^0.7.0",
-				"iconv-lite": "^0.4.24",
-				"tmp": "^0.0.33"
-			},
-			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
-			}
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
 		},
-		"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==",
+		"event-emitter": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
 			"dev": true,
 			"requires": {
-				"ansi-gray": "^0.1.1",
-				"color-support": "^1.1.3",
-				"parse-node-version": "^1.0.0",
-				"time-stamp": "^1.0.0"
+				"d": "1",
+				"es5-ext": "~0.10.14"
 			}
 		},
-		"fast-deep-equal": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		"event-stream": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
+			"integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
+			"requires": {
+				"duplexer": "^0.1.1",
+				"from": "^0.1.7",
+				"map-stream": "0.0.7",
+				"pause-stream": "^0.0.11",
+				"split": "^1.0.1",
+				"stream-combiner": "^0.2.2",
+				"through": "^2.3.8"
+			}
 		},
-		"fast-glob": {
-			"version": "2.2.6",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
-			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+		"eventemitter3": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+			"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
+		},
+		"events": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+			"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+			"dev": true
+		},
+		"eventsource": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
 			"dev": true,
-			"requires": {
-				"@mrmlnc/readdir-enhanced": "^2.2.1",
-				"@nodelib/fs.stat": "^1.1.2",
-				"glob-parent": "^3.1.0",
-				"is-glob": "^4.0.0",
-				"merge2": "^1.2.3",
-				"micromatch": "^3.1.10"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-					"dev": true,
-					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+			"requires": {
+				"original": "^1.0.0"
+			}
+		},
+		"evp_bytestokey": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+			"dev": true,
+			"requires": {
+				"md5.js": "^1.3.4",
+				"safe-buffer": "^5.1.1"
+			}
+		},
+		"execa": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+			"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+			"dev": true,
+			"requires": {
+				"cross-spawn": "^6.0.0",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			}
+		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
+		"expand-brackets": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+			"dev": true,
+			"requires": {
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"is-descriptor": "^0.1.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extendable": "^0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
+				}
+			}
+		},
+		"express": {
+			"version": "4.16.4",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
+			"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+			"requires": {
+				"accepts": "~1.3.5",
+				"array-flatten": "1.1.1",
+				"body-parser": "1.18.3",
+				"content-disposition": "0.5.2",
+				"content-type": "~1.0.4",
+				"cookie": "0.3.1",
+				"cookie-signature": "1.0.6",
+				"debug": "2.6.9",
+				"depd": "~1.1.2",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"finalhandler": "1.1.1",
+				"fresh": "0.5.2",
+				"merge-descriptors": "1.0.1",
+				"methods": "~1.1.2",
+				"on-finished": "~2.3.0",
+				"parseurl": "~1.3.2",
+				"path-to-regexp": "0.1.7",
+				"proxy-addr": "~2.0.4",
+				"qs": "6.5.2",
+				"range-parser": "~1.2.0",
+				"safe-buffer": "5.1.2",
+				"send": "0.16.2",
+				"serve-static": "1.13.2",
+				"setprototypeof": "1.1.0",
+				"statuses": "~1.4.0",
+				"type-is": "~1.6.16",
+				"utils-merge": "1.0.1",
+				"vary": "~1.1.2"
+			},
+			"dependencies": {
+				"array-flatten": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+				}
+			}
+		},
+		"extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		},
+		"extend-shallow": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+			"requires": {
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
+			},
+			"dependencies": {
+				"is-extendable": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
+						"is-plain-object": "^2.0.4"
 					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+				}
+			}
+		},
+		"external-editor": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+			"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+			"dev": true,
+			"requires": {
+				"chardet": "^0.7.0",
+				"iconv-lite": "^0.4.24",
+				"tmp": "^0.0.33"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"safer-buffer": ">= 2.1.2 < 3"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+				}
+			}
+		},
+		"extglob": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+			"dev": true,
+			"requires": {
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+					"dev": true,
+					"requires": {
+						"is-descriptor": "^1.0.0"
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"is-extendable": "^0.1.0"
+					}
+				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-data-descriptor": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+					"dev": true,
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
 					}
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
+		"extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+		},
+		"falafel": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz",
+			"integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.0.0",
+				"foreach": "^2.0.5",
+				"isarray": "0.0.1",
+				"object-keys": "^1.0.6"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				}
 			}
 		},
+		"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": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+			"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+		},
+		"fast-glob": {
+			"version": "2.2.6",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz",
+			"integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==",
+			"dev": true,
+			"requires": {
+				"@mrmlnc/readdir-enhanced": "^2.2.1",
+				"@nodelib/fs.stat": "^1.1.2",
+				"glob-parent": "^3.1.0",
+				"is-glob": "^4.0.0",
+				"merge2": "^1.2.3",
+				"micromatch": "^3.1.10"
+			}
+		},
+		"fast-json-parse": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+			"integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
+		},
 		"fast-json-stable-stringify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -10506,18 +7435,22 @@
 				"escape-string-regexp": "^1.0.5"
 			}
 		},
+		"file-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
+			"integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"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==",
 			"dev": true
 		},
-		"filename-regex": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
-		},
 		"fileset": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
@@ -10559,7 +7492,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
 			"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"encodeurl": "~1.0.2",
@@ -10602,58 +7534,38 @@
 			"dev": true
 		},
 		"flush-write-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
 		"follow-redirects": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
-			"integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+			"integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
 			"dev": true,
 			"requires": {
-				"debug": "=3.1.0"
+				"debug": "^3.2.6"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
 					"requires": {
-						"ms": "2.0.0"
+						"ms": "^2.1.1"
 					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
@@ -10662,6 +7574,41 @@
 			"resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
 			"integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
 		},
+		"fontkit": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.8.0.tgz",
+			"integrity": "sha512-EFDRCca7khfQWYu1iFhsqeABpi87f03MBdkT93ZE6YhqCdMzb5Eojb6c4dlJikGv5liuhByyzA7ikpIPTSBWbQ==",
+			"dev": true,
+			"requires": {
+				"babel-runtime": "^6.11.6",
+				"brfs": "^1.4.0",
+				"brotli": "^1.2.0",
+				"browserify-optional": "^1.0.0",
+				"clone": "^1.0.1",
+				"deep-equal": "^1.0.0",
+				"dfa": "^1.0.0",
+				"restructure": "^0.5.3",
+				"tiny-inflate": "^1.0.2",
+				"unicode-properties": "^1.0.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"clone": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+					"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+					"dev": true
+				}
+			}
+		},
+		"for-each": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+			"requires": {
+				"is-callable": "^1.1.3"
+			}
+		},
 		"for-in": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -10675,6 +7622,12 @@
 				"for-in": "^1.0.1"
 			}
 		},
+		"foreach": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+			"dev": true
+		},
 		"forever-agent": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -10699,8 +7652,7 @@
 		"forwarded": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-			"dev": true
+			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
 		},
 		"fragment-cache": {
 			"version": "0.2.1",
@@ -10713,8 +7665,7 @@
 		"fresh": {
 			"version": "0.5.2",
 			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-			"dev": true
+			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
 		},
 		"from": {
 			"version": "0.1.7",
@@ -10729,32 +7680,6 @@
 			"requires": {
 				"inherits": "^2.0.1",
 				"readable-stream": "^2.0.0"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"fs-access": {
@@ -10770,7 +7695,6 @@
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
 			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"jsonfile": "^4.0.0",
@@ -10785,43 +7709,17 @@
 			"requires": {
 				"minipass": "^2.2.1"
 			}
-		},
-		"fs-write-stream-atomic": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.1.2",
-				"iferr": "^0.1.5",
-				"imurmurhash": "^0.1.4",
-				"readable-stream": "1 || 2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
+		},
+		"fs-write-stream-atomic": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.1.2",
+				"iferr": "^0.1.5",
+				"imurmurhash": "^0.1.4",
+				"readable-stream": "1 || 2"
 			}
 		},
 		"fs.realpath": {
@@ -10869,12 +7767,14 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
 					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+					"optional": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
@@ -10889,17 +7789,20 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -11016,7 +7919,8 @@
 				"inherits": {
 					"version": "2.0.3",
 					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+					"optional": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -11028,6 +7932,7 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+					"optional": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -11035,750 +7940,205 @@
 				"isarray": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"optional": true
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-				},
-				"minipass": {
-					"version": "2.3.5",
-					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-					"requires": {
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.0"
-					}
-				},
-				"minizlib": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-					"optional": true,
-					"requires": {
-						"minipass": "^2.2.1"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"optional": true
-				},
-				"needle": {
-					"version": "2.2.4",
-					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
-					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
-					"optional": true,
-					"requires": {
-						"debug": "^2.1.2",
-						"iconv-lite": "^0.4.4",
-						"sax": "^1.2.4"
-					}
-				},
-				"node-pre-gyp": {
-					"version": "0.10.3",
-					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
-					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
-					"optional": true,
-					"requires": {
-						"detect-libc": "^1.0.2",
-						"mkdirp": "^0.5.1",
-						"needle": "^2.2.1",
-						"nopt": "^4.0.1",
-						"npm-packlist": "^1.1.6",
-						"npmlog": "^4.0.2",
-						"rc": "^1.2.7",
-						"rimraf": "^2.6.1",
-						"semver": "^5.3.0",
-						"tar": "^4"
-					}
-				},
-				"nopt": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-					"optional": true,
-					"requires": {
-						"abbrev": "1",
-						"osenv": "^0.1.4"
-					}
-				},
-				"npm-bundled": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
-					"optional": true
-				},
-				"npm-packlist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
-					"optional": true,
-					"requires": {
-						"ignore-walk": "^3.0.1",
-						"npm-bundled": "^1.0.1"
-					}
-				},
-				"npmlog": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-					"optional": true,
-					"requires": {
-						"are-we-there-yet": "~1.1.2",
-						"console-control-strings": "~1.1.0",
-						"gauge": "~2.7.3",
-						"set-blocking": "~2.0.0"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"optional": true
-				},
-				"once": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-					"optional": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"optional": true
-				},
-				"osenv": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-					"optional": true,
-					"requires": {
-						"os-homedir": "^1.0.0",
-						"os-tmpdir": "^1.0.0"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"optional": true
-				},
-				"process-nextick-args": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-					"optional": true
-				},
-				"rc": {
-					"version": "1.2.8",
-					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-					"optional": true,
-					"requires": {
-						"deep-extend": "^0.6.0",
-						"ini": "~1.3.0",
-						"minimist": "^1.2.0",
-						"strip-json-comments": "~2.0.1"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-							"optional": true
-						}
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"optional": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"optional": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				},
-				"safer-buffer": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-					"optional": true
-				},
-				"sax": {
-					"version": "1.2.4",
-					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-					"optional": true
-				},
-				"semver": {
-					"version": "5.6.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-					"optional": true
-				},
-				"set-blocking": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"optional": true
 				},
-				"signal-exit": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+				"minimatch": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+					"optional": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"optional": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"minipass": {
+					"version": "2.3.5",
+					"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+					"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+					"optional": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"minizlib": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+					"integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
 					"optional": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"minipass": "^2.2.1"
 					}
 				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+				"mkdirp": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+					"optional": true,
 					"requires": {
-						"ansi-regex": "^2.0.0"
+						"minimist": "0.0.8"
 					}
 				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
 					"optional": true
 				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+				"needle": {
+					"version": "2.2.4",
+					"resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
+					"integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
 					"optional": true,
 					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"debug": "^2.1.2",
+						"iconv-lite": "^0.4.4",
+						"sax": "^1.2.4"
 					}
 				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"optional": true
+				"node-pre-gyp": {
+					"version": "0.10.3",
+					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
+					"integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
+					"optional": true,
+					"requires": {
+						"detect-libc": "^1.0.2",
+						"mkdirp": "^0.5.1",
+						"needle": "^2.2.1",
+						"nopt": "^4.0.1",
+						"npm-packlist": "^1.1.6",
+						"npmlog": "^4.0.2",
+						"rc": "^1.2.7",
+						"rimraf": "^2.6.1",
+						"semver": "^5.3.0",
+						"tar": "^4"
+					}
 				},
-				"wide-align": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+				"nopt": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"optional": true,
 					"requires": {
-						"string-width": "^1.0.2 || 2"
+						"abbrev": "1",
+						"osenv": "^0.1.4"
 					}
 				},
-				"wrappy": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				"npm-bundled": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
+					"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+					"optional": true
 				},
-				"yallist": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-				}
-			}
-		},
-		"ftp": {
-			"version": "0.3.10",
-			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "1.1.x",
-				"xregexp": "2.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
+				"npm-packlist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
+					"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+					"optional": true,
+					"requires": {
+						"ignore-walk": "^3.0.1",
+						"npm-bundled": "^1.0.1"
+					}
 				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-					"dev": true,
+				"npmlog": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+					"optional": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.1",
-						"isarray": "0.0.1",
-						"string_decoder": "~0.10.x"
+						"are-we-there-yet": "~1.1.2",
+						"console-control-strings": "~1.1.0",
+						"gauge": "~2.7.3",
+						"set-blocking": "~2.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
+				"number-is-nan": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+					"optional": true
 				},
-				"xregexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
-					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
-					"dev": true
-				}
-			}
-		},
-		"gaze": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-			"requires": {
-				"globule": "^1.0.0"
-			}
-		},
-		"genfun": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-			"dev": true
-		},
-		"get-caller-file": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-		},
-		"get-stdin": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
-		},
-		"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
-		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
-		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"requires": {
-				"assert-plus": "^1.0.0"
-			}
-		},
-		"glob": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			}
-		},
-		"glob-base": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
-			"requires": {
-				"glob-parent": "^2.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"glob-parent": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-					"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-					"dev": true,
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"optional": true
+				},
+				"once": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+					"optional": true,
 					"requires": {
-						"is-glob": "^2.0.0"
+						"wrappy": "1"
 					}
 				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
+				"os-homedir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
-		"glob-parent": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-			"requires": {
-				"is-glob": "^3.1.0",
-				"path-dirname": "^1.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+					"optional": true
 				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+				"osenv": {
+					"version": "0.1.5",
+					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+					"optional": true,
 					"requires": {
-						"is-extglob": "^2.1.0"
+						"os-homedir": "^1.0.0",
+						"os-tmpdir": "^1.0.0"
 					}
-				}
-			}
-		},
-		"glob-to-regexp": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-			"dev": true
-		},
-		"global-dirs": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-			"dev": true,
-			"requires": {
-				"ini": "^1.3.4"
-			}
-		},
-		"globals": {
-			"version": "9.18.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-			"dev": true
-		},
-		"globby": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-			"dev": true,
-			"requires": {
-				"array-union": "^1.0.1",
-				"dir-glob": "^2.0.0",
-				"glob": "^7.1.2",
-				"ignore": "^3.3.5",
-				"pify": "^3.0.0",
-				"slash": "^1.0.0"
-			}
-		},
-		"globule": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
-			"requires": {
-				"glob": "~7.1.1",
-				"lodash": "~4.17.10",
-				"minimatch": "~3.0.2"
-			}
-		},
-		"got": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-			"dev": true,
-			"requires": {
-				"create-error-class": "^3.0.0",
-				"duplexer3": "^0.1.4",
-				"get-stream": "^3.0.0",
-				"is-redirect": "^1.0.0",
-				"is-retry-allowed": "^1.0.0",
-				"is-stream": "^1.0.0",
-				"lowercase-keys": "^1.0.0",
-				"safe-buffer": "^5.0.1",
-				"timed-out": "^4.0.0",
-				"unzip-response": "^2.0.1",
-				"url-parse-lax": "^1.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "4.1.15",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
-		},
-		"graphql": {
-			"version": "14.1.1",
-			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
-			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
-			"requires": {
-				"iterall": "^1.2.2"
-			}
-		},
-		"graphql-tag": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
-			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
-		},
-		"gzip-size": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
-			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
-			"dev": true,
-			"requires": {
-				"duplexer": "^0.1.1",
-				"pify": "^3.0.0"
-			}
-		},
-		"handle-thing": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
-			"dev": true
-		},
-		"handlebars": {
-			"version": "4.0.12",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
-			"integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
-			"dev": true,
-			"requires": {
-				"async": "^2.5.0",
-				"optimist": "^0.6.1",
-				"source-map": "^0.6.1",
-				"uglify-js": "^3.1.4"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-		},
-		"har-validator": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-			"requires": {
-				"ajv": "^6.5.5",
-				"har-schema": "^2.0.0"
-			}
-		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"requires": {
-				"ansi-regex": "^2.0.0"
-			}
-		},
-		"has-binary2": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-			"requires": {
-				"isarray": "2.0.1"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
-				}
-			}
-		},
-		"has-cors": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
-		},
-		"has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-			"dev": true
-		},
-		"has-unicode": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
-			}
-		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+					"optional": true
+				},
+				"process-nextick-args": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+					"optional": true
+				},
+				"rc": {
+					"version": "1.2.8",
+					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+					"optional": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"deep-extend": "^0.6.0",
+						"ini": "~1.3.0",
+						"minimist": "^1.2.0",
+						"strip-json-comments": "~2.0.1"
+					},
+					"dependencies": {
+						"minimist": {
+							"version": "1.2.0",
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+							"optional": true
+						}
 					}
-				}
-			}
-		},
-		"hash-base": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
-			}
-		},
-		"hash.js": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.3",
-				"minimalistic-assert": "^1.0.1"
-			}
-		},
-		"hmac-drbg": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-			"dev": true,
-			"requires": {
-				"hash.js": "^1.0.3",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.1"
-			}
-		},
-		"hoek": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
-			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
-		},
-		"hoopy": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-			"dev": true
-		},
-		"hosted-git-info": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
-			},
-			"dependencies": {
+				},
 				"readable-stream": {
 					"version": "2.3.6",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"core-util-is": "~1.0.0",
 						"inherits": "~2.0.3",
@@ -11789,490 +8149,696 @@
 						"util-deprecate": "~1.0.1"
 					}
 				},
+				"rimraf": {
+					"version": "2.6.3",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+					"optional": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+				},
+				"safer-buffer": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+					"optional": true
+				},
+				"sax": {
+					"version": "1.2.4",
+					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+					"optional": true
+				},
+				"semver": {
+					"version": "5.6.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+					"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+					"optional": true
+				},
+				"set-blocking": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+					"optional": true
+				},
+				"signal-exit": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+					"optional": true
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+					"optional": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
 				"string_decoder": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-					"dev": true,
+					"optional": true,
 					"requires": {
 						"safe-buffer": "~5.1.0"
 					}
-				}
-			}
-		},
-		"html-entities": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-			"dev": true
-		},
-		"htmlparser2": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
-			"integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^1.3.0",
-				"domhandler": "^2.3.0",
-				"domutils": "^1.5.1",
-				"entities": "^1.1.1",
-				"inherits": "^2.0.1",
-				"readable-stream": "^3.0.6"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
+						"ansi-regex": "^2.0.0"
 					}
-				}
-			}
-		},
-		"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",
-			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-			"dev": true
-		},
-		"http-errors": {
-			"version": "1.6.3",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-			"dev": true,
-			"requires": {
-				"depd": "~1.1.2",
-				"inherits": "2.0.3",
-				"setprototypeof": "1.1.0",
-				"statuses": ">= 1.4.0 < 2"
-			}
-		},
-		"http-parser-js": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
-			"dev": true
-		},
-		"http-proxy": {
-			"version": "1.17.0",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
-			"dev": true,
-			"requires": {
-				"eventemitter3": "^3.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
-			}
-		},
-		"http-proxy-agent": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-			"dev": true,
-			"requires": {
-				"agent-base": "4",
-				"debug": "3.1.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
+				},
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+					"optional": true
+				},
+				"tar": {
+					"version": "4.4.8",
+					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+					"optional": true,
+					"requires": {
+						"chownr": "^1.1.1",
+						"fs-minipass": "^1.2.5",
+						"minipass": "^2.3.4",
+						"minizlib": "^1.1.1",
+						"mkdirp": "^0.5.0",
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.2"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+					"optional": true
+				},
+				"wide-align": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+					"optional": true,
 					"requires": {
-						"ms": "2.0.0"
+						"string-width": "^1.0.2 || 2"
 					}
+				},
+				"wrappy": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+				},
+				"yallist": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
 				}
 			}
 		},
-		"http-proxy-middleware": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
-			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+		"ftp": {
+			"version": "0.3.10",
+			"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+			"integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
 			"dev": true,
 			"requires": {
-				"http-proxy": "^1.16.2",
-				"is-glob": "^4.0.0",
-				"lodash": "^4.17.5",
-				"micromatch": "^3.1.9"
+				"readable-stream": "1.1.x",
+				"xregexp": "2.0.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"isarray": {
+					"version": "0.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+					"dev": true
 				},
-				"expand-brackets": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+				"readable-stream": {
+					"version": "1.1.14",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
 					"dev": true,
 					"requires": {
-						"debug": "^2.3.3",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"posix-character-classes": "^0.1.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.1",
+						"isarray": "0.0.1",
+						"string_decoder": "~0.10.x"
 					}
 				},
-				"extglob": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-					"dev": true,
-					"requires": {
-						"array-unique": "^0.3.2",
-						"define-property": "^1.0.0",
-						"expand-brackets": "^2.1.4",
-						"extend-shallow": "^2.0.1",
-						"fragment-cache": "^0.2.1",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"xregexp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+					"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
+					"dev": true
+				}
+			}
+		},
+		"function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+		},
+		"gaze": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+			"requires": {
+				"globule": "^1.0.0"
+			}
+		},
+		"genfun": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+			"integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+			"dev": true
+		},
+		"get-caller-file": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+			"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+		},
+		"get-stdin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+		},
+		"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
+		},
+		"get-uri": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
+			"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
+			"dev": true,
+			"requires": {
+				"data-uri-to-buffer": "2",
+				"debug": "4",
+				"extend": "~3.0.2",
+				"file-uri-to-path": "1",
+				"ftp": "~0.3.10",
+				"readable-stream": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
+				}
+			}
+		},
+		"get-value": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+		},
+		"getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+			"requires": {
+				"assert-plus": "^1.0.0"
+			}
+		},
+		"glob": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+			"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+			"requires": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			}
+		},
+		"glob-parent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+			"requires": {
+				"is-glob": "^3.1.0",
+				"path-dirname": "^1.0.0"
+			},
+			"dependencies": {
+				"is-extglob": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
+				"is-glob": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-extglob": "^2.1.0"
 					}
-				},
+				}
+			}
+		},
+		"glob-to-regexp": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+			"dev": true
+		},
+		"global-dirs": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+			"dev": true,
+			"requires": {
+				"ini": "^1.3.4"
+			}
+		},
+		"globals": {
+			"version": "9.18.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+			"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+			"dev": true
+		},
+		"globby": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+			"integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+			"dev": true,
+			"requires": {
+				"array-union": "^1.0.1",
+				"dir-glob": "^2.0.0",
+				"glob": "^7.1.2",
+				"ignore": "^3.3.5",
+				"pify": "^3.0.0",
+				"slash": "^1.0.0"
+			}
+		},
+		"globule": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+			"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+			"requires": {
+				"glob": "~7.1.1",
+				"lodash": "~4.17.10",
+				"minimatch": "~3.0.2"
+			}
+		},
+		"got": {
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+			"dev": true,
+			"requires": {
+				"create-error-class": "^3.0.0",
+				"duplexer3": "^0.1.4",
+				"get-stream": "^3.0.0",
+				"is-redirect": "^1.0.0",
+				"is-retry-allowed": "^1.0.0",
+				"is-stream": "^1.0.0",
+				"lowercase-keys": "^1.0.0",
+				"safe-buffer": "^5.0.1",
+				"timed-out": "^4.0.0",
+				"unzip-response": "^2.0.1",
+				"url-parse-lax": "^1.0.0"
+			}
+		},
+		"graceful-fs": {
+			"version": "4.1.15",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+			"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+		},
+		"graphql": {
+			"version": "14.1.1",
+			"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.1.1.tgz",
+			"integrity": "sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==",
+			"requires": {
+				"iterall": "^1.2.2"
+			}
+		},
+		"graphql-tag": {
+			"version": "2.10.1",
+			"resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
+			"integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
+		},
+		"gzip-size": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
+			"integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
+			"dev": true,
+			"requires": {
+				"duplexer": "^0.1.1",
+				"pify": "^3.0.0"
+			}
+		},
+		"handle-thing": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+			"integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+			"dev": true
+		},
+		"handlebars": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz",
+			"integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==",
+			"dev": true,
+			"requires": {
+				"neo-async": "^2.6.0",
+				"optimist": "^0.6.1",
+				"source-map": "^0.6.1",
+				"uglify-js": "^3.1.4"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"har-schema": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+		},
+		"har-validator": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+			"requires": {
+				"ajv": "^6.5.5",
+				"har-schema": "^2.0.0"
+			}
+		},
+		"has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"requires": {
+				"function-bind": "^1.1.1"
+			}
+		},
+		"has-ansi": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+			"requires": {
+				"ansi-regex": "^2.0.0"
+			}
+		},
+		"has-binary2": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+			"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+			"requires": {
+				"isarray": "2.0.1"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+					"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+				}
+			}
+		},
+		"has-cors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+			"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+		},
+		"has-flag": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+		},
+		"has-symbols": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+			"integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+		},
+		"has-unicode": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+		},
+		"has-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+			"requires": {
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
+			}
+		},
+		"has-values": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+			"requires": {
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
+			},
+			"dependencies": {
 				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				},
-				"nanomatch": {
-					"version": "1.2.13",
-					"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-					"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-					"dev": true,
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
 					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"fragment-cache": "^0.2.1",
-						"is-windows": "^1.0.2",
-						"kind-of": "^6.0.2",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.1"
+						"is-buffer": "^1.1.5"
 					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+				}
+			}
+		},
+		"hash-base": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+			"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"hash.js": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.3",
+				"minimalistic-assert": "^1.0.1"
+			}
+		},
+		"hmac-drbg": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+			"dev": true,
+			"requires": {
+				"hash.js": "^1.0.3",
+				"minimalistic-assert": "^1.0.0",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
+		},
+		"hoek": {
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
+			"integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
+		},
+		"hoopy": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+			"integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+			"dev": true
+		},
+		"hosted-git-info": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+		},
+		"hpack.js": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+			"dev": true,
+			"requires": {
+				"inherits": "^2.0.1",
+				"obuf": "^1.0.0",
+				"readable-stream": "^2.0.1",
+				"wbuf": "^1.1.0"
+			}
+		},
+		"html-entities": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+			"integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+			"dev": true
+		},
+		"htmlparser2": {
+			"version": "3.10.1",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+			"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+			"dev": true,
+			"requires": {
+				"domelementtype": "^1.3.1",
+				"domhandler": "^2.3.0",
+				"domutils": "^1.5.1",
+				"entities": "^1.1.1",
+				"inherits": "^2.0.1",
+				"readable-stream": "^3.1.1"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "0.2.5",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^0.1.0"
-							}
-						},
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						},
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
 					}
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				}
+			}
+		},
+		"http-auth": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz",
+			"integrity": "sha1-lFz63WZSHq+PfISRPTd9exXyTjE=",
+			"dev": true,
+			"requires": {
+				"apache-crypt": "^1.1.2",
+				"apache-md5": "^1.0.6",
+				"bcryptjs": "^2.3.0",
+				"uuid": "^3.0.0"
+			}
+		},
+		"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",
+			"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+			"dev": true
+		},
+		"http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+			"requires": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			}
+		},
+		"http-parser-js": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
+			"integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
+			"dev": true
+		},
+		"http-proxy": {
+			"version": "1.17.0",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+			"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+			"dev": true,
+			"requires": {
+				"eventemitter3": "^3.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"http-proxy-agent": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+			"integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+			"dev": true,
+			"requires": {
+				"agent-base": "4",
+				"debug": "3.1.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ms": "2.0.0"
 					}
 				}
 			}
 		},
+		"http-proxy-middleware": {
+			"version": "0.18.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+			"integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+			"dev": true,
+			"requires": {
+				"http-proxy": "^1.16.2",
+				"is-glob": "^4.0.0",
+				"lodash": "^4.17.5",
+				"micromatch": "^3.1.9"
+			}
+		},
+		"http-signature": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"jsprim": "^1.2.2",
+				"sshpk": "^1.7.0"
+			}
+		},
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -12429,24 +8995,26 @@
 			}
 		},
 		"i18next": {
-			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/i18next/-/i18next-12.1.0.tgz",
-			"integrity": "sha512-AexmwGkKxwKfo5fGeXTWEY4xqzRPigQ1S/0InOUUVziGO54cd4fKyYK8ED1Thx9fd+WA3fRSZ+1iekvFQMbsFw==",
-			"dev": true
+			"version": "15.0.8",
+			"resolved": "https://registry.npmjs.org/i18next/-/i18next-15.0.8.tgz",
+			"integrity": "sha512-ayzNwJ9NHtqEeAG0nQ6yKFbIpZULpDeesjVnfWQaPwbH7Anee8QwRAYPNWHtFCmDZV9FZaKiEbfo1scH8+KSDg==",
+			"dev": true,
+			"requires": {
+				"@babel/runtime": "^7.3.1"
+			}
 		},
 		"iconv-lite": {
 			"version": "0.4.23",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
 			"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-			"dev": true,
 			"requires": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
 		"ieee754": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-			"integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+			"version": "1.1.13",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+			"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
 			"dev": true
 		},
 		"iferr": {
@@ -12656,20 +9224,26 @@
 			}
 		},
 		"invert-kv": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-			"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+			"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+			"dev": true
 		},
 		"ionic": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.10.1.tgz",
-			"integrity": "sha512-nqwFQ1Ec3Dtg9EqMQGXO003bNlVZuH+/hKU+asmX+DO5V6Am6E+KHrgBRRzSKqmuF+l5Wk81EvMD8L5tg2sLRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.6.0",
-				"@ionic/discover": "1.0.11",
-				"@ionic/utils-fs": "1.0.0",
-				"@ionic/utils-network": "0.0.6",
+			"version": "4.12.0",
+			"resolved": "https://registry.npmjs.org/ionic/-/ionic-4.12.0.tgz",
+			"integrity": "sha512-3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg==",
+			"dev": true,
+			"requires": {
+				"@ionic/cli-framework": "1.7.0",
+				"@ionic/discover": "1.0.13",
+				"@ionic/utils-array": "0.0.1",
+				"@ionic/utils-fs": "1.2.0",
+				"@ionic/utils-network": "0.0.8",
+				"@ionic/utils-process": "0.1.0",
+				"@ionic/utils-stream": "0.0.1",
+				"@ionic/utils-subprocess": "0.1.0",
+				"@ionic/utils-terminal": "0.0.1",
 				"chalk": "^2.3.0",
 				"debug": "^4.0.0",
 				"diff": "^4.0.1",
@@ -12691,325 +9265,34 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.0.tgz",
-					"integrity": "sha512-9R57tpsCFq62l5kt7ZAgimRK1Hk2XDhlqNM4/0ugpgX8EIMFW05dUlCwtKmg3Sya48LpHEhoO63Z+KH+cGpSpw==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "1.0.0",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"log-update": "^2.3.0",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^2.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.1",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/discover": {
-					"version": "1.0.11",
-					"resolved": "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.11.tgz",
-					"integrity": "sha512-E2CYZsR2noHtUjYceUNP6w1DMYnjPqITyC8Ewiz1iaNWgEntr7xvt1/XbkMlnswn9QKNSItNL6iWY0Q91N+k2A==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"netmask": "^1.0.6",
-						"tslib": "^1.9.0",
-						"ws": "^6.0.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.0.0.tgz",
-					"integrity": "sha512-cOCO1dcugDL38Hu1HAofvC/bsIE/mCp3Uz4bTjtrhJF7T0T0OC6hHOOlacUz2HTvxfn3ZJqa3uhcy6/GYTJZsQ==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"fs-extra": "^7.0.1",
-						"through2": "^3.0.0",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"ci-info": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-					"dev": true
-				},
 				"debug": {
 					"version": "4.1.1",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
 					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"diff": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
-					"dev": true
-				},
-				"get-uri": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz",
-					"integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==",
-					"dev": true,
-					"requires": {
-						"data-uri-to-buffer": "2",
-						"debug": "4",
-						"extend": "~3.0.2",
-						"file-uri-to-path": "1",
-						"ftp": "~0.3.10",
-						"readable-stream": "3"
-					}
-				},
-				"is-ci": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-					"dev": true,
-					"requires": {
-						"ci-info": "^1.5.0"
-					}
-				},
-				"mime": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"pac-proxy-agent": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
-					"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"get-uri": "^2.0.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"pac-resolver": "^3.0.0",
-						"raw-body": "^2.2.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"proxy-agent": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz",
-					"integrity": "sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==",
-					"dev": true,
-					"requires": {
-						"agent-base": "^4.2.0",
-						"debug": "^3.1.0",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.1",
-						"lru-cache": "^4.1.2",
-						"pac-proxy-agent": "^3.0.0",
-						"proxy-from-env": "^1.0.0",
-						"socks-proxy-agent": "^4.0.1"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"qs": {
-					"version": "6.6.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.6.0.tgz",
-					"integrity": "sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz",
-					"integrity": "sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"superagent": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
-					"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
-					"dev": true,
-					"requires": {
-						"component-emitter": "^1.2.0",
-						"cookiejar": "^2.1.2",
-						"debug": "^4.1.0",
-						"form-data": "^2.3.3",
-						"formidable": "^1.2.0",
-						"methods": "^1.1.1",
-						"mime": "^2.4.0",
-						"qs": "^6.6.0",
-						"readable-stream": "^3.0.6"
-					}
-				},
-				"superagent-proxy": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
-					"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"proxy-agent": "3"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"tar": {
-					"version": "4.4.8",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-					"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-					"dev": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.3.4",
-						"minizlib": "^1.1.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.2"
+						"ms": "^2.1.1"
 					}
 				},
-				"through2": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz",
-					"integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==",
-					"dev": true,
-					"requires": {
-						"readable-stream": "2 || 3",
-						"xtend": "~4.0.1"
-					}
+				"diff": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+					"integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+					"dev": true
 				},
-				"update-notifier": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-					"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-					"dev": true,
-					"requires": {
-						"boxen": "^1.2.1",
-						"chalk": "^2.0.1",
-						"configstore": "^3.0.0",
-						"import-lazy": "^2.1.0",
-						"is-ci": "^1.0.10",
-						"is-installed-globally": "^0.1.0",
-						"is-npm": "^1.0.0",
-						"latest-version": "^3.0.0",
-						"semver-diff": "^2.0.0",
-						"xdg-basedir": "^3.0.0"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
+				"through2": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+					"integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"string-width": {
-							"version": "2.1.1",
-							"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-							"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-							"dev": true,
-							"requires": {
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^4.0.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
+						"readable-stream": "2 || 3"
 					}
 				}
 			}
@@ -13032,9 +9315,9 @@
 			"dev": true
 		},
 		"ipaddr.js": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
-			"integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=",
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+			"integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
 			"dev": true
 		},
 		"is-absolute": {
@@ -13081,6 +9364,11 @@
 				"builtin-modules": "^1.0.0"
 			}
 		},
+		"is-callable": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+			"integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+		},
 		"is-ci": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -13098,6 +9386,11 @@
 				"kind-of": "^3.0.2"
 			}
 		},
+		"is-date-object": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+			"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+		},
 		"is-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -13121,21 +9414,6 @@
 			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
 			"dev": true
 		},
-		"is-dotfile": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-			"dev": true
-		},
-		"is-equal-shallow": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
-			"requires": {
-				"is-primitive": "^2.0.0"
-			}
-		},
 		"is-extendable": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -13200,907 +9478,550 @@
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
 			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-			"dev": true
-		},
-		"is-path-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "^1.0.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "^1.0.1"
-			}
-		},
-		"is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"requires": {
-				"isobject": "^3.0.1"
-			}
-		},
-		"is-posix-bracket": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
-		},
-		"is-primitive": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-			"dev": true
-		},
-		"is-redirect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-			"dev": true
-		},
-		"is-relative": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-			"dev": true,
-			"requires": {
-				"is-unc-path": "^1.0.0"
-			}
-		},
-		"is-retry-allowed": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-			"dev": true
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-		},
-		"is-unc-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-			"dev": true,
-			"requires": {
-				"unc-path-regex": "^0.1.2"
-			}
-		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-		},
-		"is-wsl": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-			"dev": true
-		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-		},
-		"isbinaryfile": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-			"dev": true,
-			"requires": {
-				"buffer-alloc": "^1.2.0"
-			}
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-		},
-		"istanbul-instrumenter-loader": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
-			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
-			"dev": true,
-			"requires": {
-				"convert-source-map": "^1.5.0",
-				"istanbul-lib-instrument": "^1.7.3",
-				"loader-utils": "^1.1.0",
-				"schema-utils": "^0.3.0"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "5.5.2",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-					"dev": true,
-					"requires": {
-						"co": "^4.6.0",
-						"fast-deep-equal": "^1.0.0",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.3.0"
-					}
-				},
-				"fast-deep-equal": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-					"dev": true,
-					"requires": {
-						"ajv": "^5.0.0"
-					}
-				}
+				"kind-of": "^3.0.2"
 			}
 		},
-		"istanbul-lib-coverage": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+		"is-obj": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
 			"dev": true
 		},
-		"istanbul-lib-hook": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz",
-			"integrity": "sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==",
-			"dev": true,
-			"requires": {
-				"append-transform": "^1.0.0"
-			}
+		"is-path-cwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+			"dev": true
 		},
-		"istanbul-lib-instrument": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+		"is-path-in-cwd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
 			"dev": true,
 			"requires": {
-				"babel-generator": "^6.18.0",
-				"babel-template": "^6.16.0",
-				"babel-traverse": "^6.18.0",
-				"babel-types": "^6.18.0",
-				"babylon": "^6.18.0",
-				"istanbul-lib-coverage": "^1.2.1",
-				"semver": "^5.3.0"
+				"is-path-inside": "^1.0.0"
 			}
 		},
-		"istanbul-lib-report": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz",
-			"integrity": "sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==",
+		"is-path-inside": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+			"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
 			"dev": true,
 			"requires": {
-				"istanbul-lib-coverage": "^2.0.1",
-				"make-dir": "^1.3.0",
-				"supports-color": "^5.4.0"
-			},
-			"dependencies": {
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				}
+				"path-is-inside": "^1.0.1"
 			}
 		},
-		"istanbul-reports": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.0.1.tgz",
-			"integrity": "sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==",
-			"dev": true,
+		"is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"requires": {
-				"handlebars": "^4.0.11"
+				"isobject": "^3.0.1"
 			}
 		},
-		"iterall": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
-			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		"is-promise": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+			"dev": true
 		},
-		"jasmine": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
-			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+		"is-redirect": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+			"dev": true
+		},
+		"is-regex": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+			"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
 			"requires": {
-				"glob": "^7.0.6",
-				"jasmine-core": "~3.3.0"
+				"has": "^1.0.1"
 			}
 		},
-		"jasmine-core": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
-			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
-		},
-		"jasmine-spec-reporter": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+		"is-relative": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
 			"dev": true,
 			"requires": {
-				"colors": "1.1.2"
-			},
-			"dependencies": {
-				"colors": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-					"dev": true
-				}
+				"is-unc-path": "^1.0.0"
 			}
 		},
-		"jasminewd2": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
-			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+		"is-retry-allowed": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
 			"dev": true
 		},
-		"js-base64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
-		},
-		"js-tokens": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-			"dev": true
+		"is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
 		},
-		"js-yaml": {
-			"version": "3.12.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
-			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
-			"dev": true,
+		"is-symbol": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+			"integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
 			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"dependencies": {
-				"esprima": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-					"dev": true
-				}
+				"has-symbols": "^1.0.0"
 			}
 		},
-		"jsbarcode": {
-			"version": "4.0.0-alpha.5",
-			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-4.0.0-alpha.5.tgz",
-			"integrity": "sha512-YVBAjFgNKGzUGmSAmzU1dsNTR5omfwWhvusKR+SRRXcuSg4xT3Wl7hYfovt8eZK2LZyFJviQ+Glt9W6T7caQYw=="
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		"is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
 		},
-		"jsesc": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-			"dev": true
+		"is-unc-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+			"dev": true,
+			"requires": {
+				"unc-path-regex": "^0.1.2"
+			}
 		},
-		"json-loader": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-			"dev": true
+		"is-utf8": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
 		},
-		"json-parse-better-errors": {
+		"is-windows": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-			"dev": true
-		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-		},
-		"json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 		},
-		"json3": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-			"dev": true
+		"is-wsl": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+			"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
 		},
-		"json5": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
-			"dev": true,
-			"requires": {
-				"minimist": "^1.2.0"
-			}
+		"isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 		},
-		"jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+		"isbinaryfile": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+			"integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.6"
+				"buffer-alloc": "^1.2.0"
 			}
 		},
-		"jsonparse": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-			"dev": true
+		"isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
 		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			}
+		"isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
 		},
-		"karma": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.0.tgz",
-			"integrity": "sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==",
-			"dev": true,
-			"requires": {
-				"bluebird": "^3.3.0",
-				"body-parser": "^1.16.1",
-				"chokidar": "^2.0.3",
-				"colors": "^1.1.0",
-				"combine-lists": "^1.0.0",
-				"connect": "^3.6.0",
-				"core-js": "^2.2.0",
-				"di": "^0.0.1",
-				"dom-serialize": "^2.2.0",
-				"expand-braces": "^0.1.1",
-				"flatted": "^2.0.0",
-				"glob": "^7.1.1",
-				"graceful-fs": "^4.1.2",
-				"http-proxy": "^1.13.0",
-				"isbinaryfile": "^3.0.0",
-				"lodash": "^4.17.5",
-				"log4js": "^3.0.0",
-				"mime": "^2.3.1",
-				"minimatch": "^3.0.2",
-				"optimist": "^0.6.1",
-				"qjobs": "^1.1.4",
-				"range-parser": "^1.2.0",
-				"rimraf": "^2.6.0",
-				"safe-buffer": "^5.0.1",
-				"socket.io": "2.1.1",
-				"source-map": "^0.6.1",
-				"tmp": "0.0.33",
-				"useragent": "2.3.0"
+		"isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+		},
+		"istanbul-api": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.1.tgz",
+			"integrity": "sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"compare-versions": "^3.2.1",
+				"fileset": "^2.0.3",
+				"istanbul-lib-coverage": "^2.0.3",
+				"istanbul-lib-hook": "^2.0.3",
+				"istanbul-lib-instrument": "^3.1.0",
+				"istanbul-lib-report": "^2.0.4",
+				"istanbul-lib-source-maps": "^3.0.2",
+				"istanbul-reports": "^2.1.1",
+				"js-yaml": "^3.12.0",
+				"make-dir": "^1.3.0",
+				"minimatch": "^3.0.4",
+				"once": "^1.4.0"
 			},
 			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"connect": {
-					"version": "3.6.6",
-					"resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-					"integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"finalhandler": "1.1.0",
-						"parseurl": "~1.3.2",
-						"utils-merge": "1.0.1"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"engine.io-client": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-					"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+				"istanbul-lib-instrument": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz",
+					"integrity": "sha512-ooVllVGT38HIk8MxDj/OIHXSYvH+1tq/Vb38s8ixt9GoJadXska4WkGY+0wkmtYCZNYtaARniH/DixUGGLZ0uA==",
 					"dev": true,
 					"requires": {
-						"component-emitter": "1.2.1",
-						"component-inherit": "0.0.3",
-						"debug": "~3.1.0",
-						"engine.io-parser": "~2.1.1",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"ws": "~3.3.1",
-						"xmlhttprequest-ssl": "~1.5.4",
-						"yeast": "0.1.2"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
+						"@babel/generator": "^7.0.0",
+						"@babel/parser": "^7.0.0",
+						"@babel/template": "^7.0.0",
+						"@babel/traverse": "^7.0.0",
+						"@babel/types": "^7.0.0",
+						"istanbul-lib-coverage": "^2.0.3",
+						"semver": "^5.5.0"
 					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+				}
+			}
+		},
+		"istanbul-instrumenter-loader": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+			"integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
+			"dev": true,
+			"requires": {
+				"convert-source-map": "^1.5.0",
+				"istanbul-lib-instrument": "^1.7.3",
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^0.3.0"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "5.5.2",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+					"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"co": "^4.6.0",
+						"fast-deep-equal": "^1.0.0",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.3.0"
 					}
 				},
-				"finalhandler": {
+				"fast-deep-equal": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-					"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-					"dev": true,
-					"requires": {
-						"debug": "2.6.9",
-						"encodeurl": "~1.0.1",
-						"escape-html": "~1.0.3",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"statuses": "~1.3.1",
-						"unpipe": "~1.0.0"
-					}
+					"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+					"integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+					"dev": true
+				},
+				"json-schema-traverse": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+					"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"schema-utils": {
+					"version": "0.3.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+					"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ajv": "^5.0.0"
 					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				}
+			}
+		},
+		"istanbul-lib-coverage": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
+			"integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+			"dev": true
+		},
+		"istanbul-lib-hook": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz",
+			"integrity": "sha512-CLmEqwEhuCYtGcpNVJjLV1DQyVnIqavMLFHV/DP+np/g3qvdxu3gsPqYoJMXm15sN84xOlckFB3VNvRbf5yEgA==",
+			"dev": true,
+			"requires": {
+				"append-transform": "^1.0.0"
+			}
+		},
+		"istanbul-lib-instrument": {
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
+			"integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+			"dev": true,
+			"requires": {
+				"babel-generator": "^6.18.0",
+				"babel-template": "^6.16.0",
+				"babel-traverse": "^6.18.0",
+				"babel-types": "^6.18.0",
+				"babylon": "^6.18.0",
+				"istanbul-lib-coverage": "^1.2.1",
+				"semver": "^5.3.0"
+			}
+		},
+		"istanbul-lib-report": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz",
+			"integrity": "sha512-sOiLZLAWpA0+3b5w5/dq0cjm2rrNdAfHWaGhmn7XEFW6X++IV9Ohn+pnELAl9K3rfpaeBfbmH9JU5sejacdLeA==",
+			"dev": true,
+			"requires": {
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"supports-color": "^6.0.0"
+			},
+			"dependencies": {
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-lib-source-maps": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz",
+			"integrity": "sha512-JX4v0CiKTGp9fZPmoxpu9YEkPbEqCqBbO3403VabKjH+NRXo72HafD5UgnjTEqHL2SAjaZK1XDuDOkn6I5QVfQ==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^2.0.3",
+				"make-dir": "^1.3.0",
+				"rimraf": "^2.6.2",
+				"source-map": "^0.6.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"ms": "^2.1.1"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
+				"istanbul-lib-coverage": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+					"integrity": "sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==",
+					"dev": true
 				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				}
+			}
+		},
+		"istanbul-reports": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.1.1.tgz",
+			"integrity": "sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==",
+			"dev": true,
+			"requires": {
+				"handlebars": "^4.1.0"
+			}
+		},
+		"iterall": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz",
+			"integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="
+		},
+		"jasmine": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.3.1.tgz",
+			"integrity": "sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==",
+			"requires": {
+				"glob": "^7.0.6",
+				"jasmine-core": "~3.3.0"
+			}
+		},
+		"jasmine-core": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
+			"integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA=="
+		},
+		"jasmine-spec-reporter": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
+			"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+			"dev": true,
+			"requires": {
+				"colors": "1.1.2"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+					"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+					"dev": true
+				}
+			}
+		},
+		"jasminewd2": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+			"integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+			"dev": true
+		},
+		"js-base64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+			"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
+		},
+		"js-tokens": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+			"dev": true
+		},
+		"js-yaml": {
+			"version": "3.12.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
+			"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+			"dev": true,
+			"requires": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"dependencies": {
+				"esprima": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+					"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+					"dev": true
+				}
+			}
+		},
+		"jsbarcode": {
+			"version": "3.11.0",
+			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.0.tgz",
+			"integrity": "sha512-/ozCd7wsa+VIHo9sUc03HneVEQrH7cVWfJolUT/WOW1m8mJ2e3iYZje6C9X3LFHdczlesqFHRpxLtbVsNtjyow=="
+		},
+		"jsbn": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+		},
+		"jsesc": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+			"integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+			"dev": true
+		},
+		"json-loader": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+			"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+			"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",
+			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+			"dev": true
+		},
+		"json-schema": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+		},
+		"json-schema-traverse": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+		},
+		"json-stringify-safe": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+		},
+		"json3": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+			"dev": true
+		},
+		"json5": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+			"integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+			"dev": true,
+			"requires": {
+				"minimist": "^1.2.0"
+			}
+		},
+		"jsonfile": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+			"requires": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"jsonparse": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+			"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+			"dev": true
+		},
+		"jsprim": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+			"requires": {
+				"assert-plus": "1.0.0",
+				"extsprintf": "1.3.0",
+				"json-schema": "0.2.3",
+				"verror": "1.10.0"
+			}
+		},
+		"karma": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz",
+			"integrity": "sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.3.0",
+				"body-parser": "^1.16.1",
+				"braces": "^2.3.2",
+				"chokidar": "^2.0.3",
+				"colors": "^1.1.0",
+				"connect": "^3.6.0",
+				"core-js": "^2.2.0",
+				"di": "^0.0.1",
+				"dom-serialize": "^2.2.0",
+				"flatted": "^2.0.0",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.1.2",
+				"http-proxy": "^1.13.0",
+				"isbinaryfile": "^3.0.0",
+				"lodash": "^4.17.11",
+				"log4js": "^4.0.0",
+				"mime": "^2.3.1",
+				"minimatch": "^3.0.2",
+				"optimist": "^0.6.1",
+				"qjobs": "^1.1.4",
+				"range-parser": "^1.2.0",
+				"rimraf": "^2.6.0",
+				"safe-buffer": "^5.0.1",
+				"socket.io": "2.1.1",
+				"source-map": "^0.6.1",
+				"tmp": "0.0.33",
+				"useragent": "2.3.0"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.5",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+					"integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==",
 					"dev": true
 				},
-				"log4js": {
-					"version": "3.0.6",
-					"resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
-					"integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
-					"dev": true,
-					"requires": {
-						"circular-json": "^0.5.5",
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"rfdc": "^1.1.2",
-						"streamroller": "0.7.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
 				"mime": {
 					"version": "2.4.0",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
 					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-					"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
-					"dev": true,
-					"requires": {
-						"debug": "~3.1.0",
-						"engine.io": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"socket.io-adapter": "~1.1.0",
-						"socket.io-client": "2.1.1",
-						"socket.io-parser": "~3.2.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
-				"socket.io-client": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
-					"dev": true,
-					"requires": {
-						"backo2": "1.0.2",
-						"base64-arraybuffer": "0.1.5",
-						"component-bind": "1.0.0",
-						"component-emitter": "1.2.1",
-						"debug": "~3.1.0",
-						"engine.io-client": "~3.2.0",
-						"has-binary2": "~1.0.2",
-						"has-cors": "1.1.0",
-						"indexof": "0.0.1",
-						"object-component": "0.0.3",
-						"parseqs": "0.0.5",
-						"parseuri": "0.0.5",
-						"socket.io-parser": "~3.2.0",
-						"to-array": "0.1.4"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-							"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-							"dev": true,
-							"requires": {
-								"ms": "2.0.0"
-							}
-						},
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-							"dev": true
-						}
-					}
-				},
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"statuses": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-					"integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-					"dev": true
-				},
-				"streamroller": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-					"integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
-					"dev": true,
-					"requires": {
-						"date-format": "^1.2.0",
-						"debug": "^3.1.0",
-						"mkdirp": "^0.5.1",
-						"readable-stream": "^2.3.0"
-					},
-					"dependencies": {
-						"debug": {
-							"version": "3.2.6",
-							"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-							"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-							"dev": true,
-							"requires": {
-								"ms": "^2.1.1"
-							}
-						}
-					}
-				},
-				"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"
-					}
-				},
-				"ws": {
-					"version": "3.3.3",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-					"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0",
-						"safe-buffer": "~5.1.0",
-						"ultron": "~1.1.0"
-					}
 				}
 			}
 		},
@@ -14115,90 +10036,13 @@
 			}
 		},
 		"karma-coverage-istanbul-reporter": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz",
-			"integrity": "sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz",
+			"integrity": "sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==",
 			"dev": true,
 			"requires": {
-				"istanbul-api": "^2.0.5",
+				"istanbul-api": "^2.1.1",
 				"minimatch": "^3.0.4"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.6",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"istanbul-api": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.0.6.tgz",
-					"integrity": "sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==",
-					"dev": true,
-					"requires": {
-						"async": "^2.6.1",
-						"compare-versions": "^3.2.1",
-						"fileset": "^2.0.3",
-						"istanbul-lib-coverage": "^2.0.1",
-						"istanbul-lib-hook": "^2.0.1",
-						"istanbul-lib-instrument": "^3.0.0",
-						"istanbul-lib-report": "^2.0.2",
-						"istanbul-lib-source-maps": "^2.0.1",
-						"istanbul-reports": "^2.0.1",
-						"js-yaml": "^3.12.0",
-						"make-dir": "^1.3.0",
-						"once": "^1.4.0"
-					}
-				},
-				"istanbul-lib-coverage": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-					"integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==",
-					"dev": true
-				},
-				"istanbul-lib-instrument": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz",
-					"integrity": "sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==",
-					"dev": true,
-					"requires": {
-						"@babel/generator": "^7.0.0",
-						"@babel/parser": "^7.0.0",
-						"@babel/template": "^7.0.0",
-						"@babel/traverse": "^7.0.0",
-						"@babel/types": "^7.0.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"semver": "^5.5.0"
-					}
-				},
-				"istanbul-lib-source-maps": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz",
-					"integrity": "sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==",
-					"dev": true,
-					"requires": {
-						"debug": "^3.1.0",
-						"istanbul-lib-coverage": "^2.0.1",
-						"make-dir": "^1.3.0",
-						"rimraf": "^2.6.2",
-						"source-map": "^0.6.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
 			}
 		},
 		"karma-jasmine": {
@@ -14246,20 +10090,6 @@
 			"dev": true,
 			"requires": {
 				"package-json": "^4.0.0"
-			},
-			"dependencies": {
-				"package-json": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-					"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-					"dev": true,
-					"requires": {
-						"got": "^6.7.1",
-						"registry-auth-token": "^3.0.1",
-						"registry-url": "^3.0.3",
-						"semver": "^5.1.0"
-					}
-				}
 			}
 		},
 		"lazy-cache": {
@@ -14269,11 +10099,12 @@
 			"dev": true
 		},
 		"lcid": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+			"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+			"dev": true,
 			"requires": {
-				"invert-kv": "^1.0.0"
+				"invert-kv": "^2.0.0"
 			}
 		},
 		"leek": {
@@ -14300,6 +10131,32 @@
 				}
 			}
 		},
+		"less": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
+			"integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+			"dev": true,
+			"requires": {
+				"clone": "^2.1.2",
+				"errno": "^0.1.1",
+				"graceful-fs": "^4.1.2",
+				"image-size": "~0.5.0",
+				"mime": "^1.4.1",
+				"mkdirp": "^0.5.0",
+				"promise": "^7.1.1",
+				"request": "^2.83.0",
+				"source-map": "~0.6.0"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true,
+					"optional": true
+				}
+			}
+		},
 		"less-loader": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
@@ -14339,6 +10196,144 @@
 				"immediate": "~3.0.5"
 			}
 		},
+		"linebreak": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/linebreak/-/linebreak-0.3.0.tgz",
+			"integrity": "sha1-BSZICmLAW9Z58+nZmDDgnGp9DtY=",
+			"dev": true,
+			"requires": {
+				"base64-js": "0.0.8",
+				"brfs": "^1.3.0",
+				"unicode-trie": "^0.3.0"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "0.0.8",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+					"integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+					"dev": true
+				}
+			}
+		},
+		"live-server": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/live-server/-/live-server-1.2.1.tgz",
+			"integrity": "sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.4",
+				"colors": "^1.3.3",
+				"connect": "^3.6.6",
+				"cors": "^2.8.5",
+				"event-stream": "3.3.4",
+				"faye-websocket": "0.11.x",
+				"http-auth": "3.1.x",
+				"morgan": "^1.9.1",
+				"object-assign": "^4.1.1",
+				"opn": "^6.0.0",
+				"proxy-middleware": "^0.15.0",
+				"send": "^0.16.2",
+				"serve-index": "^1.9.1"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.3.3",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz",
+					"integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==",
+					"dev": true
+				},
+				"event-stream": {
+					"version": "3.3.4",
+					"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+					"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1",
+						"from": "~0",
+						"map-stream": "~0.1.0",
+						"pause-stream": "0.0.11",
+						"split": "0.3",
+						"stream-combiner": "~0.0.4",
+						"through": "~2.3.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"map-stream": {
+					"version": "0.1.0",
+					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+					"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+					"dev": true
+				},
+				"mime": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+					"dev": true
+				},
+				"object-assign": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+					"dev": true
+				},
+				"opn": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz",
+					"integrity": "sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==",
+					"dev": true,
+					"requires": {
+						"is-wsl": "^1.1.0"
+					}
+				},
+				"send": {
+					"version": "0.16.2",
+					"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+					"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+					"dev": true,
+					"requires": {
+						"debug": "2.6.9",
+						"depd": "~1.1.2",
+						"destroy": "~1.0.4",
+						"encodeurl": "~1.0.2",
+						"escape-html": "~1.0.3",
+						"etag": "~1.8.1",
+						"fresh": "0.5.2",
+						"http-errors": "~1.6.2",
+						"mime": "1.4.1",
+						"ms": "2.0.0",
+						"on-finished": "~2.3.0",
+						"range-parser": "~1.2.0",
+						"statuses": "~1.4.0"
+					}
+				},
+				"split": {
+					"version": "0.3.3",
+					"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+					"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+					"dev": true,
+					"requires": {
+						"through": "2"
+					}
+				},
+				"stream-combiner": {
+					"version": "0.0.4",
+					"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+					"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+					"dev": true,
+					"requires": {
+						"duplexer": "~0.1.1"
+					}
+				}
+			}
+		},
 		"livereload-js": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
@@ -14578,6 +10573,36 @@
 				}
 			}
 		},
+		"log4js": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/log4js/-/log4js-4.1.0.tgz",
+			"integrity": "sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==",
+			"dev": true,
+			"requires": {
+				"date-format": "^2.0.0",
+				"debug": "^4.1.1",
+				"flatted": "^2.0.0",
+				"rfdc": "^1.1.2",
+				"streamroller": "^1.0.4"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"loglevel": {
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
@@ -14631,24 +10656,24 @@
 			}
 		},
 		"lunr": {
-			"version": "2.3.5",
-			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.5.tgz",
-			"integrity": "sha512-EtnfmHsHJTr3u24sito9JctSxej5Ds0SgUD2Lm+qRHyLgM7BGesFlW14eNh1mil0fV5Muh8gf3dBBXzADlUlzQ==",
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.6.tgz",
+			"integrity": "sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==",
 			"dev": true
 		},
 		"macos-release": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.0.0.tgz",
-			"integrity": "sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.1.0.tgz",
+			"integrity": "sha512-8TCbwvN1mfNxbBv0yBtfyIFMo3m1QsNbKHv7PYIp/abRBKVQBXN7ecu3aeGGgT18VC/Tf397LBDGZF9KBGJFFw==",
 			"dev": true
 		},
 		"magic-string": {
-			"version": "0.25.1",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz",
-			"integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==",
+			"version": "0.25.2",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz",
+			"integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
 			"dev": true,
 			"requires": {
-				"sourcemap-codec": "^1.4.1"
+				"sourcemap-codec": "^1.4.4"
 			}
 		},
 		"make-dir": {
@@ -14666,6 +10691,93 @@
 			"integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
 			"dev": true
 		},
+		"make-fetch-happen": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
+			"integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
+			"dev": true,
+			"requires": {
+				"agentkeepalive": "^3.4.1",
+				"cacache": "^11.0.1",
+				"http-cache-semantics": "^3.8.1",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"mississippi": "^3.0.0",
+				"node-fetch-npm": "^2.0.2",
+				"promise-retry": "^1.1.1",
+				"socks-proxy-agent": "^4.0.0",
+				"ssri": "^6.0.0"
+			},
+			"dependencies": {
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+					"dev": true,
+					"requires": {
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
+					},
+					"dependencies": {
+						"lru-cache": {
+							"version": "5.1.1",
+							"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+							"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+							"dev": true,
+							"requires": {
+								"yallist": "^3.0.2"
+							}
+						}
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
+				}
+			}
+		},
 		"map-age-cleaner": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -14698,15 +10810,9 @@
 			}
 		},
 		"marked": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz",
-			"integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==",
-			"dev": true
-		},
-		"math-random": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-			"integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz",
+			"integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==",
 			"dev": true
 		},
 		"md5.js": {
@@ -14720,11 +10826,16 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"meant": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz",
+			"integrity": "sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg==",
+			"dev": true
+		},
 		"media-typer": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-			"dev": true
+			"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
 		},
 		"mem": {
 			"version": "4.1.0",
@@ -14736,6 +10847,16 @@
 				"p-is-promise": "^2.0.0"
 			}
 		},
+		"memory-fs": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+			"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+			"dev": true,
+			"requires": {
+				"errno": "^0.1.3",
+				"readable-stream": "^2.0.1"
+			}
+		},
 		"meow": {
 			"version": "3.7.0",
 			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -14820,8 +10941,16 @@
 		"merge-descriptors": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-			"dev": true
+			"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+		},
+		"merge-source-map": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz",
+			"integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6"
+			}
 		},
 		"merge2": {
 			"version": "1.2.3",
@@ -14832,8 +10961,36 @@
 		"methods": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-			"dev": true
+			"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+		},
+		"micromatch": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"braces": "^2.3.1",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"extglob": "^2.0.4",
+				"fragment-cache": "^0.2.1",
+				"kind-of": "^6.0.2",
+				"nanomatch": "^1.2.9",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.2"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
 		},
 		"miller-rabin": {
 			"version": "4.0.1",
@@ -14877,6 +11034,17 @@
 			"resolved": "https://registry.npmjs.org/mingo/-/mingo-1.3.3.tgz",
 			"integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY="
 		},
+		"mini-css-extract-plugin": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
+			"integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0",
+				"webpack-sources": "^1.1.0"
+			}
+		},
 		"minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -15014,6 +11182,20 @@
 				"on-headers": "~1.0.1"
 			}
 		},
+		"move-concurrently": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+			"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+			"dev": true,
+			"requires": {
+				"aproba": "^1.1.1",
+				"copy-concurrently": "^1.0.0",
+				"fs-write-stream-atomic": "^1.0.8",
+				"mkdirp": "^0.5.1",
+				"rimraf": "^2.5.4",
+				"run-queue": "^1.0.3"
+			}
+		},
 		"ms": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -15063,6 +11245,33 @@
 			"resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
 			"integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
 		},
+		"nanomatch": {
+			"version": "1.2.13",
+			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+			"dev": true,
+			"requires": {
+				"arr-diff": "^4.0.0",
+				"array-unique": "^0.3.2",
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"fragment-cache": "^0.2.1",
+				"is-windows": "^1.0.2",
+				"kind-of": "^6.0.2",
+				"object.pick": "^1.3.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"dependencies": {
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+					"dev": true
+				}
+			}
+		},
 		"ncp": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
@@ -15072,8 +11281,7 @@
 		"negotiator": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-			"dev": true
+			"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
 		},
 		"neo-async": {
 			"version": "2.6.0",
@@ -15153,40 +11361,12 @@
 				"url": "^0.11.0",
 				"util": "^0.11.0",
 				"vm-browserify": "0.0.4"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					},
-					"dependencies": {
-						"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"
-							}
-						}
-					}
-				}
 			}
 		},
 		"node-releases": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.6.tgz",
-			"integrity": "sha512-lODUVHEIZutZx+TDdOk47qLik8FJMXzJ+WnyUGci1MTvTOyzZrz5eVPIIpc5Hb3NfHZGeGHeuwrRYVI1PEITWg==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.12.tgz",
+			"integrity": "sha512-Y+AQ1xdjcgaEzpL65PBEF3fnl1FNKnDh9Zm+AUQLIlyyqtSc4u93jyMN4zrjMzdwKQ10RTr3tgY1x7qpsfF/xg==",
 			"dev": true,
 			"requires": {
 				"semver": "^5.3.0"
@@ -15318,8 +11498,7 @@
 					"requires": {
 						"glob": "^7.0.0",
 						"lodash": "^4.0.0",
-						"scss-tokenizer": "^0.2.3",
-						"yargs": "^7.0.0"
+						"scss-tokenizer": "^0.2.3"
 					}
 				},
 				"semver": {
@@ -15352,6 +11531,18 @@
 				"abbrev": "1"
 			}
 		},
+		"normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
 		"normalize-path": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -15367,21 +11558,58 @@
 			"dev": true
 		},
 		"npm-bundled": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz",
-			"integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
+			"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
 			"dev": true
 		},
+		"npm-package-arg": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
+			"integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
+			"dev": true,
+			"requires": {
+				"hosted-git-info": "^2.6.0",
+				"osenv": "^0.1.5",
+				"semver": "^5.5.0",
+				"validate-npm-package-name": "^3.0.0"
+			}
+		},
 		"npm-packlist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
-			"integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+			"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
 			"dev": true,
 			"requires": {
 				"ignore-walk": "^3.0.1",
 				"npm-bundled": "^1.0.1"
 			}
 		},
+		"npm-pick-manifest": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
+			"integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+			"dev": true,
+			"requires": {
+				"figgy-pudding": "^3.5.1",
+				"npm-package-arg": "^6.0.0",
+				"semver": "^5.4.1"
+			}
+		},
+		"npm-registry-fetch": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
+			"integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
+			"dev": true,
+			"requires": {
+				"JSONStream": "^1.3.4",
+				"bluebird": "^3.5.1",
+				"figgy-pudding": "^3.4.1",
+				"lru-cache": "^4.1.3",
+				"make-fetch-happen": "^4.0.1",
+				"npm-package-arg": "^6.1.0"
+			}
+		},
 		"npm-run-path": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -15497,6 +11725,16 @@
 				}
 			}
 		},
+		"object-inspect": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+			"integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+		},
+		"object-keys": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+			"integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+		},
 		"object-visit": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -15505,27 +11743,6 @@
 				"isobject": "^3.0.0"
 			}
 		},
-		"object.omit": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
-			"requires": {
-				"for-own": "^0.1.4",
-				"is-extendable": "^0.1.1"
-			},
-			"dependencies": {
-				"for-own": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-					"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-					"dev": true,
-					"requires": {
-						"for-in": "^1.0.1"
-					}
-				}
-			}
-		},
 		"object.pick": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -15534,6 +11751,14 @@
 				"isobject": "^3.0.1"
 			}
 		},
+		"objectorarray": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz",
+			"integrity": "sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==",
+			"requires": {
+				"tape": "^4.8.0"
+			}
+		},
 		"obuf": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -15544,7 +11769,6 @@
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
 			"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-			"dev": true,
 			"requires": {
 				"ee-first": "1.1.1"
 			}
@@ -15552,8 +11776,7 @@
 		"on-headers": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
-			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
-			"dev": true
+			"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
 		},
 		"once": {
 			"version": "1.4.0",
@@ -15677,7 +11900,6 @@
 			"version": "5.4.0",
 			"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
 			"integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-			"dev": true,
 			"requires": {
 				"is-wsl": "^1.1.0"
 			}
@@ -15748,6 +11970,43 @@
 			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
 		},
+		"os-locale": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+			"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+			"dev": true,
+			"requires": {
+				"execa": "^1.0.0",
+				"lcid": "^2.0.0",
+				"mem": "^4.0.0"
+			},
+			"dependencies": {
+				"execa": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+					"dev": true,
+					"requires": {
+						"cross-spawn": "^6.0.0",
+						"get-stream": "^4.0.0",
+						"is-stream": "^1.1.0",
+						"npm-run-path": "^2.0.0",
+						"p-finally": "^1.0.0",
+						"signal-exit": "^3.0.0",
+						"strip-eof": "^1.0.0"
+					}
+				},
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+					"dev": true,
+					"requires": {
+						"pump": "^3.0.0"
+					}
+				}
+			}
+		},
 		"os-name": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz",
@@ -15831,6 +12090,51 @@
 			"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
 			"dev": true
 		},
+		"pac-proxy-agent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz",
+			"integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"get-uri": "^2.0.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"pac-resolver": "^3.0.0",
+				"raw-body": "^2.2.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"raw-body": {
+					"version": "2.3.3",
+					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+					"integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+					"dev": true,
+					"requires": {
+						"bytes": "3.0.0",
+						"http-errors": "1.6.3",
+						"iconv-lite": "0.4.23",
+						"unpipe": "1.0.0"
+					}
+				}
+			}
+		},
 		"pac-resolver": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz",
@@ -15842,50 +12146,127 @@
 				"ip": "^1.1.5",
 				"netmask": "^1.0.6",
 				"thunkify": "^2.1.2"
+			}
+		},
+		"package-json": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+			"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+			"dev": true,
+			"requires": {
+				"got": "^6.7.1",
+				"registry-auth-token": "^3.0.1",
+				"registry-url": "^3.0.3",
+				"semver": "^5.1.0"
+			}
+		},
+		"pacote": {
+			"version": "9.4.0",
+			"resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
+			"integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
+			"dev": true,
+			"requires": {
+				"bluebird": "^3.5.3",
+				"cacache": "^11.3.2",
+				"figgy-pudding": "^3.5.1",
+				"get-stream": "^4.1.0",
+				"glob": "^7.1.3",
+				"lru-cache": "^5.1.1",
+				"make-fetch-happen": "^4.0.1",
+				"minimatch": "^3.0.4",
+				"minipass": "^2.3.5",
+				"mississippi": "^3.0.0",
+				"mkdirp": "^0.5.1",
+				"normalize-package-data": "^2.4.0",
+				"npm-package-arg": "^6.1.0",
+				"npm-packlist": "^1.1.12",
+				"npm-pick-manifest": "^2.2.3",
+				"npm-registry-fetch": "^3.8.0",
+				"osenv": "^0.1.5",
+				"promise-inflight": "^1.0.1",
+				"promise-retry": "^1.1.1",
+				"protoduck": "^5.0.1",
+				"rimraf": "^2.6.2",
+				"safe-buffer": "^5.1.2",
+				"semver": "^5.6.0",
+				"ssri": "^6.0.1",
+				"tar": "^4.4.8",
+				"unique-filename": "^1.1.1",
+				"which": "^1.3.1"
 			},
 			"dependencies": {
-				"degenerator": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
-					"integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"dev": true,
 					"requires": {
-						"ast-types": "0.x.x",
-						"escodegen": "1.x.x",
-						"esprima": "3.x.x"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"escodegen": {
-					"version": "1.11.0",
-					"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
-					"integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
+				"get-stream": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
 					"dev": true,
 					"requires": {
-						"esprima": "^3.1.3",
-						"estraverse": "^4.2.0",
-						"esutils": "^2.0.2",
-						"optionator": "^0.8.1",
-						"source-map": "~0.6.1"
+						"pump": "^3.0.0"
 					}
 				},
-				"esprima": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-					"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-					"dev": true
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
 				},
-				"estraverse": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-					"dev": true
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+					"dev": true,
+					"requires": {
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"figgy-pudding": "^3.5.1"
+					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
@@ -15904,38 +12285,12 @@
 				"cyclist": "~0.2.2",
 				"inherits": "^2.0.3",
 				"readable-stream": "^2.1.5"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"parse-asn1": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.3.tgz",
-			"integrity": "sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==",
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+			"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 			"dev": true,
 			"requires": {
 				"asn1.js": "^4.0.0",
@@ -15946,35 +12301,6 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
-		"parse-glob": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
-			"requires": {
-				"glob-base": "^0.3.0",
-				"is-dotfile": "^1.0.0",
-				"is-extglob": "^1.0.0",
-				"is-glob": "^2.0.0"
-			},
-			"dependencies": {
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				}
-			}
-		},
 		"parse-json": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -16032,8 +12358,7 @@
 		"parseurl": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-			"dev": true
+			"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
 		},
 		"pascalcase": {
 			"version": "0.1.1",
@@ -16075,14 +12400,12 @@
 		"path-parse": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-			"dev": true
+			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
 		},
 		"path-to-regexp": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-			"dev": true
+			"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
 		},
 		"path-type": {
 			"version": "3.0.0",
@@ -16114,6 +12437,41 @@
 				"sha.js": "^2.4.8"
 			}
 		},
+		"pdfkit": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/pdfkit/-/pdfkit-0.9.0.tgz",
+			"integrity": "sha512-j/tJvvoEM7qMiOfodNkz6XRNBvAhVohWP1mUvgg+Xy8X8S3aMBpVGXJGZWNCoCUH2ywLidZSbHyn5mJaqv9umw==",
+			"dev": true,
+			"requires": {
+				"crypto-js": "^3.1.9-1",
+				"fontkit": "^1.0.0",
+				"linebreak": "^0.3.0",
+				"png-js": ">=0.1.0",
+				"saslprep": "1.0.1"
+			}
+		},
+		"pdfmake": {
+			"version": "0.1.54",
+			"resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.1.54.tgz",
+			"integrity": "sha512-HO2FX+czmO+8LpWXQMFQfdUCCKnqwSvSEJExGkUKfsV34DRIV5PZjNg0xWS7ypGrnTY6RTTssWpdreX/pbyeyw==",
+			"dev": true,
+			"requires": {
+				"iconv-lite": "^0.4.24",
+				"linebreak": "^0.3.0",
+				"pdfkit": "^0.9.0"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.4.24",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+					"dev": true,
+					"requires": {
+						"safer-buffer": ">= 2.1.2 < 3"
+					}
+				}
+			}
+		},
 		"performance-now": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -16190,6 +12548,29 @@
 				"semver-compare": "^1.0.0"
 			}
 		},
+		"plist": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
+			"integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+			"requires": {
+				"base64-js": "^1.2.3",
+				"xmlbuilder": "^9.0.7",
+				"xmldom": "0.1.x"
+			},
+			"dependencies": {
+				"base64-js": {
+					"version": "1.3.0",
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
+				}
+			}
+		},
+		"png-js": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/png-js/-/png-js-0.1.1.tgz",
+			"integrity": "sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=",
+			"dev": true
+		},
 		"pngjs": {
 			"version": "3.3.3",
 			"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.3.tgz",
@@ -16258,20 +12639,6 @@
 			"requires": {
 				"cosmiconfig": "^4.0.0",
 				"import-cwd": "^2.0.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-					"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
-					"dev": true,
-					"requires": {
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.9.0",
-						"parse-json": "^4.0.0",
-						"require-from-string": "^2.0.1"
-					}
-				}
 			}
 		},
 		"postcss-loader": {
@@ -16304,12 +12671,6 @@
 			"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
 			"dev": true
 		},
-		"preserve": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
-		},
 		"process": {
 			"version": "0.11.10",
 			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -16601,7 +12962,6 @@
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
 			"integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
-			"dev": true,
 			"requires": {
 				"forwarded": "~0.1.2",
 				"ipaddr.js": "1.8.0"
@@ -16610,7 +12970,39 @@
 				"ipaddr.js": {
 					"version": "1.8.0",
 					"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+					"integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+				}
+			}
+		},
+		"proxy-agent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.0.tgz",
+			"integrity": "sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==",
+			"dev": true,
+			"requires": {
+				"agent-base": "^4.2.0",
+				"debug": "^3.1.0",
+				"http-proxy-agent": "^2.1.0",
+				"https-proxy-agent": "^2.2.1",
+				"lru-cache": "^4.1.2",
+				"pac-proxy-agent": "^3.0.0",
+				"proxy-from-env": "^1.0.0",
+				"socks-proxy-agent": "^4.0.1"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
 					"dev": true
 				}
 			}
@@ -16697,8 +13089,7 @@
 		"q": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-			"dev": true
+			"integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4="
 		},
 		"qjobs": {
 			"version": "1.2.0",
@@ -16861,40 +13252,26 @@
 			"dev": true
 		},
 		"querystringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
-			"integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+			"integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
 			"dev": true
 		},
-		"randomatic": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-			"integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+		"quote-stream": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz",
+			"integrity": "sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=",
 			"dev": true,
 			"requires": {
-				"is-number": "^4.0.0",
-				"kind-of": "^6.0.0",
-				"math-random": "^1.0.1"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-					"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				}
+				"buffer-equal": "0.0.1",
+				"minimist": "^1.1.3",
+				"through2": "^2.0.0"
 			}
 		},
 		"randombytes": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-			"integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
 			"requires": {
 				"safe-buffer": "^5.1.0"
@@ -16913,53 +13290,42 @@
 		"range-parser": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-			"dev": true
+			"integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
 		},
 		"raw-body": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-			"integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+			"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
 			"dev": true,
 			"requires": {
-				"bytes": "3.0.0",
-				"http-errors": "1.6.2",
-				"iconv-lite": "0.4.19",
-				"unpipe": "1.0.0"
+				"bytes": "1",
+				"string_decoder": "0.10"
 			},
 			"dependencies": {
-				"depd": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-					"integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-					"dev": true
-				},
-				"http-errors": {
-					"version": "1.6.2",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-					"integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-					"dev": true,
-					"requires": {
-						"depd": "1.1.1",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.0.3",
-						"statuses": ">= 1.3.1 < 2"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.19",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-					"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+				"bytes": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
 					"dev": true
 				},
-				"setprototypeof": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-					"integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+				"string_decoder": {
+					"version": "0.10.31",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
 					"dev": true
 				}
 			}
 		},
+		"raw-loader": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
+			"integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.1.0",
+				"schema-utils": "^1.0.0"
+			}
+		},
 		"rc": {
 			"version": "1.2.8",
 			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -16972,21 +13338,125 @@
 				"strip-json-comments": "~2.0.1"
 			}
 		},
-		"read-cache": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+		"read-cache": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+			"integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+			"dev": true,
+			"requires": {
+				"pify": "^2.3.0"
+			},
+			"dependencies": {
+				"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"
+			},
+			"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"
+					}
+				},
+				"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-up": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+			"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+			"dev": true,
+			"requires": {
+				"find-up": "^2.0.0",
+				"read-pkg": "^2.0.0"
+			},
+			"dependencies": {
+				"find-up": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+					"dev": true,
+					"requires": {
+						"locate-path": "^2.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+					"dev": true,
+					"requires": {
+						"p-locate": "^2.0.0",
+						"path-exists": "^3.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+					"dev": true,
+					"requires": {
+						"p-limit": "^1.1.0"
+					}
+				}
+			}
+		},
+		"readable-stream": {
+			"version": "2.3.6",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+			"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 			"dev": true,
 			"requires": {
-				"pify": "^2.3.0"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
+				"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"
 			}
 		},
 		"readdirp": {
@@ -17390,15 +13860,6 @@
 			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
 			"dev": true
 		},
-		"regex-cache": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-			"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-			"dev": true,
-			"requires": {
-				"is-equal-shallow": "^0.1.3"
-			}
-		},
 		"regex-not": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -17420,9 +13881,9 @@
 			}
 		},
 		"registry-auth-token": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-			"integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+			"integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
 			"dev": true,
 			"requires": {
 				"rc": "^1.1.6",
@@ -17484,6 +13945,35 @@
 				"is-finite": "^1.0.0"
 			}
 		},
+		"request": {
+			"version": "2.88.0",
+			"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+			"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"aws-sign2": "~0.7.0",
+				"aws4": "^1.8.0",
+				"caseless": "~0.12.0",
+				"combined-stream": "~1.0.6",
+				"extend": "~3.0.2",
+				"forever-agent": "~0.6.1",
+				"form-data": "~2.3.2",
+				"har-validator": "~5.1.0",
+				"http-signature": "~1.2.0",
+				"is-typedarray": "~1.0.0",
+				"isstream": "~0.1.2",
+				"json-stringify-safe": "~5.0.1",
+				"mime-types": "~2.1.19",
+				"oauth-sign": "~0.9.0",
+				"performance-now": "^2.1.0",
+				"qs": "~6.5.2",
+				"safe-buffer": "^5.1.2",
+				"tough-cookie": "~2.4.3",
+				"tunnel-agent": "^0.6.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -17507,10 +13997,13 @@
 			"dev": true
 		},
 		"resolve": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-			"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-			"dev": true
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+			"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+			"dev": true,
+			"requires": {
+				"path-parse": "^1.0.6"
+			}
 		},
 		"resolve-cwd": {
 			"version": "2.0.0",
@@ -17542,6 +14035,23 @@
 				"signal-exit": "^3.0.2"
 			}
 		},
+		"restructure": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/restructure/-/restructure-0.5.4.tgz",
+			"integrity": "sha1-9U591WNZD7NP1r9Vh2EJrsyyjeg=",
+			"dev": true,
+			"requires": {
+				"browserify-optional": "^1.0.0"
+			}
+		},
+		"resumer": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+			"integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
+			"requires": {
+				"through": "~2.3.4"
+			}
+		},
 		"ret": {
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -17592,6 +14102,36 @@
 			"integrity": "sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==",
 			"dev": true
 		},
+		"rollup-plugin-commonjs": {
+			"version": "8.2.6",
+			"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz",
+			"integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==",
+			"dev": true,
+			"requires": {
+				"acorn": "^5.2.1",
+				"estree-walker": "^0.5.0",
+				"magic-string": "^0.22.4",
+				"resolve": "^1.4.0",
+				"rollup-pluginutils": "^2.0.1"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+					"dev": true
+				},
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				}
+			}
+		},
 		"rollup-plugin-node-resolve": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz",
@@ -17605,94 +14145,20 @@
 			}
 		},
 		"rollup-pluginutils": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz",
-			"integrity": "sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==",
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.5.0.tgz",
+			"integrity": "sha512-9Muh1H+XB5f5ONmKMayUoTYR1EZwHbwJJ9oZLrKT5yuTf/RLIQ5mYIGsrERquVucJmjmaAW0Y7+6Qo1Ep+5w3Q==",
 			"dev": true,
 			"requires": {
-				"estree-walker": "^0.5.2",
-				"micromatch": "^2.3.11"
+				"estree-walker": "^0.6.0",
+				"micromatch": "^3.1.10"
 			},
 			"dependencies": {
-				"arr-diff": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-					"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.0.1"
-					}
-				},
-				"array-unique": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-					"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-					"dev": true
-				},
-				"braces": {
-					"version": "1.8.5",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-					"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-					"dev": true,
-					"requires": {
-						"expand-range": "^1.8.1",
-						"preserve": "^0.2.0",
-						"repeat-element": "^1.1.2"
-					}
-				},
-				"expand-brackets": {
-					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-					"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-					"dev": true,
-					"requires": {
-						"is-posix-bracket": "^0.1.0"
-					}
-				},
-				"extglob": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-					"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"is-extglob": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-					"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+				"estree-walker": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz",
+					"integrity": "sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==",
 					"dev": true
-				},
-				"is-glob": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-					"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^1.0.0"
-					}
-				},
-				"micromatch": {
-					"version": "2.3.11",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-					"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^2.0.0",
-						"array-unique": "^0.2.1",
-						"braces": "^1.8.2",
-						"expand-brackets": "^0.1.4",
-						"extglob": "^0.3.1",
-						"filename-regex": "^2.0.0",
-						"is-extglob": "^1.0.0",
-						"is-glob": "^2.0.1",
-						"kind-of": "^3.0.2",
-						"normalize-path": "^2.0.1",
-						"object.omit": "^2.0.0",
-						"parse-glob": "^3.0.4",
-						"regex-cache": "^0.4.2"
-					}
 				}
 			}
 		},
@@ -17781,6 +14247,12 @@
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
+		"saslprep": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.1.tgz",
+			"integrity": "sha512-ntN6SbE3hRqd45PKKadRPgA+xHPWg5lPSj2JWJdJvjTwXDDfkPVtXWvP8jJojvnm+rAsZ2b299C5NwZqq818EA==",
+			"dev": true
+		},
 		"sass-loader": {
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
@@ -17907,7 +14379,6 @@
 			"version": "0.16.2",
 			"resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
 			"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
 				"depd": "~1.1.2",
@@ -17927,8 +14398,7 @@
 				"mime": {
 					"version": "1.4.1",
 					"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-					"dev": true
+					"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
 				}
 			}
 		},
@@ -17957,7 +14427,6 @@
 			"version": "1.13.2",
 			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
 			"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-			"dev": true,
 			"requires": {
 				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
@@ -18000,8 +14469,7 @@
 		"setprototypeof": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-			"dev": true
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
 		},
 		"sha.js": {
 			"version": "2.4.11",
@@ -18030,6 +14498,12 @@
 				}
 			}
 		},
+		"shallow-copy": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+			"integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=",
+			"dev": true
+		},
 		"shebang-command": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -18082,6 +14556,39 @@
 			"integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==",
 			"dev": true
 		},
+		"snapdragon": {
+			"version": "0.8.2",
+			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+			"requires": {
+				"base": "^0.11.1",
+				"debug": "^2.2.0",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"map-cache": "^0.2.2",
+				"source-map": "^0.5.6",
+				"source-map-resolve": "^0.5.0",
+				"use": "^3.1.0"
+			},
+			"dependencies": {
+				"define-property": {
+					"version": "0.2.5",
+					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+					"requires": {
+						"is-descriptor": "^0.1.0"
+					}
+				},
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
+				}
+			}
+		},
 		"snapdragon-node": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
@@ -18141,6 +14648,53 @@
 				"kind-of": "^3.2.0"
 			}
 		},
+		"socket.io": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+			"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+			"dev": true,
+			"requires": {
+				"debug": "~3.1.0",
+				"engine.io": "~3.2.0",
+				"has-binary2": "~1.0.2",
+				"socket.io-adapter": "~1.1.0",
+				"socket.io-client": "2.1.1",
+				"socket.io-parser": "~3.2.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"dev": true,
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"socket.io-client": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+					"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+					"dev": true,
+					"requires": {
+						"backo2": "1.0.2",
+						"base64-arraybuffer": "0.1.5",
+						"component-bind": "1.0.0",
+						"component-emitter": "1.2.1",
+						"debug": "~3.1.0",
+						"engine.io-client": "~3.2.0",
+						"has-binary2": "~1.0.2",
+						"has-cors": "1.1.0",
+						"indexof": "0.0.1",
+						"object-component": "0.0.3",
+						"parseqs": "0.0.5",
+						"parseuri": "0.0.5",
+						"socket.io-parser": "~3.2.0",
+						"to-array": "0.1.4"
+					}
+				}
+			}
+		},
 		"socket.io-adapter": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
@@ -18239,10 +14793,60 @@
 				}
 			}
 		},
+		"sockjs": {
+			"version": "0.3.19",
+			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+			"integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+			"dev": true,
+			"requires": {
+				"faye-websocket": "^0.10.0",
+				"uuid": "^3.0.1"
+			}
+		},
+		"sockjs-client": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
+			"integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.2.5",
+				"eventsource": "^1.0.7",
+				"faye-websocket": "~0.11.1",
+				"inherits": "^2.0.3",
+				"json3": "^3.3.2",
+				"url-parse": "^1.4.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"faye-websocket": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+					"integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+					"dev": true,
+					"requires": {
+						"websocket-driver": ">=0.5.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"socks": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/socks/-/socks-2.2.3.tgz",
-			"integrity": "sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
+			"integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
 			"dev": true,
 			"requires": {
 				"ip": "^1.1.5",
@@ -18250,13 +14854,13 @@
 			}
 		},
 		"socks-proxy-agent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz",
-			"integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+			"integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
 			"dev": true,
 			"requires": {
-				"agent-base": "~4.2.0",
-				"socks": "~2.2.0"
+				"agent-base": "~4.2.1",
+				"socks": "~2.3.2"
 			}
 		},
 		"source-list-map": {
@@ -18280,6 +14884,18 @@
 				"loader-utils": "^1.1.0"
 			}
 		},
+		"source-map-resolve": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+			"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+			"requires": {
+				"atob": "^2.1.1",
+				"decode-uri-component": "^0.2.0",
+				"resolve-url": "^0.2.1",
+				"source-map-url": "^0.4.0",
+				"urix": "^0.1.0"
+			}
+		},
 		"source-map-support": {
 			"version": "0.5.10",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
@@ -18318,29 +14934,101 @@
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-exceptions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
-		},
-		"spdx-expression-parse": {
+		"spdx-exceptions": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+		},
+		"spdx-expression-parse": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"requires": {
+				"spdx-exceptions": "^2.1.0",
+				"spdx-license-ids": "^3.0.0"
+			}
+		},
+		"spdx-license-ids": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+		},
+		"spdy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+			"integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.1.0",
+				"handle-thing": "^2.0.0",
+				"http-deceiver": "^1.2.7",
+				"select-hose": "^2.0.0",
+				"spdy-transport": "^3.0.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
+		"spdy-transport": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+			"dev": true,
 			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
+				"debug": "^4.1.0",
+				"detect-node": "^2.0.4",
+				"hpack.js": "^2.1.6",
+				"obuf": "^1.1.2",
+				"readable-stream": "^3.0.6",
+				"wbuf": "^1.7.3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
 			}
 		},
-		"spdx-license-ids": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-			"integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
-		},
 		"speed-measure-webpack-plugin": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz",
-			"integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
+			"integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
 			"dev": true,
 			"requires": {
 				"chalk": "^2.0.1"
@@ -18363,18 +15051,18 @@
 			}
 		},
 		"split2": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.0.tgz",
-			"integrity": "sha512-ePE1otNQVMnBRyqf3INbZvZwBPGsdBDThgrOWZ6z8zXGNVQNVCSEoOO9aBMTzDN1mXoNSZJ2kHSFH7AA5SPWww==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz",
+			"integrity": "sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==",
 			"dev": true,
 			"requires": {
 				"readable-stream": "^3.0.0"
 			},
 			"dependencies": {
 				"readable-stream": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-					"integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
 					"dev": true,
 					"requires": {
 						"inherits": "^2.0.3",
@@ -18426,6 +15114,15 @@
 				"safe-buffer": "^5.1.1"
 			}
 		},
+		"static-eval": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+			"integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+			"dev": true,
+			"requires": {
+				"escodegen": "^1.8.1"
+			}
+		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -18445,6 +15142,45 @@
 				}
 			}
 		},
+		"static-module": {
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/static-module/-/static-module-2.2.5.tgz",
+			"integrity": "sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==",
+			"dev": true,
+			"requires": {
+				"concat-stream": "~1.6.0",
+				"convert-source-map": "^1.5.1",
+				"duplexer2": "~0.1.4",
+				"escodegen": "~1.9.0",
+				"falafel": "^2.1.0",
+				"has": "^1.0.1",
+				"magic-string": "^0.22.4",
+				"merge-source-map": "1.0.4",
+				"object-inspect": "~1.4.0",
+				"quote-stream": "~1.0.2",
+				"readable-stream": "~2.3.3",
+				"shallow-copy": "~0.0.1",
+				"static-eval": "^2.0.0",
+				"through2": "~2.0.3"
+			},
+			"dependencies": {
+				"magic-string": {
+					"version": "0.22.5",
+					"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
+					"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
+					"dev": true,
+					"requires": {
+						"vlq": "^0.2.2"
+					}
+				},
+				"object-inspect": {
+					"version": "1.4.1",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.4.1.tgz",
+					"integrity": "sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==",
+					"dev": true
+				}
+			}
+		},
 		"stats-webpack-plugin": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz",
@@ -18457,8 +15193,7 @@
 		"statuses": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-			"dev": true
+			"integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
 		},
 		"stdout-stream": {
 			"version": "1.4.1",
@@ -18500,32 +15235,6 @@
 			"requires": {
 				"inherits": "~2.0.1",
 				"readable-stream": "^2.0.2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.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"
-					}
-				}
 			}
 		},
 		"stream-combiner": {
@@ -18594,40 +15303,44 @@
 				"readable-stream": "^2.3.6",
 				"to-arraybuffer": "^1.0.0",
 				"xtend": "^4.0.0"
+			}
+		},
+		"stream-shift": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+			"dev": true
+		},
+		"streamroller": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz",
+			"integrity": "sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==",
+			"dev": true,
+			"requires": {
+				"async": "^2.6.1",
+				"date-format": "^2.0.0",
+				"debug": "^3.1.0",
+				"fs-extra": "^7.0.0",
+				"lodash": "^4.17.10"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"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"
+						"ms": "^2.1.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"
-					}
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-			"dev": true
-		},
 		"string-template": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
@@ -18658,10 +15371,20 @@
 				}
 			}
 		},
+		"string.prototype.trim": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
+			"integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
+			"requires": {
+				"define-properties": "^1.1.2",
+				"es-abstract": "^1.5.0",
+				"function-bind": "^1.0.2"
+			}
+		},
 		"string_decoder": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
-			"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+			"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"
@@ -18678,8 +15401,7 @@
 		"strip-bom": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-			"dev": true
+			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
 		},
 		"strip-eof": {
 			"version": "1.0.0",
@@ -18701,13 +15423,21 @@
 			"dev": true
 		},
 		"stripe": {
-			"version": "6.23.0",
-			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.23.0.tgz",
-			"integrity": "sha512-o3rkli0B0O05Z6BwdiNpzCxQ16J1YmUlQB2JAjNC2dTwjg3koF74qhWUY0Rbb8Xisd/Wbgi8DODzNpD9JKG/FA==",
+			"version": "6.28.0",
+			"resolved": "https://registry.npmjs.org/stripe/-/stripe-6.28.0.tgz",
+			"integrity": "sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==",
 			"requires": {
 				"lodash.isplainobject": "^4.0.6",
-				"qs": "~6.5.1",
-				"safe-buffer": "^5.1.1"
+				"qs": "^6.6.0",
+				"safe-buffer": "^5.1.1",
+				"uuid": "^3.3.2"
+			},
+			"dependencies": {
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+				}
 			}
 		},
 		"style-loader": {
@@ -18720,10 +15450,60 @@
 				"schema-utils": "^1.0.0"
 			}
 		},
+		"stylus": {
+			"version": "0.54.5",
+			"resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+			"integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+			"dev": true,
+			"requires": {
+				"css-parse": "1.7.x",
+				"debug": "*",
+				"glob": "7.0.x",
+				"mkdirp": "0.5.x",
+				"sax": "0.5.x",
+				"source-map": "0.1.x"
+			},
+			"dependencies": {
+				"glob": {
+					"version": "7.0.6",
+					"resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+					"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+					"dev": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.2",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"dev": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
+		"stylus-loader": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+			"integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+			"dev": true,
+			"requires": {
+				"loader-utils": "^1.0.2",
+				"lodash.clonedeep": "^4.5.0",
+				"when": "~3.6.x"
+			}
+		},
 		"subscriptions-transport-ws": {
-			"version": "0.9.15",
-			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz",
-			"integrity": "sha512-f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ==",
+			"version": "0.9.16",
+			"resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz",
+			"integrity": "sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==",
 			"requires": {
 				"backo2": "^1.0.2",
 				"eventemitter3": "^3.1.0",
@@ -18742,6 +15522,90 @@
 				}
 			}
 		},
+		"superagent": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/superagent/-/superagent-4.1.0.tgz",
+			"integrity": "sha512-FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==",
+			"dev": true,
+			"requires": {
+				"component-emitter": "^1.2.0",
+				"cookiejar": "^2.1.2",
+				"debug": "^4.1.0",
+				"form-data": "^2.3.3",
+				"formidable": "^1.2.0",
+				"methods": "^1.1.1",
+				"mime": "^2.4.0",
+				"qs": "^6.6.0",
+				"readable-stream": "^3.0.6"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"qs": {
+					"version": "6.7.0",
+					"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+					"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+					"dev": true
+				},
+				"readable-stream": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
+		},
+		"superagent-proxy": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
+			"integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
+			"dev": true,
+			"requires": {
+				"debug": "^3.1.0",
+				"proxy-agent": "3"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				}
+			}
+		},
 		"supports-color": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -18752,11 +15616,11 @@
 			}
 		},
 		"swiper": {
-			"version": "4.4.6",
-			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.4.6.tgz",
-			"integrity": "sha512-F9NDtijQt+etiOe6JAEH+Cb+QKzwwFpi08FlOIQv8ALdoQ8tvAX/38a/28E5XxalAkChsHCutwkBCzDxDXTGiA==",
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.0.tgz",
+			"integrity": "sha512-jRCd/CGet9kaHwthHdd/sL/YU8CI157PWLyItnIcn/o/jP4haVky3zTF6f9F3JDpmQIw7jdWihISiYx0/oTHsg==",
 			"requires": {
-				"dom7": "^2.1.2",
+				"dom7": "^2.1.3",
 				"ssr-window": "^1.0.1"
 			}
 		},
@@ -18771,6 +15635,51 @@
 			"integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
 			"dev": true
 		},
+		"tape": {
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/tape/-/tape-4.10.1.tgz",
+			"integrity": "sha512-G0DywYV1jQeY3axeYnXUOt6ktnxS9OPJh97FGR3nrua8lhWi1zPflLxcAHavZ7Jf3qUfY7cxcVIVFa4mY2IY1w==",
+			"requires": {
+				"deep-equal": "~1.0.1",
+				"defined": "~1.0.0",
+				"for-each": "~0.3.3",
+				"function-bind": "~1.1.1",
+				"glob": "~7.1.3",
+				"has": "~1.0.3",
+				"inherits": "~2.0.3",
+				"minimist": "~1.2.0",
+				"object-inspect": "~1.6.0",
+				"resolve": "~1.10.0",
+				"resumer": "~0.0.0",
+				"string.prototype.trim": "~1.1.2",
+				"through": "~2.3.8"
+			},
+			"dependencies": {
+				"resolve": {
+					"version": "1.10.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+					"requires": {
+						"path-parse": "^1.0.6"
+					}
+				}
+			}
+		},
+		"tar": {
+			"version": "4.4.8",
+			"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+			"integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+			"dev": true,
+			"requires": {
+				"chownr": "^1.1.1",
+				"fs-minipass": "^1.2.5",
+				"minipass": "^2.3.4",
+				"minizlib": "^1.1.1",
+				"mkdirp": "^0.5.0",
+				"safe-buffer": "^5.1.2",
+				"yallist": "^3.0.2"
+			}
+		},
 		"term-size": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
@@ -18809,14 +15718,14 @@
 			}
 		},
 		"terser": {
-			"version": "3.16.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-3.16.0.tgz",
-			"integrity": "sha512-Ua8BhyibmsQBFXDZZ3Es7GASB2yFrQJr0jgAlZK1FBLbFarrHoCuMHPCro5MbX4jidcaFGiV+uTc3wxodmGjUg==",
+			"version": "3.17.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+			"integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
 			"dev": true,
 			"requires": {
-				"commander": "~2.17.1",
+				"commander": "^2.19.0",
 				"source-map": "~0.6.1",
-				"source-map-support": "~0.5.9"
+				"source-map-support": "~0.5.10"
 			},
 			"dependencies": {
 				"source-map": {
@@ -18827,853 +15736,993 @@
 				}
 			}
 		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-		},
-		"through2": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+		"terser-webpack-plugin": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
+			"integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
 			"dev": true,
 			"requires": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+				"cacache": "^11.0.2",
+				"find-cache-dir": "^2.0.0",
+				"schema-utils": "^1.0.0",
+				"serialize-javascript": "^1.4.0",
+				"source-map": "^0.6.1",
+				"terser": "^3.16.1",
+				"webpack-sources": "^1.1.0",
+				"worker-farm": "^1.5.2"
 			},
 			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+				"cacache": {
+					"version": "11.3.2",
+					"resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+					"integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
 					"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"
+						"bluebird": "^3.5.3",
+						"chownr": "^1.1.1",
+						"figgy-pudding": "^3.5.1",
+						"glob": "^7.1.3",
+						"graceful-fs": "^4.1.15",
+						"lru-cache": "^5.1.1",
+						"mississippi": "^3.0.0",
+						"mkdirp": "^0.5.1",
+						"move-concurrently": "^1.0.1",
+						"promise-inflight": "^1.0.1",
+						"rimraf": "^2.6.2",
+						"ssri": "^6.0.1",
+						"unique-filename": "^1.1.1",
+						"y18n": "^4.0.0"
 					}
 				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+				"find-cache-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+					"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"commondir": "^1.0.1",
+						"make-dir": "^2.0.0",
+						"pkg-dir": "^3.0.0"
 					}
-				}
-			}
-		},
-		"thunkify": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
-			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
-			"dev": true
-		},
-		"thunky": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
-			"dev": true
-		},
-		"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.10",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-			"dev": true,
-			"requires": {
-				"setimmediate": "^1.0.4"
-			}
-		},
-		"tmp": {
-			"version": "0.0.33",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "~1.0.2"
-			}
-		},
-		"to-array": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
-		},
-		"to-arraybuffer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-			"dev": true
-		},
-		"to-fast-properties": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-			"dev": true
-		},
-		"to-object-path": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-			"requires": {
-				"kind-of": "^3.0.2"
-			}
-		},
-		"to-regex": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
-			}
-		},
-		"to-regex-range": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
-			}
-		},
-		"tough-cookie": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-			"requires": {
-				"psl": "^1.1.24",
-				"punycode": "^1.4.1"
-			}
-		},
-		"traverse": {
-			"version": "0.6.6",
-			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
-			"dev": true
-		},
-		"tree-kill": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
-			"dev": true
-		},
-		"trim-newlines": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
-		},
-		"trim-right": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-			"dev": true
-		},
-		"true-case-path": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-			"requires": {
-				"glob": "^7.1.2"
-			}
-		},
-		"tryer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-			"dev": true
-		},
-		"ts-node": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.2.tgz",
-			"integrity": "sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==",
-			"dev": true,
-			"requires": {
-				"arg": "^4.1.0",
-				"diff": "^3.1.0",
-				"make-error": "^1.1.1",
-				"source-map-support": "^0.5.6",
-				"yn": "^3.0.0"
-			}
-		},
-		"tslib": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
-		},
-		"tslint": {
-			"version": "5.12.1",
-			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz",
-			"integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==",
-			"dev": true,
-			"requires": {
-				"babel-code-frame": "^6.22.0",
-				"builtin-modules": "^1.1.1",
-				"chalk": "^2.3.0",
-				"commander": "^2.12.1",
-				"diff": "^3.2.0",
-				"glob": "^7.1.1",
-				"js-yaml": "^3.7.0",
-				"minimatch": "^3.0.4",
-				"resolve": "^1.3.2",
-				"semver": "^5.3.0",
-				"tslib": "^1.8.0",
-				"tsutils": "^2.27.2"
-			},
-			"dependencies": {
-				"resolve": {
-					"version": "1.10.0",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-					"integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+				},
+				"lru-cache": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+					"dev": true,
+					"requires": {
+						"yallist": "^3.0.2"
+					}
+				},
+				"make-dir": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+					"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+					"dev": true,
+					"requires": {
+						"pify": "^4.0.1",
+						"semver": "^5.6.0"
+					}
+				},
+				"mississippi": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+					"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 					"dev": true,
 					"requires": {
-						"path-parse": "^1.0.6"
+						"concat-stream": "^1.5.0",
+						"duplexify": "^3.4.2",
+						"end-of-stream": "^1.1.0",
+						"flush-write-stream": "^1.0.0",
+						"from2": "^2.1.0",
+						"parallel-transform": "^1.1.0",
+						"pump": "^3.0.0",
+						"pumpify": "^1.3.3",
+						"stream-each": "^1.1.0",
+						"through2": "^2.0.0"
+					}
+				},
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
+				},
+				"pkg-dir": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+					"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+					"dev": true,
+					"requires": {
+						"find-up": "^3.0.0"
+					}
+				},
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+					"dev": true
+				},
+				"ssri": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+					"dev": true,
+					"requires": {
+						"figgy-pudding": "^3.5.1"
 					}
+				},
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				}
 			}
 		},
-		"tslint-eslint-rules": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
-			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
+		"through": {
+			"version": "2.3.8",
+			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+		},
+		"through2": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
 			"dev": true,
 			"requires": {
-				"doctrine": "^0.7.2",
-				"tslib": "^1.0.0",
-				"tsutils": "^1.4.0"
+				"readable-stream": "~2.3.6",
+				"xtend": "~4.0.1"
 			},
 			"dependencies": {
-				"tsutils": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
-					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
-					"dev": true
+				"readable-stream": {
+					"version": "2.3.6",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+					"dev": true,
+					"requires": {
+						"core-util-is": "~1.0.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"
+					}
 				}
 			}
 		},
-		"tsutils": {
-			"version": "2.29.0",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-			"dev": true,
-			"requires": {
-				"tslib": "^1.8.1"
-			}
-		},
-		"tty-browserify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+		"thunkify": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
+			"integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
 			"dev": true
 		},
-		"tunnel-agent": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-			"requires": {
-				"safe-buffer": "^5.0.1"
-			}
+		"thunky": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+			"integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+			"dev": true
 		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		"time-stamp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+			"dev": true
 		},
-		"type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-			"dev": true,
-			"requires": {
-				"prelude-ls": "~1.1.2"
-			}
+		"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
 		},
-		"type-is": {
-			"version": "1.6.16",
-			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+		"timers-browserify": {
+			"version": "2.0.10",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+			"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 			"dev": true,
 			"requires": {
-				"media-typer": "0.3.0",
-				"mime-types": "~2.1.18"
+				"setimmediate": "^1.0.4"
 			}
 		},
-		"typedarray": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-			"dev": true
-		},
-		"typescript": {
-			"version": "3.2.4",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
-			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
+		"tiny-inflate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.2.tgz",
+			"integrity": "sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=",
 			"dev": true
 		},
-		"uglify-js": {
-			"version": "3.4.9",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-			"integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+		"tiny-lr": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+			"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
 			"dev": true,
-			"optional": true,
 			"requires": {
-				"commander": "~2.17.1",
-				"source-map": "~0.6.1"
+				"body": "^5.1.0",
+				"debug": "^3.1.0",
+				"faye-websocket": "~0.10.0",
+				"livereload-js": "^2.3.0",
+				"object-assign": "^4.1.0",
+				"qs": "^6.4.0"
 			},
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
-					"optional": true
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
 				}
 			}
 		},
-		"uglify-to-browserify": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+		"tmp": {
+			"version": "0.0.33",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
 			"dev": true,
-			"optional": true
+			"requires": {
+				"os-tmpdir": "~1.0.2"
+			}
 		},
-		"ultron": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-			"dev": true
+		"to-array": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+			"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
 		},
-		"unc-path-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+		"to-arraybuffer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+			"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
 			"dev": true
 		},
-		"union-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
-			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^0.4.3"
-			},
-			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"set-value": {
-					"version": "0.4.3",
-					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-extendable": "^0.1.1",
-						"is-plain-object": "^2.0.1",
-						"to-object-path": "^0.3.0"
-					}
-				}
+		"to-fast-properties": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+			"integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+			"dev": true
+		},
+		"to-object-path": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+			"requires": {
+				"kind-of": "^3.0.2"
 			}
 		},
-		"unique-filename": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-			"dev": true,
+		"to-regex": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
 			"requires": {
-				"unique-slug": "^2.0.0"
+				"define-property": "^2.0.2",
+				"extend-shallow": "^3.0.2",
+				"regex-not": "^1.0.2",
+				"safe-regex": "^1.1.0"
 			}
 		},
-		"unique-slug": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
-			"dev": true,
+		"to-regex-range": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 			"requires": {
-				"imurmurhash": "^0.1.4"
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1"
 			}
 		},
-		"unique-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-			"dev": true,
+		"tough-cookie": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+			"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
 			"requires": {
-				"crypto-random-string": "^1.0.0"
+				"psl": "^1.1.24",
+				"punycode": "^1.4.1"
 			}
 		},
-		"universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+		"traverse": {
+			"version": "0.6.6",
+			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
+			"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
 			"dev": true
 		},
-		"unix-crypt-td-js": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
-			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+		"tree-kill": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+			"integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
 			"dev": true
 		},
-		"unpipe": {
+		"trim-newlines": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
+		},
+		"trim-right": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
 			"dev": true
 		},
-		"unset-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+		"true-case-path": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
 			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
-			},
-			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
-				}
+				"glob": "^7.1.2"
 			}
 		},
-		"untildify": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
-			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
-			"dev": true
-		},
-		"unzip-response": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+		"tryer": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+			"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
 			"dev": true
 		},
-		"upath": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
-		},
-		"uri-js": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+		"ts-invariant": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz",
+			"integrity": "sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==",
 			"requires": {
-				"punycode": "^2.1.0"
-			},
-			"dependencies": {
-				"punycode": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-				}
+				"tslib": "^1.9.3"
 			}
 		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		"ts-node": {
+			"version": "8.0.3",
+			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.3.tgz",
+			"integrity": "sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==",
+			"dev": true,
+			"requires": {
+				"arg": "^4.1.0",
+				"diff": "^3.1.0",
+				"make-error": "^1.1.1",
+				"source-map-support": "^0.5.6",
+				"yn": "^3.0.0"
+			}
 		},
-		"url": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+		"ts-simple-ast": {
+			"version": "12.4.0",
+			"resolved": "https://registry.npmjs.org/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz",
+			"integrity": "sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==",
 			"dev": true,
 			"requires": {
-				"punycode": "1.3.2",
-				"querystring": "0.2.0"
+				"@dsherret/to-absolute-glob": "^2.0.2",
+				"code-block-writer": "^7.2.0",
+				"fs-extra": "^6.0.1",
+				"glob-parent": "^3.1.0",
+				"globby": "^8.0.1",
+				"is-negated-glob": "^1.0.0",
+				"multimatch": "^2.1.0",
+				"object-assign": "^4.1.1",
+				"tslib": "^1.9.0",
+				"typescript": "2.9.1"
 			},
 			"dependencies": {
-				"punycode": {
-					"version": "1.3.2",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+				"dir-glob": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+					"dev": true,
+					"requires": {
+						"arrify": "^1.0.1",
+						"path-type": "^3.0.0"
+					}
+				},
+				"fs-extra": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+					"integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"jsonfile": "^4.0.0",
+						"universalify": "^0.1.0"
+					}
+				},
+				"globby": {
+					"version": "8.0.2",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+					"dev": true,
+					"requires": {
+						"array-union": "^1.0.1",
+						"dir-glob": "2.0.0",
+						"fast-glob": "^2.0.2",
+						"glob": "^7.1.2",
+						"ignore": "^3.3.5",
+						"pify": "^3.0.0",
+						"slash": "^1.0.0"
+					}
+				},
+				"typescript": {
+					"version": "2.9.1",
+					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz",
+					"integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==",
 					"dev": true
 				}
 			}
 		},
-		"url-parse": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
-			"dev": true,
-			"requires": {
-				"querystringify": "^2.0.0",
-				"requires-port": "^1.0.0"
-			}
+		"tslib": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+			"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
 		},
-		"url-parse-lax": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+		"tslint": {
+			"version": "5.14.0",
+			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.14.0.tgz",
+			"integrity": "sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==",
 			"dev": true,
 			"requires": {
-				"prepend-http": "^1.0.1"
+				"babel-code-frame": "^6.22.0",
+				"builtin-modules": "^1.1.1",
+				"chalk": "^2.3.0",
+				"commander": "^2.12.1",
+				"diff": "^3.2.0",
+				"glob": "^7.1.1",
+				"js-yaml": "^3.7.0",
+				"minimatch": "^3.0.4",
+				"mkdirp": "^0.5.1",
+				"resolve": "^1.3.2",
+				"semver": "^5.3.0",
+				"tslib": "^1.8.0",
+				"tsutils": "^2.29.0"
 			}
 		},
-		"use": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-		},
-		"useragent": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+		"tslint-eslint-rules": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz",
+			"integrity": "sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=",
 			"dev": true,
 			"requires": {
-				"lru-cache": "4.1.x",
-				"tmp": "0.0.x"
+				"doctrine": "^0.7.2",
+				"tslib": "^1.0.0",
+				"tsutils": "^1.4.0"
+			},
+			"dependencies": {
+				"tsutils": {
+					"version": "1.9.1",
+					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
+					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
+					"dev": true
+				}
 			}
 		},
-		"util": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+		"tsutils": {
+			"version": "2.29.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+			"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
 			"dev": true,
 			"requires": {
-				"inherits": "2.0.3"
+				"tslib": "^1.8.1"
 			}
 		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-		},
-		"utils-merge": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+		"tty-browserify": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+			"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
 			"dev": true
 		},
-		"uuid": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-		},
-		"validate-npm-package-license": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+		"tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
+				"safe-buffer": "^5.0.1"
 			}
 		},
-		"validate-npm-package-name": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+		"tweetnacl": {
+			"version": "0.14.5",
+			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+		},
+		"type-check": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
 			"dev": true,
 			"requires": {
-				"builtins": "^1.0.3"
+				"prelude-ls": "~1.1.2"
 			}
 		},
-		"vary": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-			"dev": true
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+		"type-is": {
+			"version": "1.6.16",
+			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+			"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
+				"media-typer": "0.3.0",
+				"mime-types": "~2.1.18"
 			}
 		},
-		"viz.js": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
-			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
-			"dev": true
-		},
-		"vlq": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+		"typedarray": {
+			"version": "0.0.6",
+			"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+			"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
 			"dev": true
 		},
-		"vm-browserify": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-			"dev": true,
-			"requires": {
-				"indexof": "0.0.1"
-			}
-		},
-		"void-elements": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-			"dev": true
+		"typescript": {
+			"version": "3.2.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
+			"integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="
 		},
-		"watchpack": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-			"dev": true,
-			"requires": {
-				"chokidar": "^2.0.2",
-				"graceful-fs": "^4.1.2",
-				"neo-async": "^2.5.0"
-			},
-			"dependencies": {
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+		"uglify-js": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.2.tgz",
+			"integrity": "sha512-imog1WIsi9Yb56yRt5TfYVxGmnWs3WSGU73ieSOlMVFwhJCA9W8fqFFMMj4kgDqiS/80LGdsYnWL7O9UcjEBlg==",
+			"dev": true,
+			"optional": true,
+			"requires": {
+				"commander": "~2.19.0",
+				"source-map": "~0.6.1"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.6.1",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
+					"optional": true
+				}
+			}
+		},
+		"uglify-to-browserify": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+			"dev": true,
+			"optional": true
+		},
+		"uglifyjs-webpack-plugin": {
+			"version": "0.4.6",
+			"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+			"integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+			"dev": true,
+			"requires": {
+				"source-map": "^0.5.6",
+				"uglify-js": "^2.8.29",
+				"webpack-sources": "^1.0.1"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+					"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+					"dev": true
 				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+				"cliui": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+					"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"center-align": "^0.1.1",
+						"right-align": "^0.1.1",
+						"wordwrap": "0.0.2"
 					}
 				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+				"uglify-js": {
+					"version": "2.8.29",
+					"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+					"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"source-map": "~0.5.1",
+						"uglify-to-browserify": "~1.0.0",
+						"yargs": "~3.10.0"
 					}
 				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+				"wordwrap": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+					"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+					"dev": true
+				},
+				"yargs": {
+					"version": "3.10.0",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+					"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"camelcase": "^1.0.2",
+						"cliui": "^2.1.0",
+						"decamelize": "^1.0.0",
+						"window-size": "0.1.0"
 					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+				}
+			}
+		},
+		"ultron": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+			"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+			"dev": true
+		},
+		"unc-path-regex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+			"dev": true
+		},
+		"underscore": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+			"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+		},
+		"unicode-properties": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.1.0.tgz",
+			"integrity": "sha1-epbu9J91aC6mnSMV7smsQ//fAME=",
+			"dev": true,
+			"requires": {
+				"brfs": "^1.4.0",
+				"unicode-trie": "^0.3.0"
+			}
+		},
+		"unicode-trie": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-0.3.1.tgz",
+			"integrity": "sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=",
+			"dev": true,
+			"requires": {
+				"pako": "^0.2.5",
+				"tiny-inflate": "^1.0.0"
+			},
+			"dependencies": {
+				"pako": {
+					"version": "0.2.9",
+					"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+					"integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
 					"dev": true
+				}
+			}
+		},
+		"union-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+			"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+			"requires": {
+				"arr-union": "^3.1.0",
+				"get-value": "^2.0.6",
+				"is-extendable": "^0.1.1",
+				"set-value": "^0.4.3"
+			},
+			"dependencies": {
+				"extend-shallow": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+					"requires": {
+						"is-extendable": "^0.1.0"
+					}
 				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
+				"set-value": {
+					"version": "0.4.3",
+					"resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+					"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
 					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
 						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
+						"is-extendable": "^0.1.1",
+						"is-plain-object": "^2.0.1",
+						"to-object-path": "^0.3.0"
+					}
+				}
+			}
+		},
+		"unique-filename": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+			"dev": true,
+			"requires": {
+				"unique-slug": "^2.0.0"
+			}
+		},
+		"unique-slug": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+			"integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+			"dev": true,
+			"requires": {
+				"imurmurhash": "^0.1.4"
+			}
+		},
+		"unique-string": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+			"dev": true,
+			"requires": {
+				"crypto-random-string": "^1.0.0"
+			}
+		},
+		"universalify": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+		},
+		"unix-crypt-td-js": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz",
+			"integrity": "sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=",
+			"dev": true
+		},
+		"unpipe": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+			"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+		},
+		"unset-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+			"requires": {
+				"has-value": "^0.3.1",
+				"isobject": "^3.0.0"
+			},
+			"dependencies": {
+				"has-value": {
+					"version": "0.3.1",
+					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+					"requires": {
+						"get-value": "^2.0.3",
+						"has-values": "^0.1.4",
+						"isobject": "^2.0.0"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "2.1.0",
+							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+							"requires": {
+								"isarray": "1.0.0"
+							}
+						}
 					}
 				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+				"has-values": {
+					"version": "0.1.4",
+					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+				}
+			}
+		},
+		"untildify": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
+			"dev": true
+		},
+		"unzip-response": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+			"dev": true
+		},
+		"upath": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
+		},
+		"update-notifier": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+			"integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+			"dev": true,
+			"requires": {
+				"boxen": "^1.2.1",
+				"chalk": "^2.0.1",
+				"configstore": "^3.0.0",
+				"import-lazy": "^2.1.0",
+				"is-ci": "^1.0.10",
+				"is-installed-globally": "^0.1.0",
+				"is-npm": "^1.0.0",
+				"latest-version": "^3.0.0",
+				"semver-diff": "^2.0.0",
+				"xdg-basedir": "^3.0.0"
+			},
+			"dependencies": {
+				"ci-info": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+					"integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+					"dev": true
+				},
+				"is-ci": {
+					"version": "1.2.1",
+					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+					"integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
 					"dev": true,
 					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
+						"ci-info": "^1.5.0"
 					}
 				}
 			}
 		},
+		"uri-js": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+			"requires": {
+				"punycode": "^2.1.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+				}
+			}
+		},
+		"urix": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+		},
+		"url": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+			"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+			"dev": true,
+			"requires": {
+				"punycode": "1.3.2",
+				"querystring": "0.2.0"
+			},
+			"dependencies": {
+				"punycode": {
+					"version": "1.3.2",
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+					"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+					"dev": true
+				}
+			}
+		},
+		"url-parse": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
+			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+			"dev": true,
+			"requires": {
+				"querystringify": "^2.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"url-parse-lax": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+			"dev": true,
+			"requires": {
+				"prepend-http": "^1.0.1"
+			}
+		},
+		"use": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+		},
+		"useragent": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+			"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+			"dev": true,
+			"requires": {
+				"lru-cache": "4.1.x",
+				"tmp": "0.0.x"
+			}
+		},
+		"util": {
+			"version": "0.11.1",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+			"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+			"dev": true,
+			"requires": {
+				"inherits": "2.0.3"
+			}
+		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+		},
+		"utils-merge": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+			"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+		},
+		"uuid": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+			"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+		},
+		"validate-npm-package-license": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+			"requires": {
+				"spdx-correct": "^3.0.0",
+				"spdx-expression-parse": "^3.0.0"
+			}
+		},
+		"validate-npm-package-name": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+			"integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+			"dev": true,
+			"requires": {
+				"builtins": "^1.0.3"
+			}
+		},
+		"validator": {
+			"version": "10.11.0",
+			"resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz",
+			"integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==",
+			"dev": true
+		},
+		"vary": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+			"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+		},
+		"verror": {
+			"version": "1.10.0",
+			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+			"requires": {
+				"assert-plus": "^1.0.0",
+				"core-util-is": "1.0.2",
+				"extsprintf": "^1.2.0"
+			}
+		},
+		"viz.js": {
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
+			"integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
+			"dev": true
+		},
+		"vlq": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+			"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+			"dev": true
+		},
+		"vm-browserify": {
+			"version": "0.0.4",
+			"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+			"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+			"dev": true,
+			"requires": {
+				"indexof": "0.0.1"
+			}
+		},
+		"void-elements": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+			"integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+			"dev": true
+		},
+		"watchpack": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+			"integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+			"dev": true,
+			"requires": {
+				"chokidar": "^2.0.2",
+				"graceful-fs": "^4.1.2",
+				"neo-async": "^2.5.0"
+			}
+		},
 		"wbuf": {
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
@@ -19767,13 +16816,58 @@
 				}
 			}
 		},
+		"webpack": {
+			"version": "4.29.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
+			"integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+			"dev": true,
+			"requires": {
+				"@webassemblyjs/ast": "1.7.11",
+				"@webassemblyjs/helper-module-context": "1.7.11",
+				"@webassemblyjs/wasm-edit": "1.7.11",
+				"@webassemblyjs/wasm-parser": "1.7.11",
+				"acorn": "^6.0.5",
+				"acorn-dynamic-import": "^4.0.0",
+				"ajv": "^6.1.0",
+				"ajv-keywords": "^3.1.0",
+				"chrome-trace-event": "^1.0.0",
+				"enhanced-resolve": "^4.1.0",
+				"eslint-scope": "^4.0.0",
+				"json-parse-better-errors": "^1.0.2",
+				"loader-runner": "^2.3.0",
+				"loader-utils": "^1.1.0",
+				"memory-fs": "~0.4.1",
+				"micromatch": "^3.1.8",
+				"mkdirp": "~0.5.0",
+				"neo-async": "^2.5.0",
+				"node-libs-browser": "^2.0.0",
+				"schema-utils": "^0.4.4",
+				"tapable": "^1.1.0",
+				"terser-webpack-plugin": "^1.1.0",
+				"watchpack": "^1.5.0",
+				"webpack-sources": "^1.3.0"
+			},
+			"dependencies": {
+				"schema-utils": {
+					"version": "0.4.7",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+					"integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+					"dev": true,
+					"requires": {
+						"ajv": "^6.1.0",
+						"ajv-keywords": "^3.1.0"
+					}
+				}
+			}
+		},
 		"webpack-bundle-analyzer": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz",
-			"integrity": "sha512-naLWiRfmtH4UJgtUktRTLw6FdoZJ2RvCR9ePbwM9aRMsS/KjFerkPZG9epEvXRAw5d5oPdrs9+3p+afNjxW8Xw==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz",
+			"integrity": "sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==",
 			"dev": true,
 			"requires": {
-				"acorn": "^5.7.3",
+				"acorn": "^6.0.7",
+				"acorn-walk": "^6.1.1",
 				"bfj": "^6.1.1",
 				"chalk": "^2.4.1",
 				"commander": "^2.18.0",
@@ -19785,93 +16879,176 @@
 				"mkdirp": "^0.5.1",
 				"opener": "^1.5.1",
 				"ws": "^6.0.0"
+			}
+		},
+		"webpack-core": {
+			"version": "0.6.9",
+			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+			"dev": true,
+			"requires": {
+				"source-list-map": "~0.1.7",
+				"source-map": "~0.4.1"
 			},
 			"dependencies": {
-				"acorn": {
-					"version": "5.7.3",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-					"integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-					"dev": true
-				},
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-					"dev": true
-				},
-				"commander": {
-					"version": "2.19.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-					"integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+				"source-list-map": {
+					"version": "0.1.8",
+					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
 					"dev": true
 				},
-				"express": {
-					"version": "4.16.4",
-					"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-					"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+				"source-map": {
+					"version": "0.4.4",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
 					"dev": true,
 					"requires": {
-						"accepts": "~1.3.5",
-						"array-flatten": "1.1.1",
-						"body-parser": "1.18.3",
-						"content-disposition": "0.5.2",
-						"content-type": "~1.0.4",
-						"cookie": "0.3.1",
-						"cookie-signature": "1.0.6",
-						"debug": "2.6.9",
-						"depd": "~1.1.2",
-						"encodeurl": "~1.0.2",
-						"escape-html": "~1.0.3",
-						"etag": "~1.8.1",
-						"finalhandler": "1.1.1",
-						"fresh": "0.5.2",
-						"merge-descriptors": "1.0.1",
-						"methods": "~1.1.2",
-						"on-finished": "~2.3.0",
-						"parseurl": "~1.3.2",
-						"path-to-regexp": "0.1.7",
-						"proxy-addr": "~2.0.4",
-						"qs": "6.5.2",
-						"range-parser": "~1.2.0",
-						"safe-buffer": "5.1.2",
-						"send": "0.16.2",
-						"serve-static": "1.13.2",
-						"setprototypeof": "1.1.0",
-						"statuses": "~1.4.0",
-						"type-is": "~1.6.16",
-						"utils-merge": "1.0.1",
-						"vary": "~1.1.2"
+						"amdefine": ">=0.0.4"
 					}
 				}
 			}
 		},
-		"webpack-core": {
-			"version": "0.6.9",
-			"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-			"integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+		"webpack-dev-middleware": {
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
+			"integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
+			"dev": true,
+			"requires": {
+				"memory-fs": "~0.4.1",
+				"mime": "^2.3.1",
+				"range-parser": "^1.0.3",
+				"webpack-log": "^2.0.0"
+			},
+			"dependencies": {
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"dev": true
+				}
+			}
+		},
+		"webpack-dev-server": {
+			"version": "3.1.14",
+			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
+			"integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
 			"dev": true,
 			"requires": {
-				"source-list-map": "~0.1.7",
-				"source-map": "~0.4.1"
+				"ansi-html": "0.0.7",
+				"bonjour": "^3.5.0",
+				"chokidar": "^2.0.0",
+				"compression": "^1.5.2",
+				"connect-history-api-fallback": "^1.3.0",
+				"debug": "^3.1.0",
+				"del": "^3.0.0",
+				"express": "^4.16.2",
+				"html-entities": "^1.2.0",
+				"http-proxy-middleware": "~0.18.0",
+				"import-local": "^2.0.0",
+				"internal-ip": "^3.0.1",
+				"ip": "^1.1.5",
+				"killable": "^1.0.0",
+				"loglevel": "^1.4.1",
+				"opn": "^5.1.0",
+				"portfinder": "^1.0.9",
+				"schema-utils": "^1.0.0",
+				"selfsigned": "^1.9.1",
+				"semver": "^5.6.0",
+				"serve-index": "^1.7.2",
+				"sockjs": "0.3.19",
+				"sockjs-client": "1.3.0",
+				"spdy": "^4.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^5.1.0",
+				"url": "^0.11.0",
+				"webpack-dev-middleware": "3.4.0",
+				"webpack-log": "^2.0.0",
+				"yargs": "12.0.2"
 			},
 			"dependencies": {
-				"source-list-map": {
-					"version": "0.1.8",
-					"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-					"integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+				"debug": {
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"dev": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"decamelize": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+					"integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+					"dev": true,
+					"requires": {
+						"xregexp": "4.0.0"
+					}
+				},
+				"mime": {
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
 					"dev": true
 				},
-				"source-map": {
-					"version": "0.4.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+				"ms": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 					"dev": true,
 					"requires": {
-						"amdefine": ">=0.0.4"
+						"has-flag": "^3.0.0"
+					}
+				},
+				"webpack-dev-middleware": {
+					"version": "3.4.0",
+					"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
+					"integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
+					"dev": true,
+					"requires": {
+						"memory-fs": "~0.4.1",
+						"mime": "^2.3.1",
+						"range-parser": "^1.0.3",
+						"webpack-log": "^2.0.0"
+					}
+				},
+				"yargs": {
+					"version": "12.0.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
+					"integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+					"dev": true,
+					"requires": {
+						"cliui": "^4.0.0",
+						"decamelize": "^2.0.0",
+						"find-up": "^3.0.0",
+						"get-caller-file": "^1.0.1",
+						"os-locale": "^3.0.0",
+						"require-directory": "^2.1.1",
+						"require-main-filename": "^1.0.1",
+						"set-blocking": "^2.0.0",
+						"string-width": "^2.0.0",
+						"which-module": "^2.0.0",
+						"y18n": "^3.2.1 || ^4.0.0",
+						"yargs-parser": "^10.1.0"
 					}
 				}
 			}
 		},
+		"webpack-log": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+			"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+			"dev": true,
+			"requires": {
+				"ansi-colors": "^3.0.0",
+				"uuid": "^3.3.2"
+			}
+		},
 		"webpack-merge": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
@@ -19899,6 +17076,15 @@
 				}
 			}
 		},
+		"webpack-subresource-integrity": {
+			"version": "1.1.0-rc.6",
+			"resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
+			"integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
+			"dev": true,
+			"requires": {
+				"webpack-core": "^0.6.8"
+			}
+		},
 		"websocket-driver": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
@@ -19930,9 +17116,10 @@
 			}
 		},
 		"which-module": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-			"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+			"dev": true
 		},
 		"wide-align": {
 			"version": "1.1.3",
@@ -19951,6 +17138,15 @@
 				"string-width": "^2.1.1"
 			}
 		},
+		"win-release": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
+			"integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
+			"dev": true,
+			"requires": {
+				"semver": "^5.0.1"
+			}
+		},
 		"window-or-global": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/window-or-global/-/window-or-global-1.0.1.tgz",
@@ -19969,36 +17165,6 @@
 			"dev": true,
 			"requires": {
 				"execa": "^0.10.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
-				},
-				"execa": {
-					"version": "0.10.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-					"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^6.0.0",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				}
 			}
 		},
 		"wordwrap": {
@@ -20007,6 +17173,15 @@
 			"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
 			"dev": true
 		},
+		"worker-farm": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+			"integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+			"dev": true,
+			"requires": {
+				"errno": "~0.1.7"
+			}
+		},
 		"wrap-ansi": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -20087,6 +17262,11 @@
 			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
 			"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
 		},
+		"xmldom": {
+			"version": "0.1.27",
+			"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+			"integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+		},
 		"xmlhttprequest-ssl": {
 			"version": "1.5.5",
 			"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
@@ -20116,143 +17296,93 @@
 			"dev": true
 		},
 		"yargs": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-			"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-			"requires": {
-				"camelcase": "^3.0.0",
-				"cliui": "^3.2.0",
-				"decamelize": "^1.1.1",
-				"get-caller-file": "^1.0.1",
-				"os-locale": "^1.4.0",
-				"read-pkg-up": "^1.0.1",
+			"version": "13.2.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
+			"integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+			"dev": true,
+			"requires": {
+				"cliui": "^4.0.0",
+				"find-up": "^3.0.0",
+				"get-caller-file": "^2.0.1",
+				"os-locale": "^3.1.0",
 				"require-directory": "^2.1.1",
-				"require-main-filename": "^1.0.1",
+				"require-main-filename": "^2.0.0",
 				"set-blocking": "^2.0.0",
-				"string-width": "^1.0.2",
-				"which-module": "^1.0.0",
-				"y18n": "^3.2.1",
-				"yargs-parser": "^5.0.0"
+				"string-width": "^3.0.0",
+				"which-module": "^2.0.0",
+				"y18n": "^4.0.0",
+				"yargs-parser": "^13.0.0"
 			},
 			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
-					}
-				},
-				"find-up": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+					"dev": true
 				},
-				"normalize-package-data": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
-					"integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"is-builtin-module": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					}
+				"camelcase": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
+					"integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
+					"dev": true
 				},
-				"os-locale": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-					"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-					"requires": {
-						"lcid": "^1.0.0"
-					}
+				"get-caller-file": {
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+					"dev": true
 				},
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"requires": {
-						"pinkie-promise": "^2.0.0"
-					}
+				"require-main-filename": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+					"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+					"dev": true
 				},
-				"path-type": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-					"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+				"string-width": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
+						"emoji-regex": "^7.0.1",
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^5.1.0"
 					}
 				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-				},
-				"read-pkg": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-					"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+				"strip-ansi": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+					"dev": true,
 					"requires": {
-						"load-json-file": "^1.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^1.0.0"
+						"ansi-regex": "^4.1.0"
 					}
 				},
-				"read-pkg-up": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-					"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-					"requires": {
-						"find-up": "^1.0.0",
-						"read-pkg": "^1.0.0"
-					}
+				"y18n": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+					"dev": true
 				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+				"yargs-parser": {
+					"version": "13.0.0",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
+					"integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
+					"dev": true,
 					"requires": {
-						"code-point-at": "^1.0.0",
-						"is-fullwidth-code-point": "^1.0.0",
-						"strip-ansi": "^3.0.0"
+						"camelcase": "^5.0.0",
+						"decamelize": "^1.2.0"
 					}
 				}
 			}
 		},
 		"yargs-parser": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-			"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+			"integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+			"dev": true,
 			"requires": {
-				"camelcase": "^3.0.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
-				}
+				"camelcase": "^4.1.0"
 			}
 		},
 		"yeast": {
@@ -20272,17 +17402,18 @@
 			"integrity": "sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g=="
 		},
 		"zen-observable-ts": {
-			"version": "0.8.15",
-			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz",
-			"integrity": "sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==",
+			"version": "0.8.18",
+			"resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz",
+			"integrity": "sha512-q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A==",
 			"requires": {
+				"tslib": "^1.9.3",
 				"zen-observable": "^0.8.0"
 			}
 		},
 		"zone.js": {
-			"version": "0.8.29",
-			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
-			"integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.9.0.tgz",
+			"integrity": "sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q=="
 		}
 	}
 }

From 9b83b3f1a2e817c454ae0eadc07ddeab7525bb7f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:20:48 +0000
Subject: [PATCH 059/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 0d790856b..9d277d74f 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -124,7 +124,7 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.6", "@angular-devkit/core@^7.3.6":
+"@angular-devkit/core@7.3.6":
   version "7.3.6"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.6.tgz#bc11ca571187f0f0ce9df012332794907e0b8133"
   integrity sha512-aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g==
@@ -135,6 +135,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"

From 820adddc522eec7038e4ca8b0045a0d76fc4228d Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:20:52 +0000
Subject: [PATCH 060/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 46 +++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index f6366e309..315f9b2b6 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -124,7 +124,7 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.6", "@angular-devkit/core@~7.3.6":
+"@angular-devkit/core@7.3.6":
   version "7.3.6"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.6.tgz#bc11ca571187f0f0ce9df012332794907e0b8133"
   integrity sha512-aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g==
@@ -135,6 +135,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@~7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
@@ -1226,7 +1237,7 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@*, abbrev@1:
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
@@ -1444,7 +1455,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
-ansi@*, ansi@^0.3.1:
+ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
 
@@ -1913,7 +1924,7 @@ backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
 
-balanced-match@*, balanced-match@^1.0.0:
+balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
@@ -2121,13 +2132,13 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@*, bplist-parser@^0.1.0:
+bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@*, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
@@ -2864,7 +2875,7 @@ compression@^1.5.2, compression@^1.6.0:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@*, concat-map@0.0.1:
+concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
@@ -3175,7 +3186,7 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
 
@@ -5762,14 +5773,14 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
-inflight@*, inflight@^1.0.4:
+inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -7301,7 +7312,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -7906,7 +7917,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -10945,7 +10956,7 @@ unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
-underscore@*, underscore@^1.8.3:
+underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
 
@@ -11008,11 +11019,6 @@ unix-crypt-td-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
 
-unorm@*:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
-  integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
-
 unorm@^1.3.3:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.4.1.tgz#364200d5f13646ca8bcd44490271335614792300"
@@ -11515,7 +11521,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@*, wrappy@1:
+wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
@@ -11594,7 +11600,7 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
 
-xmldom@*, xmldom@0.1.x:
+xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
 

From 1307c952044b1c401b27470d8677127bb2f86ad5 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 22:41:09 +0000
Subject: [PATCH 061/382] chore(package): update @ngtools/webpack to version
 7.3.7

---
 shop/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 976f104e3..91ed5833a 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -168,7 +168,7 @@
 		"@angular/compiler-cli": "^7.2.7",
 		"@angular/language-service": "^7.2.7",
 		"@compodoc/compodoc": "^1.1.9",
-		"@ngtools/webpack": "^7.3.4",
+		"@ngtools/webpack": "^7.3.7",
 		"@types/googlemaps": "^3.30.16",
 		"@types/hammerjs": "^2.0.36",
 		"@types/jasmine": "^3.3.9",

From ad1ad2fa399a175277b00d72eb8e96af2ead4a50 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:06 +0000
Subject: [PATCH 062/382] chore(package): update @types/stripe to version
 6.25.7

---
 admin/website-angular/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index ca9767cc5..2cee5ed07 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -148,8 +148,8 @@
 	},
 	"devDependencies": {
 		"conventional-changelog-cli": "^2.0.11",
-		"@angular-devkit/build-angular": "^0.13.7",
-		"@angular/cli": "^7.3.7",
+		"@angular-devkit/build-angular": "^0.13.1",
+		"@angular/cli": "^7.3.1",
 		"@angular/compiler-cli": "^7.2.4",
 		"@angular/language-service": "^7.2.4",
 		"@babel/core": "^7.2.2",
@@ -168,7 +168,7 @@
 		"@types/mongoose": "^5.3.16",
 		"@types/node": "^11.9.3",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.19.7",
+		"@types/stripe": "^6.25.7",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^12.0.9",
 		"babel-loader": "^8.0.5",

From 64a3ce74439a8cf305b8d774209b73e4611f0bf3 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:09 +0000
Subject: [PATCH 063/382] chore(package): update @types/stripe to version
 6.25.7

---
 backend/api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index 8aced6be4..681a546df 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -175,7 +175,7 @@
 		"@types/socket.io": "^2.1.2",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/source-map-support": "^0.5.0",
-		"@types/stripe": "^6.25.6",
+		"@types/stripe": "^6.25.7",
 		"@types/uuid": "^3.4.4",
 		"@types/ws": "^6.0.1",
 		"concurrently": "^4.1.0",

From 0c5731126602ccd335498f86be3ece18eb11822e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:12 +0000
Subject: [PATCH 064/382] chore(package): update @types/stripe to version
 6.25.7

---
 carrier/mobile-ionic/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index da820aaf2..4f4076a1a 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -59,7 +59,7 @@
 		"@angular/http": "^7.2.10",
 		"@angular/platform-browser": "^7.2.10",
 		"@angular/platform-browser-dynamic": "^7.2.10",
-		"@angular/pwa": "^0.13.7",
+		"@angular/pwa": "^0.13.6",
 		"@angular/router": "~7.2.10",
 		"@angular/service-worker": "^7.2.10",
 		"@ionic-native/barcode-scanner": "^5.3.0",
@@ -158,10 +158,10 @@
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
 		"@angular-devkit/architect": "~0.13.6",
-		"@angular-devkit/build-angular": "~0.13.7",
-		"@angular-devkit/core": "~7.3.7",
+		"@angular-devkit/build-angular": "~0.13.6",
+		"@angular-devkit/core": "~7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.7",
+		"@angular/cli": "^7.3.6",
 		"@angular/compiler": "^7.2.10",
 		"@angular/compiler-cli": "^7.2.10",
 		"@angular/language-service": "^7.2.10",
@@ -184,7 +184,7 @@
 		"@types/socket.io-client": "^1.4.32",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^12.0.10",
-		"@types/stripe": "^6.25.6",
+		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
 		"codelyzer": "^5.0.0-beta.1",
 		"cross-env": "^5.2.0",

From c6cb046c1e3a183a54797bf52f79c0b962e3666b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:16 +0000
Subject: [PATCH 065/382] chore(package): update @types/stripe to version
 6.25.7

---
 merchant/tablet-ionic/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index a2cdb4c09..2bf3fbe43 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -62,7 +62,7 @@
 		"@angular/http": "^7.2.9",
 		"@angular/platform-browser": "^7.2.9",
 		"@angular/platform-browser-dynamic": "^7.2.9",
-		"@angular/pwa": "^0.13.7",
+		"@angular/pwa": "^0.13.6",
 		"@angular/router": "^7.2.9",
 		"@angular/service-worker": "^7.2.9",
 		"@ionic-native/barcode-scanner": "^5.2.0",
@@ -170,11 +170,11 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "^0.13.7",
-		"@angular-devkit/build-angular": "^0.13.7",
-		"@angular-devkit/core": "^7.3.7",
+		"@angular-devkit/architect": "^0.13.6",
+		"@angular-devkit/build-angular": "^0.13.6",
+		"@angular-devkit/core": "^7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.7",
+		"@angular/cli": "^7.3.6",
 		"@angular/compiler": "^7.2.9",
 		"@angular/compiler-cli": "^7.2.9",
 		"@angular/language-service": "^7.2.9",
@@ -195,7 +195,7 @@
 		"@types/node": "^11.9.3",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.25.6",
+		"@types/stripe": "^6.25.7",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^12.0.9",
 		"codelyzer": "^5.0.0-beta.1",

From b8ba3a0f20aa3d11981b011bda67ca9083a764ed Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:19 +0000
Subject: [PATCH 066/382] chore(package): update @types/stripe to version
 6.25.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f0cbd116c..1be127acb 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
 		"@types/mongoose": "^5.3.15",
 		"@types/node": "^11.9.3",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.19.7",
+		"@types/stripe": "^6.25.7",
 		"@types/uuid": "^3.4.4",
 		"cloc": "^2.4.0",
 		"cross-env": "^5.2.0",

From 0dd2e33f084fc9a9d3071874abe73d9828e0e0b8 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:22 +0000
Subject: [PATCH 067/382] chore(package): update @types/stripe to version
 6.25.7

---
 shop/mobile-ionic/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 11574689a..ec051e1fc 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -59,7 +59,7 @@
 		"@angular/http": "^7.2.10",
 		"@angular/platform-browser": "^7.2.10",
 		"@angular/platform-browser-dynamic": "^7.2.10",
-		"@angular/pwa": "^0.13.7",
+		"@angular/pwa": "^0.13.6",
 		"@angular/router": "^7.2.10",
 		"@angular/service-worker": "^7.2.3",
 		"@ionic-native/barcode-scanner": "^5.3.0",
@@ -145,11 +145,11 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "~0.13.7",
-		"@angular-devkit/build-angular": "~0.13.7",
-		"@angular-devkit/core": "~7.3.7",
+		"@angular-devkit/architect": "~0.13.6",
+		"@angular-devkit/build-angular": "~0.13.6",
+		"@angular-devkit/core": "~7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.7",
+		"@angular/cli": "^7.3.6",
 		"@angular/compiler": "~7.2.10",
 		"@angular/compiler-cli": "~7.2.10",
 		"@angular/language-service": "^7.2.10",
@@ -172,7 +172,7 @@
 		"@types/socket.io-client": "^1.4.32",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^12.0.10",
-		"@types/stripe": "^6.25.6",
+		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
 		"codelyzer": "^5.0.0-beta.1",
 		"cross-env": "^5.2.0",

From c5db3670f641ca768daca0c6359189ec707c0712 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:25 +0000
Subject: [PATCH 068/382] chore(package): update @types/stripe to version
 6.25.7

---
 shop/website-angular/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 98611b0f3..80d619f14 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -161,14 +161,14 @@
 		"zone.js": "^0.8.29"
 	},
 	"devDependencies": {
-		"@angular-devkit/build-angular": "^0.13.7",
-		"@angular-devkit/build-optimizer": "^0.13.7",
+		"@angular-devkit/build-angular": "^0.13.4",
+		"@angular-devkit/build-optimizer": "^0.13.4",
 		"@angular-extensions/testing-library": "^3.1.0",
-		"@angular/cli": "^7.3.7",
+		"@angular/cli": "^7.3.4",
 		"@angular/compiler-cli": "^7.2.7",
 		"@angular/language-service": "^7.2.7",
 		"@compodoc/compodoc": "^1.1.9",
-		"@ngtools/webpack": "^7.3.7",
+		"@ngtools/webpack": "^7.3.4",
 		"@types/googlemaps": "^3.30.16",
 		"@types/hammerjs": "^2.0.36",
 		"@types/jasmine": "^3.3.9",
@@ -176,7 +176,7 @@
 		"@types/node": "^11.9.3",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/source-map": "^0.5.7",
-		"@types/stripe": "^6.19.8",
+		"@types/stripe": "^6.25.7",
 		"@types/stripe-node": "^4.7.1",
 		"@types/uglify-js": "^3.0.4",
 		"@types/uuid": "^3.4.4",

From 374f0667f3a8fc69c680d23b02e2d0db58dea302 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:29 +0000
Subject: [PATCH 069/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json


From 6d5608020e53443de6792b73d929dea410035d94 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:33 +0000
Subject: [PATCH 070/382] chore(package): update lockfile yarn.lock

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 06a092620..8c79c9cc2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1091,10 +1091,10 @@
   version "1.4.32"
   resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14"
 
-"@types/stripe@^6.19.7":
-  version "6.19.7"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.19.7.tgz#a04c50d519ec50d820f72d12e31351f845c583fe"
-  integrity sha512-e4it4GNSZ+lrQth+2/7TDw0FVWmLcM4t/m+bDF8DhEwD17JmSKWnUNvPYbcafoeai4rI1i4RKmTeHuzB3IquRQ==
+"@types/stripe@^6.25.7":
+  version "6.25.7"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
+  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
   dependencies:
     "@types/node" "*"
 

From 5f0afe0d3280a0fa4587c18250b8798e39407864 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:37 +0000
Subject: [PATCH 071/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 120 +++++++++++---------------------
 1 file changed, 42 insertions(+), 78 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 7b7a9ecc4..01e024cce 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -14,7 +14,7 @@
   resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
   integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
 
-"@angular-devkit/architect@0.13.6":
+"@angular-devkit/architect@0.13.6", "@angular-devkit/architect@^0.13.6":
   version "0.13.6"
   resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.6.tgz#7758ab9f288cfd4f64d8b88b0700bac5c4961d06"
   integrity sha512-Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw==
@@ -22,24 +22,16 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
-"@angular-devkit/architect@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
-  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    rxjs "6.3.3"
-
-"@angular-devkit/build-angular@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
-  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
+"@angular-devkit/build-angular@^0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.6.tgz#7050a0367bb7646961d0bdc36aa083a6f3029dea"
+  integrity sha512-gdP856Z5tuQ69mJla5VPKm/uR86dcrPWYW41Jyu5oIhL2GAQ4JtDEuL2+ppwQO8i8hsXGIAbulGAbrlvU5I8OA==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/build-optimizer" "0.13.7"
-    "@angular-devkit/build-webpack" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@ngtools/webpack" "7.3.7"
+    "@angular-devkit/architect" "0.13.6"
+    "@angular-devkit/build-optimizer" "0.13.6"
+    "@angular-devkit/build-webpack" "0.13.6"
+    "@angular-devkit/core" "7.3.6"
+    "@ngtools/webpack" "7.3.6"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -66,7 +58,7 @@
     semver "5.6.0"
     source-map-loader "0.2.4"
     source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.1"
+    speed-measure-webpack-plugin "1.3.0"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
@@ -91,23 +83,23 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
-  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
+"@angular-devkit/build-optimizer@0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.6.tgz#846b6d0042de0102c6420ff86380ed961cc71956"
+  integrity sha512-/EOO0wxw7FIKfove4Fv/aKiKgvH0kFhRT2GOe3pW0yV2y2e1dfQdo2AqdGCfJ4rSbwsfWSGTUUFITc+9jgXFZw==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
-  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
+"@angular-devkit/build-webpack@0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.6.tgz#c88691aa0259d124e2bdb78a492c44aa44ae148f"
+  integrity sha512-lQmYrhOHeBn/r7uw+FfpJUq9puApYe72+mrIfg/UtLwSEYt58n5d156jnuMcfWnCyhYUgYqLTaOUfSM0RV7akw==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/architect" "0.13.6"
+    "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
 "@angular-devkit/core@0.9.0-beta.3":
@@ -132,7 +124,7 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.6":
+"@angular-devkit/core@7.3.6", "@angular-devkit/core@^7.3.6":
   version "7.3.6"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.6.tgz#bc11ca571187f0f0ce9df012332794907e0b8133"
   integrity sha512-aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g==
@@ -143,17 +135,6 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
-  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
-  dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
@@ -178,14 +159,6 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
-"@angular-devkit/schematics@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
-  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    rxjs "6.3.3"
-
 "@angular/animations@^7.2.9":
   version "7.2.9"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.9.tgz#1bfacb76dfd80656e28edb4efdfd3154e56f1c29"
@@ -283,14 +256,14 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
-  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
+"@angular/pwa@^0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.6.tgz#0aee0960e3110782744076f68c3154cf6cd17b8d"
+  integrity sha512-2bo8oMliGWr1oaI2UM+54ru9zMcwWcDxJNxD9JE6fA/ar60kZdp/ojmoI5MCME2kqSpy26eZdYYczhB51BQz3A==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
+    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/schematics" "7.3.6"
+    "@schematics/angular" "7.3.6"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
@@ -789,12 +762,12 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
-  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
+"@ngtools/webpack@7.3.6":
+  version "7.3.6"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.6.tgz#3f90c60f7c1742fa4a557f90def8fe742304f4c5"
+  integrity sha512-gDMHybwe8B+1BSvtwM5z4qAkUnZ9b4PTyIVWWECgTLDp2x3WhJi2rMk2X8HTkpbZ52pLPue5GL1sfqlZIOcX7Q==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.6"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -921,15 +894,6 @@
     "@angular-devkit/schematics" "7.3.6"
     typescript "3.2.4"
 
-"@schematics/angular@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
-  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    typescript "3.2.4"
-
 "@schematics/angular@^7.0.3":
   version "7.3.4"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.4.tgz#ba36efdd5474b793eb693d47772f998e6bd6043e"
@@ -1060,10 +1024,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stripe@^6.25.6":
-  version "6.25.6"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.6.tgz#9a5108e39976b88803d8bdcfd0d9ee1c480490e3"
-  integrity sha512-4P3VDrUmuG4MjMYw326Cfz2Q+lI5uVVoTDBFBtElQWF/aExbCJXZTHlYovZG502+UAowVuNVo5IuFHxELhambQ==
+"@types/stripe@^6.25.7":
+  version "6.25.7"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
+  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
   dependencies:
     "@types/node" "*"
 
@@ -9852,10 +9816,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
-  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
+speed-measure-webpack-plugin@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
+  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
   dependencies:
     chalk "^2.0.1"
 

From 6d626a8020d894432e5152d8f78dbf0edae73afc Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:41 +0000
Subject: [PATCH 072/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 118 ++++++++++++---------------------
 1 file changed, 41 insertions(+), 77 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 73b58c800..1db9d3b92 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -22,24 +22,16 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
-"@angular-devkit/architect@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
-  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    rxjs "6.3.3"
-
-"@angular-devkit/build-angular@~0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
-  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
+"@angular-devkit/build-angular@~0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.6.tgz#7050a0367bb7646961d0bdc36aa083a6f3029dea"
+  integrity sha512-gdP856Z5tuQ69mJla5VPKm/uR86dcrPWYW41Jyu5oIhL2GAQ4JtDEuL2+ppwQO8i8hsXGIAbulGAbrlvU5I8OA==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/build-optimizer" "0.13.7"
-    "@angular-devkit/build-webpack" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@ngtools/webpack" "7.3.7"
+    "@angular-devkit/architect" "0.13.6"
+    "@angular-devkit/build-optimizer" "0.13.6"
+    "@angular-devkit/build-webpack" "0.13.6"
+    "@angular-devkit/core" "7.3.6"
+    "@ngtools/webpack" "7.3.6"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -66,7 +58,7 @@
     semver "5.6.0"
     source-map-loader "0.2.4"
     source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.1"
+    speed-measure-webpack-plugin "1.3.0"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
@@ -91,23 +83,23 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
-  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
+"@angular-devkit/build-optimizer@0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.6.tgz#846b6d0042de0102c6420ff86380ed961cc71956"
+  integrity sha512-/EOO0wxw7FIKfove4Fv/aKiKgvH0kFhRT2GOe3pW0yV2y2e1dfQdo2AqdGCfJ4rSbwsfWSGTUUFITc+9jgXFZw==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
-  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
+"@angular-devkit/build-webpack@0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.6.tgz#c88691aa0259d124e2bdb78a492c44aa44ae148f"
+  integrity sha512-lQmYrhOHeBn/r7uw+FfpJUq9puApYe72+mrIfg/UtLwSEYt58n5d156jnuMcfWnCyhYUgYqLTaOUfSM0RV7akw==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/architect" "0.13.6"
+    "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
 "@angular-devkit/core@0.9.0-beta.3":
@@ -132,7 +124,7 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.6":
+"@angular-devkit/core@7.3.6", "@angular-devkit/core@~7.3.6":
   version "7.3.6"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.6.tgz#bc11ca571187f0f0ce9df012332794907e0b8133"
   integrity sha512-aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g==
@@ -143,17 +135,6 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
-  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
-  dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
@@ -178,14 +159,6 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
-"@angular-devkit/schematics@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
-  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    rxjs "6.3.3"
-
 "@angular/animations@^7.2.10":
   version "7.2.10"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.10.tgz#a651c9526bc0c2860eca424d73d7cd87fee5793b"
@@ -283,14 +256,14 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
-  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
+"@angular/pwa@^0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.6.tgz#0aee0960e3110782744076f68c3154cf6cd17b8d"
+  integrity sha512-2bo8oMliGWr1oaI2UM+54ru9zMcwWcDxJNxD9JE6fA/ar60kZdp/ojmoI5MCME2kqSpy26eZdYYczhB51BQz3A==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
+    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/schematics" "7.3.6"
+    "@schematics/angular" "7.3.6"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
@@ -850,12 +823,12 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
-  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
+"@ngtools/webpack@7.3.6":
+  version "7.3.6"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.6.tgz#3f90c60f7c1742fa4a557f90def8fe742304f4c5"
+  integrity sha512-gDMHybwe8B+1BSvtwM5z4qAkUnZ9b4PTyIVWWECgTLDp2x3WhJi2rMk2X8HTkpbZ52pLPue5GL1sfqlZIOcX7Q==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.6"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -904,15 +877,6 @@
     "@angular-devkit/schematics" "7.3.6"
     typescript "3.2.4"
 
-"@schematics/angular@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
-  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    typescript "3.2.4"
-
 "@schematics/angular@^7.0.3":
   version "7.3.3"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.3.tgz#aaa63331365bf67b1b908cc18cfc5d7097ec8377"
@@ -1058,10 +1022,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stripe@^6.25.6":
-  version "6.25.6"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.6.tgz#9a5108e39976b88803d8bdcfd0d9ee1c480490e3"
-  integrity sha512-4P3VDrUmuG4MjMYw326Cfz2Q+lI5uVVoTDBFBtElQWF/aExbCJXZTHlYovZG502+UAowVuNVo5IuFHxELhambQ==
+"@types/stripe@^6.25.7":
+  version "6.25.7"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
+  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
   dependencies:
     "@types/node" "*"
 
@@ -10050,10 +10014,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
-  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
+speed-measure-webpack-plugin@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
+  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
   dependencies:
     chalk "^2.0.1"
 

From 0b5d08882b017ea2876f4461936d0c00fefd641b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:10:45 +0000
Subject: [PATCH 073/382] chore(package): update lockfile backend/api/yarn.lock

---
 backend/api/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 067dc92b3..a76a233f9 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -1191,10 +1191,10 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
-"@types/stripe@^6.25.6":
-  version "6.25.6"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.6.tgz#9a5108e39976b88803d8bdcfd0d9ee1c480490e3"
-  integrity sha512-4P3VDrUmuG4MjMYw326Cfz2Q+lI5uVVoTDBFBtElQWF/aExbCJXZTHlYovZG502+UAowVuNVo5IuFHxELhambQ==
+"@types/stripe@^6.25.7":
+  version "6.25.7"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
+  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
   dependencies:
     "@types/node" "*"
 

From e7d927bf113be17a206a6aa51d3d96d88ed98f6b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:13:25 +0000
Subject: [PATCH 074/382] chore(package): update kafka-node to version 4.0.4

---
 backend/api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index 8aced6be4..c3d0f380e 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -92,7 +92,7 @@
 		"inversify": "^5.0.1",
 		"ipstack": "^0.1.1",
 		"jsonwebtoken": "^8.5.1",
-		"kafka-node": "^4.0.2",
+		"kafka-node": "^4.0.4",
 		"lodash": "^4.17.11",
 		"method-override": "^3.0.0",
 		"mkdirp": "^0.5.1",

From 63b085aabfee6428ed8d1c4d2fb9957856988129 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:13:29 +0000
Subject: [PATCH 075/382] chore(package): update lockfile backend/api/yarn.lock

---
 backend/api/yarn.lock | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 067dc92b3..60d7eb8e7 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -1890,7 +1890,7 @@ async@2.6.1, async@^2.4.1, async@^2.5.0, async@^2.6, async@^2.6.0, async@^2.6.1:
   dependencies:
     lodash "^4.17.10"
 
-async@~2.6.1:
+async@^2.6.2, async@~2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
   integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
@@ -2087,7 +2087,7 @@ bindings@^1.3.1:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bl@^1.0.0, bl@^1.2.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==
@@ -2095,6 +2095,14 @@ bl@^1.0.0, bl@^1.2.0:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
 
+bl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.0.tgz#e1a574cdf528e4053019bb800b041c0ac88da493"
+  integrity sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==
+  dependencies:
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
+
 blessed@^0.1.81:
   version "0.1.81"
   resolved "https://registry.yarnpkg.com/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129"
@@ -6356,14 +6364,14 @@ jws@^3.2.2:
     jwa "^1.4.1"
     safe-buffer "^5.0.1"
 
-kafka-node@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/kafka-node/-/kafka-node-4.0.2.tgz#cd695f5ac1cf578472f693bef291eb98978548cc"
-  integrity sha512-unMe1AckwhuuWHFWFfHJH7c3kSzfkNmvHBlOq4ZXBJUi/NYXcVsaYP6LqzhFkM7doB7lTwF9W5S9w9INk6wmAQ==
+kafka-node@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/kafka-node/-/kafka-node-4.0.4.tgz#5f775737bcbda86c4e7bcde7d5c4409d555ee11e"
+  integrity sha512-wS9tvnfdbqXKLNhMrXgm1OP1BtmmK7h+rrag2zxh99K9Yp3a1xBZqr2+RZNVigSBjIcyT5kLzrZkEatFNGVtEw==
   dependencies:
-    async "^2.5.0"
+    async "^2.6.2"
     binary "~0.3.0"
-    bl "^1.2.0"
+    bl "^2.2.0"
     buffer-crc32 "~0.2.5"
     buffermaker "~1.2.0"
     debug "^2.1.3"

From b1f95ab8c73efd8af55bd771a78612c4d08bf0f1 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:40:44 +0000
Subject: [PATCH 076/382] chore(package): update npm-check-updates to version
 3.1.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f0cbd116c..19b3052b9 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
 		"lerna-changelog": "^0.8.2",
 		"lighthouse": "^4.1.0",
 		"lint-staged": "^8.1.3",
-		"npm-check-updates": "^2.15.0",
+		"npm-check-updates": "^3.1.3",
 		"prettier": "^1.16.4",
 		"prettier-tslint": "^0.4.2",
 		"pretty-quick": "^1.10.0",

From cfb27146e4d5897fbb2d1379b4095c4f75e2b0c6 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:40:48 +0000
Subject: [PATCH 077/382] chore(package): update lockfile yarn.lock

---
 yarn.lock | 882 ++++++++++++++++++------------------------------------
 1 file changed, 286 insertions(+), 596 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 06a092620..91c52722b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -971,6 +971,18 @@
   dependencies:
     any-observable "^0.3.0"
 
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
+
 "@types/async@^2.4.1":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/async/-/async-2.4.1.tgz#43c3b2c60eab41c25ca0009c07ca7d619d943119"
@@ -1123,10 +1135,6 @@ abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
-abbrev@~1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
-
 accepts@~1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
@@ -1244,10 +1252,6 @@ aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
 
-aproba@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.0.4.tgz#2713680775e7614c8ba186c065d4e2e52d1072c0"
-
 archy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
@@ -1294,13 +1298,6 @@ array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
 
-array-index@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9"
-  dependencies:
-    debug "^2.2.0"
-    es6-symbol "^3.0.2"
-
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
@@ -1331,7 +1328,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
-asap@^2.0.0, asap@~2.0.5:
+asap@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
@@ -1345,10 +1342,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
 
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -1379,15 +1372,11 @@ atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
 
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@^1.2.1, aws4@^1.8.0:
+aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
@@ -1486,12 +1475,6 @@ binary-extensions@^1.0.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
 
-bl@~1.1.2:
-  version "1.1.2"
-  resolved "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
-  dependencies:
-    readable-stream "~2.0.5"
-
 blob@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
@@ -1502,7 +1485,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.3.0, bluebird@^3.4.3, bluebird@^3.5.0, bluebird@^3.5.3:
+bluebird@^3.3.0, bluebird@^3.5.0, bluebird@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
 
@@ -1525,12 +1508,6 @@ body-parser@^1.16.1:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
-boom@2.x.x:
-  version "2.10.1"
-  resolved "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
 boxen@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
@@ -1595,10 +1572,6 @@ buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
 
-buffer-shims@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
 buffer@^5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
@@ -1611,10 +1584,6 @@ builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
-builtins@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-0.0.7.tgz#355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"
-
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
@@ -1689,6 +1658,19 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+cacheable-request@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.0.0.tgz#4a1727414e02ac4af82560c4da1b61daa3fa2b63"
+  integrity sha512-2N7AmszH/WPPpl5Z3XMw1HAP+8d+xugnKQAeKvxFZ/04dbT/CAznqwbl+7eSr3HkwdepNwtb2yx3CAMQWvG01Q==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^4.0.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^1.0.1"
+    normalize-url "^3.1.0"
+    responselike "^1.0.2"
+
 call-limit@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.0.tgz#6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"
@@ -1759,10 +1741,6 @@ capture-stack-trace@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
 
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1801,7 +1779,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.3.2, chalk@^2.4.0:
+chalk@^2.3.2, chalk@^2.4.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1841,7 +1819,7 @@ chokidar@^2.0.3:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chownr@^1.0.1, chownr@~1.0.1:
+chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
 
@@ -1979,6 +1957,13 @@ cloc@^2.4.0:
   resolved "https://registry.yarnpkg.com/cloc/-/cloc-2.4.0.tgz#9711bf45177a681e38acaf2f9194067bfda7475c"
   integrity sha512-uDJwmipIYX1rjkaPYaYhvwvq7YBDgKrX1gdDRLGAH3374u/ZRC+wQBpSL+zhEWoXfxW26rDGhYkfX4YTXphK5Q==
 
+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"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -2063,12 +2048,6 @@ combined-stream@1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  dependencies:
-    delayed-stream "~1.0.0"
-
 commander@^2.12.1, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -2077,6 +2056,11 @@ commander@^2.14.1, commander@^2.9.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
 
+commander@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
 compare-func@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
@@ -2104,7 +2088,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0:
+concat-stream@^1.5.0, concat-stream@^1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -2135,7 +2119,7 @@ config-chain@^1.1.11:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-config-chain@^1.1.12, config-chain@~1.1.11:
+config-chain@^1.1.12:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
   dependencies:
@@ -2440,12 +2424,6 @@ crypt@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
 
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -2503,12 +2481,6 @@ cz-conventional-changelog@^2.1.0:
     right-pad "^1.0.1"
     word-wrap "^1.0.3"
 
-d@1:
-  version "1.0.0"
-  resolved "http://registry.npmjs.org/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  dependencies:
-    es5-ext "^0.10.9"
-
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
@@ -2582,6 +2554,13 @@ decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
 
+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"
+
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -2607,6 +2586,11 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+defer-to-connect@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.0.2.tgz#4bae758a314b034ae33902b5aac25a8dd6a8633e"
+  integrity sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==
+
 define-properties@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -2673,7 +2657,7 @@ detect-newline@^2.1.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
   integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
-dezalgo@^1.0.0, dezalgo@^1.0.1, dezalgo@~1.0.3:
+dezalgo@^1.0.0, dezalgo@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
   dependencies:
@@ -2865,22 +2849,6 @@ es-to-primitive@^1.1.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.1"
 
-es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.46"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
-  dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.1"
-    next-tick "1"
-
-es6-iterator@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
 es6-promise@^4.0.3:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
@@ -2891,13 +2859,6 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -3019,7 +2980,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.2:
+extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
@@ -3064,9 +3025,10 @@ fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
 
-fast-diff@^1.0.1:
+fast-diff@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
 fast-glob@^2.0.2:
   version "2.2.2"
@@ -3146,7 +3108,13 @@ find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
 
-find-up@1.1.2, find-up@^1.0.0:
+find-up@3.0.0, find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  dependencies:
+    locate-path "^3.0.0"
+
+find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
   dependencies:
@@ -3159,12 +3127,6 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  dependencies:
-    locate-path "^3.0.0"
-
 flatted@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
@@ -3195,14 +3157,6 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~2.0.0:
-  version "2.0.0"
-  resolved "http://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.11"
-
 form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
@@ -3252,7 +3206,7 @@ fs-minipass@^1.2.5:
   dependencies:
     minipass "^2.2.1"
 
-fs-vacuum@^1.2.10, fs-vacuum@~1.2.10, fs-vacuum@~1.2.9:
+fs-vacuum@^1.2.10, fs-vacuum@~1.2.10:
   version "1.2.10"
   resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"
   integrity sha1-t2Kb7AekAxolSP35n17PHMizHjY=
@@ -3261,7 +3215,7 @@ fs-vacuum@^1.2.10, fs-vacuum@~1.2.10, fs-vacuum@~1.2.9:
     path-is-inside "^1.0.1"
     rimraf "^2.5.2"
 
-fs-write-stream-atomic@^1.0.8, fs-write-stream-atomic@~1.0.10, fs-write-stream-atomic@~1.0.8:
+fs-write-stream-atomic@^1.0.8, fs-write-stream-atomic@~1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
   dependencies:
@@ -3281,22 +3235,7 @@ fsevents@^1.2.2:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
-fstream-ignore@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream-npm@~1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/fstream-npm/-/fstream-npm-1.2.1.tgz#08c4a452f789dcbac4c89a4563c902b2c862fd5b"
-  dependencies:
-    fstream-ignore "^1.0.0"
-    inherits "2"
-
-fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
+fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
   dependencies:
@@ -3317,21 +3256,7 @@ g-status@^2.0.2:
     matcher "^1.0.0"
     simple-git "^1.85.0"
 
-gauge@~2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.6.0.tgz#d35301ad18e96902b4751dcbbe40f4218b942a46"
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-color "^0.1.7"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-gauge@~2.7.1, gauge@~2.7.3:
+gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
   dependencies:
@@ -3344,18 +3269,6 @@ gauge@~2.7.1, gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-generate-function@^2.0.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  dependencies:
-    is-property "^1.0.2"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
 genfun@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
@@ -3397,7 +3310,14 @@ get-port@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
 
-get-stdin@5.0.1, get-stdin@^5.0.1:
+get-proxy@^2.1.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-stdin@5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
   integrity sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=
@@ -3506,7 +3426,7 @@ glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.0:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   dependencies:
@@ -3565,11 +3485,28 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+  dependencies:
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
+    url-parse-lax "^3.0.0"
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-graceful-fs@^4.1.15, graceful-fs@^4.1.3, graceful-fs@~4.1.9:
+graceful-fs@^4.1.15, graceful-fs@^4.1.3:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -3598,15 +3535,6 @@ har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
 
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
@@ -3626,10 +3554,6 @@ has-binary2@~1.0.2:
   dependencies:
     isarray "2.0.1"
 
-has-color@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
-
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
@@ -3680,35 +3604,23 @@ has@^1.0.1:
   dependencies:
     function-bind "^1.1.1"
 
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
 highlight.js@^9.6.0:
   version "9.12.0"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
 
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-hosted-git-info@^2.1.4, hosted-git-info@^2.1.5, hosted-git-info@^2.4.2, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
+hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
 
-hosted-git-info@~2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.1.5.tgz#0ba81d90da2e25ab34a332e6ec77936e1598118b"
-
 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"
 
+http-cache-semantics@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz#495704773277eeef6e43f9ab2c2c7d259dda25c5"
+  integrity sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==
+
 http-errors@1.6.3, http-errors@~1.6.3:
   version "1.6.3"
   resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
@@ -3737,14 +3649,6 @@ http-proxy@^1.13.0:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -3799,7 +3703,7 @@ ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
   integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
-iferr@^0.1.5, iferr@~0.1.5:
+iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
 
@@ -3873,7 +3777,7 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
-inflight@^1.0.4, inflight@~1.0.5, inflight@~1.0.6:
+inflight@^1.0.4, inflight@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
@@ -3884,7 +3788,7 @@ inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, i
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0, ini@~1.3.4:
+ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
@@ -3901,19 +3805,6 @@ init-package-json@^1.10.3:
     validate-npm-package-license "^3.0.1"
     validate-npm-package-name "^3.0.0"
 
-init-package-json@~1.9.4:
-  version "1.9.6"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.9.6.tgz#789fc2b74466a4952b9ea77c0575bc78ebd60a61"
-  dependencies:
-    glob "^7.1.1"
-    npm-package-arg "^4.0.0 || ^5.0.0"
-    promzard "^0.3.0"
-    read "~1.0.1"
-    read-package-json "1 || 2"
-    semver "2.x || 3.x || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-    validate-npm-package-name "^3.0.0"
-
 inquirer@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
@@ -4120,20 +4011,6 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
-is-my-ip-valid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-
-is-my-json-valid@^2.12.4:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz#8fd6e40363cd06b963fa877d444bfb5eddc62175"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    is-my-ip-valid "^1.0.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
@@ -4188,10 +4065,6 @@ is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
-is-property@^1.0.0, is-property@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
@@ -4409,6 +4282,11 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
+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.0, 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"
@@ -4447,10 +4325,6 @@ jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
 
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -4524,6 +4398,13 @@ karma@^4.0.0:
     tmp "0.0.33"
     useragent "2.3.0"
 
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+  dependencies:
+    json-buffer "3.0.0"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -4544,6 +4425,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
 
+kleur@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.2.tgz#83c7ec858a41098b613d5998a7b653962b504f68"
+  integrity sha512-3h7B2WRT5LNXOtQiAaWonilegHcPSf9nLVXlSTci8lu1dZUuui61+EsPEZqSVxY7rXYmB2DVKMQILxaO5WL61Q==
+
 latest-version@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
@@ -4912,7 +4798,7 @@ lock-verify@^2.0.2:
     npm-package-arg "^5.1.2 || 6"
     semver "^5.4.1"
 
-lockfile@^1.0.4, lockfile@~1.0.2:
+lockfile@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609"
   dependencies:
@@ -4998,7 +4884,7 @@ lodash.without@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
 
-lodash@4.17.11, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
+lodash@4.17.11, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -5052,7 +4938,7 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lowercase-keys@^1.0.0:
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
@@ -5250,18 +5136,18 @@ mime-db@~1.37.0:
   version "1.37.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
 
-mime-types@^2.1.11, mime-types@~2.1.18, mime-types@~2.1.7:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
-  dependencies:
-    mime-db "~1.37.0"
-
 mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
   dependencies:
     mime-db "~1.36.0"
 
+mime-types@~2.1.18:
+  version "2.1.21"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  dependencies:
+    mime-db "~1.37.0"
+
 mime@^2.3.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
@@ -5270,6 +5156,11 @@ mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
+mimic-response@^1.0.0, mimic-response@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
 minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -5433,9 +5324,10 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
-next-tick@1:
-  version "1.0.0"
-  resolved "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+nested-error-stacks@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz#d2cc9fc5235ddb371fc44d506234339c8e4b0a4b"
+  integrity sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A==
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -5478,25 +5370,6 @@ node-gyp@^3.8.0:
     tar "^2.0.0"
     which "1"
 
-node-gyp@~3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.4.0.tgz#dda558393b3ecbbe24c9e6b8703c71194c63fa36"
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3"
-    osenv "0"
-    path-array "^1.0.0"
-    request "2"
-    rimraf "2"
-    semver "2.x || 3.x || 4 || 5"
-    tar "^2.0.0"
-    which "1"
-
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
@@ -5512,11 +5385,7 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-uuid@~1.4.7:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-
-"nopt@2 || 3", nopt@~3.0.6:
+"nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
@@ -5529,11 +5398,11 @@ nopt@^4.0.1, nopt@~4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-git-url@^3.0.2, normalize-git-url@~3.0.2:
+normalize-git-url@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/normalize-git-url/-/normalize-git-url-3.0.2.tgz#8e5f14be0bdaedb73e07200310aa416c27350fc4"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, "normalize-package-data@~1.0.1 || ^2.0.0", normalize-package-data@~2.4.0:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@~2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -5542,22 +5411,13 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@~2.3.5:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-url@^3.3.0:
+normalize-url@^3.1.0, normalize-url@^3.3.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==
@@ -5578,28 +5438,43 @@ npm-cache-filename@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
 
-npm-check-updates@^2.15.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-2.15.0.tgz#7c0f540c048fc801bfd11add8708479a6b82c32e"
+npm-check-updates@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-3.1.3.tgz#9cd5af8f5c8c541f4e0287ca5d7f00aad1dad5fc"
+  integrity sha512-Et4QQkHQtffGbeP2sbdguC4VIkHstd8WWIk292zoY1SRiJZ45FfSINhrRn0dPftQ5z40C0P7aLS6gBjR8gxbtw==
   dependencies:
-    bluebird "^3.4.3"
-    chalk "^1.1.3"
+    bluebird "^3.5.3"
+    chalk "^2.4.2"
     cint "^8.2.1"
     cli-table "^0.3.1"
-    commander "^2.9.0"
-    fast-diff "^1.0.1"
-    find-up "1.1.2"
-    get-stdin "^5.0.1"
+    commander "^2.19.0"
+    fast-diff "^1.2.0"
+    find-up "3.0.0"
+    get-proxy "^2.1.0"
+    get-stdin "^6.0.0"
+    https-proxy-agent "^2.2.1"
     json-parse-helpfulerror "^1.0.3"
-    lodash "^4.15.0"
+    lodash "^4.17.11"
     node-alias "^1.0.4"
-    npm "^3.10.6"
-    npmi "^2.0.1"
-    rc-config-loader "^2.0.1"
-    semver "^5.3.0"
-    semver-utils "^1.1.1"
+    npm-conf "^1.1.3"
+    package-json "^6.2.0"
+    progress "^2.0.3"
+    prompts "^2.0.4"
+    rc-config-loader "^2.0.2"
+    registry-url "^5.0.0"
+    requireg "^0.2.1"
+    semver "^5.6.0"
+    semver-utils "^1.1.4"
     spawn-please "^0.3.0"
-    update-notifier "^2.2.0"
+    update-notifier "^2.5.0"
+
+npm-conf@^1.1.0, npm-conf@^1.1.3:
+  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-install-checks@~3.0.0:
   version "3.0.0"
@@ -5626,22 +5501,6 @@ npm-logical-tree@^1.2.1:
   resolved "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz#44610141ca24664cad35d1e607176193fd8f5b88"
   integrity sha512-AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg==
 
-"npm-package-arg@^3.0.0 || ^4.0.0", npm-package-arg@^4.1.1, npm-package-arg@~4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-4.2.1.tgz#593303fdea85f7c422775f17f9eb7670f680e3ec"
-  dependencies:
-    hosted-git-info "^2.1.5"
-    semver "^5.1.0"
-
-"npm-package-arg@^4.0.0 || ^5.0.0":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-5.1.2.tgz#fb18d17bb61e60900d6312619919bd753755ab37"
-  dependencies:
-    hosted-git-info "^2.4.2"
-    osenv "^0.1.4"
-    semver "^5.1.0"
-    validate-npm-package-name "^3.0.0"
-
 "npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^5.1.2 || 6", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
@@ -5690,22 +5549,6 @@ npm-profile@^4.0.1:
     figgy-pudding "^3.4.1"
     npm-registry-fetch "^3.8.0"
 
-npm-registry-client@~7.2.1:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-7.2.1.tgz#c792266b088cc313f8525e7e35248626c723db75"
-  dependencies:
-    concat-stream "^1.5.2"
-    graceful-fs "^4.1.6"
-    normalize-package-data "~1.0.1 || ^2.0.0"
-    npm-package-arg "^3.0.0 || ^4.0.0"
-    once "^1.3.3"
-    request "^2.74.0"
-    retry "^0.10.0"
-    semver "2 >=2.2.1 || 3.x || 4 || 5"
-    slide "^1.1.3"
-  optionalDependencies:
-    npmlog "~2.0.0 || ~3.1.0"
-
 npm-registry-fetch@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
@@ -5735,10 +5578,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-user-validate@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-0.1.5.tgz#52465d50c2d20294a57125b996baedbf56c5004b"
-
 npm-user-validate@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951"
@@ -5752,82 +5591,6 @@ npm-which@^3.0.1:
     npm-path "^2.0.2"
     which "^1.2.10"
 
-npm@^3, npm@^3.10.6:
-  version "3.10.10"
-  resolved "http://registry.npmjs.org/npm/-/npm-3.10.10.tgz#5b1d577e4c8869d6c8603bc89e9cd1637303e46e"
-  dependencies:
-    abbrev "~1.0.9"
-    ansicolors "~0.3.2"
-    ansistyles "~0.1.3"
-    aproba "~1.0.4"
-    archy "~1.0.0"
-    asap "~2.0.5"
-    chownr "~1.0.1"
-    cmd-shim "~2.0.2"
-    columnify "~1.5.4"
-    config-chain "~1.1.11"
-    dezalgo "~1.0.3"
-    editor "~1.0.0"
-    fs-vacuum "~1.2.9"
-    fs-write-stream-atomic "~1.0.8"
-    fstream "~1.0.10"
-    fstream-npm "~1.2.0"
-    glob "~7.1.0"
-    graceful-fs "~4.1.9"
-    has-unicode "~2.0.1"
-    hosted-git-info "~2.1.5"
-    iferr "~0.1.5"
-    inflight "~1.0.5"
-    inherits "~2.0.3"
-    ini "~1.3.4"
-    init-package-json "~1.9.4"
-    lockfile "~1.0.2"
-    lodash._baseuniq "~4.6.0"
-    lodash.clonedeep "~4.5.0"
-    lodash.union "~4.6.0"
-    lodash.uniq "~4.5.0"
-    lodash.without "~4.4.0"
-    mkdirp "~0.5.1"
-    node-gyp "~3.4.0"
-    nopt "~3.0.6"
-    normalize-git-url "~3.0.2"
-    normalize-package-data "~2.3.5"
-    npm-cache-filename "~1.0.2"
-    npm-install-checks "~3.0.0"
-    npm-package-arg "~4.2.0"
-    npm-registry-client "~7.2.1"
-    npm-user-validate "~0.1.5"
-    npmlog "~4.0.0"
-    once "~1.4.0"
-    opener "~1.4.2"
-    osenv "~0.1.3"
-    path-is-inside "~1.0.2"
-    read "~1.0.7"
-    read-cmd-shim "~1.0.1"
-    read-installed "~4.0.3"
-    read-package-json "~2.0.4"
-    read-package-tree "~5.1.5"
-    readable-stream "~2.1.5"
-    realize-package-specifier "~3.0.3"
-    request "~2.75.0"
-    retry "~0.10.0"
-    rimraf "~2.5.4"
-    semver "~5.3.0"
-    sha "~2.0.1"
-    slide "~1.1.6"
-    sorted-object "~2.0.1"
-    strip-ansi "~3.0.1"
-    tar "~2.2.1"
-    text-table "~0.2.0"
-    uid-number "0.0.6"
-    umask "~1.1.0"
-    unique-filename "~1.1.0"
-    unpipe "~1.0.0"
-    validate-npm-package-name "~2.2.2"
-    which "~1.2.11"
-    wrappy "~1.0.2"
-    write-file-atomic "~1.2.0"
-
 npm@^6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/npm/-/npm-6.7.0.tgz#a563d6e6806913b2afa4c713ba63047cb7c63ea4"
@@ -5942,22 +5705,6 @@ npm@^6.7.0:
     worker-farm "^1.6.0"
     write-file-atomic "^2.4.2"
 
-npmi@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/npmi/-/npmi-2.0.1.tgz#32607657e1bd47ca857ab4e9d98f0a0cff96bcea"
-  dependencies:
-    npm "^3"
-    semver "^4.1.0"
-
-"npmlog@0 || 1 || 2 || 3", "npmlog@~2.0.0 || ~3.1.0":
-  version "3.1.2"
-  resolved "http://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz#2d46fa874337af9498a2f12bb43d8d0be4a36873"
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.6.0"
-    set-blocking "~2.0.0"
-
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2, npmlog@^4.1.2, npmlog@~4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -5967,15 +5714,6 @@ npmi@^2.0.1:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-npmlog@~4.0.0:
-  version "4.0.2"
-  resolved "http://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.1"
-    set-blocking "~2.0.0"
-
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
@@ -5984,10 +5722,6 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-oauth-sign@~0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -6035,7 +5769,7 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0, once@~1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0, once@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -6052,10 +5786,6 @@ opener@^1.5.1:
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
   integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
 
-opener@~1.4.2:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
-
 opn@4.0.2:
   version "4.0.2"
   resolved "http://registry.npmjs.org/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
@@ -6109,13 +5839,18 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@0, osenv@^0.1.4, osenv@^0.1.5, osenv@~0.1.3:
+osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+p-cancelable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -6199,6 +5934,16 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
+package-json@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.2.0.tgz#06ab45d593929f4d694cc113c3ea983554b151c1"
+  integrity sha512-r9i1TSMI5x+0CtzP/hkpcmAoVtwTT7Vdy1UrkUxeSJ5N+Lzeg5+yUMlxD2FYFdOpt9Sb3QLLxdI2eosmRQGwBA==
+  dependencies:
+    got "^9.6.0"
+    registry-auth-token "^3.3.2"
+    registry-url "^5.0.0"
+    semver "^5.6.0"
+
 pacote@^9.1.0:
   version "9.4.0"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
@@ -6383,12 +6128,6 @@ pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
 
-path-array@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271"
-  dependencies:
-    array-index "^1.0.0"
-
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -6481,6 +6220,11 @@ prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
+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-tslint@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/prettier-tslint/-/prettier-tslint-0.4.2.tgz#37dd009ad6a482ea8101f40cf70b777bc86f3438"
@@ -6510,10 +6254,6 @@ pretty-quick@^1.10.0:
     mri "^1.1.0"
     multimatch "^3.0.0"
 
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
@@ -6522,6 +6262,11 @@ progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
 
+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==
+
 promise-inflight@^1.0.1, promise-inflight@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -6533,6 +6278,14 @@ promise-retry@^1.1.1:
     err-code "^1.0.0"
     retry "^0.10.0"
 
+prompts@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.4.tgz#179f9d4db3128b9933aa35f93a800d8fce76a682"
+  integrity sha512-HTzM3UWp/99A0gk51gAegwo1QRYA7xjcZufMNe33rCclFszUYAuHe1fIN/3ZmiHeGPkUsNaRyQm1hHOfM0PKxA==
+  dependencies:
+    kleur "^3.0.2"
+    sisteransi "^1.0.0"
+
 promzard@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
@@ -6620,10 +6373,6 @@ qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
-qs@~6.2.0:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
-
 query-string@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.2.0.tgz#468edeb542b7e0538f9f9b1aeb26f034f19c86e1"
@@ -6664,9 +6413,10 @@ raw-body@2.3.3:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-rc-config-loader@^2.0.1:
+rc-config-loader@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/rc-config-loader/-/rc-config-loader-2.0.2.tgz#46eb2f98fb5b2aa7b1119d66c0554de5133f1bc1"
+  integrity sha512-Nx9SNM47eNRqe0TdntOY600qWb8NDh+xU9sv5WnTscEtzfTB0ukihlqwuCLPteyJksvZ0sEVPoySNE01TKrmTQ==
   dependencies:
     debug "^3.1.0"
     js-yaml "^3.12.0"
@@ -6676,7 +6426,7 @@ rc-config-loader@^2.0.1:
     path-exists "^3.0.0"
     require-from-string "^2.0.2"
 
-rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8, rc@~1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   dependencies:
@@ -6704,7 +6454,7 @@ read-installed@~4.0.3:
   optionalDependencies:
     graceful-fs "^4.1.2"
 
-"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13, read-package-json@~2.0.4:
+"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
   dependencies:
@@ -6725,16 +6475,6 @@ read-package-tree@^5.1.6, read-package-tree@^5.2.1:
     read-package-json "^2.0.0"
     readdir-scoped-modules "^1.0.0"
 
-read-package-tree@~5.1.5:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.1.6.tgz#4f03e83d0486856fb60d97c94882841c2a7b1b7a"
-  dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    once "^1.3.0"
-    read-package-json "^2.0.0"
-    readdir-scoped-modules "^1.0.0"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -6810,29 +6550,6 @@ readable-stream@~1.1.10:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.5:
-  version "2.0.6"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-readable-stream@~2.1.5:
-  version "2.1.5"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
 readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
@@ -6850,13 +6567,6 @@ readdirp@^2.0.0:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-realize-package-specifier@~3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/realize-package-specifier/-/realize-package-specifier-3.0.3.tgz#d0def882952b8de3f67eba5e91199661271f41f4"
-  dependencies:
-    dezalgo "^1.0.1"
-    npm-package-arg "^4.1.1"
-
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -6917,12 +6627,27 @@ registry-auth-token@^3.0.1:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
 
+registry-auth-token@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
+  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
+  dependencies:
+    rc "^1.1.6"
+    safe-buffer "^5.0.1"
+
 registry-url@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
   dependencies:
     rc "^1.0.1"
 
+registry-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.0.0.tgz#ea9b9f54247d0d95adfcaf9e20a4f8fa28d86e72"
+  integrity sha512-qH1SjdlyxreHU8atIDzP1MOb1GG2g5746L3nnwISWTUh8GBLotl82sOayZJtm/KwmrMeMaEzAV26o6Pk1hJuoA==
+  dependencies:
+    rc "^1.2.8"
+
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
@@ -6955,7 +6680,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2, request@^2.74.0, request@^2.87.0, request@^2.88.0:
+request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   dependencies:
@@ -6980,32 +6705,6 @@ request@2, request@^2.74.0, request@^2.87.0, request@^2.88.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
-request@~2.75.0:
-  version "2.75.0"
-  resolved "http://registry.npmjs.org/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    bl "~1.1.2"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.0.0"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    node-uuid "~1.4.7"
-    oauth-sign "~0.8.1"
-    qs "~6.2.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -7024,6 +6723,15 @@ require-relative@^0.8.7:
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
   integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
 
+requireg@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/requireg/-/requireg-0.2.1.tgz#f8822f38181b73211d631b5842507dbde4baecdf"
+  integrity sha512-bbNOK9MAyAGe4Q9/0skx6bzkFVRvVuHerXZthc3jmf2/cO7gthKM7GpnhW522Vx3/uCLA9RXXpQaqdXHRrZVxQ==
+  dependencies:
+    nested-error-stacks "~2.0.1"
+    rc "~1.2.7"
+    resolve "~1.7.1"
+
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -7071,6 +6779,20 @@ resolve@^1.3.2, resolve@^1.3.3:
   dependencies:
     path-parse "^1.0.5"
 
+resolve@~1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
+  integrity sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==
+  dependencies:
+    path-parse "^1.0.5"
+
+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@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -7082,7 +6804,7 @@ ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
 
-retry@^0.10.0, retry@~0.10.0:
+retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
 
@@ -7119,12 +6841,6 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@~2.5.4:
-  version "2.5.4"
-  resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
-  dependencies:
-    glob "^7.0.5"
-
 robots-parser@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/robots-parser/-/robots-parser-2.1.1.tgz#41b289cf44a6aa136dc62be0085adca954573ab0"
@@ -7217,22 +6933,19 @@ semver-dsl@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-semver-utils@^1.1.1:
+semver-utils@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/semver-utils/-/semver-utils-1.1.4.tgz#cf0405e669a57488913909fc1c3f29bf2a4871e2"
-
-"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@5.6.0, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+  integrity sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==
 
 "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
-semver@^4.1.0:
-  version "4.3.6"
-  resolved "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+semver@5.6.0, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
 semver@~5.3.0:
   version "5.3.0"
@@ -7291,6 +7004,11 @@ simple-git@^1.85.0:
   dependencies:
     debug "^4.0.1"
 
+sisteransi@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
+  integrity sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ==
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -7303,7 +7021,7 @@ slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
-slide@^1.1.3, slide@^1.1.5, slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
+slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
@@ -7338,12 +7056,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  dependencies:
-    hoek "2.x.x"
-
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
@@ -7672,11 +7384,7 @@ stringify-package@^1.0.0:
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
   integrity sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==
 
-stringstream@~0.0.4:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1, strip-ansi@~3.0.1:
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   dependencies:
@@ -7760,7 +7468,7 @@ synchronous-promise@^2.0.5:
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.6.tgz#de76e0ea2b3558c1e673942e47e714a930fa64aa"
   integrity sha512-TyOuWLwkmtPL49LHCX1caIwHjRzcVd62+GF6h8W/jHOeZUFHpnd2XJDVuUlaTaLPH1nuu2M69mfHr5XbQJnf/g==
 
-tar@^2.0.0, tar@~2.2.1:
+tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   dependencies:
@@ -7861,6 +7569,11 @@ to-object-path@^0.3.0:
   dependencies:
     kind-of "^3.0.2"
 
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
@@ -7882,12 +7595,6 @@ toposort@^2.0.2:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
   integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
 
-tough-cookie@~2.3.0:
-  version "2.3.4"
-  resolved "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  dependencies:
-    punycode "^1.4.1"
-
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -7961,10 +7668,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -8052,7 +7755,7 @@ unique-filename@^1.1.0:
   dependencies:
     unique-slug "^2.0.0"
 
-unique-filename@^1.1.1, unique-filename@~1.1.0:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -8101,7 +7804,7 @@ upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
 
-update-notifier@^2.1.0, update-notifier@^2.2.0, update-notifier@^2.3.0, update-notifier@^2.5.0:
+update-notifier@^2.1.0, update-notifier@^2.3.0, update-notifier@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
   dependencies:
@@ -8126,6 +7829,13 @@ url-parse-lax@^1.0.0:
   dependencies:
     prepend-http "^1.0.1"
 
+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-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
@@ -8171,12 +7881,6 @@ validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-validate-npm-package-name@~2.2.2:
-  version "2.2.2"
-  resolved "http://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz#f65695b22f7324442019a3c7fa39a6e7fd299085"
-  dependencies:
-    builtins "0.0.7"
-
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -8217,12 +7921,6 @@ which@1, which@^1.2.1, which@^1.2.10, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-which@~1.2.11:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
-  dependencies:
-    isexe "^2.0.0"
-
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -8284,7 +7982,7 @@ wrap-ansi@^3.0.1:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@1, wrappy@~1.0.2:
+wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
@@ -8305,14 +8003,6 @@ write-file-atomic@^2.4.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.2.0.tgz#14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"
-  dependencies:
-    graceful-fs "^4.1.2"
-    imurmurhash "^0.1.4"
-    slide "^1.1.5"
-
 write-json-file@^2.2.0, write-json-file@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
@@ -8378,7 +8068,7 @@ xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
 
-xtend@^4.0.0, xtend@~4.0.1:
+xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 

From 1fe3201c649cdd6001e645f74c5362c082622cbf Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Sat, 30 Mar 2019 04:01:44 +0300
Subject: [PATCH 078/382] chore: packages updates

---
 admin/website-angular/package.json |   40 +-
 admin/website-angular/yarn.lock    | 1202 +++++++++++++++++-----------
 carrier/mobile-ionic/package.json  |   55 +-
 carrier/mobile-ionic/yarn.lock     |  256 +++---
 merchant/tablet-ionic/package.json |   74 +-
 merchant/tablet-ionic/yarn.lock    |  411 +++++-----
 shop/mobile-ionic/package.json     |   72 +-
 shop/mobile-ionic/yarn.lock        |  284 +++----
 shop/website-angular/package.json  |   33 +-
 shop/website-angular/yarn.lock     |  181 +++--
 10 files changed, 1442 insertions(+), 1166 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 2cee5ed07..d9e86dc42 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -58,16 +58,16 @@
 	},
 	"dependencies": {
 		"@agm/core": "^1.0.0-beta.5",
-		"@angular/animations": "^7.2.4",
-		"@angular/cdk": "^7.3.2",
-		"@angular/common": "^7.2.4",
-		"@angular/compiler": "^7.2.4",
-		"@angular/core": "^7.2.4",
-		"@angular/forms": "^7.2.4",
-		"@angular/http": "^7.2.4",
-		"@angular/platform-browser": "^7.2.4",
-		"@angular/platform-browser-dynamic": "^7.2.4",
-		"@angular/router": "^7.2.4",
+		"@angular/animations": "^7.2.11",
+		"@angular/cdk": "^7.3.6",
+		"@angular/common": "^7.2.11",
+		"@angular/compiler": "^7.2.11",
+		"@angular/core": "^7.2.11",
+		"@angular/forms": "^7.2.11",
+		"@angular/http": "^7.2.11",
+		"@angular/platform-browser": "^7.2.11",
+		"@angular/platform-browser-dynamic": "^7.2.11",
+		"@angular/router": "^7.2.11",
 		"@asymmetrik/ngx-leaflet": "^5.0.1",
 		"@fortawesome/fontawesome-free": "^5.7.2",
 		"@nebular/auth": "^3.2.1",
@@ -142,18 +142,21 @@
 		"typeface-exo": "^0.0.61",
 		"uuid": "^3.3.2",
 		"web-animations-js": "^2.3.1",
-		"webpack": "^4.29.3",
 		"zen-observable": "^0.8.13",
 		"zone.js": "^0.8.29"
 	},
 	"devDependencies": {
-		"conventional-changelog-cli": "^2.0.11",
-		"@angular-devkit/build-angular": "^0.13.1",
-		"@angular/cli": "^7.3.1",
-		"@angular/compiler-cli": "^7.2.4",
-		"@angular/language-service": "^7.2.4",
-		"@babel/core": "^7.2.2",
-		"@compodoc/compodoc": "^1.1.8",
+		"conventional-changelog-cli": "^2.0.12",
+		"@angular-devkit/build-angular": "^0.13.7",
+		"@angular-devkit/build-webpack": "^0.13.7",
+		"@angular-devkit/architect": "^0.13.7",
+		"@angular-devkit/core": "^7.3.7",
+		"@angular-devkit/schematics": "^7.3.7",
+		"@angular/cli": "^7.3.7",
+		"@angular/compiler-cli": "^7.2.11",
+		"@angular/language-service": "^7.2.11",
+		"@babel/core": "^7.4.0",
+		"@compodoc/compodoc": "^1.1.9",
 		"@storybook/addon-actions": "^4.1.11",
 		"@storybook/angular": "^4.1.11",
 		"@types/async": "^2.4.1",
@@ -194,6 +197,7 @@
 		"tslint": "^5.12.1",
 		"tslint-language-service": "^0.9.9",
 		"yargs": "^13.1.0",
+		"webpack-dev-server": "^3.2.1",
 		"typescript": "~3.1.6"
 	},
 	"engines": {
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 0b6d09583..2c2c2f8e0 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -7,15 +7,7 @@
   resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.5.tgz#6dbceb666b2dbc4a868b97e1340a3faceb5f2113"
   integrity sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ==
 
-"@angular-devkit/architect@0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.1.tgz#39597ce94f72d89bdd89ee567cb937cff4c13b98"
-  integrity sha512-QDmIbqde75ZZSEFbw6Q6kQWq4cY6C7D67yujXw6XTyubDNAs1tyXJyxTIB8vjSlEKwRizTTDd/B0ZXVcke3Mvw==
-  dependencies:
-    "@angular-devkit/core" "7.3.1"
-    rxjs "6.3.3"
-
-"@angular-devkit/architect@0.13.7":
+"@angular-devkit/architect@0.13.7", "@angular-devkit/architect@^0.13.7":
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
   integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
@@ -23,14 +15,6 @@
     "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@^0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.1.tgz#369febda48dd40e47a4f0077064e792612a8e1c1"
-  integrity sha512-vkKwMVQ+NNCcVR3HFMffS+Mq4b2afXeUjI+02N38hBuFTppnC83uivUB6Uu2NUk5NTSQA4BnJlG5CbMs6N4QYg==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    rxjs "6.3.3"
-
 "@angular-devkit/build-angular@^0.13.7":
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
@@ -93,7 +77,7 @@
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.7":
+"@angular-devkit/build-webpack@0.13.7", "@angular-devkit/build-webpack@^0.13.7":
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
   integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
@@ -102,18 +86,7 @@
     "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
-"@angular-devkit/core@7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.1.tgz#d92f6545796579cabdcfc29579a2c977f7a96c6c"
-  integrity sha512-56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ==
-  dependencies:
-    ajv "6.7.0"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
-"@angular-devkit/core@7.3.7":
+"@angular-devkit/core@7.3.7", "@angular-devkit/core@^7.3.7":
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
   integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
@@ -124,18 +97,7 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.1.tgz#7dc704005b966ea6c1ee62f380120183bb76eee6"
-  integrity sha512-cd7usiasfSgw75INz72/VssrLr9tiVRYfo1TEdvr9ww0GuQbuQpB33xbV8W135eAV8+wzQ3Ce8ohaDHibvj6Yg==
-  dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
-"@angular-devkit/schematics@7.3.7":
+"@angular-devkit/schematics@7.3.7", "@angular-devkit/schematics@^7.3.7":
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
   integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
@@ -143,17 +105,17 @@
     "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
-"@angular/animations@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.4.tgz#4d0a0b9f14d6bfc38ca773613b61729d020435e6"
-  integrity sha512-Wx6cqU6koFOASlyl4aCygtbtROoehU6OKwV2EZTkfzHx6Eu/QyTiSa5kyoApVM5LMmCNeb8SxJMSAnKXztNl0A==
+"@angular/animations@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
+  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.3.2":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.2.tgz#33f525051d71e2525d29b2aa798c817334973a7b"
-  integrity sha512-jnthvY1Kt+DpJTrkgyKTiVuYgBdp4iG7QDeZJPBQm0e8mL2K0Pi9AqFbo01E4CGPqZpvtEggvqM0OJpR8J+amw==
+"@angular/cdk@^7.3.6":
+  version "7.3.6"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.6.tgz#4c330cacd11df4adade6c1cd3ed587745f9912fd"
+  integrity sha512-ZuOz8nQk0bdo8YyNFcwnmSl4MPaQDAFTbLK29w4Vd/LfPnhBI3pAr0wVuPFb0fl3eSvvUrfTb/+kPbQcE07A0A==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
@@ -178,20 +140,20 @@
     semver "5.6.0"
     symbol-observable "1.2.0"
 
-"@angular/common@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.4.tgz#9f1ed530e5dc7613a263e015c203ead390d50336"
-  integrity sha512-3/i8RtnLTx/90gJHk5maE8zwsSiHgHvLItaa0qVfNlWiU0eCId/PL6TgDkut5vN9SQYL0oxhxFaVd35HmwsmuQ==
+"@angular/common@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
+  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.4.tgz#3de23fd5f558a859a444c58dab18f2981c9c2937"
-  integrity sha512-UhLosSeuwFIfaGqGcYOh9WSOuzEpeuhIRAOt81MeqOQEqkoreUjfxrQq8XWNkdqsPZHtiptF5ZwXlMBxlj9jJg==
+"@angular/compiler-cli@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz#0835a17dd9cea4bb03c5073d943a5074fed539ff"
+  integrity sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==
   dependencies:
     canonical-path "1.0.0"
-    chokidar "^1.4.2"
+    chokidar "^2.1.1"
     convert-source-map "^1.5.1"
     dependency-graph "^0.7.2"
     magic-string "^0.25.0"
@@ -202,57 +164,57 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.4.tgz#133eb97fc3169ec9ff84f134eb9e3497fa37537e"
-  integrity sha512-+zyMzPCL45ePEV9nrnYJvhAVgp2Y19bDaq0f0YdZAqAjgDqHzXGGR6wX8GueyJWmUYWx5vwK6Apla4HwDrYA1w==
+"@angular/compiler@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.11.tgz#d547bf781e5c8b28da9af2460a6dfb5683d325ae"
+  integrity sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.4.tgz#a6c84940c8edcfa37158f666a1f99c6e4a97bf95"
-  integrity sha512-kfAxhIxl89PmB7y81FR/RAv0yWRFcEYxEnTwV+o8jKGfemAXtQ0g/Vh+lJR0SD/TBgFilMxotN1mhwH4A8GShw==
+"@angular/core@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
+  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.4.tgz#be89cf83ad16fa3c813c12e4cff85da5409cf7a0"
-  integrity sha512-DAtOrdlTRsgvmZrsvczCAkY8dhTwZb5DXBmPuSXh0UR9lvEiCgNHGbwEiIiIkAHpw1wSeXZrq0qyy/oJRvf18g==
+"@angular/forms@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
+  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.4.tgz#fc151ac15c8c7542cb7242a430ad2319655c2ff5"
-  integrity sha512-kazJREm7MtSCYbE+9zU/CcUXI5Csu53PooeQlAp80/TOHqry6fVKIMHCI892Db9ScY2ds0SzbyTmrxEQo7PP1A==
+"@angular/http@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.11.tgz#c52a491374d937cd05789a5c13d70a1c5fdddf4d"
+  integrity sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.4.tgz#db72460040b070410cbff678410c142f4d682af8"
-  integrity sha512-A9Rud/27hHMSUUjpgn57nVeLsoYgdvFwJhtlZA/oCuSpmlD+LqqBsEpPhivwn++u44+DSrFXsic29jlFnsBotw==
+"@angular/language-service@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.11.tgz#1967ebcef5fc03e462941aa70dc41562d5dce06e"
+  integrity sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==
 
-"@angular/platform-browser-dynamic@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.4.tgz#24dce1bb0d9dab541b3b1b3eda3084a732f11b64"
-  integrity sha512-J/xWlmaYOPUoCHZ5TiIRiyYa4uRMtCz3aGdBfY8k/NWtNo8SCYaS3aut7Sk4RS5rK8aAVi+aYFlY5YOrlW+Hbg==
+"@angular/platform-browser-dynamic@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
+  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.4.tgz#2cf5305878d0620d6b8c02eff00ac3ca8dbc5970"
-  integrity sha512-Klt8aKR5SP9bqfMfpSY5vQOY7AQEs8JGuZOk5Bfc2dUtYT2IEIvK2IqO8v2rcFRVO13HOPUxl328efyHqLgI7g==
+"@angular/platform-browser@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
+  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/router@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.4.tgz#83f1997c2a4e6acda93b991b8d7f3dad2b3f91f0"
-  integrity sha512-T8Uqf2H1SV1MQI38WwYJ4aa+4NNnvlp2Tp/rkfg6tKcp/cLkKqE6OOfiy9lmW+i/624v8tMgYoBMOUNBjAG23g==
+"@angular/router@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
+  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -268,7 +230,7 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@>=7.1.0", "@babel/core@^7.2.2":
+"@babel/core@>=7.1.0":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687"
   integrity sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==
@@ -288,6 +250,26 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/core@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.0.tgz#248fd6874b7d755010bfe61f557461d4f446d9e9"
+  integrity sha512-Dzl7U0/T69DFOTwqz/FJdnOSWS57NpjNfCwMKHABr589Lg8uX1RrlBIJ7L5Dubt/xkLsx0xH5EBFzlBVes1ayA==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.4.0"
+    "@babel/helpers" "^7.4.0"
+    "@babel/parser" "^7.4.0"
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.0"
+    "@babel/types" "^7.4.0"
+    convert-source-map "^1.1.0"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.11"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.0.0", "@babel/generator@^7.2.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.2.tgz#fff31a7b2f2f3dad23ef8e01be45b0d5c2fc0132"
@@ -299,6 +281,17 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+"@babel/generator@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.0.tgz#c230e79589ae7a729fd4631b9ded4dc220418196"
+  integrity sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==
+  dependencies:
+    "@babel/types" "^7.4.0"
+    jsesc "^2.5.1"
+    lodash "^4.17.11"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
@@ -455,6 +448,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@babel/helper-split-export-declaration@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz#571bfd52701f492920d63b7f735030e9a3e10b55"
+  integrity sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==
+  dependencies:
+    "@babel/types" "^7.4.0"
+
 "@babel/helper-wrap-function@^7.1.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
@@ -474,6 +474,15 @@
     "@babel/traverse" "^7.1.5"
     "@babel/types" "^7.3.0"
 
+"@babel/helpers@^7.4.0":
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.2.tgz#3bdfa46a552ca77ef5a0f8551be5f0845ae989be"
+  integrity sha512-gQR1eQeroDzFBikhrCccm5Gs2xBjZ57DNjGbqTaHo911IpmSxflOQWMAHPw/TXk8L3isv7s9lYzUkexOeTQUYg==
+  dependencies:
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.0"
+    "@babel/types" "^7.4.0"
+
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
@@ -488,6 +497,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.2.tgz#95cdeddfc3992a6ca2a1315191c1679ca32c55cd"
   integrity sha512-QzNUC2RO1gadg+fs21fi0Uu0OuGNzRKEmgCxoLNzbCdoprLwjfmZwzUrpUNfJPaVRwBpDY47A17yYEGWyRelnQ==
 
+"@babel/parser@^7.4.0":
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.2.tgz#b4521a400cb5a871eab3890787b4bc1326d38d91"
+  integrity sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==
+
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
@@ -844,6 +858,13 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
+"@babel/runtime@^7.3.1":
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.2.tgz#f5ab6897320f16decd855eed70b705908a313fe8"
+  integrity sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
@@ -853,6 +874,15 @@
     "@babel/parser" "^7.2.2"
     "@babel/types" "^7.2.2"
 
+"@babel/template@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.0.tgz#12474e9c077bae585c5d835a95c0b0b790c25c8b"
+  integrity sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.4.0"
+    "@babel/types" "^7.4.0"
+
 "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2", "@babel/traverse@^7.2.3":
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
@@ -868,6 +898,21 @@
     globals "^11.1.0"
     lodash "^4.17.10"
 
+"@babel/traverse@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.0.tgz#14006967dd1d2b3494cdd650c686db9daf0ddada"
+  integrity sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.4.0"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.4.0"
+    "@babel/parser" "^7.4.0"
+    "@babel/types" "^7.4.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.11"
+
 "@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0", "@babel/types@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.2.tgz#424f5be4be633fff33fb83ab8d67e4a8290f5a2f"
@@ -877,33 +922,44 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@compodoc/compodoc@^1.1.8":
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/@compodoc/compodoc/-/compodoc-1.1.8.tgz#e5c2b03454bd489d20960ad7a68ceb008ef5cb9d"
-  integrity sha512-MuTE/KyNfRxJwLC3Ih2WXsMgd3YWFsViGxFbnrMigNYSq6/syUYVZgoj0E/Hir1au6k5jshKX1Vg7S61wqCaWg==
+"@babel/types@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.0.tgz#670724f77d24cce6cc7d8cf64599d511d164894c"
+  integrity sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.11"
+    to-fast-properties "^2.0.0"
+
+"@compodoc/compodoc@^1.1.9":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@compodoc/compodoc/-/compodoc-1.1.9.tgz#b45593897fd54ca8a0996fb41e41e26f99da6c4f"
+  integrity sha512-LFdbF/fO9qOGgdrCHg4irMBrl3sD8ySIlL6XabFAz8QbUdf2+77xOVnZJ/PYdcuI8h8vXo4UGS7MFg0pDR2jsw==
   dependencies:
     "@compodoc/ngd-transformer" "^2.0.0"
     chalk "^2.4.2"
     cheerio "^1.0.0-rc.2"
-    chokidar "^2.1.0"
+    chokidar "^2.1.2"
     colors "^1.3.3"
-    commander "2.19.0"
-    cosmiconfig "^5.0.7"
+    commander "^2.19.0"
+    cosmiconfig "^5.1.0"
     fancy-log "^1.3.3"
     findit2 "^2.2.3"
     fs-extra "^7.0.1"
     glob "^7.1.3"
-    handlebars "4.0.10"
+    handlebars "^4.1.0"
     html-entities "^1.2.1"
-    i18next "^14.1.1"
+    i18next "^15.0.4"
     inside "^1.0.0"
     json5 "^2.1.0"
-    live-server "1.2.1"
+    live-server "^1.2.1"
     lodash "^4.17.11"
-    lunr "2.3.5"
-    marked "^0.4.0"
+    lunr "^2.3.6"
+    marked "^0.6.1"
+    minimist "^1.2.0"
     opencollective "^1.0.3"
     os-name "^3.0.0"
+    pdfmake "^0.1.53"
     semver "^5.6.0"
     traverse "^0.6.6"
     ts-simple-ast "12.4.0"
@@ -1510,10 +1566,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stripe@^6.19.7":
-  version "6.19.7"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.19.7.tgz#a04c50d519ec50d820f72d12e31351f845c583fe"
-  integrity sha512-e4it4GNSZ+lrQth+2/7TDw0FVWmLcM4t/m+bDF8DhEwD17JmSKWnUNvPYbcafoeai4rI1i4RKmTeHuzB3IquRQ==
+"@types/stripe@^6.25.7":
+  version "6.25.7"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
+  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
   dependencies:
     "@types/node" "*"
 
@@ -1749,6 +1805,11 @@ acorn-dynamic-import@^4.0.0:
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
+acorn@^5.0.0:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+
 acorn@^6.0.5:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818"
@@ -1819,16 +1880,6 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
-ajv@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
-  integrity sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 ajv@6.9.1, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
@@ -1849,15 +1900,6 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-align-text@^0.1.1, align-text@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
-  dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
-
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -1988,14 +2030,6 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -2165,19 +2199,12 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
@@ -2328,6 +2355,20 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
+ast-transform@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/ast-transform/-/ast-transform-0.0.0.tgz#74944058887d8283e189d954600947bc98fe0062"
+  integrity sha1-dJRAWIh9goPhidlUYAlHvJj+AGI=
+  dependencies:
+    escodegen "~1.2.0"
+    esprima "~1.0.4"
+    through "~2.3.4"
+
+ast-types@^0.7.0:
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz#902d2e0d60d071bdcd46dc115e1809ed11c138a9"
+  integrity sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=
+
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
@@ -2348,7 +2389,7 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@^1.4.0, async@^1.5.2:
+async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
@@ -2727,7 +2768,12 @@ base64-arraybuffer@0.1.5:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
   integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
-base64-js@^1.0.2:
+base64-js@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978"
+  integrity sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=
+
+base64-js@^1.0.2, base64-js@^1.1.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
   integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
@@ -2898,15 +2944,6 @@ braces@^0.1.2:
   dependencies:
     expand-range "^0.1.0"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -2923,11 +2960,35 @@ braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+brfs@^1.3.0, brfs@^1.4.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
+  integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
+  dependencies:
+    quote-stream "^1.0.1"
+    resolve "^1.1.5"
+    static-module "^2.2.0"
+    through2 "^2.0.0"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
+brotli@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/brotli/-/brotli-1.3.2.tgz#525a9cad4fcba96475d7d388f6aecb13eed52f46"
+  integrity sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=
+  dependencies:
+    base64-js "^1.1.2"
+
+browser-resolve@^1.8.1:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
+  dependencies:
+    resolve "1.1.7"
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -2959,6 +3020,15 @@ browserify-des@^1.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
+browserify-optional@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-optional/-/browserify-optional-1.0.1.tgz#1e13722cfde0d85f121676c2a72ced533a018869"
+  integrity sha1-HhNyLP3g2F8SFnbCpyztUzoBiGk=
+  dependencies:
+    ast-transform "0.0.0"
+    ast-types "^0.7.0"
+    browser-resolve "^1.8.1"
+
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
@@ -3025,6 +3095,11 @@ buffer-alloc@^1.2.0:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
+buffer-equal@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
+
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
@@ -3197,11 +3272,6 @@ camelcase-keys@^4.0.0:
     map-obj "^2.0.0"
     quick-lru "^1.0.0"
 
-camelcase@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
-
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
@@ -3247,14 +3317,6 @@ ccount@^1.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"
   integrity sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==
 
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
-
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -3378,26 +3440,29 @@ chokidar@2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^1.4.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.1.tgz#adc39ad55a2adf26548bd2afa048f611091f9184"
+  integrity sha512-gfw3p2oQV2wEt+8VuMlNsPjCxDxvvgnm/kz+uATu805mWVF8IJN7uz9DN7iBz+RMJISmiVbCOBFs9qBGMjtPfQ==
   dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
     is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.0"
   optionalDependencies:
-    fsevents "^1.0.0"
+    fsevents "^1.2.7"
 
-chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.1.tgz#adc39ad55a2adf26548bd2afa048f611091f9184"
-  integrity sha512-gfw3p2oQV2wEt+8VuMlNsPjCxDxvvgnm/kz+uATu805mWVF8IJN7uz9DN7iBz+RMJISmiVbCOBFs9qBGMjtPfQ==
+chokidar@^2.1.1, chokidar@^2.1.2:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -3409,7 +3474,7 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.
     normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
     readdirp "^2.2.1"
-    upath "^1.1.0"
+    upath "^1.1.1"
   optionalDependencies:
     fsevents "^1.2.7"
 
@@ -3507,15 +3572,6 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
-
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
@@ -3552,6 +3608,11 @@ clone-regexp@^1.0.0:
     is-regexp "^1.0.0"
     is-supported-regexp-flag "^1.0.0"
 
+clone@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
 clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
@@ -3648,7 +3709,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@2.19.0, commander@^2.12.1, commander@^2.19.0:
+commander@2, commander@^2.12.1, commander@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -3721,7 +3782,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0:
+concat-stream@^1.5.0, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -3773,10 +3834,10 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-conventional-changelog-angular@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.2.tgz#39d945635e03b6d0c9d4078b1df74e06163dc66a"
-  integrity sha512-yx7m7lVrXmt4nKWQgWZqxSALEiAKZhOAcbxdUaU9575mB0CzXVbgrgpfSnSP7OqWDUTYGD0YVJ0MSRdyOPgAwA==
+conventional-changelog-angular@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz#299fdd43df5a1f095283ac16aeedfb0a682ecab0"
+  integrity sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -3788,13 +3849,13 @@ conventional-changelog-atom@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-cli@^2.0.11:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-2.0.11.tgz#18210bfcd61660140e3160e6d00d68abe260e493"
-  integrity sha512-00Z4EZfpuQxvStA5fjJXdixXCtRd5/AUMUOhYKOomhH3cRFqzF/P0MP8vavT9wnGkR0eba9mrWsMuqeVszPRxQ==
+conventional-changelog-cli@^2.0.12:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-2.0.12.tgz#ffe04f5430fbc339dc7fa28634c2e0de5dd76e2e"
+  integrity sha512-6wh9W5Gpr9DM40E8cFi0qa6JotVm4Jq+suksuqgKnm544H8ZXsRhgGNXShDASOteY9brv9fX8/+fE/QL1wHqbA==
   dependencies:
     add-stream "^1.0.0"
-    conventional-changelog "^3.0.5"
+    conventional-changelog "^3.0.6"
     lodash "^4.2.1"
     meow "^4.0.0"
     tempfile "^1.1.1"
@@ -3806,12 +3867,12 @@ conventional-changelog-codemirror@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-core@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.5.tgz#c2edf928539308b54fe1b90a2fc731abc021852c"
-  integrity sha512-iwqAotS4zk0wA4S84YY1JCUG7X3LxaRjJxuUo6GI4dZuIy243j5nOg/Ora35ExT4DOiw5dQbMMQvw2SUjh6moQ==
+conventional-changelog-core@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.6.tgz#ac1731a461c50d150d29c1ad4f33143293bcd32f"
+  integrity sha512-5teTAZOtJ4HLR6384h50nPAaKdDr+IaU0rnD2Gg2C3MS7hKsEPH8pZxrDNqam9eOSPQg9tET6uZY79zzgSz+ig==
   dependencies:
-    conventional-changelog-writer "^4.0.2"
+    conventional-changelog-writer "^4.0.3"
     conventional-commits-parser "^3.0.1"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
@@ -3866,15 +3927,15 @@ conventional-changelog-preset-loader@^2.0.2:
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
   integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ==
 
-conventional-changelog-writer@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.2.tgz#eb493ed84269e7a663da36e49af51c54639c9a67"
-  integrity sha512-d8/FQY/fix2xXEBUhOo8u3DCbyEw3UOQgYHxLsPDw+wHUDma/GQGAGsGtoH876WyNs32fViHmTOUrgRKVLvBug==
+conventional-changelog-writer@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.3.tgz#916a2b302d0bb5ef18efd236a034c13fb273cde1"
+  integrity sha512-bIlpSiQtQZ1+nDVHEEh798Erj2jhN/wEjyw9sfxY9es6h7pREE5BNJjfv0hXGH/FTrAsEpHUq4xzK99eePpwuA==
   dependencies:
     compare-func "^1.3.1"
     conventional-commits-filter "^2.0.1"
     dateformat "^3.0.0"
-    handlebars "^4.0.2"
+    handlebars "^4.1.0"
     json-stringify-safe "^5.0.1"
     lodash "^4.2.1"
     meow "^4.0.0"
@@ -3882,15 +3943,15 @@ conventional-changelog-writer@^4.0.2:
     split "^1.0.0"
     through2 "^2.0.0"
 
-conventional-changelog@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.0.5.tgz#660a61c1c5c9c9ba967ff3d2f5e7e9d7e0680be6"
-  integrity sha512-JYSVGJbnOl9S2gkZwmoJ+wX2gxNVHodUmEiv+eIykeJBNX0zN5vJ3oa2xCvk2HiF7TZ+Les0eq/aX49dcymONA==
+conventional-changelog@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.0.6.tgz#a0bd3b51a0549ec03eb6ef90af7f9fa8c358b15f"
+  integrity sha512-1b96x3G67lDKakRvMm+VvYGwgRk+C8aapHKL5iZ/TJzzD/RuyGA2diHNEsR+uPHmQ7/A4Ts7j6N+VNqUoOfksg==
   dependencies:
-    conventional-changelog-angular "^5.0.2"
+    conventional-changelog-angular "^5.0.3"
     conventional-changelog-atom "^2.0.1"
     conventional-changelog-codemirror "^2.0.1"
-    conventional-changelog-core "^3.1.5"
+    conventional-changelog-core "^3.1.6"
     conventional-changelog-ember "^2.0.2"
     conventional-changelog-eslint "^3.0.1"
     conventional-changelog-express "^2.0.1"
@@ -4015,6 +4076,16 @@ cosmiconfig@^5.0.0, cosmiconfig@^5.0.5, cosmiconfig@^5.0.7:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
+cosmiconfig@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
+  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.0"
+    parse-json "^4.0.0"
+
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -4123,6 +4194,11 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
+crypto-js@^3.1.9-1:
+  version "3.1.9-1"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
+  integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=
+
 css-loader@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
@@ -4636,7 +4712,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -4653,7 +4729,7 @@ 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=
 
-deep-equal@^1.0.1:
+deep-equal@^1.0.0, deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
   integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
@@ -4663,6 +4739,11 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
 deepmerge@^2.0.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
@@ -4676,6 +4757,14 @@ default-gateway@^2.6.0:
     execa "^0.10.0"
     ip-regex "^2.1.0"
 
+default-gateway@^4.0.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
+  dependencies:
+    execa "^1.0.0"
+    ip-regex "^2.1.0"
+
 default-require-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
@@ -4803,6 +4892,13 @@ detect-port@^1.2.3:
     address "^1.0.1"
     debug "^2.6.0"
 
+dfa@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.1.0.tgz#d30218bd10d030fa421df3ebbc82285463a31781"
+  integrity sha1-0wIYvRDQMPpCHfPrvIIoVGOjF4E=
+  dependencies:
+    babel-runtime "^6.11.6"
+
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -4989,6 +5085,13 @@ dotenv@^6.0.0, dotenv@^6.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
   integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
+duplexer2@~0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+  dependencies:
+    readable-stream "^2.0.2"
+
 duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -5239,6 +5342,41 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escodegen@^1.8.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
+  integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+escodegen@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.2.0.tgz#09de7967791cc958b7f89a2ddb6d23451af327e1"
+  integrity sha1-Cd55Z3kcyVi3+Jot220jRRrzJ+E=
+  dependencies:
+    esprima "~1.0.4"
+    estraverse "~1.5.0"
+    esutils "~1.0.0"
+  optionalDependencies:
+    source-map "~0.1.30"
+
+escodegen@~1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
@@ -5247,11 +5385,21 @@ eslint-scope@^4.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
+esprima@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
+  integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
+
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -5259,16 +5407,26 @@ esrecurse@^4.1.0:
   dependencies:
     estraverse "^4.1.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
+estraverse@~1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"
+  integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
   integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
+esutils@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570"
+  integrity sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=
+
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
@@ -5389,13 +5547,6 @@ expand-braces@^0.1.1:
     array-unique "^0.2.1"
     braces "^0.1.2"
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -5417,13 +5568,6 @@ expand-range@^0.1.0:
     is-number "^0.1.1"
     repeat-string "^0.2.2"
 
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
@@ -5505,13 +5649,6 @@ external-editor@^3.0.0, external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -5546,6 +5683,16 @@ faker@^4.1.0:
   resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
   integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=
 
+falafel@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
+  integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
+  dependencies:
+    acorn "^5.0.0"
+    foreach "^2.0.5"
+    isarray "0.0.1"
+    object-keys "^1.0.6"
+
 fancy-log@^1.3.2, fancy-log@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
@@ -5583,6 +5730,11 @@ fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
 fastparse@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
@@ -5667,11 +5819,6 @@ file-system-cache@^1.0.5:
     fs-extra "^0.30.0"
     ramda "^0.21.0"
 
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
 fileset@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
@@ -5685,17 +5832,6 @@ filesize@3.6.1:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
   integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
 
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -5811,6 +5947,23 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "^3.2.6"
 
+fontkit@^1.0.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/fontkit/-/fontkit-1.8.0.tgz#deb9351619e90ddc91707b6156a9f14c8ab11554"
+  integrity sha512-EFDRCca7khfQWYu1iFhsqeABpi87f03MBdkT93ZE6YhqCdMzb5Eojb6c4dlJikGv5liuhByyzA7ikpIPTSBWbQ==
+  dependencies:
+    babel-runtime "^6.11.6"
+    brfs "^1.4.0"
+    brotli "^1.2.0"
+    browserify-optional "^1.0.0"
+    clone "^1.0.1"
+    deep-equal "^1.0.0"
+    dfa "^1.0.0"
+    restructure "^0.5.3"
+    tiny-inflate "^1.0.2"
+    unicode-properties "^1.0.0"
+    unicode-trie "^0.3.0"
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -5821,13 +5974,6 @@ for-in@^1.0.1, for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
@@ -5835,6 +5981,11 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -5960,7 +6111,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.0.0, fsevents@^1.2.2, fsevents@^1.2.7:
+fsevents@^1.2.2, fsevents@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
   integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
@@ -6112,21 +6263,6 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -6343,18 +6479,7 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@4.0.10:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
-  integrity sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=
-  dependencies:
-    async "^1.4.0"
-    optimist "^0.6.1"
-    source-map "^0.4.4"
-  optionalDependencies:
-    uglify-js "^2.6"
-
-handlebars@^4.0.11, handlebars@^4.0.2:
+handlebars@^4.0.11:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
   integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
@@ -6365,6 +6490,17 @@ handlebars@^4.0.11, handlebars@^4.0.2:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+handlebars@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
+  integrity sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -6617,6 +6753,16 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
+http-proxy-middleware@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
+  dependencies:
+    http-proxy "^1.17.0"
+    is-glob "^4.0.0"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
+
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
@@ -6627,7 +6773,7 @@ http-proxy-middleware@~0.18.0:
     lodash "^4.17.5"
     micromatch "^3.1.9"
 
-http-proxy@^1.13.0, http-proxy@^1.16.2:
+http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
@@ -6681,10 +6827,12 @@ husky@^1.3.1:
     run-node "^1.0.0"
     slash "^2.0.0"
 
-i18next@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-14.1.1.tgz#d569aff68c088151f09fcb0cb6f44b36d62731d3"
-  integrity sha512-HItn9RHLyrDqe6pw6qXMYHGPHNc3y1FZndJfBlD6k4sRS0FAlYLvqCDVIWFc1XultBgsv348TtvL/lleG6JgBg==
+i18next@^15.0.4:
+  version "15.0.8"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.8.tgz#4a52ba8b422832f334fe2fb464e8ad4785899211"
+  integrity sha512-ayzNwJ9NHtqEeAG0nQ6yKFbIpZULpDeesjVnfWQaPwbH7Anee8QwRAYPNWHtFCmDZV9FZaKiEbfo1scH8+KSDg==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
 
 iconv-lite@0.4, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
@@ -6948,6 +7096,14 @@ internal-ip@^3.0.1:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
+internal-ip@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
+  integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
+  dependencies:
+    default-gateway "^4.0.1"
+    ipaddr.js "^1.9.0"
+
 interpret@^1.0.0, interpret@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
@@ -7000,7 +7156,7 @@ ipaddr.js@1.8.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
   integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
-ipaddr.js@^1.5.2:
+ipaddr.js@^1.5.2, 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==
@@ -7131,18 +7287,6 @@ is-dom@^1.0.9:
   resolved "https://registry.yarnpkg.com/is-dom/-/is-dom-1.0.9.tgz#483832d52972073de12b9fe3f60320870da8370d"
   integrity sha1-SDgy1SlyBz3hK5/j9gMghw2oNw0=
 
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -7155,11 +7299,6 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -7184,13 +7323,6 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -7220,13 +7352,6 @@ is-number@^0.1.1:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
   integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=
 
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -7234,11 +7359,6 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -7275,16 +7395,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-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -7605,6 +7715,14 @@ js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.13.0:
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
+  integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -7841,11 +7959,6 @@ known-css-properties@^0.11.0:
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.11.0.tgz#0da784f115ea77c76b81536d7052e90ee6c86a8a"
   integrity sha512-bEZlJzXo5V/ApNNa5z375mJC6Nrz4vG43UgcSCrg2OHC+yuB6j0iDSrY7RQ/+PRofFB03wNIIt9iXIVLr4wc7w==
 
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
-
 lazy-universal-dotenv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-2.0.0.tgz#e015ad9f77be9ef811956d53ea9519b1c0ab0214"
@@ -7906,6 +8019,14 @@ leven@^2.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
   integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 license-webpack-plugin@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
@@ -7921,7 +8042,16 @@ lie@~3.1.0:
   dependencies:
     immediate "~3.0.5"
 
-live-server@1.2.1:
+linebreak@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/linebreak/-/linebreak-0.3.0.tgz#0526480a62c05bd679f3e9d99830e09c6a7d0ed6"
+  integrity sha1-BSZICmLAW9Z58+nZmDDgnGp9DtY=
+  dependencies:
+    base64-js "0.0.8"
+    brfs "^1.3.0"
+    unicode-trie "^0.3.0"
+
+live-server@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/live-server/-/live-server-1.2.1.tgz#670630dd409d22fe9c513ab1c1894686c757153e"
   integrity sha512-Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw==
@@ -8108,11 +8238,6 @@ longest-streak@^2.0.1:
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e"
   integrity sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==
 
-longest@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
-
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -8148,16 +8273,23 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-lunr@2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.5.tgz#7b510bad57e948dfb99a71fdff00c1bf9171bdda"
-  integrity sha512-EtnfmHsHJTr3u24sito9JctSxej5Ds0SgUD2Lm+qRHyLgM7BGesFlW14eNh1mil0fV5Muh8gf3dBBXzADlUlzQ==
+lunr@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.6.tgz#f278beee7ffd56ad86e6e478ce02ab2b98c78dd5"
+  integrity sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==
 
 macos-release@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
   integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==
 
+magic-string@^0.22.4:
+  version "0.22.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
+  dependencies:
+    vlq "^0.2.2"
+
 magic-string@^0.25.0:
   version "0.25.2"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
@@ -8238,15 +8370,10 @@ markdown-table@^1.1.0:
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz#c78db948fa879903a41bce522e3b96f801c63786"
   integrity sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==
 
-marked@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.4.0.tgz#9ad2c2a7a1791f10a852e0112f77b571dce10c66"
-  integrity sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==
-
-math-random@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
+marked@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.1.tgz#a63addde477bca9613028de4b2bc3629e53a0562"
+  integrity sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==
 
 mathml-tag-names@^2.0.1:
   version "2.1.0"
@@ -8295,7 +8422,7 @@ mem@^4.0.0:
     mimic-fn "^1.0.0"
     p-is-promise "^2.0.0"
 
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -8359,6 +8486,13 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
+merge-source-map@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
+  dependencies:
+    source-map "^0.5.6"
+
 merge2@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
@@ -8369,25 +8503,6 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^2.1.5:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
 micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -8712,7 +8827,7 @@ negotiator@0.6.1:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
-neo-async@^2.5.0:
+neo-async@^2.5.0, neo-async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
@@ -8949,7 +9064,7 @@ normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
@@ -9098,7 +9213,12 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.12:
+object-inspect@~1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+  integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
+
+object-keys@^1.0.12, object-keys@^1.0.6:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
   integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
@@ -9138,14 +9258,6 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -9236,6 +9348,18 @@ optimist@^0.6.1, optimist@~0.6.0:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
+optionator@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
 original@>=0.0.5, original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -9395,6 +9519,11 @@ pacote@9.4.0:
     unique-filename "^1.1.1"
     which "^1.3.1"
 
+pako@^0.2.5:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
+
 pako@~1.0.2, pako@~1.0.5:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4"
@@ -9445,16 +9574,6 @@ parse-github-repo-url@^1.3.0:
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
   integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
 
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -9609,6 +9728,26 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+pdfkit@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/pdfkit/-/pdfkit-0.9.0.tgz#0d356363be4594d7d757238879dd701176f79f45"
+  integrity sha512-j/tJvvoEM7qMiOfodNkz6XRNBvAhVohWP1mUvgg+Xy8X8S3aMBpVGXJGZWNCoCUH2ywLidZSbHyn5mJaqv9umw==
+  dependencies:
+    crypto-js "^3.1.9-1"
+    fontkit "^1.0.0"
+    linebreak "^0.3.0"
+    png-js ">=0.1.0"
+    saslprep "1.0.1"
+
+pdfmake@^0.1.53:
+  version "0.1.54"
+  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.54.tgz#91a9ba862ee689f6dfd1caa07dd581c0fd770bfb"
+  integrity sha512-HO2FX+czmO+8LpWXQMFQfdUCCKnqwSvSEJExGkUKfsV34DRIV5PZjNg0xWS7ypGrnTY6RTTssWpdreX/pbyeyw==
+  dependencies:
+    iconv-lite "^0.4.24"
+    linebreak "^0.3.0"
+    pdfkit "^0.9.0"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -9674,6 +9813,11 @@ please-upgrade-node@^3.1.1:
   dependencies:
     semver-compare "^1.0.0"
 
+png-js@>=0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/png-js/-/png-js-0.1.1.tgz#1cc7c212303acabe74263ec3ac78009580242d93"
+  integrity sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=
+
 popper.js@^1.14.7:
   version "1.14.7"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
@@ -9867,10 +10011,10 @@ postcss@^6.0.1, postcss@^6.0.23:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 pretty-error@^2.1.1:
   version "2.1.1"
@@ -10106,20 +10250,20 @@ quick-lru@^1.0.0:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
   integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
+quote-stream@^1.0.1, quote-stream@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
+  integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
+  dependencies:
+    buffer-equal "0.0.1"
+    minimist "^1.1.3"
+    through2 "^2.0.0"
+
 ramda@^0.21.0:
   version "0.21.0"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35"
   integrity sha1-oAGr7bP/YQd9T/HVd9RN536NCjU=
 
-randomatic@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
@@ -10383,7 +10527,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^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.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, 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.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -10506,6 +10650,11 @@ regenerator-runtime@^0.12.0, regenerator-runtime@^0.12.1:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
+regenerator-runtime@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
+  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
+
 regenerator-transform@^0.13.3:
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
@@ -10513,13 +10662,6 @@ regenerator-transform@^0.13.3:
   dependencies:
     private "^0.1.6"
 
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -10675,7 +10817,7 @@ repeat-string@^0.2.2:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
   integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=
 
-repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -10773,7 +10915,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.8.1:
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
+
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.8.1:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
@@ -10788,6 +10935,13 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restructure@^0.5.3:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/restructure/-/restructure-0.5.4.tgz#f54e7dd563590fb34fd6bf55876109aeccb28de8"
+  integrity sha1-9U591WNZD7NP1r9Vh2EJrsyyjeg=
+  dependencies:
+    browserify-optional "^1.0.0"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -10803,13 +10957,6 @@ rfdc@^1.1.2:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
   integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
 
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
-  dependencies:
-    align-text "^0.1.1"
-
 rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -10910,6 +11057,11 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+saslprep@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.1.tgz#b644e0ba25b156b652f3cb90df7542f896049ba6"
+  integrity sha512-ntN6SbE3hRqd45PKKadRPgA+xHPWg5lPSj2JWJdJvjTwXDDfkPVtXWvP8jJojvnm+rAsZ2b299C5NwZqq818EA==
+
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
@@ -11150,6 +11302,11 @@ shallow-clone@^1.0.0:
     kind-of "^5.0.0"
     mixin-object "^2.0.1"
 
+shallow-copy@~0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
+  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
+
 shallowequal@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
@@ -11422,7 +11579,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@0.1.x:
+source-map@0.1.x, source-map@~0.1.30:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
   integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
@@ -11439,14 +11596,14 @@ source-map@0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-source-map@^0.4.2, source-map@^0.4.4, source-map@~0.4.1:
+source-map@^0.4.2, source-map@~0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -11606,6 +11763,13 @@ state-toggle@^1.0.0:
   resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz#c3cb0974f40a6a0f8e905b96789eb41afa1cde3a"
   integrity sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==
 
+static-eval@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
+  integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==
+  dependencies:
+    escodegen "^1.8.1"
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -11614,6 +11778,26 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
+static-module@^2.2.0:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
+  integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
+  dependencies:
+    concat-stream "~1.6.0"
+    convert-source-map "^1.5.1"
+    duplexer2 "~0.1.4"
+    escodegen "~1.9.0"
+    falafel "^2.1.0"
+    has "^1.0.1"
+    magic-string "^0.22.4"
+    merge-source-map "1.0.4"
+    object-inspect "~1.4.0"
+    quote-stream "~1.0.2"
+    readable-stream "~2.3.3"
+    shallow-copy "~0.0.1"
+    static-eval "^2.0.0"
+    through2 "~2.0.3"
+
 stats-webpack-plugin@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
@@ -12075,7 +12259,7 @@ text-table@0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-through2@^2.0.0, through2@^2.0.2:
+through2@^2.0.0, through2@^2.0.2, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -12083,7 +12267,7 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@~2.3, through@~2.3.1:
+through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -12105,6 +12289,11 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-inflate@^1.0.0, tiny-inflate@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
+  integrity sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=
+
 tinymce@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.0.0.tgz#03e819e8f3a2ce116fc445541fa493d6b7f5d827"
@@ -12341,6 +12530,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -12392,21 +12588,6 @@ uglify-js@3.4.x, uglify-js@^3.1.4:
     commander "~2.17.1"
     source-map "~0.6.1"
 
-uglify-js@^2.6:
-  version "2.8.29"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
-  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
-  dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
-
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
@@ -12443,11 +12624,27 @@ unicode-match-property-value-ecmascript@^1.0.2:
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
   integrity sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==
 
+unicode-properties@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-properties/-/unicode-properties-1.1.0.tgz#7a96eef49f75682ea69d2315eec9ac43ffdf00c1"
+  integrity sha1-epbu9J91aC6mnSMV7smsQ//fAME=
+  dependencies:
+    brfs "^1.4.0"
+    unicode-trie "^0.3.0"
+
 unicode-property-aliases-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
   integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
 
+unicode-trie@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-0.3.1.tgz#d671dddd89101a08bac37b6a5161010602052085"
+  integrity sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=
+  dependencies:
+    pako "^0.2.5"
+    tiny-inflate "^1.0.0"
+
 unified@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz#5032f1c1ee3364bd09da12e27fdd4a7553c7be13"
@@ -12557,6 +12754,11 @@ upath@^1.0.5, upath@^1.1.0:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
   integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
 
+upath@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
@@ -12735,6 +12937,11 @@ viz.js@^1.8.0:
   resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a"
   integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==
 
+vlq@^0.2.2:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
+
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -12838,6 +13045,16 @@ webpack-dev-middleware@^3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
+webpack-dev-middleware@^3.5.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
+  integrity sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.3.1"
+    range-parser "^1.0.3"
+    webpack-log "^2.0.0"
+
 webpack-dev-server@3.1.14:
   version "3.1.14"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
@@ -12874,6 +13091,42 @@ webpack-dev-server@3.1.14:
     webpack-log "^2.0.0"
     yargs "12.0.2"
 
+webpack-dev-server@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
+  integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
+  dependencies:
+    ansi-html "0.0.7"
+    bonjour "^3.5.0"
+    chokidar "^2.0.0"
+    compression "^1.5.2"
+    connect-history-api-fallback "^1.3.0"
+    debug "^4.1.1"
+    del "^3.0.0"
+    express "^4.16.2"
+    html-entities "^1.2.0"
+    http-proxy-middleware "^0.19.1"
+    import-local "^2.0.0"
+    internal-ip "^4.2.0"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    schema-utils "^1.0.0"
+    selfsigned "^1.9.1"
+    semver "^5.6.0"
+    serve-index "^1.7.2"
+    sockjs "0.3.19"
+    sockjs-client "1.3.0"
+    spdy "^4.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^6.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "^3.5.1"
+    webpack-log "^2.0.0"
+    yargs "12.0.2"
+
 webpack-hot-middleware@^2.24.3:
   version "2.24.3"
   resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.24.3.tgz#5bb76259a8fc0d97463ab517640ba91d3382d4a6"
@@ -12944,7 +13197,7 @@ webpack@4.29.0:
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
-webpack@^4.23.1, webpack@^4.29.3:
+webpack@^4.23.1:
   version "4.29.3"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.3.tgz#e0b406a7b4201ed5e4fb4f84fd7359f9a7db4647"
   integrity sha512-xPJvFeB+8tUflXFq+OgdpiSnsCD5EANyv56co5q8q8+YtEasn5Sj3kzY44mta+csCIEB0vneSxnuaHkOL2h94A==
@@ -13028,11 +13281,6 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
-
 windows-release@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e"
@@ -13040,16 +13288,16 @@ windows-release@^3.1.0:
   dependencies:
     execa "^0.10.0"
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
-
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
 worker-farm@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
@@ -13286,16 +13534,6 @@ yargs@^7.0.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"
-
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 4f4076a1a..d09400e69 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -52,34 +52,34 @@
 		"cordova:run:prod:device": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ionic cordova run android --prod --release --device"
 	},
 	"dependencies": {
-		"@angular/animations": "^7.2.10",
-		"@angular/common": "^7.2.10",
-		"@angular/core": "^7.2.10",
-		"@angular/forms": "^7.2.10",
-		"@angular/http": "^7.2.10",
-		"@angular/platform-browser": "^7.2.10",
-		"@angular/platform-browser-dynamic": "^7.2.10",
-		"@angular/pwa": "^0.13.6",
-		"@angular/router": "~7.2.10",
-		"@angular/service-worker": "^7.2.10",
+		"@angular/animations": "^7.2.11",
+		"@angular/common": "^7.2.11",
+		"@angular/core": "^7.2.11",
+		"@angular/forms": "^7.2.11",
+		"@angular/http": "^7.2.11",
+		"@angular/platform-browser": "^7.2.11",
+		"@angular/platform-browser-dynamic": "^7.2.11",
+		"@angular/pwa": "^0.13.7",
+		"@angular/router": "^7.2.11",
+		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
 		"@ionic-native/call-number": "^5.3.0",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
-		"@ionic-native/dialogs": "~5.3.0",
+		"@ionic-native/dialogs": "^5.3.0",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.0.0-beta.26",
 		"@ionic-native/in-app-browser": "^5.3.0",
-		"@ionic-native/intercom": "~5.3.0",
+		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",
 		"@ionic-native/network": "^5.3.0",
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",
-		"@ionic-native/unique-device-id": "~5.3.0",
+		"@ionic-native/unique-device-id": "^5.3.0",
 		"@ionic-native/vibration": "^5.3.0",
 		"@ionic/angular": "^4.1.2",
 		"@ionic/pro": "^2.0.4",
@@ -95,7 +95,7 @@
 		"apollo-link": "^1.2.11",
 		"apollo-link-context": "^1.0.17",
 		"apollo-link-ws": "^1.0.17",
-		"call-number": "~1.0.1",
+		"call-number": "^1.0.1",
 		"connect": "^3.6.6",
 		"cordova-android": "7.1.4",
 		"cordova-android-support-gradle-release": "^2.0.1",
@@ -157,14 +157,15 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "~0.13.6",
-		"@angular-devkit/build-angular": "~0.13.6",
-		"@angular-devkit/core": "~7.3.6",
-		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.6",
-		"@angular/compiler": "^7.2.10",
-		"@angular/compiler-cli": "^7.2.10",
-		"@angular/language-service": "^7.2.10",
+		"@angular-devkit/architect": "^0.13.7",
+		"@angular-devkit/build-angular": "^0.13.7",
+		"@angular-devkit/build-webpack": "^0.13.7",
+		"@angular-devkit/core": "^7.3.7",
+		"@angular-devkit/schematics": "^7.3.7",
+		"@angular/cli": "^7.3.7",
+		"@angular/compiler": "^7.2.11",
+		"@angular/compiler-cli": "^7.2.11",
+		"@angular/language-service": "^7.2.11",
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.0",
 		"@ionic/app-scripts": "^3.2.3",
@@ -193,12 +194,12 @@
 		"dotenv": "^7.0.0",
 		"envalid": "^4.2.2",
 		"ionic": "^4.12.0",
-		"jasmine-core": "~3.3.0",
-		"jasmine-spec-reporter": "~4.2.1",
+		"jasmine-core": "^3.3.0",
+		"jasmine-spec-reporter": "^4.2.1",
 		"karma": "^4.0.1",
-		"karma-chrome-launcher": "~2.2.0",
-		"karma-coverage-istanbul-reporter": "~2.0.5",
-		"karma-jasmine": "~2.0.1",
+		"karma-chrome-launcher": "^2.2.0",
+		"karma-coverage-istanbul-reporter": "^2.0.5",
+		"karma-jasmine": "^2.0.1",
 		"karma-jasmine-html-reporter": "^1.4.0",
 		"protractor": "^5.4.2",
 		"rxjs-tslint": "0.1.5",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 1db9d3b92..c6bb3d8a5 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -14,24 +14,24 @@
   resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
   integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
 
-"@angular-devkit/architect@0.13.6", "@angular-devkit/architect@~0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.6.tgz#7758ab9f288cfd4f64d8b88b0700bac5c4961d06"
-  integrity sha512-Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw==
+"@angular-devkit/architect@0.13.7", "@angular-devkit/architect@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
+  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@~0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.6.tgz#7050a0367bb7646961d0bdc36aa083a6f3029dea"
-  integrity sha512-gdP856Z5tuQ69mJla5VPKm/uR86dcrPWYW41Jyu5oIhL2GAQ4JtDEuL2+ppwQO8i8hsXGIAbulGAbrlvU5I8OA==
+"@angular-devkit/build-angular@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
+  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/build-optimizer" "0.13.6"
-    "@angular-devkit/build-webpack" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@ngtools/webpack" "7.3.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/build-optimizer" "0.13.7"
+    "@angular-devkit/build-webpack" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@ngtools/webpack" "7.3.7"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -58,7 +58,7 @@
     semver "5.6.0"
     source-map-loader "0.2.4"
     source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.0"
+    speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
@@ -83,23 +83,23 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.6.tgz#846b6d0042de0102c6420ff86380ed961cc71956"
-  integrity sha512-/EOO0wxw7FIKfove4Fv/aKiKgvH0kFhRT2GOe3pW0yV2y2e1dfQdo2AqdGCfJ4rSbwsfWSGTUUFITc+9jgXFZw==
+"@angular-devkit/build-optimizer@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
+  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.6.tgz#c88691aa0259d124e2bdb78a492c44aa44ae148f"
-  integrity sha512-lQmYrhOHeBn/r7uw+FfpJUq9puApYe72+mrIfg/UtLwSEYt58n5d156jnuMcfWnCyhYUgYqLTaOUfSM0RV7akw==
+"@angular-devkit/build-webpack@0.13.7", "@angular-devkit/build-webpack@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
+  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
 "@angular-devkit/core@0.9.0-beta.3":
@@ -124,10 +124,10 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.6", "@angular-devkit/core@~7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.6.tgz#bc11ca571187f0f0ce9df012332794907e0b8133"
-  integrity sha512-aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g==
+"@angular-devkit/core@7.3.7", "@angular-devkit/core@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
   dependencies:
     ajv "6.9.1"
     chokidar "2.0.4"
@@ -151,31 +151,31 @@
     "@angular-devkit/core" "7.3.3"
     rxjs "6.3.3"
 
-"@angular-devkit/schematics@7.3.6", "@angular-devkit/schematics@^7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.6.tgz#5580b730b1bae5397f5860cfb0d7270fec6e6deb"
-  integrity sha512-YXF7QusmMy3D9H0vNczc1n5BkuEHLwt7cW33euNeGNgTIsD0n6DrUhgClurXicnr2GNPSDYE5+3115lmJkhyrg==
+"@angular-devkit/schematics@7.3.7", "@angular-devkit/schematics@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
+  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
-"@angular/animations@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.10.tgz#a651c9526bc0c2860eca424d73d7cd87fee5793b"
-  integrity sha512-WgklBWYKy8LVlugMJ8XgBB4whNiMng8vY6mpaYhza064nsrQXK+ua1anSOGMGlmCI/5i4EgaycTS05XD/C+Kkw==
+"@angular/animations@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
+  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.6.tgz#4bcaec6f371095e8d88384408ee4c9a6852fb97c"
-  integrity sha512-u5lBcYVQRk9cez/DozJvFOYomeko9b5kE+NElyFhPtM3GF1SBcXKb5QyNxH/zSOc850VL7KPe7ZfC6kW3Phhyw==
+"@angular/cli@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
+  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    "@schematics/angular" "7.3.6"
-    "@schematics/update" "0.13.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
+    "@schematics/update" "0.13.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
@@ -185,17 +185,17 @@
     semver "5.6.0"
     symbol-observable "1.2.0"
 
-"@angular/common@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.10.tgz#0f969e02959e85e259b0d14b7355b7339e6bacd0"
-  integrity sha512-FyiVUhV1MaRogXmVKsw6CMXqWZHsiYMdK651absXtGqWZn6and0jiUwEM9LbV4HRpLbB7F6gwqCvT5Ft8xpzeg==
+"@angular/common@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
+  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.10.tgz#e1f06b37d3288d327fc46a337e49ac032c483bb2"
-  integrity sha512-L/mksAkpb8kywYlHlXi5mAyUNNiSHZpoTV+P2t3nNGmqyXuad92TvdZMCO34TYUyGyFz9AVH2qc6LciY9ipQTA==
+"@angular/compiler-cli@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz#0835a17dd9cea4bb03c5073d943a5074fed539ff"
+  integrity sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -209,75 +209,75 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.10.tgz#702b84e81e1f4376b615c4cffbae8310a0610681"
-  integrity sha512-sRuH+UDogzAHpagorHfj2rbF8HWGEJGsFUn5TGq1vyWA37ALuu/zkemufIcgET16lTiBEvVn7/Oz9Am+JTlGrg==
+"@angular/compiler@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.11.tgz#d547bf781e5c8b28da9af2460a6dfb5683d325ae"
+  integrity sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.10.tgz#dfcdbf88480cbab441963ccecaef228b058c8869"
-  integrity sha512-u2IKaq4G1wpq5w1AI0Q7jnsKuSfR4WDsBLnwtjTIjde1YDqA0n0dYwqrvWzLK6SbzSWjlrAXx0hrz5SlDchmqA==
+"@angular/core@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
+  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.10.tgz#ab4b5d702e24921b60f8e0e6df527602f99d05c4"
-  integrity sha512-fQccon0Yuni13QJt16npSRlkitPZBLXfWXDFwCEybo/QqtSar3BOJAQFW2yqokrfW5lbO5VDFJ7Pj2dDyBXEAA==
+"@angular/forms@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
+  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.10.tgz#f8906c13e1eaa440ee3401a519ec9579f707220e"
-  integrity sha512-Uaq9Ep21ZZIG+yzYHhyH+RA/AEyKGTtWT5y12UXXFsCdXSwJ2p+czw2EdP42Oj1g1QptkP6lAl2W/RUlxwXQcw==
+"@angular/http@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.11.tgz#c52a491374d937cd05789a5c13d70a1c5fdddf4d"
+  integrity sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.10.tgz#5550fa689f1b35c78cfee65644cc00f0e7778325"
-  integrity sha512-14mIHbouqD+JauLcNakhHSL7/YB63+w7NrwNJY/DHNT/IyppBUV2dneHHembGEUs3QBY+7oL8FfPCLDRT+K+OQ==
+"@angular/language-service@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.11.tgz#1967ebcef5fc03e462941aa70dc41562d5dce06e"
+  integrity sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==
 
-"@angular/platform-browser-dynamic@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.10.tgz#e721192c7e827b448daab236ba214890f29d9311"
-  integrity sha512-ZTJL7iIEL3yDgJLx5/a2wfKsxe0ZHEUSibtbRQNpn35ZI0G9QN7ezbTOqj2+/QGvaY8Y1JeoYCeJrMzaUxDxGg==
+"@angular/platform-browser-dynamic@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
+  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.10.tgz#bdd48bf7412ec95b8bd4bb6e08d80f5011385030"
-  integrity sha512-78r527d0Nw0svkDw2SBr58H3VEH5VAvn+r+q7NLqIqD8jsOMf8CMztUCDs+h02HhEHveCXWI5EtFXxWepB6wFg==
+"@angular/platform-browser@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
+  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.6.tgz#0aee0960e3110782744076f68c3154cf6cd17b8d"
-  integrity sha512-2bo8oMliGWr1oaI2UM+54ru9zMcwWcDxJNxD9JE6fA/ar60kZdp/ojmoI5MCME2kqSpy26eZdYYczhB51BQz3A==
+"@angular/pwa@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
+  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    "@schematics/angular" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
-"@angular/router@~7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.10.tgz#1842f0e19a38faf7246e69ee16dc5f62f5096e79"
-  integrity sha512-7A0n6O5sW2xbQTG6pHfCwSkx6UvUQLg6Z/sDOghAZUakf4kd5BIWet1Q9eyiYndkpq6esQ+gMt9+CeJidf5l1A==
+"@angular/router@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
+  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.10.tgz#6bb6294028e4cf169f824dd3ee1aa58cb47c9f45"
-  integrity sha512-T3s3rm3FRhrZNKsBGli6ukLobo30hMG9HkV/TH5473wBQPDIZs1aa24GYfSkqmuadvP42tn0BD6XvxWiADcY7A==
+"@angular/service-worker@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.11.tgz#ab61d4b1c75359fde461b4073b90438abff4d9e9"
+  integrity sha512-MalD4T2Iur582TMmHKFDmoqSYMys1EjdTZWt0qME85ri1w7yBriujvTyy9/aZmT2bFBGeJvbqhohoU46CsnqsA==
   dependencies:
     tslib "^1.9.0"
 
@@ -469,7 +469,7 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/dialogs@~5.3.0":
+"@ionic-native/dialogs@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.3.0.tgz#6b565119d08ffcb7c5dd1f68248b8d0739cf3aeb"
   integrity sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==
@@ -511,7 +511,7 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/intercom@~5.3.0":
+"@ionic-native/intercom@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.3.0.tgz#e920f1ed774da10944424f9dfa1a89218f8b4546"
   integrity sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==
@@ -553,7 +553,7 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/unique-device-id@~5.3.0":
+"@ionic-native/unique-device-id@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz#ac63aece625ddf23861427f4e2e4f101107b19e3"
   integrity sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==
@@ -823,12 +823,12 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.6.tgz#3f90c60f7c1742fa4a557f90def8fe742304f4c5"
-  integrity sha512-gDMHybwe8B+1BSvtwM5z4qAkUnZ9b4PTyIVWWECgTLDp2x3WhJi2rMk2X8HTkpbZ52pLPue5GL1sfqlZIOcX7Q==
+"@ngtools/webpack@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
+  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -868,13 +868,13 @@
     "@angular-devkit/schematics" "0.9.0-beta.3"
     typescript "3.0.1"
 
-"@schematics/angular@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.6.tgz#e827111e7d3cdf950efcca504389cbade3c9c59a"
-  integrity sha512-Q4VXAjVaCDb2zXFXoIdOfNPsn+EQjqDBHK4a97omytnSNAmu1erl3l2FkEMi6x/VuzK2mQSzBbmHJIgauMmOAA==
+"@schematics/angular@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
+  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     typescript "3.2.4"
 
 "@schematics/angular@^7.0.3":
@@ -886,13 +886,13 @@
     "@angular-devkit/schematics" "7.3.3"
     typescript "3.2.4"
 
-"@schematics/update@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.6.tgz#7d114b50e99af0b77ea537a50341a81a80240a02"
-  integrity sha512-TkeigdQTHG40ZGj4CAAzQHh7/rSotg0J6nkBBtc4Y+9md7IGg6dzSFJAvYbDX5JZ9tk7DpukdRHOVVopS/J0AQ==
+"@schematics/update@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
+  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -2398,7 +2398,7 @@ 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"
 
-call-number@~1.0.1:
+call-number@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-number/-/call-number-1.0.1.tgz#bf9daae487fd6a5573f89aa3655fbe8af036afd2"
   integrity sha1-v52q5If9alVz+JqjZV++ivA2r9I=
@@ -6392,7 +6392,7 @@ iterall@^1.2.2:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
-jasmine-core@^3.3, jasmine-core@~3.3.0:
+jasmine-core@^3.3, jasmine-core@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
   integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
@@ -6402,7 +6402,7 @@ jasmine-core@~2.8.0:
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
   integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
-jasmine-spec-reporter@~4.2.1:
+jasmine-spec-reporter@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
   integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
@@ -6565,7 +6565,7 @@ kareem@2.3.0, kareem@^2.3.0:
   resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.0.tgz#ef33c42e9024dce511eeaf440cd684f3af1fc769"
   integrity sha512-6hHxsp9e6zQU8nXsP+02HGWXwTkOEw6IROhF2ZA28cYbUk4eJ6QbtZvdqZOdD9YPKghG3apk5eOCvs+tLl3lRg==
 
-karma-chrome-launcher@~2.2.0:
+karma-chrome-launcher@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
   integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
@@ -6573,7 +6573,7 @@ karma-chrome-launcher@~2.2.0:
     fs-access "^1.0.0"
     which "^1.2.1"
 
-karma-coverage-istanbul-reporter@~2.0.5:
+karma-coverage-istanbul-reporter@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz#ca5899d4905e44a5984dd4f963adfc1a74dce767"
   integrity sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==
@@ -6586,7 +6586,7 @@ karma-jasmine-html-reporter@^1.4.0:
   resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.0.tgz#1abbd30d4509a8c82b96707ae7d2fa4da459ca19"
   integrity sha512-0wxhwA8PLPpICZ4o2GRnPi67hf3JhfQm5WCB8nElh4qsE6wRNOTtrqooyBPNqI087Xr2SBhxLg5fU+BJ/qxRrw==
 
-karma-jasmine@~2.0.1:
+karma-jasmine@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
   integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
@@ -10014,10 +10014,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
-  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 2bf3fbe43..dc16be46d 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -55,40 +55,40 @@
 		"cordova:run:prod:device": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ionic cordova run android --prod --release --device"
 	},
 	"dependencies": {
-		"@angular/animations": "^7.2.9",
-		"@angular/common": "^7.2.9",
-		"@angular/core": "^7.2.9",
-		"@angular/forms": "^7.2.9",
-		"@angular/http": "^7.2.9",
-		"@angular/platform-browser": "^7.2.9",
-		"@angular/platform-browser-dynamic": "^7.2.9",
-		"@angular/pwa": "^0.13.6",
-		"@angular/router": "^7.2.9",
-		"@angular/service-worker": "^7.2.9",
-		"@ionic-native/barcode-scanner": "^5.2.0",
-		"@ionic-native/call-number": "^5.2.0",
-		"@ionic-native/camera": "^5.2.0",
-		"@ionic-native/core": "^5.2.0",
-		"@ionic-native/device": "^5.2.0",
-		"@ionic-native/dialogs": "~5.2.0",
-		"@ionic-native/email-composer": "^5.2.0",
-		"@ionic-native/file-transfer": "^5.2.0",
-		"@ionic-native/geolocation": "~5.2.0",
-		"@ionic-native/globalization": "^5.2.0",
-		"@ionic-native/google-analytics": "^5.2.0",
+		"@angular/animations": "^7.2.11",
+		"@angular/common": "^7.2.11",
+		"@angular/core": "^7.2.11",
+		"@angular/forms": "^7.2.11",
+		"@angular/http": "^7.2.11",
+		"@angular/platform-browser": "^7.2.11",
+		"@angular/platform-browser-dynamic": "^7.2.11",
+		"@angular/pwa": "^0.13.7",
+		"@angular/router": "^7.2.11",
+		"@angular/service-worker": "^7.2.11",
+		"@ionic-native/barcode-scanner": "^5.3.0",
+		"@ionic-native/call-number": "^5.3.0",
+		"@ionic-native/camera": "^5.3.0",
+		"@ionic-native/core": "^5.3.0",
+		"@ionic-native/device": "^5.3.0",
+		"@ionic-native/dialogs": "^5.3.0",
+		"@ionic-native/email-composer": "^5.3.0",
+		"@ionic-native/file-transfer": "^5.3.0",
+		"@ionic-native/geolocation": "^5.3.0",
+		"@ionic-native/globalization": "^5.3.0",
+		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.0.0-beta.26",
-		"@ionic-native/in-app-browser": "^5.2.0",
-		"@ionic-native/intercom": "^5.2.0",
-		"@ionic-native/local-notifications": "^5.2.0",
-		"@ionic-native/mixpanel": "^5.2.0",
-		"@ionic-native/network": "^5.2.0",
-		"@ionic-native/open-native-settings": "^5.2.0",
-		"@ionic-native/screen-orientation": "^5.2.0",
-		"@ionic-native/splash-screen": "^5.2.0",
-		"@ionic-native/status-bar": "^5.2.0",
-		"@ionic-native/unique-device-id": "~5.2.0",
-		"@ionic-native/vibration": "~5.2.0",
-		"@ionic/angular": "^4.1.1",
+		"@ionic-native/in-app-browser": "^5.3.0",
+		"@ionic-native/intercom": "^5.3.0",
+		"@ionic-native/local-notifications": "^5.3.0",
+		"@ionic-native/mixpanel": "^5.3.0",
+		"@ionic-native/network": "^5.3.0",
+		"@ionic-native/open-native-settings": "^5.3.0",
+		"@ionic-native/screen-orientation": "^5.3.0",
+		"@ionic-native/splash-screen": "^5.3.0",
+		"@ionic-native/status-bar": "^5.3.0",
+		"@ionic-native/unique-device-id": "^5.3.0",
+		"@ionic-native/vibration": "^5.3.0",
+		"@ionic/angular": "^4.1.2",
 		"@ionic/pro": "^2.0.4",
 		"@ionic/storage": "^2.2.0",
 		"@ngx-translate/core": "^11.0.1",
@@ -171,10 +171,11 @@
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
 		"@angular-devkit/architect": "^0.13.6",
-		"@angular-devkit/build-angular": "^0.13.6",
+		"@angular-devkit/build-angular": "^0.13.7",
+		"@angular-devkit/build-optimizer": "^0.13.7",
 		"@angular-devkit/core": "^7.3.6",
 		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.6",
+		"@angular/cli": "^7.3.7",
 		"@angular/compiler": "^7.2.9",
 		"@angular/compiler-cli": "^7.2.9",
 		"@angular/language-service": "^7.2.9",
@@ -210,9 +211,10 @@
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
+		"yargs": "^13.2.2",
 		"typescript": "~3.2.4",
 		"webpack-bundle-analyzer": "^3.1.0",
-		"yargs": "^13.2.2"
+		"webpack-merge": "^4.2.1"
 	},
 	"cordova": {
 		"platforms": [
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 01e024cce..79a26909a 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -14,7 +14,15 @@
   resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
   integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
 
-"@angular-devkit/architect@0.13.6", "@angular-devkit/architect@^0.13.6":
+"@angular-devkit/architect@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
+  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
+"@angular-devkit/architect@^0.13.6":
   version "0.13.6"
   resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.6.tgz#7758ab9f288cfd4f64d8b88b0700bac5c4961d06"
   integrity sha512-Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw==
@@ -22,16 +30,16 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@^0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.6.tgz#7050a0367bb7646961d0bdc36aa083a6f3029dea"
-  integrity sha512-gdP856Z5tuQ69mJla5VPKm/uR86dcrPWYW41Jyu5oIhL2GAQ4JtDEuL2+ppwQO8i8hsXGIAbulGAbrlvU5I8OA==
+"@angular-devkit/build-angular@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
+  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/build-optimizer" "0.13.6"
-    "@angular-devkit/build-webpack" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@ngtools/webpack" "7.3.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/build-optimizer" "0.13.7"
+    "@angular-devkit/build-webpack" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@ngtools/webpack" "7.3.7"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -58,7 +66,7 @@
     semver "5.6.0"
     source-map-loader "0.2.4"
     source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.0"
+    speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
@@ -83,23 +91,23 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.6.tgz#846b6d0042de0102c6420ff86380ed961cc71956"
-  integrity sha512-/EOO0wxw7FIKfove4Fv/aKiKgvH0kFhRT2GOe3pW0yV2y2e1dfQdo2AqdGCfJ4rSbwsfWSGTUUFITc+9jgXFZw==
+"@angular-devkit/build-optimizer@0.13.7", "@angular-devkit/build-optimizer@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
+  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.6.tgz#c88691aa0259d124e2bdb78a492c44aa44ae148f"
-  integrity sha512-lQmYrhOHeBn/r7uw+FfpJUq9puApYe72+mrIfg/UtLwSEYt58n5d156jnuMcfWnCyhYUgYqLTaOUfSM0RV7akw==
+"@angular-devkit/build-webpack@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
+  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
 "@angular-devkit/core@0.9.0-beta.3":
@@ -135,6 +143,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@0.9.0-beta.3":
   version "0.9.0-beta.3"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
@@ -151,7 +170,15 @@
     "@angular-devkit/core" "7.3.4"
     rxjs "6.3.3"
 
-"@angular-devkit/schematics@7.3.6", "@angular-devkit/schematics@^7.3.6":
+"@angular-devkit/schematics@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
+  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    rxjs "6.3.3"
+
+"@angular-devkit/schematics@^7.3.6":
   version "7.3.6"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.6.tgz#5580b730b1bae5397f5860cfb0d7270fec6e6deb"
   integrity sha512-YXF7QusmMy3D9H0vNczc1n5BkuEHLwt7cW33euNeGNgTIsD0n6DrUhgClurXicnr2GNPSDYE5+3115lmJkhyrg==
@@ -159,23 +186,23 @@
     "@angular-devkit/core" "7.3.6"
     rxjs "6.3.3"
 
-"@angular/animations@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.9.tgz#1bfacb76dfd80656e28edb4efdfd3154e56f1c29"
-  integrity sha512-cdIf/UWwhNlw6Ep3pRxRk12F8q/GyTbcHDF4qbgg7lZEDPYS32KS1lpHY1pgSuSOIPZUT+iLPOxAZ6cu7Am1vA==
+"@angular/animations@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
+  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.6.tgz#4bcaec6f371095e8d88384408ee4c9a6852fb97c"
-  integrity sha512-u5lBcYVQRk9cez/DozJvFOYomeko9b5kE+NElyFhPtM3GF1SBcXKb5QyNxH/zSOc850VL7KPe7ZfC6kW3Phhyw==
+"@angular/cli@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
+  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    "@schematics/angular" "7.3.6"
-    "@schematics/update" "0.13.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
+    "@schematics/update" "0.13.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
@@ -185,10 +212,10 @@
     semver "5.6.0"
     symbol-observable "1.2.0"
 
-"@angular/common@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.9.tgz#eeb3d0332e14f737bfb9a63b8347b3dd625e57fe"
-  integrity sha512-SBIinZi/R0mKWjbKvcBhwRpAVIY/7/AnzIEkMb5JnGExersYhDD02otW3ZwPStpl7HrhgWk8ueWnxVFFXRz5gA==
+"@angular/common@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
+  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
   dependencies:
     tslib "^1.9.0"
 
@@ -216,24 +243,24 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.9.tgz#43ca94adf74fd8ad9ba0b015b3b979a5d04fb3a6"
-  integrity sha512-tW1jHjCnvtquJ3XEnmqRNMoV7MXAZ2yfnCXE25+odRZjNVMiTcKWvRLd/XjBzjCg2OvwREXcQpB7/s+Av10uAQ==
+"@angular/core@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
+  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.9.tgz#1cc46542b422654ac87a6ead84cb4d9a7e73b0e8"
-  integrity sha512-2hpu2Gl8suwG5FmOczk/oBBE1x7QypM58XE1ms0V6uYlL+g/JIg0AWMMOldI5KYUnxwoCikgsdGzzt8XPbvRkQ==
+"@angular/forms@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
+  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.9.tgz#074c6ed2860e5f56f3ea15ce7819807f36ee158c"
-  integrity sha512-86brgdKpeEJHiI45cVwEzQJIJb/c+Edlr32hH5rymj2QqpKC5RyMmLajnLhkzV3LdBvEK8P+uRyA+bZyb/X3HQ==
+"@angular/http@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.11.tgz#c52a491374d937cd05789a5c13d70a1c5fdddf4d"
+  integrity sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -242,42 +269,42 @@
   resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.9.tgz#50a74f80a42b069c6a3a0844ee6af3098f8bd48b"
   integrity sha512-+8P3yGqrCZy8PaoxUUlC6cowxPAIbuW4HwhvHvYV3G99LDQUC/bxUPSPhqbrAvDiFr3VeXqivzXgFCTo69S1WQ==
 
-"@angular/platform-browser-dynamic@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.9.tgz#bfbdf1a906f1363440cd4f18f9dd64a369a7b55a"
-  integrity sha512-QJQ1NmzaX2nAX9u6vkc/cZSBEqio/YQojaZqlbRyAn391rpzb9cGVvqYzUU9DqCeXbxKgA1xbmLiNMQ/M7xMHg==
+"@angular/platform-browser-dynamic@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
+  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.9.tgz#4259eb9c41d152c580ab283b858a938fc0058421"
-  integrity sha512-h7RaXllauFLa1SPcje/cK7IbwCqV6ViyeHEUAAWljrM2OWRU1zRYtDk/gcphRj4tWhhHVfQsJ9+0p3NoPP5LZw==
+"@angular/platform-browser@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
+  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.6.tgz#0aee0960e3110782744076f68c3154cf6cd17b8d"
-  integrity sha512-2bo8oMliGWr1oaI2UM+54ru9zMcwWcDxJNxD9JE6fA/ar60kZdp/ojmoI5MCME2kqSpy26eZdYYczhB51BQz3A==
+"@angular/pwa@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
+  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    "@schematics/angular" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
-"@angular/router@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.9.tgz#63fabbaa4dc83c32fbc2858c621916ea7b1690a1"
-  integrity sha512-vNk2x6i1iLNQM1KYnRhbC2DJQvNmlu9lVGzcZzRiS7zDT5DFvbiYA1M7ixUlbehLDEGVKlJEZNIdKWErWW8xYw==
+"@angular/router@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
+  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.9.tgz#f48cc8a86d7234f11f2d03e6696059d4cadcc5d5"
-  integrity sha512-cBwx0GN/onLSRgz18Wg1tXPcbL+TcfglAmGP0juvQnNlpRwGeyV0pF8ny9yKA1IvI6n3CkoKlmku8Tu6KcXcKA==
+"@angular/service-worker@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.11.tgz#ab61d4b1c75359fde461b4073b90438abff4d9e9"
+  integrity sha512-MalD4T2Iur582TMmHKFDmoqSYMys1EjdTZWt0qME85ri1w7yBriujvTyy9/aZmT2bFBGeJvbqhohoU46CsnqsA==
   dependencies:
     tslib "^1.9.0"
 
@@ -346,80 +373,80 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
-"@ionic-native/barcode-scanner@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.2.0.tgz#b9ec9b91bfdb0d959eedda334e2fa204aa4eae9f"
-  integrity sha512-ZtMbUnudFg26G5f9reSAhPXPEi44m8j5JKioSICuhL7mAMDwEHUwbhO7nzv932VES2fkHLVipl4wAvopacCLSQ==
+"@ionic-native/barcode-scanner@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz#e04bb2884f6f0a76b135d34f41c40e8d3a52b72d"
+  integrity sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/call-number@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.2.0.tgz#afa90099b3a6b96543b762b1aecb66ff7ebbb9b7"
-  integrity sha512-za61/CsaMiXGI3Lnj4Rx9T5Cf7ZPe+1rZql0MjNK1z3JHJ1NIscoqE6RrnEwniHJac/AXRVe92F+uEjNVkl52g==
+"@ionic-native/call-number@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.3.0.tgz#4a9318fecb4b1dce804786ecb78b51c84f05f06f"
+  integrity sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/camera@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.2.0.tgz#2e4fe57e22e8818726bf124241c76bd608fb491c"
-  integrity sha512-Q0ArlB6oFJAja+7QnKwJoBwiSFdzlB0NS4OJmxjjfI54S1ZcZxl88g1VR1QQtzXju+M4+Kse0kbXOK0DaGd/Rg==
+"@ionic-native/camera@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.3.0.tgz#fbd58cdb9c7a53fd2f65697f6395ea481743b67c"
+  integrity sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/core@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/core/-/core-5.2.0.tgz#68bf890b3276d481c2266d348028968646002234"
-  integrity sha512-bVvYZsNTckoRW61QioGHTfp2v0FJcaJ7WhlnMrGgOj/ejBvSMPpfj1K/pws0TCUFnerWyLbSXgfGGYGoicLEOw==
+"@ionic-native/core@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/core/-/core-5.3.0.tgz#50934ded237a03489cf45bef3f1d3a7f1a0a71c4"
+  integrity sha512-oIsBvkB/Q63bjKvHGW7zAFMWSXIwnZ/U962UFyuqrF9dKvNSPI5cz8iPOaqKE+jzb2XhlcGKEbp5qAhTI0BcZQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/device@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.2.0.tgz#d9a67ed36e03e06af90d9f5986dc388c758f7201"
-  integrity sha512-osDY/JdmyHDWfQHkgdxgHnKEJ33GIN0O9tsZNPvv5BTtESXdbSE/2t82HDXzXx2pIzekXCX8jgpLk7YuR78Tsw==
+"@ionic-native/device@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.3.0.tgz#6734f6adb5bed0aaa34da1aad84b658583e17d0b"
+  integrity sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/dialogs@~5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.2.0.tgz#30d179407a3a03501ef2b05ab7c1699b98dc0bd1"
-  integrity sha512-21CoFGAq2lGx+8a9rR40lcQ+gvFU61Z9yr3wQm1AQNOPC5F0B0ABIEcPynFyf5+sYjb+Kp5dAWfnispRX8gTdA==
+"@ionic-native/dialogs@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.3.0.tgz#6b565119d08ffcb7c5dd1f68248b8d0739cf3aeb"
+  integrity sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/email-composer@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/email-composer/-/email-composer-5.2.0.tgz#31b2ec1e3dbd4e7eb0c18bb3ac26fb73e05b4ad6"
-  integrity sha512-kIBqjcyyWOYDRvNch92Q+IR/ER6fYL+QyL3DDlI5ZPlb/T8ByVsiWxw5V0wktEz2hZUKLrSGBKEGRr/Or3z7oA==
+"@ionic-native/email-composer@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/email-composer/-/email-composer-5.3.0.tgz#99328cf73819ed25e4677ccd076281c8e430cac6"
+  integrity sha512-BgxdiLdlxcIIpkAhkhPPHqjvM8EJc1CD/9yi1MB6Ys7g4td5HlSxnQscnCN9aV+eVx0ft7Je40yVCkJ+xepbMA==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/file-transfer@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/file-transfer/-/file-transfer-5.2.0.tgz#25dba2c0a6c0672b2adf990262863085fd2913de"
-  integrity sha512-lYtGPp11bnzs7tgd1el5HQznL74dQrurx0o6OqO8CKfZ+8OXRE1RnaPb6ofj9rR0g2Vml+0v7a4i6h4c2gry8g==
+"@ionic-native/file-transfer@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/file-transfer/-/file-transfer-5.3.0.tgz#36d284b127cf21f2a0f105eefe5286674e53a68e"
+  integrity sha512-391Bh8n0wAL1IkBtWLuVohwH+VqGVgfRamD/gPSMpeqWicuqGB/doHk7k3IRSN81WxmeFC0LPZEcuPryuTABQQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/geolocation@~5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.2.0.tgz#191396075f09668c2b2a6a009a2f5a7d7c332c4f"
-  integrity sha512-YQdZJr5ggJFYeESlslWoSKmh+NxH9BZvCr/KETV/3kuHOo/QkQ/HdiaHFi846ZlZcm7JiYNpIALMlEWBlwBo3A==
+"@ionic-native/geolocation@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.3.0.tgz#64a3495a6b9bdf4c2d5eb106a1b49012336eaef0"
+  integrity sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/globalization@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/globalization/-/globalization-5.2.0.tgz#1d2c0f17f54243c79b589f6d4839814064885781"
-  integrity sha512-OldeM+prasbBsTIJXU29iu/WJkCzMmFElXL8Lv6GTa+Iro2UprxD1gttjktSH8viGvTHjxhlfKvc6cqVBn5Ztw==
+"@ionic-native/globalization@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/globalization/-/globalization-5.3.0.tgz#f1cd1a81a5a9079078b05a0defe6ba5216d36675"
+  integrity sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/google-analytics@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.2.0.tgz#00318ef0bac7e87db98e68418241ad6329d7779b"
-  integrity sha512-mm9bjn743Or5XQzVCepxZzvE1B2ImdmgFTsbyrM7d0WFfyeHjvZjwjTjCRR0YXlO2MBjb2FjgpDgvWOdyfdVoQ==
+"@ionic-native/google-analytics@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz#6e07f8fe67b24a83d04869d5bb2561530feb997a"
+  integrity sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==
   dependencies:
     "@types/cordova" latest
 
@@ -430,80 +457,80 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/in-app-browser@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.2.0.tgz#c3e1d4643e27e451fff24d8a9af7f41648bad868"
-  integrity sha512-mVTVtOXv8Cg9LHhcG5Nw8oNxM3TbuS5/9ywx1gpIz9ISVxIOD9sF2JgttP8NhGjMXbJKzlchp+mPcq+ne4J1YA==
+"@ionic-native/in-app-browser@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz#9e3e3ac12c18a8ebd1052ab35c05f16f090124fb"
+  integrity sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/intercom@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.2.0.tgz#872235365808c2475d2fc03794d52ec7089b7d4f"
-  integrity sha512-aniHy0Dwqx4DxUimo6rKA0FAKQp/qwPNL+eUsRVFSB17h8iEkK+lo3izJVeIZ32vYJVcORWR3fXr5cM2cFyE9Q==
+"@ionic-native/intercom@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.3.0.tgz#e920f1ed774da10944424f9dfa1a89218f8b4546"
+  integrity sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/local-notifications@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.2.0.tgz#74caa86a2c482d44d4ff90ea7de1df37b02ce89e"
-  integrity sha512-nfQL+NClUAFP7asB23HYZ0EFbkKSPXTpBi3/ckbnXLGN4ARj0hmdab1IAOUgH+Bp4+pWvehRk2BmHGU56baBow==
+"@ionic-native/local-notifications@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz#a97ce54f8f8fff198fab79a88a4c65fa64a56a54"
+  integrity sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/mixpanel@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.2.0.tgz#a39fde1da7c0f01adfa0a5377fbae58b9a4e746c"
-  integrity sha512-zMC/3pG1cbnwbtwRgkebkBy8uf2p47cXa5ZwZy6ZjJshCcv9YLyU5sa5TyDzGRuGeq2v8fDDSiRCiwL7ka2OVQ==
+"@ionic-native/mixpanel@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz#9733569e19ef4268ee3ac5b765569bd1b61f68bd"
+  integrity sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/network@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.2.0.tgz#907b5a8ae9092ae84f7270d345f2a8ad6d59f6dc"
-  integrity sha512-RovNYQExbCTnGLKjoXzPBaRf4qXtpoi0EuUiCUWjWhIoHgZvkGyIU/+lV8xcjM8cTnl0NmS0D2gj09IIW726iA==
+"@ionic-native/network@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.3.0.tgz#d7d840e631d1b9374517c521800c8ac8f5d8ebb5"
+  integrity sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/open-native-settings@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/open-native-settings/-/open-native-settings-5.2.0.tgz#8eb6a85fa6e1213ac9150a8080e860820fe68d1a"
-  integrity sha512-lUBcX9Ro0aZab1LUf23rmCHwWlOMwUgYwC7mphnHxOZ78TIipIpMWpveHEoy81931YOeOVNaX2JfyZgvntA5JQ==
+"@ionic-native/open-native-settings@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/open-native-settings/-/open-native-settings-5.3.0.tgz#900c85682957983fd2f95c10d8369cae1eb76bb1"
+  integrity sha512-fJlcXSDJInH+hCTBXomee040jDrbzEAUaM8pRhxcukdiQW3ubYeZQMUb3qpFDr0PI6yZCxJmx6u5X6kk+Ers8Q==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/screen-orientation@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/screen-orientation/-/screen-orientation-5.2.0.tgz#1d497185a0d38c7ff98dc082cc3b47a83c4261e0"
-  integrity sha512-6BhHl1Y0BC77TLLN5W7tHfwcrLHV1CiIC7TOhBIILV3fDDZ6/GiaL1pWdOvM5kSu2h32MobumEuB+9ivi4GoNQ==
+"@ionic-native/screen-orientation@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/screen-orientation/-/screen-orientation-5.3.0.tgz#ee4358d23721b3eecffa16a84aef5ef2daf91ba2"
+  integrity sha512-0UQYHTl1FxJSRrkuRjQcriipzj/a7rcgiSyYkZk/vzEDVJBHcm7fO22R6PJbsvAyn7I6Ef9oCMsPlyc5CjjNJg==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/splash-screen@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.2.0.tgz#4b065f42660fe19291e1b96f425a43eef070a04b"
-  integrity sha512-Nqykf2Fzj1mxENI6LSj1IplHiUIJzsiP13HhNWqceqAlQF2S8yI8KAKPGT6JRWtjSB1hlUR8VywhiFnX298jaw==
+"@ionic-native/splash-screen@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz#147b005ee7fcea6b816e2549db5d8cc4b550fd84"
+  integrity sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/status-bar@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-5.2.0.tgz#ae5df46511cb5b21c43b2587d2fbd433dacc6d80"
-  integrity sha512-kvCE1gh6nuXvvSv07sDmbknF5G/f09dTE27jvBPBe51OxyNcFNhHidqoRo2ZoNbMN0/Obb9KqrUiRevSQbOcUA==
+"@ionic-native/status-bar@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-5.3.0.tgz#a25558f59f2eee2aea509d563b54fcab2dc69861"
+  integrity sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/unique-device-id@~5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.2.0.tgz#a528e6f8d1b79d305c442b23033ab4ae16839ec1"
-  integrity sha512-PZmR02sjUQQOLpclmiRUOz96z2JV/B6xgJ1GjuuKnYn2ASgpvPLICaVfagSq6ETI9qybJu+0CBieL2aopUxeVQ==
+"@ionic-native/unique-device-id@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz#ac63aece625ddf23861427f4e2e4f101107b19e3"
+  integrity sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/vibration@~5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.2.0.tgz#6015c17f27cf78e7750ed069e56aff3df619d048"
-  integrity sha512-GVHEcm/+0d8MZDX4rsKN16trK1LwtdLCiGnd6dKrOBFg0czgH3hfsFQqO3efF4ZWLb+nr/qBOl8MN//YC/SA2Q==
+"@ionic-native/vibration@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.3.0.tgz#0c8a47ece05900e97af0843fa4e888f25b75b12e"
+  integrity sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==
   dependencies:
     "@types/cordova" latest
 
@@ -516,12 +543,12 @@
     tslib "^1.9.0"
     typescript "^3.2.4"
 
-"@ionic/angular@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.1.1.tgz#e3823d628d5fbea2a68193b95889ca6a9cd326bf"
-  integrity sha512-5Z7/52vCzP+wcJoUfqOWBHcjeajXWGoz6AW/sOeF/RtXqkFDc7rqrpfxZCuL6FanFm/Aayh5F7O8t5/ZgeZGqA==
+"@ionic/angular@^4.1.2":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.1.2.tgz#c14c072c5bbaa7cfc533cb6408d02e769f820776"
+  integrity sha512-GVdtpPekPjAYo/3IiRg/EoVRw1/9RwW07ITW6TRorcX1XOPJlrRXVcQyWFTbHRD9TOikgE1XmMQd/+1Lk0TQFw==
   dependencies:
-    "@ionic/core" "4.1.1"
+    "@ionic/core" "4.1.2"
     tslib "^1.9.3"
 
 "@ionic/app-scripts@^3.2.3":
@@ -606,10 +633,10 @@
     wrap-ansi "^4.0.0"
     write-file-atomic "^2.3.0"
 
-"@ionic/core@4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.1.1.tgz#3d0d905db06cb8308a445b9784e688a8b31fc78b"
-  integrity sha512-zmfRZ8PcVPRRx4HAUjB7VFHu5fyRaVdUy4vikkoIs4sbGvWPIbveweWn36oiSc6/sKMz+OsDB6+Suvdi1k7FVw==
+"@ionic/core@4.1.2":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.1.2.tgz#cbabd9ae65936f56b1dc6de021cf79778dc991da"
+  integrity sha512-QVJYpDAycmXgQL3mWdvjlIgrLEG0wVl9+NGZQATEBCTEsuDHrOw7BO28FKPlFCdfTjVA6HDJnSj1HwOUi3Yp4w==
   dependencies:
     ionicons "4.5.5"
 
@@ -762,12 +789,12 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.6.tgz#3f90c60f7c1742fa4a557f90def8fe742304f4c5"
-  integrity sha512-gDMHybwe8B+1BSvtwM5z4qAkUnZ9b4PTyIVWWECgTLDp2x3WhJi2rMk2X8HTkpbZ52pLPue5GL1sfqlZIOcX7Q==
+"@ngtools/webpack@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
+  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -885,13 +912,13 @@
     "@angular-devkit/schematics" "0.9.0-beta.3"
     typescript "3.0.1"
 
-"@schematics/angular@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.6.tgz#e827111e7d3cdf950efcca504389cbade3c9c59a"
-  integrity sha512-Q4VXAjVaCDb2zXFXoIdOfNPsn+EQjqDBHK4a97omytnSNAmu1erl3l2FkEMi6x/VuzK2mQSzBbmHJIgauMmOAA==
+"@schematics/angular@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
+  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     typescript "3.2.4"
 
 "@schematics/angular@^7.0.3":
@@ -903,13 +930,13 @@
     "@angular-devkit/schematics" "7.3.4"
     typescript "3.2.4"
 
-"@schematics/update@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.6.tgz#7d114b50e99af0b77ea537a50341a81a80240a02"
-  integrity sha512-TkeigdQTHG40ZGj4CAAzQHh7/rSotg0J6nkBBtc4Y+9md7IGg6dzSFJAvYbDX5JZ9tk7DpukdRHOVVopS/J0AQ==
+"@schematics/update@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
+  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -9816,10 +9843,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
-  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index ec051e1fc..df0d941c9 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -52,35 +52,35 @@
 		"cordova:run:prod:device": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ionic cordova run android --prod --release --device"
 	},
 	"dependencies": {
-		"@angular/animations": "^7.2.10",
-		"@angular/common": "^7.2.10",
-		"@angular/core": "^7.2.10",
-		"@angular/forms": "^7.2.10",
-		"@angular/http": "^7.2.10",
-		"@angular/platform-browser": "^7.2.10",
-		"@angular/platform-browser-dynamic": "^7.2.10",
-		"@angular/pwa": "^0.13.6",
-		"@angular/router": "^7.2.10",
-		"@angular/service-worker": "^7.2.3",
+		"@angular/animations": "^7.2.11",
+		"@angular/common": "^7.2.11",
+		"@angular/core": "^7.2.11",
+		"@angular/forms": "^7.2.11",
+		"@angular/http": "^7.2.11",
+		"@angular/platform-browser": "^7.2.11",
+		"@angular/platform-browser-dynamic": "^7.2.11",
+		"@angular/pwa": "^0.13.7",
+		"@angular/router": "^7.2.11",
+		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
 		"@ionic-native/call-number": "^5.3.0",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
 		"@ionic-native/dialogs": "^5.3.0",
-		"@ionic-native/geolocation": "~5.3.0",
-		"@ionic-native/globalization": "~5.3.0",
-		"@ionic-native/google-analytics": "~5.3.0",
+		"@ionic-native/geolocation": "^5.3.0",
+		"@ionic-native/globalization": "^5.3.0",
+		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.0.0-beta.26",
 		"@ionic-native/in-app-browser": "^5.3.0",
-		"@ionic-native/intercom": "~5.3.0",
-		"@ionic-native/local-notifications": "~5.3.0",
-		"@ionic-native/mixpanel": "~5.3.0",
-		"@ionic-native/network": "~5.3.0",
-		"@ionic-native/splash-screen": "~5.3.0",
-		"@ionic-native/status-bar": "~5.3.0",
-		"@ionic-native/unique-device-id": "~5.3.0",
-		"@ionic-native/vibration": "~5.3.0",
+		"@ionic-native/intercom": "^5.3.0",
+		"@ionic-native/local-notifications": "^5.3.0",
+		"@ionic-native/mixpanel": "^5.3.0",
+		"@ionic-native/network": "^5.3.0",
+		"@ionic-native/splash-screen": "^5.3.0",
+		"@ionic-native/status-bar": "^5.3.0",
+		"@ionic-native/unique-device-id": "^5.3.0",
+		"@ionic-native/vibration": "^5.3.0",
 		"@ionic/angular": "^4.1.2",
 		"@ionic/pro": "^2.0.4",
 		"@ionic/storage": "^2.2.0",
@@ -96,7 +96,7 @@
 		"apollo-link-context": "^1.0.17",
 		"apollo-link-ws": "^1.0.17",
 		"bootstrap": "^4.3.1",
-		"call-number": "~1.0.1",
+		"call-number": "^1.0.1",
 		"cordova-android": "^7.1.4",
 		"cordova-android-support-gradle-release": "^2.0.1",
 		"cordova-browser": "^6.0.0",
@@ -122,7 +122,7 @@
 		"font-awesome": "^4.7.0",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
-		"ionicons": "~4.5.5",
+		"ionicons": "^4.5.5",
 		"jasmine": "^3.3.1",
 		"jsbarcode": "^3.11.0",
 		"lodash": "^4.17.11",
@@ -145,14 +145,14 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "~0.13.6",
-		"@angular-devkit/build-angular": "~0.13.6",
-		"@angular-devkit/core": "~7.3.6",
-		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.6",
-		"@angular/compiler": "~7.2.10",
-		"@angular/compiler-cli": "~7.2.10",
-		"@angular/language-service": "^7.2.10",
+		"@angular-devkit/architect": "^0.13.7",
+		"@angular-devkit/build-angular": "^0.13.7",
+		"@angular-devkit/core": "^7.3.7",
+		"@angular-devkit/schematics": "^7.3.7",
+		"@angular/cli": "^7.3.7",
+		"@angular/compiler": "^7.2.11",
+		"@angular/compiler-cli": "^7.2.11",
+		"@angular/language-service": "^7.2.11",
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.0",
 		"@ionic/app-scripts": "^3.2.3",
@@ -181,12 +181,12 @@
 		"dotenv": "^7.0.0",
 		"envalid": "^4.2.2",
 		"ionic": "^4.12.0",
-		"jasmine-core": "~3.3.0",
-		"jasmine-spec-reporter": "~4.2.1",
+		"jasmine-core": "^3.3.0",
+		"jasmine-spec-reporter": "^4.2.1",
 		"karma": "^4.0.1",
-		"karma-chrome-launcher": "~2.2.0",
-		"karma-coverage-istanbul-reporter": "~2.0.5",
-		"karma-jasmine": "~2.0.1",
+		"karma-chrome-launcher": "^2.2.0",
+		"karma-coverage-istanbul-reporter": "^2.0.5",
+		"karma-jasmine": "^2.0.1",
 		"karma-jasmine-html-reporter": "^1.4.0",
 		"protractor": "^5.4.2",
 		"rxjs-tslint": "0.1.5",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 6e55858f3..cec7d75a2 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -14,24 +14,24 @@
   resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
   integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
 
-"@angular-devkit/architect@0.13.6", "@angular-devkit/architect@~0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.6.tgz#7758ab9f288cfd4f64d8b88b0700bac5c4961d06"
-  integrity sha512-Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw==
+"@angular-devkit/architect@0.13.7", "@angular-devkit/architect@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
+  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@~0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.6.tgz#7050a0367bb7646961d0bdc36aa083a6f3029dea"
-  integrity sha512-gdP856Z5tuQ69mJla5VPKm/uR86dcrPWYW41Jyu5oIhL2GAQ4JtDEuL2+ppwQO8i8hsXGIAbulGAbrlvU5I8OA==
+"@angular-devkit/build-angular@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
+  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/build-optimizer" "0.13.6"
-    "@angular-devkit/build-webpack" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@ngtools/webpack" "7.3.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/build-optimizer" "0.13.7"
+    "@angular-devkit/build-webpack" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@ngtools/webpack" "7.3.7"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -58,7 +58,7 @@
     semver "5.6.0"
     source-map-loader "0.2.4"
     source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.0"
+    speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
@@ -84,23 +84,23 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.6.tgz#846b6d0042de0102c6420ff86380ed961cc71956"
-  integrity sha512-/EOO0wxw7FIKfove4Fv/aKiKgvH0kFhRT2GOe3pW0yV2y2e1dfQdo2AqdGCfJ4rSbwsfWSGTUUFITc+9jgXFZw==
+"@angular-devkit/build-optimizer@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
+  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.6.tgz#c88691aa0259d124e2bdb78a492c44aa44ae148f"
-  integrity sha512-lQmYrhOHeBn/r7uw+FfpJUq9puApYe72+mrIfg/UtLwSEYt58n5d156jnuMcfWnCyhYUgYqLTaOUfSM0RV7akw==
+"@angular-devkit/build-webpack@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
+  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
 "@angular-devkit/core@0.9.0-beta.3":
@@ -125,10 +125,10 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.6", "@angular-devkit/core@~7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.6.tgz#bc11ca571187f0f0ce9df012332794907e0b8133"
-  integrity sha512-aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g==
+"@angular-devkit/core@7.3.7", "@angular-devkit/core@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
+  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
   dependencies:
     ajv "6.9.1"
     chokidar "2.0.4"
@@ -152,31 +152,31 @@
     "@angular-devkit/core" "7.3.3"
     rxjs "6.3.3"
 
-"@angular-devkit/schematics@7.3.6", "@angular-devkit/schematics@^7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.6.tgz#5580b730b1bae5397f5860cfb0d7270fec6e6deb"
-  integrity sha512-YXF7QusmMy3D9H0vNczc1n5BkuEHLwt7cW33euNeGNgTIsD0n6DrUhgClurXicnr2GNPSDYE5+3115lmJkhyrg==
+"@angular-devkit/schematics@7.3.7", "@angular-devkit/schematics@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
+  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
-"@angular/animations@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.10.tgz#a651c9526bc0c2860eca424d73d7cd87fee5793b"
-  integrity sha512-WgklBWYKy8LVlugMJ8XgBB4whNiMng8vY6mpaYhza064nsrQXK+ua1anSOGMGlmCI/5i4EgaycTS05XD/C+Kkw==
+"@angular/animations@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
+  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.6.tgz#4bcaec6f371095e8d88384408ee4c9a6852fb97c"
-  integrity sha512-u5lBcYVQRk9cez/DozJvFOYomeko9b5kE+NElyFhPtM3GF1SBcXKb5QyNxH/zSOc850VL7KPe7ZfC6kW3Phhyw==
+"@angular/cli@^7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
+  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
   dependencies:
-    "@angular-devkit/architect" "0.13.6"
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    "@schematics/angular" "7.3.6"
-    "@schematics/update" "0.13.6"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
+    "@schematics/update" "0.13.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
@@ -186,17 +186,17 @@
     semver "5.6.0"
     symbol-observable "1.2.0"
 
-"@angular/common@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.10.tgz#0f969e02959e85e259b0d14b7355b7339e6bacd0"
-  integrity sha512-FyiVUhV1MaRogXmVKsw6CMXqWZHsiYMdK651absXtGqWZn6and0jiUwEM9LbV4HRpLbB7F6gwqCvT5Ft8xpzeg==
+"@angular/common@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
+  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@~7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.10.tgz#e1f06b37d3288d327fc46a337e49ac032c483bb2"
-  integrity sha512-L/mksAkpb8kywYlHlXi5mAyUNNiSHZpoTV+P2t3nNGmqyXuad92TvdZMCO34TYUyGyFz9AVH2qc6LciY9ipQTA==
+"@angular/compiler-cli@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz#0835a17dd9cea4bb03c5073d943a5074fed539ff"
+  integrity sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -210,75 +210,75 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@~7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.10.tgz#702b84e81e1f4376b615c4cffbae8310a0610681"
-  integrity sha512-sRuH+UDogzAHpagorHfj2rbF8HWGEJGsFUn5TGq1vyWA37ALuu/zkemufIcgET16lTiBEvVn7/Oz9Am+JTlGrg==
+"@angular/compiler@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.11.tgz#d547bf781e5c8b28da9af2460a6dfb5683d325ae"
+  integrity sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.10.tgz#dfcdbf88480cbab441963ccecaef228b058c8869"
-  integrity sha512-u2IKaq4G1wpq5w1AI0Q7jnsKuSfR4WDsBLnwtjTIjde1YDqA0n0dYwqrvWzLK6SbzSWjlrAXx0hrz5SlDchmqA==
+"@angular/core@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
+  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.10.tgz#ab4b5d702e24921b60f8e0e6df527602f99d05c4"
-  integrity sha512-fQccon0Yuni13QJt16npSRlkitPZBLXfWXDFwCEybo/QqtSar3BOJAQFW2yqokrfW5lbO5VDFJ7Pj2dDyBXEAA==
+"@angular/forms@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
+  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.10.tgz#f8906c13e1eaa440ee3401a519ec9579f707220e"
-  integrity sha512-Uaq9Ep21ZZIG+yzYHhyH+RA/AEyKGTtWT5y12UXXFsCdXSwJ2p+czw2EdP42Oj1g1QptkP6lAl2W/RUlxwXQcw==
+"@angular/http@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.11.tgz#c52a491374d937cd05789a5c13d70a1c5fdddf4d"
+  integrity sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.10.tgz#5550fa689f1b35c78cfee65644cc00f0e7778325"
-  integrity sha512-14mIHbouqD+JauLcNakhHSL7/YB63+w7NrwNJY/DHNT/IyppBUV2dneHHembGEUs3QBY+7oL8FfPCLDRT+K+OQ==
+"@angular/language-service@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.11.tgz#1967ebcef5fc03e462941aa70dc41562d5dce06e"
+  integrity sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==
 
-"@angular/platform-browser-dynamic@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.10.tgz#e721192c7e827b448daab236ba214890f29d9311"
-  integrity sha512-ZTJL7iIEL3yDgJLx5/a2wfKsxe0ZHEUSibtbRQNpn35ZI0G9QN7ezbTOqj2+/QGvaY8Y1JeoYCeJrMzaUxDxGg==
+"@angular/platform-browser-dynamic@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
+  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.10.tgz#bdd48bf7412ec95b8bd4bb6e08d80f5011385030"
-  integrity sha512-78r527d0Nw0svkDw2SBr58H3VEH5VAvn+r+q7NLqIqD8jsOMf8CMztUCDs+h02HhEHveCXWI5EtFXxWepB6wFg==
+"@angular/platform-browser@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
+  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.6.tgz#0aee0960e3110782744076f68c3154cf6cd17b8d"
-  integrity sha512-2bo8oMliGWr1oaI2UM+54ru9zMcwWcDxJNxD9JE6fA/ar60kZdp/ojmoI5MCME2kqSpy26eZdYYczhB51BQz3A==
+"@angular/pwa@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
+  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
-    "@schematics/angular" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
+    "@schematics/angular" "7.3.7"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
-"@angular/router@^7.2.10":
-  version "7.2.10"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.10.tgz#1842f0e19a38faf7246e69ee16dc5f62f5096e79"
-  integrity sha512-7A0n6O5sW2xbQTG6pHfCwSkx6UvUQLg6Z/sDOghAZUakf4kd5BIWet1Q9eyiYndkpq6esQ+gMt9+CeJidf5l1A==
+"@angular/router@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
+  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.2.3":
-  version "7.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.6.tgz#5a3497060d2e03ef68f563de89cc8b0fc52c55f0"
-  integrity sha512-jRIP8LPVqeC10GRVdf9Twa5fOWqfUxfU02dH6mg9q81uhSrJM91fyI0Mjco6SrgKJ3AWgvU01f7rlJKH3rmuWw==
+"@angular/service-worker@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.11.tgz#ab61d4b1c75359fde461b4073b90438abff4d9e9"
+  integrity sha512-MalD4T2Iur582TMmHKFDmoqSYMys1EjdTZWt0qME85ri1w7yBriujvTyy9/aZmT2bFBGeJvbqhohoU46CsnqsA==
   dependencies:
     tslib "^1.9.0"
 
@@ -480,21 +480,21 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/geolocation@~5.3.0":
+"@ionic-native/geolocation@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.3.0.tgz#64a3495a6b9bdf4c2d5eb106a1b49012336eaef0"
   integrity sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/globalization@~5.3.0":
+"@ionic-native/globalization@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/globalization/-/globalization-5.3.0.tgz#f1cd1a81a5a9079078b05a0defe6ba5216d36675"
   integrity sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/google-analytics@~5.3.0":
+"@ionic-native/google-analytics@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz#6e07f8fe67b24a83d04869d5bb2561530feb997a"
   integrity sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==
@@ -515,56 +515,56 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/intercom@~5.3.0":
+"@ionic-native/intercom@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.3.0.tgz#e920f1ed774da10944424f9dfa1a89218f8b4546"
   integrity sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/local-notifications@~5.3.0":
+"@ionic-native/local-notifications@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz#a97ce54f8f8fff198fab79a88a4c65fa64a56a54"
   integrity sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/mixpanel@~5.3.0":
+"@ionic-native/mixpanel@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz#9733569e19ef4268ee3ac5b765569bd1b61f68bd"
   integrity sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/network@~5.3.0":
+"@ionic-native/network@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.3.0.tgz#d7d840e631d1b9374517c521800c8ac8f5d8ebb5"
   integrity sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/splash-screen@~5.3.0":
+"@ionic-native/splash-screen@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz#147b005ee7fcea6b816e2549db5d8cc4b550fd84"
   integrity sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/status-bar@~5.3.0":
+"@ionic-native/status-bar@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-5.3.0.tgz#a25558f59f2eee2aea509d563b54fcab2dc69861"
   integrity sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/unique-device-id@~5.3.0":
+"@ionic-native/unique-device-id@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz#ac63aece625ddf23861427f4e2e4f101107b19e3"
   integrity sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/vibration@~5.3.0":
+"@ionic-native/vibration@^5.3.0":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.3.0.tgz#0c8a47ece05900e97af0843fa4e888f25b75b12e"
   integrity sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==
@@ -828,12 +828,12 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.6.tgz#3f90c60f7c1742fa4a557f90def8fe742304f4c5"
-  integrity sha512-gDMHybwe8B+1BSvtwM5z4qAkUnZ9b4PTyIVWWECgTLDp2x3WhJi2rMk2X8HTkpbZ52pLPue5GL1sfqlZIOcX7Q==
+"@ngtools/webpack@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
+  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -874,13 +874,13 @@
     "@angular-devkit/schematics" "0.9.0-beta.3"
     typescript "3.0.1"
 
-"@schematics/angular@7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.6.tgz#e827111e7d3cdf950efcca504389cbade3c9c59a"
-  integrity sha512-Q4VXAjVaCDb2zXFXoIdOfNPsn+EQjqDBHK4a97omytnSNAmu1erl3l2FkEMi6x/VuzK2mQSzBbmHJIgauMmOAA==
+"@schematics/angular@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
+  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     typescript "3.2.4"
 
 "@schematics/angular@^7.0.3":
@@ -892,13 +892,13 @@
     "@angular-devkit/schematics" "7.3.3"
     typescript "3.2.4"
 
-"@schematics/update@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.6.tgz#7d114b50e99af0b77ea537a50341a81a80240a02"
-  integrity sha512-TkeigdQTHG40ZGj4CAAzQHh7/rSotg0J6nkBBtc4Y+9md7IGg6dzSFJAvYbDX5JZ9tk7DpukdRHOVVopS/J0AQ==
+"@schematics/update@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
+  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    "@angular-devkit/schematics" "7.3.6"
+    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/schematics" "7.3.7"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -1028,10 +1028,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stripe@^6.25.6":
-  version "6.25.6"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.6.tgz#9a5108e39976b88803d8bdcfd0d9ee1c480490e3"
-  integrity sha512-4P3VDrUmuG4MjMYw326Cfz2Q+lI5uVVoTDBFBtElQWF/aExbCJXZTHlYovZG502+UAowVuNVo5IuFHxELhambQ==
+"@types/stripe@^6.25.7":
+  version "6.25.7"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
+  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
   dependencies:
     "@types/node" "*"
 
@@ -2405,7 +2405,7 @@ call-me-maybe@^1.0.1:
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
   integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
 
-call-number@~1.0.1:
+call-number@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-number/-/call-number-1.0.1.tgz#bf9daae487fd6a5573f89aa3655fbe8af036afd2"
   integrity sha1-v52q5If9alVz+JqjZV++ivA2r9I=
@@ -5641,7 +5641,7 @@ ionic@^4.12.0:
     update-notifier "^2.3.0"
     uuid "^3.2.1"
 
-ionicons@4.5.5, ionicons@~4.5.5:
+ionicons@4.5.5, ionicons@^4.5.5:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.5.tgz#b059958a54dd45cfa127acc0baf11503b8671e51"
   integrity sha512-dIGI73XG6Fg2Ps77ry5Ywe36Pq7wUGkDkl0pBhC4uhsiyoW+oXe+pplmarXEnKEcB5fmlkRrBOxYYzZaoRiUGw==
@@ -6098,7 +6098,7 @@ iterall@^1.2.1, iterall@^1.2.2:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
-jasmine-core@^3.3, jasmine-core@~3.3.0:
+jasmine-core@^3.3, jasmine-core@^3.3.0, jasmine-core@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
   integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
@@ -6108,7 +6108,7 @@ jasmine-core@~2.8.0:
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
   integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
-jasmine-spec-reporter@~4.2.1:
+jasmine-spec-reporter@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
   integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
@@ -6271,7 +6271,7 @@ jszip@^3.1.3:
     readable-stream "~2.3.6"
     set-immediate-shim "~1.0.1"
 
-karma-chrome-launcher@~2.2.0:
+karma-chrome-launcher@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
   integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
@@ -6279,7 +6279,7 @@ karma-chrome-launcher@~2.2.0:
     fs-access "^1.0.0"
     which "^1.2.1"
 
-karma-coverage-istanbul-reporter@~2.0.5:
+karma-coverage-istanbul-reporter@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz#ca5899d4905e44a5984dd4f963adfc1a74dce767"
   integrity sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==
@@ -6292,7 +6292,7 @@ karma-jasmine-html-reporter@^1.4.0:
   resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.0.tgz#1abbd30d4509a8c82b96707ae7d2fa4da459ca19"
   integrity sha512-0wxhwA8PLPpICZ4o2GRnPi67hf3JhfQm5WCB8nElh4qsE6wRNOTtrqooyBPNqI087Xr2SBhxLg5fU+BJ/qxRrw==
 
-karma-jasmine@~2.0.1:
+karma-jasmine@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
   integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
@@ -9541,10 +9541,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
-  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 
@@ -10851,7 +10851,7 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@4.2.1:
+webpack-merge@4.2.1, webpack-merge@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
   integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 80d619f14..e02dbc03e 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -103,18 +103,18 @@
 	},
 	"dependencies": {
 		"@agm/core": "^1.0.0-beta.5",
-		"@angular/animations": "^7.2.7",
-		"@angular/cdk": "^7.3.3",
-		"@angular/common": "^7.2.7",
-		"@angular/compiler": "^7.2.7",
-		"@angular/core": "^7.2.7",
-		"@angular/forms": "^7.2.7",
+		"@angular/animations": "^7.2.11",
+		"@angular/cdk": "^7.3.6",
+		"@angular/common": "^7.2.11",
+		"@angular/compiler": "^7.2.11",
+		"@angular/core": "^7.2.11",
+		"@angular/forms": "^7.2.11",
 		"@angular/material": "^7.3.3",
-		"@angular/platform-browser": "^7.2.7",
-		"@angular/platform-browser-dynamic": "^7.2.7",
-		"@angular/platform-server": "^7.2.7",
-		"@angular/router": "^7.2.7",
-		"@angular/service-worker": "^7.2.7",
+		"@angular/platform-browser": "^7.2.11",
+		"@angular/platform-browser-dynamic": "^7.2.11",
+		"@angular/platform-server": "^7.2.11",
+		"@angular/router": "^7.2.11",
+		"@angular/service-worker": "^7.2.11",
 		"@fortawesome/angular-fontawesome": "^0.3.0",
 		"@fortawesome/fontawesome-free": "^5.7.2",
 		"@fortawesome/fontawesome-svg-core": "^1.2.15",
@@ -161,12 +161,13 @@
 		"zone.js": "^0.8.29"
 	},
 	"devDependencies": {
-		"@angular-devkit/build-angular": "^0.13.4",
-		"@angular-devkit/build-optimizer": "^0.13.4",
+		"@angular-devkit/build-angular": "^0.13.7",
+		"@angular-devkit/build-optimizer": "^0.13.7",
 		"@angular-extensions/testing-library": "^3.1.0",
-		"@angular/cli": "^7.3.4",
-		"@angular/compiler-cli": "^7.2.7",
-		"@angular/language-service": "^7.2.7",
+		"@angular/cli": "^7.3.7",
+		"@angular/compiler": "^7.2.11",
+		"@angular/compiler-cli": "^7.2.11",
+		"@angular/language-service": "^7.2.9",
 		"@compodoc/compodoc": "^1.1.9",
 		"@ngtools/webpack": "^7.3.4",
 		"@types/googlemaps": "^3.30.16",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index a2b1fba29..68935972c 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -7,14 +7,6 @@
   resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.5.tgz#6dbceb666b2dbc4a868b97e1340a3faceb5f2113"
   integrity sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ==
 
-"@angular-devkit/architect@0.13.4":
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.4.tgz#f5db62f028e3c0971db5719be9c17a78fd8a67a2"
-  integrity sha512-wJF8oz8MurtpFi0ik42bkI2F5gEnuOe79KHPO1i3SYfdhEp5NY8igVKZ6chB/eq4Ml50aHxas8Hh9ke12K+Pxw==
-  dependencies:
-    "@angular-devkit/core" "7.3.4"
-    rxjs "6.3.3"
-
 "@angular-devkit/architect@0.13.7":
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
@@ -23,16 +15,16 @@
     "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@^0.13.4":
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.4.tgz#f8b12bfae1d80b0aafc916f04b42a79b30c4cf7c"
-  integrity sha512-7yJzgNk3ToiAHd8vnYonqiswvVNYzOUKg2xZfpx+SD5m7mVE+CSUp+P4YzUrI0Vm9WitZOYaCv1I6G1NguJHqA==
+"@angular-devkit/build-angular@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
+  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
   dependencies:
-    "@angular-devkit/architect" "0.13.4"
-    "@angular-devkit/build-optimizer" "0.13.4"
-    "@angular-devkit/build-webpack" "0.13.4"
-    "@angular-devkit/core" "7.3.4"
-    "@ngtools/webpack" "7.3.4"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/build-optimizer" "0.13.7"
+    "@angular-devkit/build-webpack" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
+    "@ngtools/webpack" "7.3.7"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -59,7 +51,7 @@
     semver "5.6.0"
     source-map-loader "0.2.4"
     source-map-support "0.5.10"
-    speed-measure-webpack-plugin "1.3.0"
+    speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
@@ -75,23 +67,23 @@
   optionalDependencies:
     node-sass "4.11.0"
 
-"@angular-devkit/build-optimizer@0.13.4", "@angular-devkit/build-optimizer@^0.13.4":
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.4.tgz#2323c3bd45b325252ccea9623375051c7b24c0a7"
-  integrity sha512-YTpiE4F2GnFc4jbXZkmFUMHOvo3kWcMPAInVbjXNSIWMqW8Ibs7d6MAcualQX4NCvcn45+mVXLfY/8hWZ/b7lw==
+"@angular-devkit/build-optimizer@0.13.7", "@angular-devkit/build-optimizer@^0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
+  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.4":
-  version "0.13.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.4.tgz#98e81c07ec64e9aa9f29d29ced9a94b2fb0b0248"
-  integrity sha512-W5baPrsNUUyeD5K9ZjiTfiDsytBoqDvGDMKRUO9XWV8xF8LYF2ttsBQxlJK7SKkMyJXcjmiHhdkMq5wgRE7n0A==
+"@angular-devkit/build-webpack@0.13.7":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
+  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
   dependencies:
-    "@angular-devkit/architect" "0.13.4"
-    "@angular-devkit/core" "7.3.4"
+    "@angular-devkit/architect" "0.13.7"
+    "@angular-devkit/core" "7.3.7"
     rxjs "6.3.3"
 
 "@angular-devkit/core@7.3.4":
@@ -132,17 +124,17 @@
     dom-testing-library "^3.11.1"
     tslib "^1.9.0"
 
-"@angular/animations@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.7.tgz#14aa9b4006dbffb08bd705842cdcc1d0b502ae90"
-  integrity sha512-eU/wSkBmukZXCCe/epUl02xsKPauF+deMbncxBE+w/NmmWjJ77Q09iZAcgzM92RVXj2LsVYQXsNEBGT3X0hRZw==
+"@angular/animations@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
+  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.3.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.3.tgz#02a2ad248141cd9968a5950ce0602da3fcf5445b"
-  integrity sha512-0M3nwq+c9+d+p0XeU12I9djutlsajRrxcu7AvHQXUs/5grYFsXsX0f468qXDiKmcgqGUBNtN2fBOUhGNlispuQ==
+"@angular/cdk@^7.3.6":
+  version "7.3.6"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.6.tgz#4c330cacd11df4adade6c1cd3ed587745f9912fd"
+  integrity sha512-ZuOz8nQk0bdo8YyNFcwnmSl4MPaQDAFTbLK29w4Vd/LfPnhBI3pAr0wVuPFb0fl3eSvvUrfTb/+kPbQcE07A0A==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
@@ -167,17 +159,17 @@
     semver "5.6.0"
     symbol-observable "1.2.0"
 
-"@angular/common@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.7.tgz#d0078a1cabc5e5c34ceb7691c2a31440ce7630fb"
-  integrity sha512-U1l2CIcmpTAJMWcyTXI9qt1E8CxwKNW1vr6XWZo4X5ziCIzf7RvClzK7Ci5KZKkoPJrJqBJu661Q75Yt22dJsg==
+"@angular/common@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
+  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.7.tgz#01adbb176075d2d02959a92053409dd0af343e2f"
-  integrity sha512-UPWROJzBLejgNf+aqgEUXYts8UiFOl2IavDhS/olA9irszv2lNFj9Yqr8OKdy0jK/lKaipZog3VZEx8g5dNeBA==
+"@angular/compiler-cli@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz#0835a17dd9cea4bb03c5073d943a5074fed539ff"
+  integrity sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -191,31 +183,31 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.7.tgz#3f3deb851634db871e92acde2f1ee56362d8c47f"
-  integrity sha512-e61YVxW5x4w+X4yjGaptYoJIja7HwH0+8FFEaH6VuPl/DrK8wP4HDMhLo4NzdgeZKLR2jBIQSqLmoM8W7UXcqw==
+"@angular/compiler@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.11.tgz#d547bf781e5c8b28da9af2460a6dfb5683d325ae"
+  integrity sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.7.tgz#4311028181a98aa844572ea4b6cb9e87fc58d9ba"
-  integrity sha512-E7qjMQdS77SbRROKu13VsfL+MJN52eTlrU0SzEAFGUOgdvbmDYJOaEwjqrouKpYZ0pul8KOoalvlPB7oVflC7A==
+"@angular/core@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
+  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.7.tgz#bdffad0070e01bd0e1f6f7045909cc9aa33e59f0"
-  integrity sha512-2gBs+BG2cMPsHq9JVEzmu2Ev539zjfHmr6cna2W38KLXeGbNf42rbbMUXpYD8cndY0QTYcnwfMpRNIl9zKRZnw==
+"@angular/forms@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
+  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.7.tgz#c92d7fde437d6bddd2a4fe197f9c06005f3a5c53"
-  integrity sha512-d3iCBpOfgLNSGMrtqZvN6NHZIEnKD2MV8Hz4WsRLU4WY0RbshZj5dqx2nO3YRT2tACpAvhWBQoYvtLpTCPzsMA==
+"@angular/language-service@^7.2.9":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.11.tgz#1967ebcef5fc03e462941aa70dc41562d5dce06e"
+  integrity sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==
 
 "@angular/material@^7.3.3":
   version "7.3.3"
@@ -224,40 +216,40 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.7.tgz#22db038715c5b17464627a89898a63ece149c840"
-  integrity sha512-3nlcwCZOzlKw/4CMJ4zy1JEVy8Ky4KyLRRePLledOMdsGbuDIoq/kyAnBzg295Xe9ovBxv8cmuSkShci+s/x8g==
+"@angular/platform-browser-dynamic@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
+  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.7.tgz#a1a14181354e07c19d38218a7a4af6ea4defa569"
-  integrity sha512-9C3ffZs0ZUw+dYg1oJKiONf64UKTdAzIOaTQXTrVrCa3oN7Jb2tUfmpenmB+ATRxwhL2n7Yi725YWwxY2FwqvQ==
+"@angular/platform-browser@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
+  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.7.tgz#c1383edeeff2e7329e71659230fe16b9088ced5d"
-  integrity sha512-9KtfnUF3IhPk6riVaFhwn1iPNEPO8wjOLSmI4RltMDXha5xGUC4eMBcT2MhfPsB1+4m6D4D7pBmv8uhn4v/J2g==
+"@angular/platform-server@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.11.tgz#abb37f4d4f74966cf7b643adbd073d93cf6d8644"
+  integrity sha512-IPxgOvgjfe2P8OmfAZZhU4ioGAxa8tXleGZjQbXB68JbVM2pxhRVVe5ooMcQjrjhVS8avd/yb/F5h5kOS4mQYg==
   dependencies:
     domino "^2.1.0"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.7.tgz#66705f6b6f4546adae1dc58f5701b9d7a6b2723c"
-  integrity sha512-59+M8+IH7V2NPPqWw2mwdg+kh/jfwQcXE0tB8iZ5V2ldACPucY/Td6qiT5H6t7EkELtvkKJwS6vKFV22qdRp3w==
+"@angular/router@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
+  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.2.7":
-  version "7.2.7"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.7.tgz#718fe4b8b6ed80650c7e14303781b8f6cedac986"
-  integrity sha512-oKPHZWXQnKR6gX1PvhBlk4TC6mSl7EgNd4MaZu/FwOuc5f+zo4oZPTAbzBYqkhbaqpvRyNylolTyJX5QeV9iPg==
+"@angular/service-worker@^7.2.11":
+  version "7.2.11"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.11.tgz#ab61d4b1c75359fde461b4073b90438abff4d9e9"
+  integrity sha512-MalD4T2Iur582TMmHKFDmoqSYMys1EjdTZWt0qME85ri1w7yBriujvTyy9/aZmT2bFBGeJvbqhohoU46CsnqsA==
   dependencies:
     tslib "^1.9.0"
 
@@ -385,7 +377,18 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.4", "@ngtools/webpack@^7.3.4":
+"@ngtools/webpack@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
+  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
+  dependencies:
+    "@angular-devkit/core" "7.3.7"
+    enhanced-resolve "4.1.0"
+    rxjs "6.3.3"
+    tree-kill "1.2.1"
+    webpack-sources "1.3.0"
+
+"@ngtools/webpack@^7.3.4":
   version "7.3.4"
   resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.4.tgz#069b3425ef928ecf91f34b0c4c04dde158534a85"
   integrity sha512-qTfw/LGZ3kDZAgqb6gMVr36E0W3M+bnS/xAxNTxshxmJOCQr9AcKtX4sP65QweKS60KoBBR1a7nR6SOi1NJkxA==
@@ -576,10 +579,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/stripe@^6.19.8":
-  version "6.19.8"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.19.8.tgz#8a48761da6b8b19b8dbe079f9a87ed5a9999d751"
-  integrity sha512-MJbX7QjwV7sgoeHHsTtp1twAkplKfuY5M8b09Ko6Hf0mCfnECDA9iJ13VamLoPhxwaEkEL+FX+WSSZmUKO+Dkw==
+"@types/stripe@^6.25.7":
+  version "6.25.7"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
+  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
   dependencies:
     "@types/node" "*"
 
@@ -8936,10 +8939,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
-  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 

From e0902a7c1a6b3c0e4164e66bc0121fe8bb00183d Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2019 05:08:50 +0000
Subject: [PATCH 079/382] chore(package): update @storybook/addon-actions to
 version 5.0.6

---
 admin/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index d9e86dc42..6c75fe1b8 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -157,7 +157,7 @@
 		"@angular/language-service": "^7.2.11",
 		"@babel/core": "^7.4.0",
 		"@compodoc/compodoc": "^1.1.9",
-		"@storybook/addon-actions": "^4.1.11",
+		"@storybook/addon-actions": "^5.0.6",
 		"@storybook/angular": "^4.1.11",
 		"@types/async": "^2.4.1",
 		"@types/d3-color": "^1.2.2",

From 079a06ccf97ff51ee7500d13227b628f226dcf5c Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2019 05:09:16 +0000
Subject: [PATCH 080/382] chore(package): update @storybook/angular to version
 5.0.6

---
 admin/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 6c75fe1b8..645a53a75 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -158,7 +158,7 @@
 		"@babel/core": "^7.4.0",
 		"@compodoc/compodoc": "^1.1.9",
 		"@storybook/addon-actions": "^5.0.6",
-		"@storybook/angular": "^4.1.11",
+		"@storybook/angular": "^5.0.6",
 		"@types/async": "^2.4.1",
 		"@types/d3-color": "^1.2.2",
 		"@types/faker": "^4.1.5",

From e438a82d56c5af3c2593f0cef299083dc5450436 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 1 Apr 2019 10:30:11 +0300
Subject: [PATCH 081/382] feat(ever-admin): added default username form email
 EV-1188

---
 .../components/account/account.component.html   | 17 +++++++++++------
 .../components/account/account.component.ts     | 16 ++++++++++++++--
 .../basic-info/basic-info.component.html        |  2 +-
 .../basic-info/basic-info.component.ts          |  2 +-
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
index 2baaf731c..e04075b53 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
@@ -11,7 +11,8 @@
 					id="email"
 					name="email-input"
 					placeholder="Email"
-					[(ngModel)]="account.email"
+					[(ngModel)]="accountModel.email"
+					(change)="emailChange()"
 					#email="ngModel"
 					[ngClass]="{
 						'input-danger':
@@ -41,15 +42,19 @@
 					id="username"
 					name="username-input"
 					placeholder="Username"
-					[(ngModel)]="account.username"
+					[(ngModel)]="accountModel.username"
 					#username="ngModel"
 					[ngClass]="{
 						'input-danger':
 							username.invalid &&
-							(username.dirty || username.touched),
+							(username.dirty ||
+								username.touched ||
+								accountModel.username !== ''),
 						'input-success':
 							username.valid &&
-							(username.dirty || username.touched)
+							(username.dirty ||
+								username.touched ||
+								accountModel.username !== '')
 					}"
 					required
 					minlength="3"
@@ -76,7 +81,7 @@
 					class="form-control"
 					id="pass"
 					name="pass-input"
-					[(ngModel)]="account.password"
+					[(ngModel)]="accountModel.password"
 					#password="ngModel"
 					placeholder="Password"
 					[ngClass]="{
@@ -112,7 +117,7 @@
 					class="form-control"
 					id="rPass"
 					name="r-pass-input"
-					[(ngModel)]="account.repeatPassword"
+					[(ngModel)]="accountModel.repeatPassword"
 					#rPassword="ngModel"
 					placeholder="Repeat password"
 					[ngClass]="{
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
index 95bd628ff..daa60317b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
@@ -10,7 +10,7 @@ export class AccountComponent {
 	@ViewChild('accountForm')
 	accountForm: NgForm;
 
-	account = {
+	accountModel = {
 		email: '',
 		username: '',
 		password: '',
@@ -20,7 +20,19 @@ export class AccountComponent {
 	get formValid() {
 		return (
 			this.accountForm.valid &&
-			this.account.password === this.account.repeatPassword
+			this.accountModel.password === this.accountModel.repeatPassword
 		);
 	}
+
+	emailChange() {
+		let targetIndex = this.accountModel.email.indexOf('@');
+		if (targetIndex > 0 && this.accountModel.username === '') {
+			let defaultUsername = this.accountModel.email.substring(
+				0,
+				targetIndex
+			);
+
+			this.accountModel.username = defaultUsername;
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
index 3918c2b42..13e87b424 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
@@ -11,7 +11,7 @@
 					id="name"
 					name="name-input"
 					placeholder="Name"
-					[(ngModel)]="basicInfo.name"
+					[(ngModel)]="basicInfoModel.name"
 					#name="ngModel"
 					[ngClass]="{
 						'input-danger':
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index 11bc02fc4..014bec2f2 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -10,7 +10,7 @@ export class BasicInfoComponent {
 	@ViewChild('basicInfoForm')
 	basicInfoForm: NgForm;
 
-	basicInfo = {
+	basicInfoModel = {
 		name: ''
 	};
 }

From ffc53cac33d9044b348ed56d473d71bca52d7d69 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 1 Apr 2019 12:08:01 +0300
Subject: [PATCH 082/382] feat(ever-admin): extended Basic info step EV-1189

---
 .../file-uploader.component.scss              |  1 +
 .../basic-info/basic-info.component.html      | 87 ++++++++++++++++++-
 .../basic-info/basic-info.component.scss      | 19 ++++
 .../basic-info/basic-info.component.ts        | 24 ++++-
 .../components/components.module.ts           |  4 +-
 5 files changed, 131 insertions(+), 4 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.scss b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.scss
index 4eca4942c..003df9e8d 100644
--- a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.scss
+++ b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.scss
@@ -7,6 +7,7 @@
 		border-radius: 0px;
 		border-top-right-radius: 0.375rem;
 		border-bottom-right-radius: 0.375rem;
+		margin: 0;
 	}
 
 	input {
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
index 13e87b424..a02c1b9c1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
@@ -2,7 +2,7 @@
 	<nb-card-header>Basic info</nb-card-header>
 	<nb-card-body>
 		<form class="row m-0" #basicInfoForm="ngForm">
-			<div class="form-group col-md-6">
+			<div class="form-group offset-md-2 col-md-8">
 				<label for="name">Name</label>
 				<input
 					nbInput
@@ -13,6 +13,7 @@
 					placeholder="Name"
 					[(ngModel)]="basicInfoModel.name"
 					#name="ngModel"
+					(change)="nameChange()"
 					[ngClass]="{
 						'input-danger':
 							name.invalid && (name.dirty || name.touched),
@@ -32,6 +33,90 @@
 					>
 				</small>
 			</div>
+			<div class="offset-md-2 col-md-8">
+				<label for="name">Photo</label>
+				<e-cu-file-uploader
+					[placeholder]="uploaderPlaceholder"
+					[name]="name.value"
+					[fileUrl]="basicInfoModel.logo"
+					(uploadedImgUrl)="basicInfoModel.logo = $event"
+					[customClass]="
+						basicInfoModel.logo !== ''
+							? invalidUrl
+								? 'form-control-danger'
+								: 'form-control-success'
+							: ''
+					"
+				></e-cu-file-uploader>
+
+				<small
+					class="text-danger"
+					*ngIf="invalidUrl && basicInfoModel.logo !== ''"
+				>
+					<span *ngIf="invalidUrl"
+						>Enter a valid logo URL or browse from a device</span
+					>
+				</small>
+			</div>
+			<div
+				class="offset-md-2 col-md-8"
+				[hidden]="basicInfoModel.logo === '' || invalidUrl"
+			>
+				<div class="col-sm-10">
+					<div class="row preview-img">
+						<div class="remove-icon" (click)="deleteImg()">
+							<img
+								src="{{ basicInfoModel.logo }}"
+								alt="Invalid image"
+								class="img-rounded"
+								(error)="invalidUrl = true"
+								(load)="invalidUrl = false"
+							/>
+
+							<span
+								class="ion-md-remove-circle text-danger pl-2"
+								title="Remove"
+							></span>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div class="form-group offset-md-2 col-md-8 mt-3">
+				<label for="barcodeData">Barcode Data</label>
+				<input
+					nbInput
+					type="text"
+					class="form-control"
+					id="barcodeData"
+					name="barcode-data-input"
+					placeholder="Barcode data"
+					[(ngModel)]="basicInfoModel.barcodeData"
+					#barcodeData="ngModel"
+					[ngClass]="{
+						'input-danger':
+							barcodeData.invalid &&
+							(barcodeData.dirty || barcodeData.touched),
+						'input-success':
+							barcodeData.valid &&
+							(barcodeData.dirty ||
+								barcodeData.touched ||
+								barcodeData.value)
+					}"
+					required
+				/>
+				<small
+					class="text-danger"
+					*ngIf="
+						barcodeData.invalid &&
+						(barcodeData.dirty || barcodeData.touched)
+					"
+				>
+					<span *ngIf="barcodeData.errors.required"
+						>Barcode Data is required</span
+					>
+				</small>
+			</div>
 		</form>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss
index b91331c86..6fa6b927a 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss
@@ -2,4 +2,23 @@
 	nb-card-body {
 		text-align: left;
 	}
+
+	.preview-img {
+		padding-right: 16px;
+	}
+
+	.img-rounded {
+		margin-top: 3px;
+		max-height: 70px;
+	}
+
+	.remove-icon {
+		cursor: pointer;
+
+		span {
+			padding-right: 7px;
+			position: absolute;
+			font-size: 1.1em;
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index 014bec2f2..b14fffa2f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -1,5 +1,5 @@
 import { Component, ViewChild } from '@angular/core';
-import { NgForm } from '@angular/forms';
+import { NgForm, NgModel } from '@angular/forms';
 
 @Component({
 	selector: 'ea-merchants-setup-basic-info',
@@ -10,7 +10,27 @@ export class BasicInfoComponent {
 	@ViewChild('basicInfoForm')
 	basicInfoForm: NgForm;
 
+	@ViewChild('name')
+	name: NgModel;
+
+	// TODO add translate
+	uploaderPlaceholder: string = 'Photo (optional)';
+
 	basicInfoModel = {
-		name: ''
+		name: '',
+		logo: '',
+		barcodeData: ''
 	};
+
+	invalidUrl: boolean;
+
+	deleteImg() {
+		this.basicInfoModel.logo = '';
+	}
+
+	nameChange() {
+		if (this.name.valid && this.basicInfoModel.barcodeData === '') {
+			this.basicInfoModel.barcodeData = this.name.value;
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index b7dc11337..2488a97a8 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -5,6 +5,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { AccountComponent } from './account/account.component';
 import { FormsModule } from '@angular/forms';
 import { BasicInfoComponent } from './basic-info/basic-info.component';
+import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
 
 const COMPONENTS = [AccountComponent, BasicInfoComponent];
 
@@ -13,7 +14,8 @@ const COMPONENTS = [AccountComponent, BasicInfoComponent];
 		CommonModule,
 		ThemeModule,
 		FormsModule,
-		TranslateModule.forChild()
+		TranslateModule.forChild(),
+		FileUploaderModule
 	],
 	declarations: COMPONENTS,
 	exports: COMPONENTS

From f1b1d75d930ad39bc8fe887a3716ff471e6bed9c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 1 Apr 2019 12:30:16 +0300
Subject: [PATCH 083/382] feat(ever-admin): validation from Basic Info to Setup
 Merchant EV-1189

---
 .../components/basic-info/basic-info.component.ts    |  7 +++++++
 .../pages/+setup/+merchants/merchants.component.html | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index b14fffa2f..0459b5196 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -24,6 +24,13 @@ export class BasicInfoComponent {
 
 	invalidUrl: boolean;
 
+	get formValid() {
+		return (
+			this.basicInfoForm.valid &&
+			(this.basicInfoModel.logo === '' || !this.invalidUrl)
+		);
+	}
+
 	deleteImg() {
 		this.basicInfoModel.logo = '';
 	}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 651d2d03f..031a390bd 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -21,10 +21,18 @@
 							</button>
 						</nb-step>
 						<nb-step label="Basic info">
-							<ea-merchants-setup-basic-info></ea-merchants-setup-basic-info>
+							<ea-merchants-setup-basic-info
+								#basicInfo
+							></ea-merchants-setup-basic-info>
 
 							<button nbButton nbStepperPrevious>PREV</button>
-							<button nbButton nbStepperNext>NEXT</button>
+							<button
+								nbButton
+								nbStepperNext
+								[disabled]="!basicInfo.formValid"
+							>
+								NEXT
+							</button>
 						</nb-step>
 						<nb-step label="Contact info">
 							<h3>Contact info</h3>

From aa89b2cacca5d91b69e77957faef24180ffcee50 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 1 Apr 2019 14:03:35 +0300
Subject: [PATCH 084/382] feat(ever-admin): finished Basic info step, added
 library for show qrcode EV-1189

---
 admin/website-angular/package.json            |  7 ++--
 .../basic-info/basic-info.component.html      | 29 +++++++++-----
 .../basic-info/basic-info.component.scss      | 10 +++++
 .../basic-info/basic-info.component.ts        | 18 +++++++--
 admin/website-angular/yarn.lock               | 38 +++++++++++++++++++
 5 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index dd97e5d0d..d666f8946 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -129,6 +129,7 @@
 		"normalize.css": "^8.0.1",
 		"pace-js": "1.0.2",
 		"popper.js": "^1.14.7",
+		"qrcode": "^1.3.3",
 		"reflect-metadata": "^0.1.13",
 		"roboto-fontface": "^0.10.0",
 		"rxjs": "^6.4.0",
@@ -147,7 +148,6 @@
 		"zone.js": "^0.8.29"
 	},
 	"devDependencies": {
-		"conventional-changelog-cli": "^2.0.11",
 		"@angular-devkit/build-angular": "^0.13.1",
 		"@angular/cli": "^7.3.1",
 		"@angular/compiler-cli": "^7.2.4",
@@ -173,6 +173,7 @@
 		"@types/yargs": "^12.0.9",
 		"babel-loader": "^8.0.5",
 		"codelyzer": "^4.5.0",
+		"conventional-changelog-cli": "^2.0.11",
 		"cross-env": "^5.2.0",
 		"dotenv": "^6.2.0",
 		"envalid": "^4.2.2",
@@ -193,8 +194,8 @@
 		"ts-node": "^8.0.2",
 		"tslint": "^5.12.1",
 		"tslint-language-service": "^0.9.9",
-		"yargs": "^13.1.0",
-		"typescript": "~3.1.6"
+		"typescript": "~3.1.6",
+		"yargs": "^13.1.0"
 	},
 	"engines": {
 		"node": ">=10.15.0",
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
index a02c1b9c1..f7afe3497 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
@@ -64,15 +64,14 @@
 			>
 				<div class="col-sm-10">
 					<div class="row preview-img">
+						<img
+							src="{{ basicInfoModel.logo }}"
+							alt="Invalid image"
+							class="img-rounded"
+							(error)="invalidUrl = true"
+							(load)="invalidUrl = false"
+						/>
 						<div class="remove-icon" (click)="deleteImg()">
-							<img
-								src="{{ basicInfoModel.logo }}"
-								alt="Invalid image"
-								class="img-rounded"
-								(error)="invalidUrl = true"
-								(load)="invalidUrl = false"
-							/>
-
 							<span
 								class="ion-md-remove-circle text-danger pl-2"
 								title="Remove"
@@ -82,7 +81,7 @@
 				</div>
 			</div>
 
-			<div class="form-group offset-md-2 col-md-8 mt-3">
+			<div class="form-group offset-md-2 col-md-8 mt-3 mb-0">
 				<label for="barcodeData">Barcode Data</label>
 				<input
 					nbInput
@@ -92,6 +91,7 @@
 					name="barcode-data-input"
 					placeholder="Barcode data"
 					[(ngModel)]="basicInfoModel.barcodeData"
+					(change)="barcodeDataChange()"
 					#barcodeData="ngModel"
 					[ngClass]="{
 						'input-danger':
@@ -117,6 +117,17 @@
 					>
 				</small>
 			</div>
+			<div class="offset-md-2 col-md-8" [hidden]="!barcodetDataUrl">
+				<div class="col-sm-10">
+					<span class="row preview-barcode">
+						<img
+							src="{{ barcodetDataUrl }}"
+							alt="Invalid image"
+							class="img-rounded"
+						/>
+					</span>
+				</div>
+			</div>
 		</form>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss
index 6fa6b927a..84292236b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.scss
@@ -7,6 +7,16 @@
 		padding-right: 16px;
 	}
 
+	.preview-barcode {
+		padding: 8px;
+		background: #dedede;
+		display: inline-block;
+		margin-top: 3px;
+		img {
+			margin: 0;
+		}
+	}
+
 	.img-rounded {
 		margin-top: 3px;
 		max-height: 70px;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index 0459b5196..45b6d2ee3 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -1,5 +1,6 @@
 import { Component, ViewChild } from '@angular/core';
 import { NgForm, NgModel } from '@angular/forms';
+import QRCode from 'qrcode';
 
 @Component({
 	selector: 'ea-merchants-setup-basic-info',
@@ -15,15 +16,14 @@ export class BasicInfoComponent {
 
 	// TODO add translate
 	uploaderPlaceholder: string = 'Photo (optional)';
-
+	barcodetDataUrl: string;
+	invalidUrl: boolean;
 	basicInfoModel = {
 		name: '',
 		logo: '',
 		barcodeData: ''
 	};
 
-	invalidUrl: boolean;
-
 	get formValid() {
 		return (
 			this.basicInfoForm.valid &&
@@ -38,6 +38,18 @@ export class BasicInfoComponent {
 	nameChange() {
 		if (this.name.valid && this.basicInfoModel.barcodeData === '') {
 			this.basicInfoModel.barcodeData = this.name.value;
+
+			this.barcodeDataChange();
+		}
+	}
+
+	async barcodeDataChange() {
+		if (this.basicInfoModel.barcodeData) {
+			this.barcodetDataUrl = await QRCode.toDataURL(
+				this.basicInfoModel.barcodeData
+			);
+		} else {
+			this.barcodetDataUrl = null;
 		}
 	}
 }
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index d82a44409..5c0b756c9 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -3184,6 +3184,13 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
   integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
 
+can-promise@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/can-promise/-/can-promise-0.0.1.tgz#7a7597ad801fb14c8b22341dfec314b6bd6ad8d3"
+  integrity sha512-gzVrHyyrvgt0YpDm7pn04MQt8gjh0ZAhN4ZDyCRtGl6YnuuK6b4aiUTD7G52r9l4YNmxfTtEscb92vxtAlL6XQ==
+  dependencies:
+    window-or-global "^1.0.1"
+
 caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000932:
   version "1.0.30000936"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000936.tgz#5d33b118763988bf721b9b8ad436d0400e4a116b"
@@ -4784,6 +4791,11 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dijkstrajs@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
+  integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs=
+
 dir-glob@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
@@ -7362,6 +7374,11 @@ isarray@2.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
   integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
+isarray@^2.0.1:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz#38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7"
+  integrity sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==
+
 isbinaryfile@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
@@ -9636,6 +9653,11 @@ please-upgrade-node@^3.1.1:
   dependencies:
     semver-compare "^1.0.0"
 
+pngjs@^3.3.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+
 popper.js@^1.14.7:
   version "1.14.7"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
@@ -10038,6 +10060,17 @@ qjobs@^1.1.4:
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
+qrcode@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.3.3.tgz#5ef50c0c890cffa1897f452070f0f094936993de"
+  integrity sha512-SH7V13AcJusH3GT8bMNOGz4w0L+LjcpNOU/NiOgtBhT/5DoWeZE6D5ntMJnJ84AMkoaM4kjJJoHoh9g++8lWFg==
+  dependencies:
+    can-promise "0.0.1"
+    dijkstrajs "^1.0.1"
+    isarray "^2.0.1"
+    pngjs "^3.3.0"
+    yargs "^12.0.5"
+
 qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -12990,6 +13023,11 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
+window-or-global@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/window-or-global/-/window-or-global-1.0.1.tgz#dbe45ba2a291aabc56d62cf66c45b7fa322946de"
+  integrity sha1-2+RboqKRqrxW1iz2bEW3+jIpRt4=
+
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"

From b793e995b494288bdfa8e09537880ec8b31835d5 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 1 Apr 2019 18:17:44 +0300
Subject: [PATCH 085/382] feat(ever-admin): improved forwardOrdersUsing on
 Warehouse EV-1190

---
 .../@core/data/fakeDataServices/warehouses.ts |  22 ++-
 .../contact-info-form.component.html          | 177 ++++++++++++------
 .../contact-info-form.component.ts            | 124 +++++++-----
 .../warehouse-manage-tabs.component.ts        |   6 +-
 .../warehouse-mutation.component.html         |   2 +-
 .../warehouse-manage.component.html           |   2 +-
 .../warehouse-manage.component.ts             |   6 +-
 .../warehouses/warehouses.types.graphql       |   6 +-
 .../integration/GeoLocationWarehouses.spec.ts |   7 +-
 shared/core/entities/Warehouse.ts             |   4 +-
 shared/core/interfaces/IWarehouse.ts          |   2 +-
 11 files changed, 231 insertions(+), 127 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts b/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts
index 6bfcbb9cf..7d15b584d 100644
--- a/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts
+++ b/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts
@@ -38,9 +38,9 @@ export default class FakeDataWarehouses {
 								contactPhone: faker.phone.phoneNumber(),
 								ordersEmail: null,
 								ordersPhone: null,
-								forwardOrdersUsing: faker.random.number(
-									1
-								) as ForwardOrdersMethod,
+								forwardOrdersUsing: [
+									ForwardOrdersMethod.Unselected
+								],
 								isManufacturing: true,
 								isCarrierRequired: true,
 								usedCarriersIds: [],
@@ -71,7 +71,9 @@ export default class FakeDataWarehouses {
 							logo: getFakeImg(200, 200, 75, 'Pizza Dan'),
 							contactEmail: faker.internet.email(),
 							contactPhone: faker.phone.phoneNumber(),
-							forwardOrdersUsing: ForwardOrdersMethod.Unselected,
+							forwardOrdersUsing: [
+								ForwardOrdersMethod.Unselected
+							],
 							ordersEmail: null,
 							ordersPhone: null,
 							isManufacturing: true,
@@ -103,7 +105,9 @@ export default class FakeDataWarehouses {
 							logo: getFakeImg(200, 200, 75, 'Pizza Hit'),
 							contactEmail: faker.internet.email(),
 							contactPhone: faker.phone.phoneNumber(),
-							forwardOrdersUsing: ForwardOrdersMethod.Unselected,
+							forwardOrdersUsing: [
+								ForwardOrdersMethod.Unselected
+							],
 							ordersEmail: null,
 							ordersPhone: null,
 							isManufacturing: true,
@@ -135,7 +139,9 @@ export default class FakeDataWarehouses {
 							logo: getFakeImg(200, 200, 75, 'Pizza Troya'),
 							contactEmail: faker.internet.email(),
 							contactPhone: faker.phone.phoneNumber(),
-							forwardOrdersUsing: ForwardOrdersMethod.Unselected,
+							forwardOrdersUsing: [
+								ForwardOrdersMethod.Unselected
+							],
 							ordersEmail: null,
 							ordersPhone: null,
 							isManufacturing: false,
@@ -167,7 +173,9 @@ export default class FakeDataWarehouses {
 							logo: getFakeImg(200, 200, 75, 'Pizza Pizza'),
 							contactEmail: faker.internet.email(),
 							contactPhone: faker.phone.phoneNumber(),
-							forwardOrdersUsing: ForwardOrdersMethod.Unselected,
+							forwardOrdersUsing: [
+								ForwardOrdersMethod.Unselected
+							],
 							ordersEmail: null,
 							ordersPhone: null,
 							isManufacturing: true,
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html
index 4db6ef7b9..c2dfcd2e6 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html
@@ -1,92 +1,145 @@
 <div class="col-sm-12" [formGroup]="form" *ngIf="form">
 	<fieldset>
 		<div class="form-group row">
-			<label class="col-sm-2 control-label">{{ "WAREHOUSE_VIEW.MUTATION.CONTACT_PHONE" | translate }}</label>
+			<div class="col-sm-6">
+				<label class=" control-label">{{
+					'WAREHOUSE_VIEW.MUTATION.CONTACT_EMAIL' | translate
+				}}</label>
 
-			<div class="col-sm-9">
-				<input type="text" class="form-control" [placeholder]="'WAREHOUSE_VIEW.MUTATION.CONTACT_PHONE' | translate" formControlName="contactPhone"
+				<input
+					type="email"
+					class="form-control"
+					[placeholder]="
+						'WAREHOUSE_VIEW.MUTATION.CONTACT_EMAIL' | translate
+					"
+					formControlName="contactEmail"
 				/>
 
-				<div *ngIf="contactPhone.errors && (contactPhone.dirty || contactPhone.touched)" class="alert alert-danger">
-					<div [hidden]="!contactPhone.hasError('pattern')">
-						<!-- Phone number can start with "+" and must contains only only: "-, ., (space), #" and digit characters. -->
-						{{ "WAREHOUSE_VIEW.MUTATION.ERRORS.PHONE_CONTAINS_ONLY_DIGIT" | translate }}
+				<div
+					*ngIf="
+						contactEmail.errors &&
+						(contactEmail.dirty || contactEmail.touched)
+					"
+					class="alert alert-danger"
+				>
+					<div [hidden]="!contactEmail.hasError('email')">
+						{{
+							'WAREHOUSE_VIEW.MUTATION.ERRORS.INVALID_EMAIL'
+								| translate
+						}}
 					</div>
 				</div>
 			</div>
-		</div>
+			<div class="col-sm-6">
+				<label class="control-label">{{
+					'WAREHOUSE_VIEW.MUTATION.CONTACT_PHONE' | translate
+				}}</label>
 
-		<div class="form-group row">
-			<label class="col-sm-2 control-label">{{ "WAREHOUSE_VIEW.MUTATION.CONTACT_EMAIL" | translate }}</label>
-
-			<div class="col-sm-9">
-				<input type="email" class="form-control" [placeholder]="'WAREHOUSE_VIEW.MUTATION.CONTACT_EMAIL' | translate" formControlName="contactEmail"
+				<input
+					type="text"
+					class="form-control"
+					[placeholder]="
+						'WAREHOUSE_VIEW.MUTATION.CONTACT_PHONE' | translate
+					"
+					formControlName="contactPhone"
 				/>
 
-				<div *ngIf="contactEmail.errors && (contactEmail.dirty || contactEmail.touched)" class="alert alert-danger">
-					<div [hidden]="!contactEmail.hasError('email')">
-						{{ "WAREHOUSE_VIEW.MUTATION.ERRORS.INVALID_EMAIL" | translate }}
+				<div
+					*ngIf="
+						contactPhone.errors &&
+						(contactPhone.dirty || contactPhone.touched)
+					"
+					class="alert alert-danger"
+				>
+					<div [hidden]="!contactPhone.hasError('pattern')">
+						<!-- Phone number can start with "+" and must contains only only: "-, ., (space), #" and digit characters. -->
+						{{
+							'WAREHOUSE_VIEW.MUTATION.ERRORS.PHONE_CONTAINS_ONLY_DIGIT'
+								| translate
+						}}
 					</div>
 				</div>
 			</div>
 		</div>
-
 		<div class="form-group row">
-			<label class="col-sm-2 control-label">
-				{{ "WAREHOUSE_VIEW.MUTATION.FORWARD_ORDERS_WITH" | translate }}
-			</label>
-
-			<div class="col-sm-9">
-				<select class="form-control" formControlName="forwardOrdersUsing" [value]="null">
-					<option *ngFor="let option of forwardOrdersOptions" [ngValue]="option.id">
-						{{ option.name | translate }}
-					</option>
-				</select>
-			</div>
-		</div>
-
-		<div class="form-group row">
-			<label class="col-sm-2 control-label">
-				{{ "WAREHOUSE_VIEW.MUTATION.ORDERS_PHONE" | translate }}
-			</label>
-
-			<div class="col-sm-9">
-				<input type="text" class="form-control" [placeholder]="'WAREHOUSE_VIEW.MUTATION.ORDERS_PHONE' | translate" formControlName="ordersPhone"
+			<div class="col-sm-6">
+				<nb-checkbox
+					[value]="forwardingEmail"
+					(change)="forwardingEmailChange()"
+					>Order Forwarding Email</nb-checkbox
+				>
+				<input
+					*ngIf="forwardingEmail"
+					type="email"
+					class="form-control"
+					[placeholder]="
+						'WAREHOUSE_VIEW.MUTATION.ORDERS_EMAIL' | translate
+					"
+					formControlName="ordersEmail"
 				/>
-
-				<div *ngIf="(ordersPhone.errors || ordersPhone.hasError('pattern') || form.hasError('ordersPhoneRequired')) && (ordersPhone.dirty || ordersPhone.touched)"
-				 class="alert alert-danger">
-					<div [hidden]="!ordersPhone.hasError('pattern')">
-						<!-- Phone number can start with "+" and must contains only only: "-, ., (space), #" and digit characters. -->
-						{{ "WAREHOUSE_VIEW.MUTATION.ERRORS.PHONE_CONTAINS_ONLY_DIGIT" | translate }}
+				<div
+					*ngIf="
+						(ordersEmail.errors ||
+							ordersEmail.errors ||
+							(forwardingEmail && ordersEmail.value === '')) &&
+						(ordersEmail.dirty || ordersEmail.touched)
+					"
+					class="alert alert-danger"
+				>
+					<div [hidden]="!ordersEmail.hasError('email')">
+						{{
+							'WAREHOUSE_VIEW.MUTATION.ERRORS.INVALID_EMAIL'
+								| translate
+						}}
 					</div>
-					<div [hidden]="!form.hasError('ordersPhoneRequired')">
-						{{ "WAREHOUSE_VIEW.MUTATION.ERRORS.ORDERS_PHONE_IS_REQUIRED" | translate }}
+					<div *ngIf="forwardingEmail && ordersEmail.value === ''">
+						{{
+							'WAREHOUSE_VIEW.MUTATION.ERRORS.ORDERS_EMAIL_IS_REQUIRED'
+								| translate
+						}}
 					</div>
 				</div>
 			</div>
-		</div>
-
-		<div class="form-group row">
-			<label class="col-sm-2 control-label">
-				{{ "WAREHOUSE_VIEW.MUTATION.ORDERS_EMAIL" | translate }}
-			</label>
-
-			<div class="col-sm-9">
-				<input type="email" class="form-control" [placeholder]="'WAREHOUSE_VIEW.MUTATION.ORDERS_EMAIL' | translate" formControlName="ordersEmail"
+			<div class="col-sm-6">
+				<nb-checkbox
+					[value]="forwardingPhone"
+					(change)="forwardingPhoneChange()"
+					>Order Forwarding Phone</nb-checkbox
+				>
+				<input
+					*ngIf="forwardingPhone"
+					type="text"
+					class="form-control"
+					[placeholder]="
+						'WAREHOUSE_VIEW.MUTATION.ORDERS_PHONE' | translate
+					"
+					formControlName="ordersPhone"
 				/>
 
-				<div *ngIf="(ordersEmail.errors || ordersEmail.errors || form.hasError('ordersEmailRequired')) && (ordersEmail.dirty || ordersEmail.touched)"
-				 class="alert alert-danger">
-					<div [hidden]="!ordersEmail.hasError('email')">
-						{{ "WAREHOUSE_VIEW.MUTATION.ERRORS.INVALID_EMAIL" | translate }}
+				<div
+					*ngIf="
+						(ordersPhone.errors ||
+							ordersPhone.hasError('pattern') ||
+							(forwardingPhone && ordersPhone.value === '')) &&
+						(ordersPhone.dirty || ordersPhone.touched)
+					"
+					class="alert alert-danger"
+				>
+					<div [hidden]="!ordersPhone.hasError('pattern')">
+						<!-- Phone number can start with "+" and must contains only only: "-, ., (space), #" and digit characters.-->
+						{{
+							'WAREHOUSE_VIEW.MUTATION.ERRORS.PHONE_CONTAINS_ONLY_DIGIT'
+								| translate
+						}}
 					</div>
-					<div [hidden]="!form.hasError('ordersEmailRequired')">
-						{{ "WAREHOUSE_VIEW.MUTATION.ERRORS.ORDERS_EMAIL_IS_REQUIRED" | translate }}
+					<div *ngIf="forwardingPhone && ordersPhone.value === ''">
+						{{
+							'WAREHOUSE_VIEW.MUTATION.ERRORS.ORDERS_PHONE_IS_REQUIRED'
+								| translate
+						}}
 					</div>
 				</div>
 			</div>
 		</div>
-
 	</fieldset>
-</div>
\ No newline at end of file
+</div>
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.ts
index 87c3879c6..5a92981eb 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.ts
@@ -2,7 +2,6 @@ import { Component, Input } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import ForwardOrdersMethod from '@modules/server.common/enums/ForwardOrdersMethod';
 import { IWarehouseCreateObject } from '@modules/server.common/interfaces/IWarehouse';
-import { IMultiSelectOption } from 'angular-2-dropdown-multiselect';
 import { FormHelpers } from '../../../forms/helpers';
 
 export type WarehouseContactInfo = Pick<
@@ -14,6 +13,8 @@ export type WarehouseContactInfo = Pick<
 	| 'ordersPhone'
 >;
 
+const phoneNumberRegex = /^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9x]*$/;
+
 @Component({
 	selector: 'ea-warehouse-contact-info-form',
 	templateUrl: 'contact-info-form.component.html'
@@ -22,56 +23,28 @@ export class ContactInfoFormComponent {
 	@Input()
 	readonly form: FormGroup;
 
-	public ForwardOrdersMethod = ForwardOrdersMethod;
-
-	readonly forwardOrdersOptions: IMultiSelectOption[] = [
-		{ id: ForwardOrdersMethod['Unselected'], name: '' },
-		{ id: ForwardOrdersMethod.Email, name: 'Email' },
-		{ id: ForwardOrdersMethod.Phone, name: 'Phone' }
-	];
+	forwardingEmail: boolean;
+	forwardingPhone: boolean;
 
 	static buildForm(formBuilder: FormBuilder): FormGroup {
 		// would be used in the parent component and injected into this.form
 
-		const phoneNumberRegex = /^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9x]*$/;
-
-		return formBuilder.group(
-			{
-				contactPhone: ['', [Validators.pattern(phoneNumberRegex)]],
-				contactEmail: ['', [Validators.email]],
-
-				forwardOrdersUsing: [
-					ForwardOrdersMethod['Unselected'],
-					[Validators.required]
-				],
-
-				ordersPhone: ['', [Validators.pattern(phoneNumberRegex)]],
-				ordersEmail: ['', [Validators.email]]
-			},
-			{
-				validator: (form) => {
-					switch (form.get('forwardOrdersUsing').value) {
-						// case ForwardOrdersMethod[ 'Unselected' ]:
-						// 	return true;
-						case ForwardOrdersMethod.Phone:
-							return form.get('ordersPhone').value
-								? null
-								: { ordersPhoneRequired: true };
-						case ForwardOrdersMethod.Email:
-							return form.get('ordersEmail').value
-								? null
-								: { ordersEmailRequired: true };
-					}
-				}
-			}
-		);
+		return formBuilder.group({
+			contactPhone: ['', [Validators.pattern(phoneNumberRegex)]],
+			contactEmail: ['', [Validators.email]],
+
+			forwardOrdersUsing: [],
+
+			ordersPhone: ['', [Validators.pattern(phoneNumberRegex)]],
+			ordersEmail: ['', [Validators.email]]
+		});
 	}
 
 	getValue() {
 		const contactInfo = this.form.getRawValue() as {
 			contactEmail: string;
 			contactPhone: string;
-			forwardOrdersUsing: ForwardOrdersMethod;
+			forwardOrdersUsing: ForwardOrdersMethod[];
 			ordersEmail: string;
 			ordersPhone: string;
 		};
@@ -83,7 +56,7 @@ export class ContactInfoFormComponent {
 			...(contactInfo.contactPhone
 				? { contactPhone: contactInfo.contactPhone }
 				: { contactPhone: null }),
-			forwardOrdersUsing: contactInfo.forwardOrdersUsing,
+			forwardOrdersUsing: this.getForwardOrdersUsing(),
 			...(contactInfo.ordersEmail
 				? { ordersEmail: contactInfo.ordersEmail }
 				: { ordersEmail: null }),
@@ -93,7 +66,7 @@ export class ContactInfoFormComponent {
 		};
 	}
 
-	public setValue<T extends WarehouseContactInfo>(contactInfo: T) {
+	setValue<T extends WarehouseContactInfo>(contactInfo: T) {
 		FormHelpers.deepMark(this.form, 'dirty');
 
 		this.form.setValue({
@@ -107,6 +80,15 @@ export class ContactInfoFormComponent {
 			ordersEmail: contactInfo.ordersEmail ? contactInfo.ordersEmail : '',
 			ordersPhone: contactInfo.ordersPhone ? contactInfo.ordersPhone : ''
 		});
+
+		if (contactInfo.forwardOrdersUsing) {
+			this.forwardingEmail = contactInfo.forwardOrdersUsing.includes(
+				ForwardOrdersMethod.Email
+			);
+			this.forwardingPhone = contactInfo.forwardOrdersUsing.includes(
+				ForwardOrdersMethod.Phone
+			);
+		}
 	}
 
 	get contactEmail() {
@@ -128,4 +110,60 @@ export class ContactInfoFormComponent {
 	get ordersPhone() {
 		return this.form.get('ordersPhone');
 	}
+
+	get validForm() {
+		return this.form && this.form.valid && this.forwardingEmail
+			? this.ordersEmail.value !== ''
+			: true && this.forwardingPhone
+			? this.ordersPhone.value !== ''
+			: true;
+	}
+
+	forwardingPhoneChange() {
+		this.forwardingPhone = !this.forwardingPhone;
+		let forwardOrdersUsingArr = this.forwardOrdersUsing.value || [];
+
+		forwardOrdersUsingArr = forwardOrdersUsingArr.filter(
+			(v) => v !== ForwardOrdersMethod.Phone
+		);
+
+		if (this.forwardingPhone) {
+			forwardOrdersUsingArr.push(ForwardOrdersMethod.Phone);
+		} else {
+			this.ordersPhone.setValue('');
+		}
+
+		this.forwardOrdersUsing.setValue(forwardOrdersUsingArr);
+	}
+
+	forwardingEmailChange() {
+		this.forwardingEmail = !this.forwardingEmail;
+		let forwardOrdersUsingArr = this.forwardOrdersUsing.value || [];
+
+		forwardOrdersUsingArr = forwardOrdersUsingArr.filter(
+			(v) => v !== ForwardOrdersMethod.Email
+		);
+
+		if (this.forwardingEmail) {
+			forwardOrdersUsingArr.push(ForwardOrdersMethod.Email);
+		} else {
+			this.ordersEmail.setValue('');
+		}
+
+		this.forwardOrdersUsing.setValue(forwardOrdersUsingArr);
+	}
+
+	private getForwardOrdersUsing() {
+		const forwardOrdersUsing = [];
+
+		if (this.forwardingEmail) {
+			forwardOrdersUsing.push(ForwardOrdersMethod.Email);
+		}
+
+		if (this.forwardingPhone) {
+			forwardOrdersUsing.push(ForwardOrdersMethod.Phone);
+		}
+
+		return forwardOrdersUsing;
+	}
 }
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
index 45fe5ebda..6a7a76c6c 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
@@ -70,6 +70,10 @@ export class WarehouseManageTabsComponent {
 		return this.form.get('location');
 	}
 
+	get validForm() {
+		return this.form.valid && this.contactInfoForm.validForm;
+	}
+
 	onCoordinatesChanges(coords: number[]) {
 		this.mapCoordEmitter.emit(coords);
 	}
@@ -98,7 +102,7 @@ export class WarehouseManageTabsComponent {
 			contactInfo: {
 				contactEmail: string;
 				contactPhone: string;
-				forwardOrdersUsing: ForwardOrdersMethod;
+				forwardOrdersUsing: ForwardOrdersMethod[];
 				ordersEmail: string;
 				ordersPhone: string;
 			};
diff --git a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html
index 5e93dc03a..17bedfac9 100644
--- a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html
@@ -30,7 +30,7 @@
 		[title]="
 			'WAREHOUSE_VIEW.MUTATION.WIZARD_TITLES.CONTACT_INFO' | translate
 		"
-		[isValid]="contactInfo.valid"
+		[isValid]="contactInfoForm?.validForm"
 	>
 		<div class="pt-5"></div>
 		<ea-warehouse-contact-info-form
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html
index 5cf382aae..54550d00c 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html
@@ -21,7 +21,7 @@ <h1>{{ 'WAREHOUSE_MANAGE.MANAGE_STORE' | translate }}</h1>
 				type="button"
 				class="btn btn-success pull-right text-center"
 				(click)="updateWarehouse()"
-				[disabled]="!form.valid"
+				[disabled]="!validForm"
 			>
 				<i class="ion-md-checkmark button-icon"></i>
 				<span>{{ 'WAREHOUSE_MANAGE.SAVE' | translate }}</span>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
index 9612b6c55..42eccf26a 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
@@ -17,7 +17,7 @@ import 'rxjs/add/operator/withLatestFrom';
 })
 export class WarehouseManageComponent implements OnInit {
 	loading: boolean;
-	//
+
 	@ViewChild('warehouseManageTabs')
 	warehouseManageTabs: WarehouseManageTabsComponent;
 
@@ -56,6 +56,10 @@ export class WarehouseManageComponent implements OnInit {
 		this._loadWarehouse();
 	}
 
+	get validForm() {
+		return this.warehouseManageTabs.validForm;
+	}
+
 	async updateWarehouse() {
 		try {
 			this.loading = true;
diff --git a/backend/api/src/graphql/warehouses/warehouses.types.graphql b/backend/api/src/graphql/warehouses/warehouses.types.graphql
index 758f47762..077002254 100644
--- a/backend/api/src/graphql/warehouses/warehouses.types.graphql
+++ b/backend/api/src/graphql/warehouses/warehouses.types.graphql
@@ -25,7 +25,7 @@ type Warehouse {
 	contactEmail: String
 	contactPhone: String
 
-	forwardOrdersUsing: Int!
+	forwardOrdersUsing: [Int!]
 	ordersEmail: String
 	ordersPhone: String
 
@@ -62,7 +62,7 @@ input WarehouseCreateInput {
 	contactEmail: String
 	contactPhone: String
 
-	forwardOrdersUsing: Int!
+	forwardOrdersUsing: [Int!]
 	ordersEmail: String
 	ordersPhone: String
 
@@ -92,7 +92,7 @@ input WarehousesFindInput {
 	contactEmail: String
 	contactPhone: String
 
-	forwardOrdersUsing: Int
+	forwardOrdersUsing: [Int]
 	ordersEmail: String
 	ordersPhone: String
 
diff --git a/backend/api/src/test/integration/GeoLocationWarehouses.spec.ts b/backend/api/src/test/integration/GeoLocationWarehouses.spec.ts
index aaf299553..56c890d2c 100644
--- a/backend/api/src/test/integration/GeoLocationWarehouses.spec.ts
+++ b/backend/api/src/test/integration/GeoLocationWarehouses.spec.ts
@@ -54,7 +54,7 @@ function warehouseFixture([lng, lat]: [
 			contactPhone: faker.phone.phoneNumber(),
 			ordersEmail: null,
 			ordersPhone: null,
-			forwardOrdersUsing: faker.random.number(1) as ForwardOrdersMethod,
+			forwardOrdersUsing: [ForwardOrdersMethod.Unselected],
 			isManufacturing: true,
 			isCarrierRequired: true,
 			usedCarriersIds: [],
@@ -75,10 +75,7 @@ describe('GeoLocationWarehouses', () => {
 			reconnectInterval: 1000
 		};
 
-		await mongoose.connect(
-			mongoUrl,
-			options
-		);
+		await mongoose.connect(mongoUrl, options);
 		console.log(`MongoDB successfully connected to ${mongoUrl}`);
 	});
 
diff --git a/shared/core/entities/Warehouse.ts b/shared/core/entities/Warehouse.ts
index 742f18e37..f4bea14ae 100644
--- a/shared/core/entities/Warehouse.ts
+++ b/shared/core/entities/Warehouse.ts
@@ -175,9 +175,9 @@ class Warehouse extends DBObject<IWarehouse, IWarehouseCreateObject>
 	 * @type {ForwardOrdersMethod}
 	 * @memberof Warehouse
 	 */
-	@Types.Number(ForwardOrdersMethod.Phone)
+	@Schema([Number])
 	@Column()
-	forwardOrdersUsing: ForwardOrdersMethod;
+	forwardOrdersUsing: ForwardOrdersMethod[];
 
 	/**
 	 * Is Warehouse products by default require manufacturing
diff --git a/shared/core/interfaces/IWarehouse.ts b/shared/core/interfaces/IWarehouse.ts
index 18a7a7d56..3bbf0e21b 100644
--- a/shared/core/interfaces/IWarehouse.ts
+++ b/shared/core/interfaces/IWarehouse.ts
@@ -69,7 +69,7 @@ export interface IWarehouseCreateObject extends DBCreateObject {
 	 * @type {ForwardOrdersMethod}
 	 * @memberof IWarehouseCreateObject
 	 */
-	forwardOrdersUsing: ForwardOrdersMethod;
+	forwardOrdersUsing: ForwardOrdersMethod[];
 
 	/**
 	 * Is Warehouse products by default require manufacturing

From 4fde108390cbf43211a4dec76a50a32af4a01112 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 2 Apr 2019 09:46:42 +0300
Subject: [PATCH 086/382] fix(ever-admin): contact info in "Manage Store" page 
 EV-1190

---
 .../contact-info/contact-info-form.component.ts   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.ts
index 5a92981eb..0ed3fcb47 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.ts
@@ -112,11 +112,12 @@ export class ContactInfoFormComponent {
 	}
 
 	get validForm() {
-		return this.form && this.form.valid && this.forwardingEmail
-			? this.ordersEmail.value !== ''
-			: true && this.forwardingPhone
-			? this.ordersPhone.value !== ''
-			: true;
+		return (
+			this.form &&
+			this.form.valid &&
+			(this.forwardingEmail ? this.ordersEmail.value !== '' : true) &&
+			(this.forwardingPhone ? this.ordersPhone.value !== '' : true)
+		);
 	}
 
 	forwardingPhoneChange() {
@@ -164,6 +165,10 @@ export class ContactInfoFormComponent {
 			forwardOrdersUsing.push(ForwardOrdersMethod.Phone);
 		}
 
+		if (!this.forwardingEmail && !this.forwardingPhone) {
+			forwardOrdersUsing.push(ForwardOrdersMethod.Unselected);
+		}
+
 		return forwardOrdersUsing;
 	}
 }

From 49f1d097f26112029583d8d7d84d440a650f759c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 2 Apr 2019 11:24:10 +0300
Subject: [PATCH 087/382] feat(ever-admin): added step "Contact info", in Setup
 Merchants page EV-1190

---
 .../contact-info-form.component.html          |   2 +
 .../components/account/account.component.html |   4 +-
 .../basic-info/basic-info.component.html      |  88 +++++-----
 .../components/components.module.ts           |   9 +-
 .../contact-info/contact-info.component.html  | 150 ++++++++++++++++++
 .../contact-info/contact-info.component.scss  |   5 +
 .../contact-info/contact-info.component.ts    |  21 +++
 .../instructions/instructions.component.html  |   3 +
 .../+merchants/merchants.component.html       |  12 +-
 .../+setup/+merchants/merchants.module.ts     |   3 +-
 10 files changed, 246 insertions(+), 51 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts

diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html
index c2dfcd2e6..c9b54114f 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html
@@ -61,6 +61,8 @@
 				</div>
 			</div>
 		</div>
+
+		<!-- TODO add translate -->
 		<div class="form-group row">
 			<div class="col-sm-6">
 				<nb-checkbox
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
index e04075b53..ddd067b6f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
@@ -28,9 +28,7 @@
 					*ngIf="email.invalid && (email.dirty || email.touched)"
 				>
 					<span *ngIf="email.errors.required">Email is required</span>
-					<span *ngIf="email.errors.email"
-						>Email must be a valid email address</span
-					>
+					<span *ngIf="email.errors.email">Invalid email format</span>
 				</small>
 			</div>
 			<div class="form-group col-md-6">
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
index f7afe3497..5ade2d2dd 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
@@ -81,51 +81,53 @@
 				</div>
 			</div>
 
-			<div class="form-group offset-md-2 col-md-8 mt-3 mb-0">
-				<label for="barcodeData">Barcode Data</label>
-				<input
-					nbInput
-					type="text"
-					class="form-control"
-					id="barcodeData"
-					name="barcode-data-input"
-					placeholder="Barcode data"
-					[(ngModel)]="basicInfoModel.barcodeData"
-					(change)="barcodeDataChange()"
-					#barcodeData="ngModel"
-					[ngClass]="{
-						'input-danger':
+			<div class="mb-3 col-12 p-0">
+				<div class="form-group offset-md-2 col-md-8 mt-3 mb-0">
+					<label for="barcodeData">Barcode Data</label>
+					<input
+						nbInput
+						type="text"
+						class="form-control"
+						id="barcodeData"
+						name="barcode-data-input"
+						placeholder="Barcode data"
+						[(ngModel)]="basicInfoModel.barcodeData"
+						(change)="barcodeDataChange()"
+						#barcodeData="ngModel"
+						[ngClass]="{
+							'input-danger':
+								barcodeData.invalid &&
+								(barcodeData.dirty || barcodeData.touched),
+							'input-success':
+								barcodeData.valid &&
+								(barcodeData.dirty ||
+									barcodeData.touched ||
+									barcodeData.value)
+						}"
+						required
+					/>
+					<small
+						class="text-danger"
+						*ngIf="
 							barcodeData.invalid &&
-							(barcodeData.dirty || barcodeData.touched),
-						'input-success':
-							barcodeData.valid &&
-							(barcodeData.dirty ||
-								barcodeData.touched ||
-								barcodeData.value)
-					}"
-					required
-				/>
-				<small
-					class="text-danger"
-					*ngIf="
-						barcodeData.invalid &&
-						(barcodeData.dirty || barcodeData.touched)
-					"
-				>
-					<span *ngIf="barcodeData.errors.required"
-						>Barcode Data is required</span
+							(barcodeData.dirty || barcodeData.touched)
+						"
 					>
-				</small>
-			</div>
-			<div class="offset-md-2 col-md-8" [hidden]="!barcodetDataUrl">
-				<div class="col-sm-10">
-					<span class="row preview-barcode">
-						<img
-							src="{{ barcodetDataUrl }}"
-							alt="Invalid image"
-							class="img-rounded"
-						/>
-					</span>
+						<span *ngIf="barcodeData.errors.required"
+							>Barcode Data is required</span
+						>
+					</small>
+				</div>
+				<div class="offset-md-2 col-md-8" [hidden]="!barcodetDataUrl">
+					<div class="col-sm-10">
+						<span class="row preview-barcode">
+							<img
+								src="{{ barcodetDataUrl }}"
+								alt="Invalid image"
+								class="img-rounded"
+							/>
+						</span>
+					</div>
 				</div>
 			</div>
 		</form>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 2488a97a8..dde660a22 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -6,8 +6,15 @@ import { AccountComponent } from './account/account.component';
 import { FormsModule } from '@angular/forms';
 import { BasicInfoComponent } from './basic-info/basic-info.component';
 import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
+import { MerchantsSetupInstructionsComponent } from './instructions/instructions.component';
+import { ContactInfoComponent } from './contact-info/contact-info.component';
 
-const COMPONENTS = [AccountComponent, BasicInfoComponent];
+const COMPONENTS = [
+	AccountComponent,
+	BasicInfoComponent,
+	ContactInfoComponent,
+	MerchantsSetupInstructionsComponent
+];
 
 @NgModule({
 	imports: [
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
new file mode 100644
index 000000000..b46fddf44
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
@@ -0,0 +1,150 @@
+<nb-card class="setup-merchant-contact-info">
+	<nb-card-header>Contact info</nb-card-header>
+	<nb-card-body>
+		<form class="row m-0" #contactInfoForm="ngForm">
+			<div class="form-group offset-md-2 col-md-8">
+				<label for="contactPhone">Contact Phone</label>
+				<input
+					nbInput
+					type="text"
+					class="form-control"
+					id="contactPhone"
+					name="contact-phone-input"
+					placeholder="Contact Phone"
+					[(ngModel)]="contactInfoModel.contactPhone"
+					#contactPhone="ngModel"
+					pattern="^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9x]*$"
+					[ngClass]="{
+						'input-danger':
+							contactPhone.invalid &&
+							(contactPhone.dirty || contactPhone.touched),
+						'input-success':
+							contactPhone.valid &&
+							contactPhone.value !== '' &&
+							(contactPhone.dirty || contactPhone.touched)
+					}"
+				/>
+				<small
+					class="text-danger"
+					*ngIf="
+						contactPhone.invalid &&
+						(contactPhone.dirty || contactPhone.touched)
+					"
+				>
+					<span *ngIf="contactPhone.errors.pattern"
+						>Invalid phone number format</span
+					>
+				</small>
+			</div>
+
+			<div class="form-group offset-md-2 col-md-4">
+				<nb-checkbox
+					[value]="forwardingEmail"
+					(change)="forwardingEmail = !forwardingEmail"
+					>Order Forwarding Email</nb-checkbox
+				>
+			</div>
+			<div class="form-group  col-md-4">
+				<nb-checkbox
+					[value]="forwardingPhone"
+					(change)="forwardingPhone = !forwardingPhone"
+					>Order Forwarding Phone</nb-checkbox
+				>
+			</div>
+
+			<div
+				*ngIf="forwardingEmail"
+				class="form-group offset-md-2 col-md-8"
+			>
+				<label for="ordersEmail">Orders Email</label>
+				<input
+					nbInput
+					type="email"
+					class="form-control"
+					id="ordersEmail"
+					name="orders-email-input"
+					placeholder="Orders Email"
+					[(ngModel)]="contactInfoModel.ordersEmail"
+					#ordersEmail="ngModel"
+					required
+					email
+					[ngClass]="{
+						'input-danger':
+							ordersEmail.invalid &&
+							(ordersEmail.dirty ||
+								ordersEmail.touched ||
+								ordersEmail.value !== ''),
+						'input-success':
+							ordersEmail.valid &&
+							(ordersEmail.dirty ||
+								ordersEmail.touched ||
+								ordersEmail.value !== '')
+					}"
+				/>
+				<small
+					class="text-danger"
+					*ngIf="
+						ordersEmail.invalid &&
+						(ordersEmail.dirty ||
+							ordersEmail.touched ||
+							ordersEmail.value !== '')
+					"
+				>
+					<span *ngIf="ordersEmail.errors.required"
+						>Orders email is required</span
+					>
+					<span *ngIf="ordersEmail.errors.email"
+						>Invalid email format</span
+					>
+				</small>
+			</div>
+
+			<div
+				*ngIf="forwardingPhone"
+				class="form-group offset-md-2 col-md-8"
+			>
+				<label for="ordersPhone">Orders Phone</label>
+				<input
+					nbInput
+					type="text"
+					class="form-control"
+					id="ordersPhone"
+					name="orders-phone-input"
+					placeholder="Orders Phone"
+					[(ngModel)]="contactInfoModel.ordersPhone"
+					#ordersPhone="ngModel"
+					required
+					pattern="^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9x]*$"
+					[ngClass]="{
+						'input-danger':
+							ordersPhone.invalid &&
+							(ordersPhone.dirty ||
+								ordersPhone.touched ||
+								ordersPhone.value !== ''),
+						'input-success':
+							ordersPhone.valid &&
+							(ordersPhone.dirty ||
+								ordersPhone.touched ||
+								ordersPhone.value !== '')
+					}"
+				/>
+				<small
+					class="text-danger"
+					*ngIf="
+						ordersPhone.invalid &&
+						(ordersPhone.dirty ||
+							ordersPhone.touched ||
+							ordersPhone.value !== '')
+					"
+				>
+					<span *ngIf="ordersPhone.errors.required"
+						>Orders phone is required</span
+					>
+					<span *ngIf="ordersPhone.errors.pattern"
+						>Invalid phone number format</span
+					>
+				</small>
+			</div>
+		</form>
+	</nb-card-body></nb-card
+>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.scss
new file mode 100644
index 000000000..fc1d729ab
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.scss
@@ -0,0 +1,5 @@
+.setup-merchant-contact-info {
+	nb-card-body {
+		text-align: left;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
new file mode 100644
index 000000000..f9c68969c
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
@@ -0,0 +1,21 @@
+import { Component, ViewChild } from '@angular/core';
+import { NgForm } from '@angular/forms';
+
+@Component({
+	selector: 'ea-merchants-setup-contact-info',
+	templateUrl: './contact-info.component.html',
+	styleUrls: ['./contact-info.component.scss']
+})
+export class ContactInfoComponent {
+	@ViewChild('contactInfoForm')
+	contactInfoForm: NgForm;
+
+	forwardingEmail: boolean;
+	forwardingPhone: boolean;
+	contactInfoModel = {
+		contactPhone: '',
+		forwardOrdersUsing: [],
+		ordersEmail: '',
+		ordersPhone: ''
+	};
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index 1c5ab1e0b..99930f4a6 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -9,5 +9,8 @@ <h5>How to setup {{ stepper.selected.label }}?</h5>
 		<div *ngIf="stepper.index === 1">
 			TODO add instructions for Basic info
 		</div>
+		<div *ngIf="stepper.index === 2">
+			TODO add instructions for Contact info
+		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 031a390bd..0ea3ff864 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -35,10 +35,18 @@
 							</button>
 						</nb-step>
 						<nb-step label="Contact info">
-							<h3>Contact info</h3>
+							<ea-merchants-setup-contact-info
+								#contactInfo
+							></ea-merchants-setup-contact-info>
 
 							<button nbButton nbStepperPrevious>PREV</button>
-							<button nbButton nbStepperNext>NEXT</button>
+							<button
+								nbButton
+								nbStepperNext
+								[disabled]="contactInfo.contactInfoForm.invalid"
+							>
+								NEXT
+							</button>
 						</nb-step>
 						<nb-step label="Location">
 							<h3>Location</h3>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index 7e39d68b4..43d56e3f1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -6,7 +6,6 @@ import { TranslateModule } from '@ngx-translate/core';
 import { SetupMerchantsComponent } from './merchants.component';
 import { NbStepperModule } from '@nebular/theme';
 import { SetupMerchantsComponentsModule } from './components/components.module';
-import { MerchantsSetupInstructionsComponent } from './components/instructions/instructions.component';
 
 const routes: Routes = [
 	{
@@ -24,6 +23,6 @@ const routes: Routes = [
 		NbStepperModule,
 		SetupMerchantsComponentsModule
 	],
-	declarations: [SetupMerchantsComponent, MerchantsSetupInstructionsComponent]
+	declarations: [SetupMerchantsComponent]
 })
 export class SetupMerchantsModule {}

From 8d2bd70650394009e53e9851947ac61c79b57d89 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 2 Apr 2019 12:06:21 +0300
Subject: [PATCH 088/382] feat(ever-admin): initialize step "Location", in
 Setup Merchants page EV-1191

---
 .../components/account/account.component.ts   |  2 +-
 .../basic-info/basic-info.component.ts        |  2 +-
 .../components/components.module.ts           | 12 +++++-----
 .../contact-info/contact-info.component.ts    |  2 +-
 .../location/location.component.html          | 13 +++++++++++
 .../components/location/location.component.ts | 13 +++++++++++
 .../components/location/location.module.ts    | 22 +++++++++++++++++++
 .../+merchants/merchants.component.html       |  2 +-
 .../+setup/+merchants/merchants.module.ts     |  4 +++-
 9 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.module.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
index daa60317b..aed5b275a 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
@@ -6,7 +6,7 @@ import { NgForm } from '@angular/forms';
 	templateUrl: './account.component.html',
 	styleUrls: ['./account.component.scss']
 })
-export class AccountComponent {
+export class SetupMerchantAccountComponent {
 	@ViewChild('accountForm')
 	accountForm: NgForm;
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index 45b6d2ee3..55148298f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -7,7 +7,7 @@ import QRCode from 'qrcode';
 	templateUrl: './basic-info.component.html',
 	styleUrls: ['./basic-info.component.scss']
 })
-export class BasicInfoComponent {
+export class SetupMerchantBasicInfoComponent {
 	@ViewChild('basicInfoForm')
 	basicInfoForm: NgForm;
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index dde660a22..734a536ae 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -2,17 +2,17 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ThemeModule } from 'app/@theme';
 import { TranslateModule } from '@ngx-translate/core';
-import { AccountComponent } from './account/account.component';
 import { FormsModule } from '@angular/forms';
-import { BasicInfoComponent } from './basic-info/basic-info.component';
 import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
 import { MerchantsSetupInstructionsComponent } from './instructions/instructions.component';
-import { ContactInfoComponent } from './contact-info/contact-info.component';
+import { SetupMerchantAccountComponent } from './account/account.component';
+import { SetupMerchantBasicInfoComponent } from './basic-info/basic-info.component';
+import { SetupMerchantContactInfoComponent } from './contact-info/contact-info.component';
 
 const COMPONENTS = [
-	AccountComponent,
-	BasicInfoComponent,
-	ContactInfoComponent,
+	SetupMerchantAccountComponent,
+	SetupMerchantBasicInfoComponent,
+	SetupMerchantContactInfoComponent,
 	MerchantsSetupInstructionsComponent
 ];
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
index f9c68969c..b18b6b14c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
@@ -6,7 +6,7 @@ import { NgForm } from '@angular/forms';
 	templateUrl: './contact-info.component.html',
 	styleUrls: ['./contact-info.component.scss']
 })
-export class ContactInfoComponent {
+export class SetupMerchantContactInfoComponent {
 	@ViewChild('contactInfoForm')
 	contactInfoForm: NgForm;
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
new file mode 100644
index 000000000..72121c69c
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
@@ -0,0 +1,13 @@
+<nb-card class="setup-merchant-location">
+	<nb-card-header>Location</nb-card-header>
+	<nb-card-body>
+		<ea-location-form
+			#locationForm
+			[form]="location"
+			[showAutocompleteSearch]="true"
+			(mapCoordinatesEmitter)="onCoordinatesChanges($event)"
+			(mapGeometryEmitter)="onGeometrySend($event)"
+		>
+		</ea-location-form>
+	</nb-card-body>
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
new file mode 100644
index 000000000..0bec5412f
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { LocationFormComponent } from 'app/@shared/forms/location';
+import { FormBuilder } from '@angular/forms';
+
+@Component({
+	selector: 'ea-merchants-setup-location',
+	templateUrl: './location.component.html'
+})
+export class SetupMerchantLocationComponent {
+	location = LocationFormComponent.buildForm(this.formBuilder);
+
+	constructor(private readonly formBuilder: FormBuilder) {}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.module.ts
new file mode 100644
index 000000000..99255d164
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ThemeModule } from 'app/@theme';
+import { TranslateModule } from '@ngx-translate/core';
+import { FormsModule } from '@angular/forms';
+import { SetupMerchantLocationComponent } from './location.component';
+import { LocationFormModule } from 'app/@shared/forms/location';
+
+const COMPONENTS = [SetupMerchantLocationComponent];
+
+@NgModule({
+	imports: [
+		CommonModule,
+		ThemeModule,
+		FormsModule,
+		TranslateModule.forChild(),
+		LocationFormModule
+	],
+	declarations: COMPONENTS,
+	exports: COMPONENTS
+})
+export class SetupMerchantsLocationModule {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 0ea3ff864..c78d6f98c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -49,7 +49,7 @@
 							</button>
 						</nb-step>
 						<nb-step label="Location">
-							<h3>Location</h3>
+							<ea-merchants-setup-location></ea-merchants-setup-location>
 
 							<button nbButton nbStepperPrevious>PREV</button>
 							<button nbButton nbStepperNext>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index 43d56e3f1..827f07bda 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -6,6 +6,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { SetupMerchantsComponent } from './merchants.component';
 import { NbStepperModule } from '@nebular/theme';
 import { SetupMerchantsComponentsModule } from './components/components.module';
+import { SetupMerchantsLocationModule } from './components/location/location.module';
 
 const routes: Routes = [
 	{
@@ -21,7 +22,8 @@ const routes: Routes = [
 		RouterModule.forChild(routes),
 		TranslateModule.forChild(),
 		NbStepperModule,
-		SetupMerchantsComponentsModule
+		SetupMerchantsComponentsModule,
+		SetupMerchantsLocationModule
 	],
 	declarations: [SetupMerchantsComponent]
 })

From e5c2ce63c51b0ae763f6d337a2a52abfd0db0a4d Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 2 Apr 2019 13:43:48 +0300
Subject: [PATCH 089/382] feat(ever-admin): finished Location step, in Setup
 Merchants EV-1191

---
 .../instructions/instructions.component.html           |  3 +++
 .../components/location/location.component.html        |  9 +++++++--
 .../components/location/location.component.scss        |  5 +++++
 .../components/location/location.component.ts          |  8 ++++++--
 .../+merchants/components/location/location.module.ts  |  4 +++-
 .../pages/+setup/+merchants/merchants.component.html   | 10 ++++++++--
 6 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.scss

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index 99930f4a6..ffbe83439 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -12,5 +12,8 @@ <h5>How to setup {{ stepper.selected.label }}?</h5>
 		<div *ngIf="stepper.index === 2">
 			TODO add instructions for Contact info
 		</div>
+		<div *ngIf="stepper.index === 3">
+			TODO add instructions for Location
+		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
index 72121c69c..b36fe160c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
@@ -5,9 +5,14 @@
 			#locationForm
 			[form]="location"
 			[showAutocompleteSearch]="true"
-			(mapCoordinatesEmitter)="onCoordinatesChanges($event)"
-			(mapGeometryEmitter)="onGeometrySend($event)"
+			(mapCoordinatesEmitter)="mapCoordEmitter.emit($event)"
+			(mapGeometryEmitter)="mapGeometryEmitter.emit($event)"
 		>
 		</ea-location-form>
+		<google-map
+			[mapCoordEvent]="mapCoordEmitter"
+			[mapGeometryEvent]="mapGeometryEmitter"
+		>
+		</google-map>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.scss
new file mode 100644
index 000000000..17d2250d5
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.scss
@@ -0,0 +1,5 @@
+.setup-merchant-location {
+	nb-card-body {
+		text-align: left;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
index 0bec5412f..656f95f84 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
@@ -1,13 +1,17 @@
-import { Component } from '@angular/core';
+import { Component, EventEmitter } from '@angular/core';
 import { LocationFormComponent } from 'app/@shared/forms/location';
 import { FormBuilder } from '@angular/forms';
 
 @Component({
 	selector: 'ea-merchants-setup-location',
-	templateUrl: './location.component.html'
+	templateUrl: './location.component.html',
+	styleUrls: ['./location.component.scss']
 })
 export class SetupMerchantLocationComponent {
 	location = LocationFormComponent.buildForm(this.formBuilder);
 
+	mapCoordEmitter = new EventEmitter<number[]>();
+	mapGeometryEmitter = new EventEmitter<any>();
+
 	constructor(private readonly formBuilder: FormBuilder) {}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.module.ts
index 99255d164..9d9d762cd 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.module.ts
@@ -5,6 +5,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { FormsModule } from '@angular/forms';
 import { SetupMerchantLocationComponent } from './location.component';
 import { LocationFormModule } from 'app/@shared/forms/location';
+import { GoogleMapModule } from 'app/@shared/forms/google-map/google-map.module';
 
 const COMPONENTS = [SetupMerchantLocationComponent];
 
@@ -14,7 +15,8 @@ const COMPONENTS = [SetupMerchantLocationComponent];
 		ThemeModule,
 		FormsModule,
 		TranslateModule.forChild(),
-		LocationFormModule
+		LocationFormModule,
+		GoogleMapModule
 	],
 	declarations: COMPONENTS,
 	exports: COMPONENTS
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index c78d6f98c..7489354d5 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -49,10 +49,16 @@
 							</button>
 						</nb-step>
 						<nb-step label="Location">
-							<ea-merchants-setup-location></ea-merchants-setup-location>
+							<ea-merchants-setup-location
+								#location
+							></ea-merchants-setup-location>
 
 							<button nbButton nbStepperPrevious>PREV</button>
-							<button nbButton nbStepperNext>
+							<button
+								nbButton
+								nbStepperNext
+								[disabled]="location.location.invalid"
+							>
 								NEXT
 							</button>
 						</nb-step>

From e85d10c2966431fc3c5b4d1c01fa1f69aa69d2ef Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 2 Apr 2019 14:08:30 +0300
Subject: [PATCH 090/382] feat(ever-admin): added step "Payments" in Setup
 Merchants EV-1192

---
 .../+merchants/components/components.module.ts       |  4 +++-
 .../components/payments/payments.component.html      | 12 ++++++++++++
 .../components/payments/payments.component.scss      |  5 +++++
 .../components/payments/payments.component.ts        | 10 ++++++++++
 .../pages/+setup/+merchants/merchants.component.html |  2 +-
 5 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 734a536ae..21a3de9b3 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -8,12 +8,14 @@ import { MerchantsSetupInstructionsComponent } from './instructions/instructions
 import { SetupMerchantAccountComponent } from './account/account.component';
 import { SetupMerchantBasicInfoComponent } from './basic-info/basic-info.component';
 import { SetupMerchantContactInfoComponent } from './contact-info/contact-info.component';
+import { SetupMerchantPaymentsComponent } from './payments/payments.component';
 
 const COMPONENTS = [
 	SetupMerchantAccountComponent,
 	SetupMerchantBasicInfoComponent,
 	SetupMerchantContactInfoComponent,
-	MerchantsSetupInstructionsComponent
+	MerchantsSetupInstructionsComponent,
+	SetupMerchantPaymentsComponent
 ];
 
 @NgModule({
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
new file mode 100644
index 000000000..98bdfd5f9
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
@@ -0,0 +1,12 @@
+<nb-card class="setup-merchant-payments">
+	<nb-card-header>Payments</nb-card-header>
+	<nb-card-body>
+		<div class="row m-0">
+			<div class="form-group offset-md-2 col-md-4">
+				<nb-checkbox [(ngModel)]="isPaymentEnabled">
+					Allow online payments?
+				</nb-checkbox>
+			</div>
+		</div>
+	</nb-card-body>
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.scss
new file mode 100644
index 000000000..cfc3388e6
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.scss
@@ -0,0 +1,5 @@
+.setup-merchant-payments {
+	nb-card-body {
+		text-align: left;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
new file mode 100644
index 000000000..89b332685
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+	selector: 'ea-merchants-setup-payments',
+	templateUrl: './payments.component.html',
+	styleUrls: ['./payments.component.scss']
+})
+export class SetupMerchantPaymentsComponent {
+	isPaymentEnabled: boolean;
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 7489354d5..8df828373 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -63,7 +63,7 @@
 							</button>
 						</nb-step>
 						<nb-step label="Payments">
-							<h3>Payments</h3>
+							<ea-merchants-setup-payments></ea-merchants-setup-payments>
 
 							<button nbButton nbStepperPrevious>PREV</button>
 							<button nbButton nbStepperNext>

From 7166cb5908bec00e0117c5f5995873f3cf01d9a5 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 2 Apr 2019 14:12:17 +0300
Subject: [PATCH 091/382] feat(ever-admin): added "Payments" step for
 instructions EV-1192

---
 .../components/instructions/instructions.component.html        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index ffbe83439..6de65f33c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -15,5 +15,8 @@ <h5>How to setup {{ stepper.selected.label }}?</h5>
 		<div *ngIf="stepper.index === 3">
 			TODO add instructions for Location
 		</div>
+		<div *ngIf="stepper.index === 4">
+			TODO add instructions for Payments
+		</div>
 	</nb-card-body>
 </nb-card>

From 45f0ae85b4166056f6052a5aad67112f7f27566b Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 2 Apr 2019 14:37:28 +0300
Subject: [PATCH 092/382] feat(ever-admin): added step "Manufacturing" in Setup
 Merchants EV-1193

---
 .../+merchants/components/components.module.ts       |  4 +++-
 .../instructions/instructions.component.html         |  3 +++
 .../manufacturing/manufacturing.component.html       | 12 ++++++++++++
 .../manufacturing/manufacturing.component.scss       |  5 +++++
 .../manufacturing/manufacturing.component.ts         | 10 ++++++++++
 .../pages/+setup/+merchants/merchants.component.html |  2 +-
 6 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 21a3de9b3..027057baa 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -9,13 +9,15 @@ import { SetupMerchantAccountComponent } from './account/account.component';
 import { SetupMerchantBasicInfoComponent } from './basic-info/basic-info.component';
 import { SetupMerchantContactInfoComponent } from './contact-info/contact-info.component';
 import { SetupMerchantPaymentsComponent } from './payments/payments.component';
+import { SetupMerchantManufacturingComponent } from './manufacturing/manufacturing.component';
 
 const COMPONENTS = [
 	SetupMerchantAccountComponent,
 	SetupMerchantBasicInfoComponent,
 	SetupMerchantContactInfoComponent,
 	MerchantsSetupInstructionsComponent,
-	SetupMerchantPaymentsComponent
+	SetupMerchantPaymentsComponent,
+	SetupMerchantManufacturingComponent
 ];
 
 @NgModule({
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index 6de65f33c..a577ca793 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -18,5 +18,8 @@ <h5>How to setup {{ stepper.selected.label }}?</h5>
 		<div *ngIf="stepper.index === 4">
 			TODO add instructions for Payments
 		</div>
+		<div *ngIf="stepper.index === 5">
+			TODO add instructions for Manufacturing
+		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
new file mode 100644
index 000000000..fdf2ec94a
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
@@ -0,0 +1,12 @@
+<nb-card class="setup-merchant-manufacturing">
+	<nb-card-header>Manufacturing</nb-card-header>
+	<nb-card-body>
+		<div class="row m-0">
+			<div class="form-group offset-md-2 col-md-4">
+				<nb-checkbox [(ngModel)]="isManufacturing">
+					Products Manufacturing
+				</nb-checkbox>
+			</div>
+		</div>
+	</nb-card-body>
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.scss
new file mode 100644
index 000000000..d3fcaf1e9
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.scss
@@ -0,0 +1,5 @@
+.setup-merchant-manufacturing {
+	nb-card-body {
+		text-align: left;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.ts
new file mode 100644
index 000000000..978994b07
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+	selector: 'ea-merchants-setup-manufacturing',
+	templateUrl: './manufacturing.component.html',
+	styleUrls: ['./manufacturing.component.scss']
+})
+export class SetupMerchantManufacturingComponent {
+	isManufacturing: boolean;
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 8df828373..87d28620e 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -71,7 +71,7 @@
 							</button>
 						</nb-step>
 						<nb-step label="Manufacturing">
-							<h3>Manufacturing</h3>
+							<ea-merchants-setup-manufacturing></ea-merchants-setup-manufacturing>
 
 							<button nbButton nbStepperPrevious>PREV</button>
 							<button nbButton nbStepperNext>

From e6d5075d7794f7befeb2e52cf36596298691cc86 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 2 Apr 2019 16:20:52 +0300
Subject: [PATCH 093/382] feat(ever-admin): initialize step "Delivery &
 Takeaway Settings", in Setup Merchants page EV-1194

---
 .../warehouse-mutation.component.html         |  2 +-
 .../warehouse-mutation.component.ts           |  6 ++++
 .../components/components.module.ts           |  4 ++-
 .../delivery-takeaway.component.html          | 31 +++++++++++++++++++
 .../delivery-takeaway.component.scss          |  5 +++
 .../delivery-takeaway.component.ts            | 13 ++++++++
 .../+merchants/merchants.component.html       |  2 +-
 7 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts

diff --git a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html
index 17bedfac9..ea21b1070 100644
--- a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html
@@ -30,7 +30,7 @@
 		[title]="
 			'WAREHOUSE_VIEW.MUTATION.WIZARD_TITLES.CONTACT_INFO' | translate
 		"
-		[isValid]="contactInfoForm?.validForm"
+		[isValid]="isValidContactInfo"
 	>
 		<div class="pt-5"></div>
 		<ea-warehouse-contact-info-form
diff --git a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
index 03ff7ec39..a65695b3d 100644
--- a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
@@ -68,6 +68,12 @@ export class WarehouseMutationComponent implements AfterViewInit {
 		return this._translate(this.BUTTON_PREV);
 	}
 
+	get isValidContactInfo() {
+		return this.contactInfoForm.validForm !== undefined
+			? this.contactInfoForm.validForm
+			: true;
+	}
+
 	ngAfterViewInit() {
 		// This hack is need because the styles of 'ng-bootstrap' modal and google autocomplete api
 		// collide and autocomplete field just doesn't show without larger z-index.
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 027057baa..6d56cf099 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -10,6 +10,7 @@ import { SetupMerchantBasicInfoComponent } from './basic-info/basic-info.compone
 import { SetupMerchantContactInfoComponent } from './contact-info/contact-info.component';
 import { SetupMerchantPaymentsComponent } from './payments/payments.component';
 import { SetupMerchantManufacturingComponent } from './manufacturing/manufacturing.component';
+import { SetupMerchantDeliveryAndTakeawayComponent } from './settings/delivery-takeaway/delivery-takeaway.component';
 
 const COMPONENTS = [
 	SetupMerchantAccountComponent,
@@ -17,7 +18,8 @@ const COMPONENTS = [
 	SetupMerchantContactInfoComponent,
 	MerchantsSetupInstructionsComponent,
 	SetupMerchantPaymentsComponent,
-	SetupMerchantManufacturingComponent
+	SetupMerchantManufacturingComponent,
+	SetupMerchantDeliveryAndTakeawayComponent
 ];
 
 @NgModule({
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
new file mode 100644
index 000000000..9349499d7
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -0,0 +1,31 @@
+<nb-card class="setup-merchant-delivery-takeaway">
+	<nb-card-header>Delivery & Takeaway Settings</nb-card-header>
+	<nb-card-body>
+		<div class="row">
+			<div class="form-group offset-md-2 col-md-4">
+				<nb-checkbox [(ngModel)]="isCarrierRequired">
+					Carrier required
+				</nb-checkbox>
+			</div>
+		</div>
+		<div class="row">
+			<div class="form-group offset-md-2 col-md-4">
+				<nb-checkbox [(ngModel)]="productsDelivery">
+					Products Delivery (by default)
+				</nb-checkbox>
+			</div>
+			<div class="form-group  col-md-4">
+				<nb-checkbox [(ngModel)]="productsTakeaway">
+					Products Takeaway (by default)
+				</nb-checkbox>
+			</div>
+		</div>
+		<div class="row">
+			<div class="form-group offset-md-2 col-md-10">
+				<nb-checkbox [(ngModel)]="hasRestrictedCarriers">
+					Restricted Carriers
+				</nb-checkbox>
+			</div>
+		</div>
+	</nb-card-body>
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss
new file mode 100644
index 000000000..abd88e3a6
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss
@@ -0,0 +1,5 @@
+.setup-merchant-delivery-takeaway {
+	nb-card-body {
+		text-align: left;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
new file mode 100644
index 000000000..ee630a12b
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+@Component({
+	selector: 'ea-merchants-setup-delivery-takeaway',
+	templateUrl: './delivery-takeaway.component.html',
+	styleUrls: ['./delivery-takeaway.component.scss']
+})
+export class SetupMerchantDeliveryAndTakeawayComponent {
+	isCarrierRequired: boolean;
+	productsDelivery: boolean;
+	productsTakeaway: boolean;
+	hasRestrictedCarriers: boolean;
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 87d28620e..314eabf49 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -79,7 +79,7 @@
 							</button>
 						</nb-step>
 						<nb-step label="Delivery & Takeaway Settings">
-							<h3>Delivery & Takeaway Settings</h3>
+							<ea-merchants-setup-delivery-takeaway></ea-merchants-setup-delivery-takeaway>
 
 							<button nbButton nbStepperPrevious>PREV</button>
 							<button nbButton nbStepperNext>

From 350a7c3f29f853325f65ffb7b86ab45654cd5ad3 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 2 Apr 2019 17:58:18 +0300
Subject: [PATCH 094/382] feat(ever-admin): initialize step "Orders Settings"
 in Setup Merchants EV-1195

---
 .../+setup/+merchants/components/components.module.ts     | 4 +++-
 .../components/instructions/instructions.component.html   | 6 ++++++
 .../components/settings/orders/orders.component.html      | 4 ++++
 .../components/settings/orders/orders.component.scss      | 5 +++++
 .../components/settings/orders/orders.component.ts        | 8 ++++++++
 .../app/pages/+setup/+merchants/merchants.component.html  | 2 +-
 6 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 6d56cf099..25165f0c0 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -11,6 +11,7 @@ import { SetupMerchantContactInfoComponent } from './contact-info/contact-info.c
 import { SetupMerchantPaymentsComponent } from './payments/payments.component';
 import { SetupMerchantManufacturingComponent } from './manufacturing/manufacturing.component';
 import { SetupMerchantDeliveryAndTakeawayComponent } from './settings/delivery-takeaway/delivery-takeaway.component';
+import { SetupMerchantOrdersSettingsComponent } from './settings/orders/orders.component';
 
 const COMPONENTS = [
 	SetupMerchantAccountComponent,
@@ -19,7 +20,8 @@ const COMPONENTS = [
 	MerchantsSetupInstructionsComponent,
 	SetupMerchantPaymentsComponent,
 	SetupMerchantManufacturingComponent,
-	SetupMerchantDeliveryAndTakeawayComponent
+	SetupMerchantDeliveryAndTakeawayComponent,
+	SetupMerchantOrdersSettingsComponent
 ];
 
 @NgModule({
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index a577ca793..0858a7e1f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -21,5 +21,11 @@ <h5>How to setup {{ stepper.selected.label }}?</h5>
 		<div *ngIf="stepper.index === 5">
 			TODO add instructions for Manufacturing
 		</div>
+		<div *ngIf="stepper.index === 6">
+			TODO add instructions for Delivery & Takeaway Settings
+		</div>
+		<div *ngIf="stepper.index === 7">
+			TODO add instructions for Orders Settings
+		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
new file mode 100644
index 000000000..7cc9af5b8
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
@@ -0,0 +1,4 @@
+<nb-card class="setup-merchant-orders-settings">
+	<nb-card-header>Orders Settings</nb-card-header>
+	<nb-card-body> </nb-card-body>
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.scss
new file mode 100644
index 000000000..cca2686dd
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.scss
@@ -0,0 +1,5 @@
+.setup-merchant-orders-settings {
+	nb-card-body {
+		text-align: left;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
new file mode 100644
index 000000000..ffaa397a7
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+	selector: 'ea-merchants-setup-orders-settings',
+	templateUrl: './orders.component.html',
+	styleUrls: ['./orders.component.scss']
+})
+export class SetupMerchantOrdersSettingsComponent {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 314eabf49..3dce86d5e 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -87,7 +87,7 @@
 							</button>
 						</nb-step>
 						<nb-step label="Orders Settings">
-							<h3>Orders Settings</h3>
+							<ea-merchants-setup-orders-settings></ea-merchants-setup-orders-settings>
 
 							<button nbButton nbStepperPrevious>PREV</button>
 							<button nbButton nbStepperNext>

From 23c05895a4280a969e9189c162c6e45a9610c74f Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Tue, 2 Apr 2019 18:32:08 +0300
Subject: [PATCH 095/382] feat(ever-carrier): add translates to the menu
 EV-1185

---
 carrier/mobile-ionic/src/assets/i18n/bg.json  |  8 +++++++
 carrier/mobile-ionic/src/assets/i18n/en.json  |  8 +++++++
 carrier/mobile-ionic/src/assets/i18n/he.json  |  8 +++++++
 carrier/mobile-ionic/src/assets/i18n/ru.json  |  8 +++++++
 .../src/components/menu/menu.component.html   | 24 ++++++++++++++-----
 5 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/carrier/mobile-ionic/src/assets/i18n/bg.json b/carrier/mobile-ionic/src/assets/i18n/bg.json
index 64b2c9161..3f941c206 100644
--- a/carrier/mobile-ionic/src/assets/i18n/bg.json
+++ b/carrier/mobile-ionic/src/assets/i18n/bg.json
@@ -8,6 +8,14 @@
 	"MAIN_VIEW": {
 		"EVERCO_DRIVER": "Шофьор"
 	},
+	"MENU": {
+		"MAIN": "Oсновен",
+		"DELIVERIES": "Доставките",
+		"SETTINGS": "Настройки",
+		"LANGUAGE": "Език",
+		"ABOUT_US": "За нас",
+		"TERMS_OF_USE": "Условия за ползване"
+	},
 	"DELIVERY_VIEW": {
 		"THE_CUSTOMER_HAS_TO_PAY": "Клиентът трябва да плати",
 		"CUSTOMER_ALREADY_PAID_WITH_CARD": "Клиент вече е платил с карта!",
diff --git a/carrier/mobile-ionic/src/assets/i18n/en.json b/carrier/mobile-ionic/src/assets/i18n/en.json
index 689e67481..583954716 100644
--- a/carrier/mobile-ionic/src/assets/i18n/en.json
+++ b/carrier/mobile-ionic/src/assets/i18n/en.json
@@ -8,6 +8,14 @@
 	"MAIN_VIEW": {
 		"EVERCO_DRIVER": "Carrier"
 	},
+	"MENU": {
+		"MAIN": "Main",
+		"DELIVERIES": "Deliveries",
+		"SETTINGS": "Settings",
+		"LANGUAGE": "Language",
+		"ABOUT_US": "About Us",
+		"TERMS_OF_USE": "Terms of Use"
+	},
 	"DELIVERY_VIEW": {
 		"THE_CUSTOMER_HAS_TO_PAY": "The Customer has to pay",
 		"CUSTOMER_ALREADY_PAID_WITH_CARD": "Customer already paid with card!",
diff --git a/carrier/mobile-ionic/src/assets/i18n/he.json b/carrier/mobile-ionic/src/assets/i18n/he.json
index 51d90cd1a..730bbb4eb 100644
--- a/carrier/mobile-ionic/src/assets/i18n/he.json
+++ b/carrier/mobile-ionic/src/assets/i18n/he.json
@@ -8,6 +8,14 @@
 	"MAIN_VIEW": {
 		"EVERCO_DRIVER": "נהג"
 	},
+	"MENU": {
+		"MAIN": "ראשי",
+		"DELIVERIES": "משלוחים",
+		"SETTINGS": "הגדרות",
+		"LANGUAGE": "שפה",
+		"ABOUT_US": "עלינו",
+		"TERMS_OF_USE": "תנאי שימוש"
+	},
 	"DELIVERY_VIEW": {
 		"THE_CUSTOMER_HAS_TO_PAY": "הלקוח חייב לשלם",
 		"CUSTOMER_ALREADY_PAID_WITH_CARD": "הלקוח כבר שילם עם כרטיס!",
diff --git a/carrier/mobile-ionic/src/assets/i18n/ru.json b/carrier/mobile-ionic/src/assets/i18n/ru.json
index 0fd611c7b..faa9eaafe 100644
--- a/carrier/mobile-ionic/src/assets/i18n/ru.json
+++ b/carrier/mobile-ionic/src/assets/i18n/ru.json
@@ -8,6 +8,14 @@
 	"MAIN_VIEW": {
 		"EVERCO_DRIVER": "Курьер"
 	},
+	"MENU": {
+		"MAIN": "Главный",
+		"DELIVERIES": "Поставки",
+		"SETTINGS": "Настройки",
+		"LANGUAGE": "Язык",
+		"ABOUT_US": "Насчет нас",
+		"TERMS_OF_USE": "Условия эксплуатации"
+	},
 	"DELIVERY_VIEW": {
 		"THE_CUSTOMER_HAS_TO_PAY": "Клиент должен заплатить",
 		"CUSTOMER_ALREADY_PAID_WITH_CARD": "Клиент уже заплатил карточкой!",
diff --git a/carrier/mobile-ionic/src/components/menu/menu.component.html b/carrier/mobile-ionic/src/components/menu/menu.component.html
index 903f0e24f..9cea392d4 100644
--- a/carrier/mobile-ionic/src/components/menu/menu.component.html
+++ b/carrier/mobile-ionic/src/components/menu/menu.component.html
@@ -23,7 +23,9 @@ <h1 class="title header-bar-big-title">
 						routerLinkActive="activated"
 					>
 						<ion-icon name="bicycle"></ion-icon>
-						<ion-label>Main</ion-label>
+						<ion-label>
+							{{ 'MENU.MAIN' | translate }}
+						</ion-label>
 					</ion-item>
 
 					<ion-item
@@ -32,11 +34,15 @@ <h1 class="title header-bar-big-title">
 						routerLinkActive="activated"
 					>
 						<ion-icon name="card"></ion-icon>
-						<ion-label>Deliveries</ion-label>
+						<ion-label>
+							{{ 'MENU.DELIVERIES' | translate }}
+						</ion-label>
 					</ion-item>
 
 					<ion-item disabled="true">
-						<ion-label>Settings</ion-label>
+						<ion-label>
+							{{ 'MENU.SETTINGS' | translate }}
+						</ion-label>
 					</ion-item>
 
 					<ion-item
@@ -45,7 +51,9 @@ <h1 class="title header-bar-big-title">
 						routerLinkActive="activated"
 					>
 						<ion-icon name="globe"></ion-icon>
-						<ion-label>Language</ion-label>
+						<ion-label>
+							{{ 'MENU.LANGUAGE' | translate }}
+						</ion-label>
 					</ion-item>
 
 					<ion-item
@@ -54,7 +62,9 @@ <h1 class="title header-bar-big-title">
 						routerLinkActive="activated"
 					>
 						<ion-icon name="information-circle-outline"></ion-icon>
-						<ion-label>About Us</ion-label>
+						<ion-label>
+							{{ 'MENU.ABOUT_US' | translate }}
+						</ion-label>
 					</ion-item>
 
 					<ion-item
@@ -63,7 +73,9 @@ <h1 class="title header-bar-big-title">
 						routerLinkActive="activated"
 					>
 						<ion-icon name="paper"></ion-icon>
-						<ion-label>Terms of Use</ion-label>
+						<ion-label>
+							{{ 'MENU.TERMS_OF_USE' | translate }}
+						</ion-label>
 					</ion-item>
 				</ion-menu-toggle>
 			</ion-item-group>

From 5d6a1639e260ead037d025dcdc1e18b668a74a42 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Wed, 3 Apr 2019 02:00:04 +0300
Subject: [PATCH 096/382] docs: add lerna badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b02ea1505..8f8ca86ae 100644
--- a/README.md
+++ b/README.md
@@ -337,3 +337,4 @@ All other brand and product names are trademarks, registered trademarks or servi
 [![Known Vulnerabilities](https://snyk.io/test/github/ever-co/ever/badge.svg)](https://snyk.io/test/github/ever-co/ever)
 [![Greenkeeper badge](https://badges.greenkeeper.io/ever-co/ever.svg)](https://greenkeeper.io)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fever-co%2Fever.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fever-co%2Fever?ref=badge_shield)
+[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io)

From 24f5309dd428453bd55943472f8c87d261ba1ae6 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 10:24:17 +0300
Subject: [PATCH 097/382] feat(ever-admin): added barcode types on Orders
 Settings in Setup Merchants EV-1195

---
 .../+merchants/components/components.module.ts     |  2 ++
 .../settings/orders/orders.component.html          | 14 +++++++++++++-
 .../components/settings/orders/orders.component.ts | 12 +++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 25165f0c0..792bb06e3 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -12,6 +12,7 @@ import { SetupMerchantPaymentsComponent } from './payments/payments.component';
 import { SetupMerchantManufacturingComponent } from './manufacturing/manufacturing.component';
 import { SetupMerchantDeliveryAndTakeawayComponent } from './settings/delivery-takeaway/delivery-takeaway.component';
 import { SetupMerchantOrdersSettingsComponent } from './settings/orders/orders.component';
+import { NbRadioModule } from '@nebular/theme';
 
 const COMPONENTS = [
 	SetupMerchantAccountComponent,
@@ -29,6 +30,7 @@ const COMPONENTS = [
 		CommonModule,
 		ThemeModule,
 		FormsModule,
+		NbRadioModule,
 		TranslateModule.forChild(),
 		FileUploaderModule
 	],
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
index 7cc9af5b8..7fd8c8c1b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
@@ -1,4 +1,16 @@
 <nb-card class="setup-merchant-orders-settings">
 	<nb-card-header>Orders Settings</nb-card-header>
-	<nb-card-body> </nb-card-body>
+	<nb-card-body>
+		<div class="form-group offset-md-2 col-md-8">
+			<label>Order Barcode/QR code types</label>
+			<nb-radio-group [(ngModel)]="iorderBarcodeType">
+				<nb-radio
+					*ngFor="let type of orderBarcodeTypes"
+					[value]="type.value"
+				>
+					{{ type.label }}
+				</nb-radio>
+			</nb-radio-group>
+		</div>
+	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
index ffaa397a7..f627002a1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
@@ -1,8 +1,18 @@
 import { Component } from '@angular/core';
+import OrderBarcodeTypes from '@modules/server.common/enums/OrderBarcodeTypes';
 
 @Component({
 	selector: 'ea-merchants-setup-orders-settings',
 	templateUrl: './orders.component.html',
 	styleUrls: ['./orders.component.scss']
 })
-export class SetupMerchantOrdersSettingsComponent {}
+export class SetupMerchantOrdersSettingsComponent {
+	iorderBarcodeType: OrderBarcodeTypes;
+
+	orderBarcodeTypes = [
+		{ label: 'QR', value: OrderBarcodeTypes.QR },
+		{ label: 'CODE128', value: OrderBarcodeTypes.CODE128 },
+		{ label: 'CODE39', value: OrderBarcodeTypes.CODE39 },
+		{ label: 'pharmacode', value: OrderBarcodeTypes.pharmacode }
+	];
+}

From 4c0dd318db92e7e3a02c066fa98d8768582258f2 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 11:28:42 +0300
Subject: [PATCH 098/382] feat(ever-api): added field "isSharedCarrier" on
 Carrier document and  manage it from Admin app EV-1194

---
 .../@core/data/fakeDataServices/carriers.ts   |  4 ++++
 .../basic-info/basic-info-form.component.html | 19 +++++++++----------
 .../basic-info/basic-info-form.component.ts   |  6 ++++++
 .../graphql/carriers/carriers.types.graphql   |  1 +
 shared/core/entities/Carrier.ts               | 11 +++++++++++
 shared/core/interfaces/ICarrier.ts            |  2 ++
 6 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/fakeDataServices/carriers.ts b/admin/website-angular/src/app/@core/data/fakeDataServices/carriers.ts
index b590b8dd1..bcd01d67f 100644
--- a/admin/website-angular/src/app/@core/data/fakeDataServices/carriers.ts
+++ b/admin/website-angular/src/app/@core/data/fakeDataServices/carriers.ts
@@ -41,6 +41,7 @@ export default class FakeDataCarriers {
 									min: 0,
 									max: 60
 								}),
+								isSharedCarrier: true,
 								geoLocation: {
 									city: faker.address.city(),
 									postcode: faker.address.zipCode(),
@@ -79,6 +80,7 @@ export default class FakeDataCarriers {
 								min: 0,
 								max: 60
 							}),
+							isSharedCarrier: true,
 							geoLocation: {
 								city: 'Ashdod',
 								postcode: '77452',
@@ -114,6 +116,7 @@ export default class FakeDataCarriers {
 								min: 0,
 								max: 60
 							}),
+							isSharedCarrier: true,
 							geoLocation: {
 								city: 'Ashdod',
 								postcode: '77452',
@@ -148,6 +151,7 @@ export default class FakeDataCarriers {
 								min: 0,
 								max: 60
 							}),
+							isSharedCarrier: true,
 							geoLocation: {
 								city: 'Ashdod',
 								postcode: '77452',
diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
index 90c47a2e9..867ad4af8 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
@@ -190,16 +190,15 @@
 			</div>
 
 			<div class="form-group row">
-				<label class="col-sm-2 control-label pt-1" for="is-active-radio"
-					>{{ 'CARRIERS_VIEW.CARRIER_PAGE.ACTIVE' | translate }}
-				</label>
-				<div class="col-sm-1">
-					<nb-checkbox formControlName="isActive"></nb-checkbox>
-
-					<div *ngIf="isActiveValid" class="alert alert-danger">
-						{{ 'SHARED.FORMS.ERRORS.IS_ACTIVE' | translate }}!
-					</div>
-				</div>
+				<!-- TODO add translate -->
+				<nb-checkbox class="col-sm-12" formControlName="isSharedCarrier"
+					>Carrier Can be Shared?</nb-checkbox
+				>
+				<nb-checkbox class="col-sm-12" formControlName="isActive">
+					{{
+						'CARRIERS_VIEW.CARRIER_PAGE.ACTIVE' | translate
+					}}</nb-checkbox
+				>
 			</div>
 		</fieldset>
 	</div>
diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
index aa7ef6b8f..b0537f16d 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
@@ -29,6 +29,7 @@ export type CarrierBasicInfo = Pick<
 	| 'lastName'
 	| 'logo'
 	| 'apartment'
+	| 'isSharedCarrier'
 >;
 
 @Component({
@@ -54,6 +55,10 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 		return this.form.get('isActive');
 	}
 
+	get isSharedCarrier() {
+		return this.form.get('isSharedCarrier');
+	}
+
 	get username() {
 		return this.form.get('username');
 	}
@@ -139,6 +144,7 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 				]
 			],
 			isActive: [true, Validators.required],
+			isSharedCarrier: [false],
 			phone: [
 				'',
 				[
diff --git a/backend/api/src/graphql/carriers/carriers.types.graphql b/backend/api/src/graphql/carriers/carriers.types.graphql
index 47be8dd67..97e483b09 100644
--- a/backend/api/src/graphql/carriers/carriers.types.graphql
+++ b/backend/api/src/graphql/carriers/carriers.types.graphql
@@ -13,6 +13,7 @@ type Carrier {
 	geoLocation: GeoLocation!
 	devicesIds: [String!]!
 	apartment: String
+	isSharedCarrier: Boolean
 	# Resolved
 	devices: [Device!]!
 
diff --git a/shared/core/entities/Carrier.ts b/shared/core/entities/Carrier.ts
index ad017a2c6..1d54343c1 100644
--- a/shared/core/entities/Carrier.ts
+++ b/shared/core/entities/Carrier.ts
@@ -220,6 +220,17 @@ class Carrier extends DBObject<ICarrier, ICarrierCreateObject>
 	@Schema([String])
 	devicesIds: string[];
 
+	/**
+	 * Is shared the carrier, i.e if not then only merchant which already has such carrier assigned
+	 * (inside "carriersIds" array on Merchant) can use such carrier and no one else
+	 *
+	 * @type {boolean}
+	 * @memberof Carrier
+	 */
+	@Types.Boolean(false)
+	@Column()
+	isSharedCarrier: boolean;
+
 	/**
 	 * Full name of the Carrier
 	 *
diff --git a/shared/core/interfaces/ICarrier.ts b/shared/core/interfaces/ICarrier.ts
index 22b9597fb..a91641aba 100644
--- a/shared/core/interfaces/ICarrier.ts
+++ b/shared/core/interfaces/ICarrier.ts
@@ -32,6 +32,7 @@ export interface ICarrierCreateObject extends DBCreateObject {
 	totalDistanceToday?: number;
 
 	devicesIds?: string[];
+	isSharedCarrier: boolean;
 
 	/**
 	 * Url to Carrier logo/photo
@@ -61,6 +62,7 @@ interface ICarrier extends DBRawObject, ICarrierCreateObject {
 	totalDistanceToday: number;
 	devicesIds: string[];
 	logo: string;
+	isSharedCarrier: boolean;
 }
 
 export default ICarrier;

From 264cf1442cc3b01467817fecf4389317f617f3e2 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 11:59:00 +0300
Subject: [PATCH 099/382] feat(ever-merchant): manage property
 "isSharedCarrier" EV-1194

---
 .../graphql/carriers/carriers.types.graphql   |  3 ++
 .../account/account-form.component.html       | 47 ++++++++++++-------
 .../account/account-form.component.ts         |  7 ++-
 .../add-new-carrier/add-new-carrier.ts        |  1 +
 .../account/account-form.component.html       | 45 ++++++++++++------
 .../account/account-form.component.ts         |  8 +++-
 .../carrier-edit-popup/carrier-edit-popup.ts  |  2 +
 7 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/backend/api/src/graphql/carriers/carriers.types.graphql b/backend/api/src/graphql/carriers/carriers.types.graphql
index 97e483b09..b2acfb04f 100644
--- a/backend/api/src/graphql/carriers/carriers.types.graphql
+++ b/backend/api/src/graphql/carriers/carriers.types.graphql
@@ -29,6 +29,7 @@ input CarriersFindInput {
 	phone: String
 	isDeleted: Boolean
 	status: Int
+	isSharedCarrier: Boolean
 	# TODO geoLocation
 }
 
@@ -59,6 +60,7 @@ input CarrierCreateInput {
 	skippedOrderIds: [String!]
 	deliveriesCountToday: Int
 	totalDistanceToday: Float
+	isSharedCarrier: Boolean
 	devicesIds: [String!]
 
 	# True carrier enabled in system, False carrier completely disabled in the system (e.g. was fired).
@@ -83,6 +85,7 @@ input CarrierUpdateInput {
 	deliveriesCountToday: Int
 	totalDistanceToday: Float
 	devicesIds: [String!]
+	isSharedCarrier: Boolean
 
 	# True carrier enabled in system, False carrier completely disabled in the system (e.g. was fired).
 	# This setting is set by Admin, not by carrier itself
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.html b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.html
index 3a19c3f5d..17ec3a5cf 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.html
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.html
@@ -14,7 +14,8 @@ <h5>{{ 'CARRIERS_VIEW.ADD_CARRIER.ACCOUNT' | translate }}</h5>
 				<ion-input type="text" formControlName="userName"></ion-input>
 			</ion-item>
 		</ion-col>
-
+	</ion-row>
+	<ion-row class="items-end">
 		<ion-col>
 			<ion-item>
 				<ion-label position="floating">{{
@@ -26,21 +27,6 @@ <h5>{{ 'CARRIERS_VIEW.ADD_CARRIER.ACCOUNT' | translate }}</h5>
 				></ion-input>
 			</ion-item>
 		</ion-col>
-	</ion-row>
-	<ion-row class="items-end">
-		<ion-col>
-			<ion-item class="coord-box">
-				<ion-checkbox
-					class="mr-2"
-					color="success"
-					formControlName="isActive"
-				></ion-checkbox>
-
-				<ion-label>{{
-					'CARRIERS_VIEW.ADD_CARRIER.IS_ACTIVE' | translate
-				}}</ion-label>
-			</ion-item>
-		</ion-col>
 
 		<ion-col>
 			<ion-item>
@@ -66,4 +52,33 @@ <h5>{{ 'CARRIERS_VIEW.ADD_CARRIER.ACCOUNT' | translate }}</h5>
 			</span>
 		</ion-col>
 	</ion-row>
+
+	<ion-row>
+		<ion-col>
+			<ion-item class="coord-box">
+				<ion-checkbox
+					class="mr-2"
+					color="success"
+					formControlName="isSharedCarrier"
+				></ion-checkbox>
+
+				<!-- TODO add translate -->
+				<ion-label>Carrier Can be Shared?</ion-label>
+			</ion-item>
+		</ion-col>
+
+		<ion-col>
+			<ion-item class="coord-box">
+				<ion-checkbox
+					class="mr-2"
+					color="success"
+					formControlName="isActive"
+				></ion-checkbox>
+
+				<ion-label>{{
+					'CARRIERS_VIEW.ADD_CARRIER.IS_ACTIVE' | translate
+				}}</ion-label>
+			</ion-item>
+		</ion-col>
+	</ion-row>
 </form>
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.ts
index 5eba8f577..3c2b210f9 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.ts
@@ -19,6 +19,7 @@ export class AccountFormComponent implements OnDestroy, OnInit, OnChanges {
 	userName: AbstractControl;
 	password: AbstractControl;
 	isActive: AbstractControl;
+	isSharedCarrier: AbstractControl;
 	repeatPassword: AbstractControl;
 
 	$password: any;
@@ -63,15 +64,17 @@ export class AccountFormComponent implements OnDestroy, OnInit, OnChanges {
 					}
 				]
 			],
-			isActive: [true, Validators.required]
+			isActive: [true, Validators.required],
+			isSharedCarrier: [false]
 		});
 	}
 
 	bindFormControls() {
 		this.userName = this.form.get('userName');
 		this.password = this.form.get('password');
-		this.isActive = this.form.get('isActive');
 		this.repeatPassword = this.form.get('repeatPassword');
+		this.isActive = this.form.get('isActive');
+		this.isSharedCarrier = this.form.get('isSharedCarrier');
 	}
 
 	ngOnDestroy(): void {
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
index 61d611ab6..33cb723b0 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
@@ -81,6 +81,7 @@ export class AddNewCarrierComponent implements OnInit, OnDestroy, OnChanges {
 			phone: this.basicInfoForm.phone.value,
 
 			username: this.accountForm.userName.value,
+			isSharedCarrier: this.accountForm.isSharedCarrier.value,
 
 			geoLocation: {
 				city: this.locationForm.city.value,
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.html b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.html
index 16c59104a..6bb335baa 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.html
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.html
@@ -14,7 +14,8 @@ <h5>{{ 'CARRIERS_VIEW.ADD_CARRIER.ACCOUNT' | translate }}</h5>
 				<ion-input type="text" formControlName="userName"></ion-input>
 			</ion-item>
 		</ion-col>
-
+	</ion-row>
+	<ion-row class="items-end">
 		<ion-col>
 			<ion-item>
 				<ion-label position="floating">{{
@@ -26,20 +27,6 @@ <h5>{{ 'CARRIERS_VIEW.ADD_CARRIER.ACCOUNT' | translate }}</h5>
 				></ion-input>
 			</ion-item>
 		</ion-col>
-	</ion-row>
-	<ion-row class="items-end">
-		<ion-col>
-			<ion-item class="coord-box">
-				<ion-checkbox
-					color="success"
-					class="mr-2"
-					formControlName="isActive"
-				></ion-checkbox>
-				<ion-label>{{
-					'CARRIERS_VIEW.ADD_CARRIER.IS_ACTIVE' | translate
-				}}</ion-label>
-			</ion-item>
-		</ion-col>
 
 		<ion-col>
 			<ion-item>
@@ -65,4 +52,32 @@ <h5>{{ 'CARRIERS_VIEW.ADD_CARRIER.ACCOUNT' | translate }}</h5>
 			</span>
 		</ion-col>
 	</ion-row>
+
+	<ion-row class="items-end">
+		<ion-col>
+			<ion-item class="coord-box">
+				<ion-checkbox
+					class="mr-2"
+					color="success"
+					formControlName="isSharedCarrier"
+				></ion-checkbox>
+
+				<!-- TODO add translate -->
+				<ion-label>Carrier Can be Shared?</ion-label>
+			</ion-item>
+		</ion-col>
+
+		<ion-col>
+			<ion-item class="coord-box">
+				<ion-checkbox
+					color="success"
+					class="mr-2"
+					formControlName="isActive"
+				></ion-checkbox>
+				<ion-label>{{
+					'CARRIERS_VIEW.ADD_CARRIER.IS_ACTIVE' | translate
+				}}</ion-label>
+			</ion-item>
+		</ion-col>
+	</ion-row>
 </form>
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.ts
index 015b01e4e..2f7b7ceb8 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.ts
@@ -19,6 +19,7 @@ export class AccountFormComponent implements OnDestroy, OnInit, OnChanges {
 	userName: AbstractControl;
 	password: AbstractControl;
 	isActive: AbstractControl;
+	isSharedCarrier: AbstractControl;
 	repeatPassword: AbstractControl;
 	$password: any;
 	form: FormGroup;
@@ -58,15 +59,17 @@ export class AccountFormComponent implements OnDestroy, OnInit, OnChanges {
 					}
 				]
 			],
-			isActive: [true, Validators.required]
+			isActive: [true, Validators.required],
+			isSharedCarrier: [false]
 		});
 	}
 
 	bindFormControls() {
 		this.userName = this.form.get('userName');
 		this.password = this.form.get('password');
-		this.isActive = this.form.get('isActive');
 		this.repeatPassword = this.form.get('repeatPassword');
+		this.isActive = this.form.get('isActive');
+		this.isSharedCarrier = this.form.get('isSharedCarrier');
 	}
 
 	ngOnDestroy(): void {
@@ -79,6 +82,7 @@ export class AccountFormComponent implements OnDestroy, OnInit, OnChanges {
 		if (this.carrier) {
 			this.userName.setValue(this.carrier.username);
 			this.isActive.setValue(this.carrier.isActive);
+			this.isSharedCarrier.setValue(this.carrier.isSharedCarrier);
 		}
 	}
 }
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
index 66c36c08c..0d60efefb 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
@@ -94,6 +94,7 @@ export class CarrierEditPopupPage implements OnInit, OnDestroy, OnChanges {
 
 		const account = {
 			isActive: this.accountForm.isActive.value,
+			isSharedCarrier: this.accountForm.isSharedCarrier.value,
 			username: this.accountForm.userName.value,
 			password: this.accountForm.password.value,
 			repeatPassword: this.accountForm.repeatPassword.value
@@ -110,6 +111,7 @@ export class CarrierEditPopupPage implements OnInit, OnDestroy, OnChanges {
 
 			username: account.username,
 			isActive: account.isActive,
+			isSharedCarrier: account.isSharedCarrier,
 
 			geoLocation
 		};

From 81b6e8c9bd27fb6cf661dabf7b71753744400978 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 12:16:53 +0300
Subject: [PATCH 100/382] fix(ever-merchant): small fixing EV-1194

---
 .../carrier/forms/basic-info/basic-info-form.component.html     | 2 +-
 .../add-new-carrier/account/account-form.component.html         | 2 +-
 .../carrier-edit-popup/account/account-form.component.html      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
index 867ad4af8..708ad2a1c 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
@@ -192,7 +192,7 @@
 			<div class="form-group row">
 				<!-- TODO add translate -->
 				<nb-checkbox class="col-sm-12" formControlName="isSharedCarrier"
-					>Carrier Can be Shared?</nb-checkbox
+					>Carrier can be shared?</nb-checkbox
 				>
 				<nb-checkbox class="col-sm-12" formControlName="isActive">
 					{{
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.html b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.html
index 17ec3a5cf..f072c359d 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.html
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.html
@@ -63,7 +63,7 @@ <h5>{{ 'CARRIERS_VIEW.ADD_CARRIER.ACCOUNT' | translate }}</h5>
 				></ion-checkbox>
 
 				<!-- TODO add translate -->
-				<ion-label>Carrier Can be Shared?</ion-label>
+				<ion-label>Carrier can be shared?</ion-label>
 			</ion-item>
 		</ion-col>
 
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.html b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.html
index 6bb335baa..469be4f13 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.html
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.html
@@ -63,7 +63,7 @@ <h5>{{ 'CARRIERS_VIEW.ADD_CARRIER.ACCOUNT' | translate }}</h5>
 				></ion-checkbox>
 
 				<!-- TODO add translate -->
-				<ion-label>Carrier Can be Shared?</ion-label>
+				<ion-label>Carrier can be shared?</ion-label>
 			</ion-item>
 		</ion-col>
 

From 412b8ed8783b2ea613398d8e14aced134c54563e Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 12:27:27 +0300
Subject: [PATCH 101/382] feat(ever-api): added field "carriersIds" on
 Warehouse EV-1194

---
 .../api/src/graphql/warehouses/warehouses.types.graphql  | 3 +++
 shared/core/entities/Warehouse.ts                        | 9 +++++++++
 shared/core/interfaces/IWarehouse.ts                     | 1 +
 3 files changed, 13 insertions(+)

diff --git a/backend/api/src/graphql/warehouses/warehouses.types.graphql b/backend/api/src/graphql/warehouses/warehouses.types.graphql
index 077002254..d443ba5a1 100644
--- a/backend/api/src/graphql/warehouses/warehouses.types.graphql
+++ b/backend/api/src/graphql/warehouses/warehouses.types.graphql
@@ -40,6 +40,7 @@ type Warehouse {
 	orders: [Order!]! # Resolved
 	users: [User!]! # Resolved
 	hasRestrictedCarriers: Boolean
+	carriersIds: [String!]
 	usedCarriersIds: [String!]
 	carriers: [Carrier!] # Resolved, if hasRestrictedCarriers is false -> returns null
 	orderBarcodeType: Int
@@ -73,6 +74,7 @@ input WarehouseCreateInput {
 	isCarrierRequired: Boolean
 
 	hasRestrictedCarriers: Boolean
+	carriersIds: [String!]
 	usedCarriersIds: [String!]
 }
 
@@ -105,6 +107,7 @@ input WarehousesFindInput {
 	# TODO devices: Device[]
 
 	hasRestrictedCarriers: Boolean
+	carriersIds: [String!]
 	usedCarriersIds: [String!]
 }
 
diff --git a/shared/core/entities/Warehouse.ts b/shared/core/entities/Warehouse.ts
index f4bea14ae..4ca347787 100644
--- a/shared/core/entities/Warehouse.ts
+++ b/shared/core/entities/Warehouse.ts
@@ -230,6 +230,15 @@ class Warehouse extends DBObject<IWarehouse, IWarehouseCreateObject>
 	@Column()
 	hasRestrictedCarriers: boolean;
 
+	/**
+	 * IDs of carriers which are "connected" (assigned) to the Store ("own carriers").
+	 *
+	 * @type {string[]}
+	 * @memberof Warehouse
+	 */
+	@Schema([String])
+	carriersIds: string[];
+
 	@Types.Boolean(false)
 	@Column()
 	isDeleted: boolean;
diff --git a/shared/core/interfaces/IWarehouse.ts b/shared/core/interfaces/IWarehouse.ts
index 3bbf0e21b..d33500e4b 100644
--- a/shared/core/interfaces/IWarehouse.ts
+++ b/shared/core/interfaces/IWarehouse.ts
@@ -99,6 +99,7 @@ export interface IWarehouseCreateObject extends DBCreateObject {
 	 * @memberof IWarehouseCreateObject
 	 */
 	hasRestrictedCarriers?: boolean;
+	carriersIds?: string[];
 
 	/**
 	 * Password hash

From 545cc7094c27dd9e04319ba500657bc38e9131ad Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 14:13:27 +0300
Subject: [PATCH 102/382] feat(ever-admin): manage property "carriersIds"
 EV-1194

---
 .../@core/data/fakeDataServices/warehouses.ts |  8 ++--
 .../src/app/@core/data/warehouses.service.ts  |  1 +
 .../basic-info/basic-info-form.component.html |  4 +-
 .../basic-info/basic-info-form.component.ts   | 42 ++++++++++---------
 ...rehouse-manage-tabs-details.component.html |  2 +-
 ...warehouse-manage-tabs-details.component.ts | 14 +++----
 .../warehouse-manage-tabs.component.ts        |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts b/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts
index 7d15b584d..2eecc183b 100644
--- a/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts
+++ b/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts
@@ -78,7 +78,7 @@ export default class FakeDataWarehouses {
 							ordersPhone: null,
 							isManufacturing: true,
 							isCarrierRequired: true,
-							hasRestrictedCarriers: true,
+							hasRestrictedCarriers: false,
 							usedCarriersIds: [],
 							products: [],
 							geoLocation: {
@@ -112,7 +112,7 @@ export default class FakeDataWarehouses {
 							ordersPhone: null,
 							isManufacturing: true,
 							isCarrierRequired: true,
-							hasRestrictedCarriers: true,
+							hasRestrictedCarriers: false,
 							usedCarriersIds: [],
 							products: [],
 							geoLocation: {
@@ -146,7 +146,7 @@ export default class FakeDataWarehouses {
 							ordersPhone: null,
 							isManufacturing: false,
 							isCarrierRequired: false,
-							hasRestrictedCarriers: true,
+							hasRestrictedCarriers: false,
 							usedCarriersIds: [],
 							products: [],
 							geoLocation: {
@@ -180,7 +180,7 @@ export default class FakeDataWarehouses {
 							ordersPhone: null,
 							isManufacturing: true,
 							isCarrierRequired: true,
-							hasRestrictedCarriers: true,
+							hasRestrictedCarriers: false,
 							usedCarriersIds: [],
 							products: [],
 							geoLocation: {
diff --git a/admin/website-angular/src/app/@core/data/warehouses.service.ts b/admin/website-angular/src/app/@core/data/warehouses.service.ts
index 6e1de1430..62e47467c 100644
--- a/admin/website-angular/src/app/@core/data/warehouses.service.ts
+++ b/admin/website-angular/src/app/@core/data/warehouses.service.ts
@@ -98,6 +98,7 @@ export class WarehousesService {
 							logo
 							username
 							usedCarriersIds
+							carriersIds
 							geoLocation {
 								city
 								streetAddress
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.html b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.html
index f1de943da..53587d995 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.html
@@ -183,9 +183,9 @@
 
 				<div *ngIf="hasRestrictedCarriers.value">
 					<ss-multiselect-dropdown
-						[options]="carriersOptions$ | async"
+						[options]="carriersOptions"
 						[settings]="{ displayAllSelectedText: true }"
-						formControlName="usedCarriersIds"
+						formControlName="carriersIds"
 						class="carriers-dropdown"
 					>
 					</ss-multiselect-dropdown>
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
index c13132802..e47d3ce47 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
@@ -23,7 +23,7 @@ export type WarehouseBasicInfo = Pick<
 	| 'isActive'
 	| 'username'
 	| 'hasRestrictedCarriers'
-	| 'usedCarriersIds'
+	| 'carriersIds'
 >;
 
 @Component({
@@ -42,19 +42,7 @@ export class BasicInfoFormComponent implements OnInit {
 
 	uploaderPlaceholder: string;
 
-	carriersOptions$: Observable<IMultiSelectOption[]> = concat(
-		Observable.of([]),
-		this.carrierRouter.getAllActive().pipe(
-			map((carriers) =>
-				carriers.map((c) => {
-					return {
-						id: c.id,
-						name: `${c.firstName} ${c.lastName}`
-					};
-				})
-			)
-		)
-	);
+	carriersOptions: IMultiSelectOption[];
 
 	static buildForm(formBuilder: FormBuilder): FormGroup {
 		// would be used in the parent component and injected into this.form
@@ -90,7 +78,7 @@ export class BasicInfoFormComponent implements OnInit {
 			username: ['', [Validators.required]],
 
 			hasRestrictedCarriers: [false, [Validators.required]],
-			usedCarriersIds: [[]]
+			carriersIds: [[]]
 		});
 	}
 
@@ -106,7 +94,7 @@ export class BasicInfoFormComponent implements OnInit {
 			username: string;
 
 			hasRestrictedCarriers: boolean;
-			usedCarriersIds: string[];
+			carriersIds: string[];
 		};
 
 		if (!basicInfo.logo) {
@@ -122,7 +110,7 @@ export class BasicInfoFormComponent implements OnInit {
 			...(basicInfo.hasRestrictedCarriers
 				? {
 						hasRestrictedCarriers: basicInfo.hasRestrictedCarriers,
-						usedCarriersIds: basicInfo.usedCarriersIds
+						carriersIds: basicInfo.carriersIds
 				  }
 				: {})
 		};
@@ -135,7 +123,7 @@ export class BasicInfoFormComponent implements OnInit {
 			pick(basicInfo, [
 				...Object.keys(this.getValue()),
 				'hasRestrictedCarriers',
-				'usedCarriersIds'
+				'carriersIds'
 			])
 		);
 	}
@@ -177,8 +165,8 @@ export class BasicInfoFormComponent implements OnInit {
 		return this.form.get('hasRestrictedCarriers');
 	}
 
-	get usedCarriersIds() {
-		return this.form.get('usedCarriersIds');
+	get carriersIds() {
+		return this.form.get('carriersIds');
 	}
 
 	get showLogoMeta() {
@@ -186,6 +174,7 @@ export class BasicInfoFormComponent implements OnInit {
 	}
 
 	ngOnInit(): void {
+		this.loadCarriersOptions();
 		this.getUploaderPlaceholderText();
 	}
 
@@ -203,4 +192,17 @@ export class BasicInfoFormComponent implements OnInit {
 			res['OPTIONAL']
 		})`;
 	}
+
+	private async loadCarriersOptions() {
+		const carriers = await this.carrierRouter
+			.getAllActive()
+			.pipe(first())
+			.toPromise();
+		this.carriersOptions = carriers.map((c) => {
+			return {
+				id: c.id,
+				name: `${c.firstName} ${c.lastName}`
+			};
+		});
+	}
 }
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.html b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.html
index 098fc413d..25bad7199 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.html
@@ -147,7 +147,7 @@
 					<ss-multiselect-dropdown
 						[options]="carriersOptions$ | async"
 						[settings]="{ displayAllSelectedText: true }"
-						formControlName="usedCarriersIds"
+						formControlName="carriersIds"
 						class="carriers-dropdown"
 					>
 					</ss-multiselect-dropdown>
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
index 0947d1875..f4f47926a 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
@@ -29,7 +29,7 @@ export type WarehouseManageTabsDetails = Pick<
 	| 'logo'
 	| 'isActive'
 	| 'hasRestrictedCarriers'
-	| 'usedCarriersIds'
+	| 'carriersIds'
 	| 'isManufacturing'
 	| 'isCarrierRequired'
 >;
@@ -82,8 +82,8 @@ export class WarehouseManageTabsDetailsComponent
 	get hasRestrictedCarriers() {
 		return this.form.get('hasRestrictedCarriers');
 	}
-	get usedCarriersIds() {
-		return this.form.get('usedCarriersIds');
+	get carriersIds() {
+		return this.form.get('carriersIds');
 	}
 	get showLogoMeta() {
 		return this.logo && this.logo.value !== '';
@@ -126,7 +126,7 @@ export class WarehouseManageTabsDetailsComponent
 			isManufacturing: [true, [Validators.required]],
 			isCarrierRequired: [true, [Validators.required]],
 			hasRestrictedCarriers: [false, [Validators.required]],
-			usedCarriersIds: [[]]
+			carriersIds: [[]]
 		});
 	}
 
@@ -146,7 +146,7 @@ export class WarehouseManageTabsDetailsComponent
 			isManufacturing: boolean;
 			isCarrierRequired: boolean;
 			hasRestrictedCarriers: boolean;
-			usedCarriersIds: string[];
+			carriersIds: string[];
 		};
 
 		return {
@@ -158,7 +158,7 @@ export class WarehouseManageTabsDetailsComponent
 			...(basicInfo.hasRestrictedCarriers
 				? {
 						hasRestrictedCarriers: basicInfo.hasRestrictedCarriers,
-						usedCarriersIds: basicInfo.usedCarriersIds
+						carriersIds: basicInfo.carriersIds
 				  }
 				: {})
 		};
@@ -171,7 +171,7 @@ export class WarehouseManageTabsDetailsComponent
 			_.pick(basicInfo, [
 				...Object.keys(this.getValue()),
 				'hasRestrictedCarriers',
-				'usedCarriersIds'
+				'carriersIds'
 			])
 		);
 	}
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
index 6a7a76c6c..288a8ecc6 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
@@ -16,7 +16,7 @@ export type WarehouseManageTabs = Pick<
 	| 'isActive'
 	| 'username'
 	| 'hasRestrictedCarriers'
-	| 'usedCarriersIds'
+	| 'carriersIds'
 	| 'isManufacturing'
 	| 'isCarrierRequired'
 >;

From 15d455bb148d1ff553c252760fc061fcfc98af02 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 14:30:31 +0300
Subject: [PATCH 103/382] feat(ever-merchant): manage property "carriersIds"
 EV-1194

---
 .../carrier-tracking/carrier-tracking.component.ts     |  2 +-
 .../+carriers/add-carriers-popup/add-carriers-popup.ts |  4 ++--
 .../carriers-catalog/carriers-catalog.ts               |  2 +-
 .../carrier-delete-popup/carrier-delete-popup.ts       |  2 +-
 merchant/tablet-ionic/src/pages/+carriers/carriers.ts  |  2 +-
 merchant/tablet-ionic/src/pages/+track/track.ts        | 10 +++-------
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
index da94e47a2..b20a0ece7 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
@@ -113,7 +113,7 @@ export class CarrierTrackingComponent implements OnInit, OnDestroy {
 			if (!res.carrierId && res.storeId) {
 				this.selectNewStore(res.storeId);
 				this.filteredCarriersList = this.carriers.filter((x) =>
-					this.selectedStore.usedCarriersIds.includes(x.id)
+					this.selectedStore.carriersIds.includes(x.id)
 				);
 				this.selectedCarrier = undefined;
 				this.revertMap();
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
index 44dbe45ea..400efc678 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
@@ -143,10 +143,10 @@ export class AddCarriersPopupPage implements OnInit, OnDestroy {
 			});
 
 			warehouse.hasRestrictedCarriers = true;
-			warehouse.usedCarriersIds.push(carrier.id);
+			warehouse.carriersIds.push(carrier.id);
 		} else if (this.choiced === 'existing') {
 			warehouse.hasRestrictedCarriers = true;
-			warehouse.usedCarriersIds.push(
+			warehouse.carriersIds.push(
 				...this.carriersCatalog.selecteCarriers.map((c) => c.id)
 			);
 		}
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/carriers-catalog/carriers-catalog.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/carriers-catalog/carriers-catalog.ts
index 96c3dfe60..a85ac4651 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/carriers-catalog/carriers-catalog.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/carriers-catalog/carriers-catalog.ts
@@ -106,7 +106,7 @@ export class CarriersCatalogComponent implements OnDestroy {
 		this.carrierRouter.getAllActive().subscribe((carriers: Carrier[]) => {
 			loadData(
 				carriers.filter(
-					(c: Carrier) => !warehouse.usedCarriersIds.includes(c.id)
+					(c: Carrier) => !warehouse.carriersIds.includes(c.id)
 				)
 			);
 		});
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-delete-popup/carrier-delete-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-delete-popup/carrier-delete-popup.ts
index 94d59f811..cc129037f 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-delete-popup/carrier-delete-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-delete-popup/carrier-delete-popup.ts
@@ -35,7 +35,7 @@ export class CarrierDeletePopupPage {
 			.pipe(first())
 			.toPromise();
 
-		merchant.usedCarriersIds = merchant.usedCarriersIds.filter(
+		merchant.carriersIds = merchant.carriersIds.filter(
 			(x) => x !== carrierId
 		);
 
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carriers.ts b/merchant/tablet-ionic/src/pages/+carriers/carriers.ts
index 582f24152..80ec2335a 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carriers.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carriers.ts
@@ -94,7 +94,7 @@ export class CarriersPage implements OnInit, OnDestroy {
 				.pipe(first())
 				.toPromise();
 
-			merchant.usedCarriersIds = merchant.usedCarriersIds.filter(
+			merchant.carriersIds = merchant.carriersIds.filter(
 				(x) => x !== carrierId
 			);
 
diff --git a/merchant/tablet-ionic/src/pages/+track/track.ts b/merchant/tablet-ionic/src/pages/+track/track.ts
index 2559c55c1..0044c27e1 100644
--- a/merchant/tablet-ionic/src/pages/+track/track.ts
+++ b/merchant/tablet-ionic/src/pages/+track/track.ts
@@ -74,22 +74,18 @@ export class TrackPage implements OnInit, OnDestroy {
 				);
 				const allAssignedCarriers = warehouse
 					.filter((wh) => wh.id !== this.warehouseId)
-					.map((wh) => wh.usedCarriersIds);
+					.map((wh) => wh.carriersIds);
 
 				this.warehouseCoordinates = {
 					lat: currentWarehouse.geoLocation.loc.coordinates[1],
 					lng: currentWarehouse.geoLocation.loc.coordinates[0]
 				};
-				this.totalCarriers = currentWarehouse.usedCarriersIds.length;
+				this.totalCarriers = currentWarehouse.carriersIds.length;
 				this.carriers$ = this.carrierService
 					.getAllCarriers()
 					.subscribe((carriers) => {
 						this.carriers = carriers.filter((car) => {
-							if (
-								currentWarehouse.usedCarriersIds.includes(
-									car.id
-								)
-							) {
+							if (currentWarehouse.carriersIds.includes(car.id)) {
 								car.shared = false;
 								return true;
 							} else {

From d860792d6a02e31e937d932af1bf30eb658bb46f Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 14:58:15 +0300
Subject: [PATCH 104/382] fix(ever-merchant): fixed bug with Used and
 Restricted carriers EV-1194

---
 .../carrier-tracking/carrier-tracking.component.ts     |  2 +-
 .../+carriers/add-carriers-popup/add-carriers-popup.ts |  4 ++--
 .../carriers-catalog/carriers-catalog.ts               |  2 +-
 .../carrier-delete-popup/carrier-delete-popup.ts       |  2 +-
 merchant/tablet-ionic/src/pages/+carriers/carriers.ts  |  2 +-
 merchant/tablet-ionic/src/pages/+track/track.ts        | 10 +++++++---
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
index b20a0ece7..da94e47a2 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
@@ -113,7 +113,7 @@ export class CarrierTrackingComponent implements OnInit, OnDestroy {
 			if (!res.carrierId && res.storeId) {
 				this.selectNewStore(res.storeId);
 				this.filteredCarriersList = this.carriers.filter((x) =>
-					this.selectedStore.carriersIds.includes(x.id)
+					this.selectedStore.usedCarriersIds.includes(x.id)
 				);
 				this.selectedCarrier = undefined;
 				this.revertMap();
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
index 400efc678..44dbe45ea 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
@@ -143,10 +143,10 @@ export class AddCarriersPopupPage implements OnInit, OnDestroy {
 			});
 
 			warehouse.hasRestrictedCarriers = true;
-			warehouse.carriersIds.push(carrier.id);
+			warehouse.usedCarriersIds.push(carrier.id);
 		} else if (this.choiced === 'existing') {
 			warehouse.hasRestrictedCarriers = true;
-			warehouse.carriersIds.push(
+			warehouse.usedCarriersIds.push(
 				...this.carriersCatalog.selecteCarriers.map((c) => c.id)
 			);
 		}
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/carriers-catalog/carriers-catalog.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/carriers-catalog/carriers-catalog.ts
index a85ac4651..96c3dfe60 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/carriers-catalog/carriers-catalog.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/carriers-catalog/carriers-catalog.ts
@@ -106,7 +106,7 @@ export class CarriersCatalogComponent implements OnDestroy {
 		this.carrierRouter.getAllActive().subscribe((carriers: Carrier[]) => {
 			loadData(
 				carriers.filter(
-					(c: Carrier) => !warehouse.carriersIds.includes(c.id)
+					(c: Carrier) => !warehouse.usedCarriersIds.includes(c.id)
 				)
 			);
 		});
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-delete-popup/carrier-delete-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-delete-popup/carrier-delete-popup.ts
index cc129037f..94d59f811 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-delete-popup/carrier-delete-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-delete-popup/carrier-delete-popup.ts
@@ -35,7 +35,7 @@ export class CarrierDeletePopupPage {
 			.pipe(first())
 			.toPromise();
 
-		merchant.carriersIds = merchant.carriersIds.filter(
+		merchant.usedCarriersIds = merchant.usedCarriersIds.filter(
 			(x) => x !== carrierId
 		);
 
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carriers.ts b/merchant/tablet-ionic/src/pages/+carriers/carriers.ts
index 80ec2335a..582f24152 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carriers.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carriers.ts
@@ -94,7 +94,7 @@ export class CarriersPage implements OnInit, OnDestroy {
 				.pipe(first())
 				.toPromise();
 
-			merchant.carriersIds = merchant.carriersIds.filter(
+			merchant.usedCarriersIds = merchant.usedCarriersIds.filter(
 				(x) => x !== carrierId
 			);
 
diff --git a/merchant/tablet-ionic/src/pages/+track/track.ts b/merchant/tablet-ionic/src/pages/+track/track.ts
index 0044c27e1..2559c55c1 100644
--- a/merchant/tablet-ionic/src/pages/+track/track.ts
+++ b/merchant/tablet-ionic/src/pages/+track/track.ts
@@ -74,18 +74,22 @@ export class TrackPage implements OnInit, OnDestroy {
 				);
 				const allAssignedCarriers = warehouse
 					.filter((wh) => wh.id !== this.warehouseId)
-					.map((wh) => wh.carriersIds);
+					.map((wh) => wh.usedCarriersIds);
 
 				this.warehouseCoordinates = {
 					lat: currentWarehouse.geoLocation.loc.coordinates[1],
 					lng: currentWarehouse.geoLocation.loc.coordinates[0]
 				};
-				this.totalCarriers = currentWarehouse.carriersIds.length;
+				this.totalCarriers = currentWarehouse.usedCarriersIds.length;
 				this.carriers$ = this.carrierService
 					.getAllCarriers()
 					.subscribe((carriers) => {
 						this.carriers = carriers.filter((car) => {
-							if (currentWarehouse.carriersIds.includes(car.id)) {
+							if (
+								currentWarehouse.usedCarriersIds.includes(
+									car.id
+								)
+							) {
 								car.shared = false;
 								return true;
 							} else {

From 45ca3cce8628c214cd0007783417590674d03a91 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 16:12:43 +0300
Subject: [PATCH 105/382] feat(ever-admin): exported shared carriers table
 EV-1194

---
 .../carriers-table.component.html             |   6 +
 .../carriers-table.component.scss             |   0
 .../carriers-table.component.ts               | 201 ++++++++++++++
 .../carriers-table/carriers-table.module.ts   |  18 ++
 .../pages/+carriers/carriers.component.html   |   9 +-
 .../app/pages/+carriers/carriers.component.ts | 262 ++----------------
 .../app/pages/+carriers/carriers.module.ts    |  12 +-
 .../delivery-takeaway.component.html          |  51 ++--
 .../delivery-takeaway.component.scss          |   7 +
 .../delivery-takeaway.component.ts            |   1 -
 10 files changed, 283 insertions(+), 284 deletions(-)
 create mode 100644 admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.html
 create mode 100644 admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.scss
 create mode 100644 admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
 create mode 100644 admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.module.ts

diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.html b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.html
new file mode 100644
index 000000000..c0b3ce74e
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.html
@@ -0,0 +1,6 @@
+<ng2-smart-table
+	[settings]="settingsSmartTable"
+	[source]="sourceSmartTable"
+	(userRowSelect)="selectCarrierTmp($event)"
+>
+</ng2-smart-table>
diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.scss b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
new file mode 100644
index 000000000..e4c6c2bb2
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
@@ -0,0 +1,201 @@
+import { Component, OnDestroy, AfterViewInit } from '@angular/core';
+import { LocalDataSource } from 'ng2-smart-table';
+import { TranslateService } from '@ngx-translate/core';
+import { CarrierImageComponent } from 'app/@shared/render-component/carriers-table/carrier-image/carrier-image.component';
+import { RedirectNameComponent } from 'app/@shared/render-component/name-redirect/name-redirect.component';
+import { CarrierPhoneComponent } from 'app/@shared/render-component/carriers-table/carrier-phone/carrier-phone.component';
+import { Observable, forkJoin, Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { CarriersService } from 'app/@core/data/carriers.service';
+import Carrier from '@modules/server.common/entities/Carrier';
+import CarrierStatus from '@modules/server.common/enums/CarrierStatus';
+import { CarrierActionsComponent } from 'app/@shared/render-component/carriers-table/carrier-actions/carrier-actions.component';
+
+const perPage = 5;
+
+@Component({
+	selector: 'ea-carriers-smart-table',
+	templateUrl: 'carriers-table.component.html',
+	styleUrls: ['carriers-table.component.scss']
+})
+export class CarriersSmartTableComponent implements OnDestroy, AfterViewInit {
+	static noInfoSign = '';
+
+	settingsSmartTable: any;
+	sourceSmartTable = new LocalDataSource();
+	selectedCarriers: Carrier[] = [];
+
+	private dataCount: number;
+	private $carriers;
+	private ngDestroy$ = new Subject<void>();
+
+	constructor(
+		private readonly _translateService: TranslateService,
+		private readonly _carriersService: CarriersService
+	) {
+		this._loadSettingsSmartTable();
+		this._loadDataSmartTable();
+		this._applyTranslationOnSmartTable();
+	}
+
+	get hasSelectedCarriers(): boolean {
+		return this.selectedCarriers.length > 0;
+	}
+
+	ngAfterViewInit() {
+		this._addCustomHTMLElements();
+		this.smartTableChange();
+	}
+
+	ngOnDestroy() {
+		this.ngDestroy$.next();
+		this.ngDestroy$.complete();
+	}
+
+	selectCarrierTmp(ev) {
+		this.selectedCarriers = ev.selected;
+	}
+
+	// This is just workaround to show some search icon on smart table, in the future maybe we must find better solution.
+	private _addCustomHTMLElements(): any {
+		document.querySelector(
+			'tr.ng2-smart-filters > th:nth-child(1)'
+		).innerHTML = '<i class="fa fa-search" style="font-size: 1.3em"/>';
+	}
+
+	private async _loadDataSmartTable(page = 1) {
+		if (this.$carriers) {
+			await this.$carriers.unsubscribe();
+		}
+
+		this.$carriers = this._carriersService
+			.getCarriers({
+				skip: perPage * (page - 1),
+				limit: perPage
+			})
+			.pipe(takeUntil(this.ngDestroy$))
+			.subscribe(async (data: Carrier[]) => {
+				const carriersVm = data.map((c) => {
+					return {
+						id: c.id,
+						image: c.logo || CarriersSmartTableComponent.noInfoSign,
+						name: `${c.firstName ||
+							CarriersSmartTableComponent.noInfoSign} ${c.lastName ||
+							CarriersSmartTableComponent.noInfoSign}`,
+						phone:
+							c.phone || CarriersSmartTableComponent.noInfoSign,
+						status: {
+							[CarrierStatus.Offline]: 'Offline',
+							[CarrierStatus.Online]: 'Online',
+							[CarrierStatus.Blocked]: 'Blocked'
+						}[c.status],
+						address: `${c.geoLocation.city ||
+							CarriersSmartTableComponent.noInfoSign} st. ${c
+							.geoLocation.streetAddress ||
+							CarriersSmartTableComponent.noInfoSign}, hse. № ${c
+							.geoLocation.house ||
+							CarriersSmartTableComponent.noInfoSign}`,
+						deliveries: c.numberOfDeliveries
+					};
+				});
+
+				await this.loadDataCount();
+
+				const carriersData = new Array(this.dataCount);
+
+				carriersData.splice(
+					perPage * (page - 1),
+					perPage,
+					...carriersVm
+				);
+
+				await this.sourceSmartTable.load(carriersData);
+			});
+	}
+
+	private _loadSettingsSmartTable() {
+		const columnTitlePrefix = 'CARRIERS_VIEW.SMART_TABLE_COLUMNS.';
+		const getTranslate = (name: string): Observable<string | any> =>
+			this._translateService.get(columnTitlePrefix + name);
+
+		forkJoin(
+			this._translateService.get('Id'),
+			getTranslate('IMAGE'),
+			getTranslate('NAME'),
+			getTranslate('PHONE'),
+			getTranslate('STATUS'),
+			getTranslate('ADDRESS'),
+			getTranslate('DELIVERIES')
+		)
+			.pipe(takeUntil(this.ngDestroy$))
+			.subscribe(
+				([id, image, name, phone, status, address, deliveries]) => {
+					this.settingsSmartTable = {
+						actions: false,
+						selectMode: 'multi',
+						columns: {
+							images: {
+								title: image,
+								class: 'carrier-image',
+								type: 'custom',
+								renderComponent: CarrierImageComponent,
+								onComponentInitFunction: (instance) => {
+									instance.redirectPage = 'carriers';
+								},
+								filter: false
+							},
+							name: {
+								title: name,
+								type: 'custom',
+								renderComponent: RedirectNameComponent,
+								onComponentInitFunction: (instance) => {
+									instance.redirectPage = 'carriers';
+								}
+							},
+							phone: {
+								title: phone,
+								type: 'custom',
+								renderComponent: CarrierPhoneComponent
+							},
+							status: { title: status },
+							address: { title: address },
+							deliveries: { title: deliveries, filter: false },
+							actions: {
+								title: 'Actions',
+								filter: false,
+								type: 'custom',
+								renderComponent: CarrierActionsComponent
+							}
+						},
+						pager: {
+							display: true,
+							perPage
+						}
+					};
+				}
+			);
+	}
+
+	private _applyTranslationOnSmartTable() {
+		this._translateService.onLangChange.subscribe(() => {
+			this._loadSettingsSmartTable();
+			this._loadDataSmartTable();
+		});
+	}
+
+	private async smartTableChange() {
+		this.sourceSmartTable
+			.onChanged()
+			.pipe(takeUntil(this.ngDestroy$))
+			.subscribe(async (event) => {
+				if (event.action === 'page') {
+					const page = event.paging.page;
+					this._loadDataSmartTable(page);
+				}
+			});
+	}
+
+	private async loadDataCount() {
+		this.dataCount = await this._carriersService.getCountOfCarriers();
+	}
+}
diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.module.ts b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.module.ts
new file mode 100644
index 000000000..abd6f6813
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { CarriersTableModule } from 'app/@shared/render-component/carriers-table/carriers-table.module';
+import { CarriersSmartTableComponent } from './carriers-table.component';
+import { TranslateModule } from '@ngx-translate/core';
+
+@NgModule({
+	imports: [
+		CommonModule,
+		Ng2SmartTableModule,
+		CarriersTableModule,
+		TranslateModule.forChild()
+	],
+	declarations: [CarriersSmartTableComponent],
+	exports: [CarriersSmartTableComponent]
+})
+export class CarriersSmartTableModule {}
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.html b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
index f9656eea2..746687c87 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
@@ -11,7 +11,7 @@
 		</button>
 		<button
 			class="btn btn-icon btn-danger btn-sm mr-2 d-inline-block"
-			[disabled]="!hasSelectedCarriers"
+			[disabled]="!carriersTable.hasSelectedCarriers"
 			(click)="deleteSelectedCarriers()"
 		>
 			<i class="ion-md-trash button-icon"></i>
@@ -26,11 +26,6 @@
 		</button>
 	</nb-card-header>
 	<nb-card-body [nbSpinner]="loading">
-		<ng2-smart-table
-			[settings]="settingsSmartTable"
-			[source]="sourceSmartTable"
-			(userRowSelect)="selectCarrierTmp($event)"
-		>
-		</ng2-smart-table>
+		<ea-carriers-smart-table #carriersTable></ea-carriers-smart-table>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
index 896896d5d..357936e55 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
@@ -1,76 +1,33 @@
-import { Component, OnDestroy, AfterViewInit } from '@angular/core';
-import { DomSanitizer } from '@angular/platform-browser';
-import { Router } from '@angular/router';
-import { LocalDataSource } from 'ng2-smart-table';
-import Carrier from '@modules/server.common/entities/Carrier';
-import CarrierStatus from '@modules/server.common/enums/CarrierStatus';
+import { Component, OnDestroy, ViewChild } from '@angular/core';
+
 import { CarriersService } from '../../@core/data/carriers.service';
 import { CarrierMutationComponent } from '../../@shared/carrier/carrier-mutation';
-import { Observable, forkJoin } from 'rxjs';
 import { Subject } from 'rxjs/Rx';
 import { ToasterService } from 'angular2-toaster';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateService } from '@ngx-translate/core';
-import { takeUntil } from 'rxjs/operators';
 import _ from 'lodash';
-import { RedirectNameComponent } from '../../@shared/render-component/name-redirect/name-redirect.component';
-import { CarrierImageComponent } from '../../@shared/render-component/carriers-table/carrier-image/carrier-image.component';
-import { CarrierPhoneComponent } from '../../@shared/render-component/carriers-table/carrier-phone/carrier-phone.component';
-import { CarrierActionsComponent } from 'app/@shared/render-component/carriers-table/carrier-actions/carrier-actions.component';
-
-const perPage = 5;
+import { CarriersSmartTableComponent } from 'app/@shared/carrier/carriers-table/carriers-table.component';
 
 @Component({
 	selector: 'ea-carriers',
 	templateUrl: 'carriers.component.html',
 	styleUrls: ['carriers.component.scss']
 })
-export class CarriersComponent implements OnDestroy, AfterViewInit {
-	private ngDestroy$ = new Subject<void>();
-
-	static noInfoSign = '';
-
-	protected carriers: Carrier[];
-	protected settingsSmartTable: any;
-	protected sourceSmartTable = new LocalDataSource();
-
-	private _selectedCarriers: Carrier[] = [];
+export class CarriersComponent implements OnDestroy {
+	@ViewChild('carriersTable')
+	carriersTable: CarriersSmartTableComponent;
 
-	private dataCount: number;
-	private $carriers;
+	loading: boolean;
 
-	public Offline: string = 'Offline';
-	public Online: string = 'Online';
-
-	public loading: boolean;
+	private ngDestroy$ = new Subject<void>();
 
 	constructor(
-		private readonly _translateService: TranslateService,
 		private readonly _carriersService: CarriersService,
-		private readonly _sanitizer: DomSanitizer,
-		private readonly _router: Router,
 		private readonly _toasterService: ToasterService,
 		private readonly modalService: NgbModal
-	) {
-		this._loadSettingsSmartTable();
-		this._loadDataSmartTable();
-		this._applyTranslationOnSmartTable();
-	}
-
-	ngAfterViewInit() {
-		this._addCustomHTMLElements();
-		this.smartTableChange();
-	}
+	) {}
 
-	protected get hasSelectedCarriers(): boolean {
-		return this._selectedCarriers.length > 0;
-	}
-
-	protected selectCarrierTmp(ev) {
-		this._selectedCarriers = ev.selected;
-	}
-
-	protected openWizardNewCarrier() {
+	openWizardNewCarrier() {
 		this.modalService.open(CarrierMutationComponent, {
 			size: 'lg',
 			container: 'nb-layout',
@@ -79,19 +36,21 @@ export class CarriersComponent implements OnDestroy, AfterViewInit {
 		});
 	}
 
-	protected deleteSelectedCarriers() {
-		const idsForDelete: string[] = this._selectedCarriers.map((c) => c.id);
+	deleteSelectedCarriers() {
+		const idsForDelete: string[] = this.carriersTable.selectedCarriers.map(
+			(c) => c.id
+		);
 		this.loading = true;
 
 		try {
 			this._carriersService.removeByIds(idsForDelete).subscribe(() => {
-				this._selectedCarriers.forEach((carrier) =>
+				this.carriersTable.selectedCarriers.forEach((carrier) =>
 					this._toasterService.pop(
 						`success`,
 						`Carrier ${carrier['name']} DELETED`
 					)
 				);
-				this._selectedCarriers = [];
+				this.carriersTable.selectedCarriers = [];
 			});
 			this.loading = false;
 		} catch (error) {
@@ -100,195 +59,6 @@ export class CarriersComponent implements OnDestroy, AfterViewInit {
 		}
 	}
 
-	private _applyTranslationOnSmartTable() {
-		this._translateService.onLangChange.subscribe(() => {
-			this._loadSettingsSmartTable();
-			this._loadDataSmartTable();
-		});
-	}
-
-	// This is just workaround to show some search icon on smart table, in the future maybe we must find better solution.
-	private _addCustomHTMLElements(): any {
-		document.querySelector(
-			'tr.ng2-smart-filters > th:nth-child(1)'
-		).innerHTML = '<i class="fa fa-search" style="font-size: 1.3em"/>';
-	}
-
-	private _loadSettingsSmartTable() {
-		const columnTitlePrefix = 'CARRIERS_VIEW.SMART_TABLE_COLUMNS.';
-		const getTranslate = (name: string): Observable<string | any> =>
-			this._translateService.get(columnTitlePrefix + name);
-
-		forkJoin(
-			this._translateService.get('Id'),
-			getTranslate('IMAGE'),
-			getTranslate('NAME'),
-			getTranslate('PHONE'),
-			getTranslate('STATUS'),
-			getTranslate('ADDRESS'),
-			getTranslate('DELIVERIES')
-		)
-			.pipe(takeUntil(this.ngDestroy$))
-			.subscribe(
-				([id, image, name, phone, status, address, deliveries]) => {
-					this.settingsSmartTable = {
-						actions: false,
-						selectMode: 'multi',
-						columns: {
-							images: {
-								title: image,
-								class: 'carrier-image',
-								type: 'custom',
-								renderComponent: CarrierImageComponent,
-								onComponentInitFunction: (instance) => {
-									instance.redirectPage = 'carriers';
-								},
-								filter: false
-							},
-							name: {
-								title: name,
-								type: 'custom',
-								renderComponent: RedirectNameComponent,
-								onComponentInitFunction: (instance) => {
-									instance.redirectPage = 'carriers';
-								}
-							},
-							phone: {
-								title: phone,
-								type: 'custom',
-								renderComponent: CarrierPhoneComponent
-							},
-							status: { title: status },
-							address: { title: address },
-							deliveries: { title: deliveries, filter: false },
-							actions: {
-								title: 'Actions',
-								filter: false,
-								type: 'custom',
-								renderComponent: CarrierActionsComponent
-							}
-						},
-						pager: {
-							display: true,
-							perPage
-						}
-					};
-				}
-			);
-	}
-
-	private async _loadDataSmartTable(page = 1) {
-		if (this.$carriers) {
-			await this.$carriers.unsubscribe();
-		}
-
-		this.$carriers = this._carriersService
-			.getCarriers({
-				skip: perPage * (page - 1),
-				limit: perPage
-			})
-			.pipe(takeUntil(this.ngDestroy$))
-			.subscribe(async (data: Carrier[]) => {
-				const carriersVm = data.map((c) => {
-					return {
-						id: c.id,
-						image: c.logo || CarriersComponent.noInfoSign,
-						name: `${c.firstName ||
-							CarriersComponent.noInfoSign} ${c.lastName ||
-							CarriersComponent.noInfoSign}`,
-						phone: c.phone || CarriersComponent.noInfoSign,
-						status: {
-							[CarrierStatus.Offline]: 'Offline',
-							[CarrierStatus.Online]: 'Online',
-							[CarrierStatus.Blocked]: 'Blocked'
-						}[c.status],
-						address: `${c.geoLocation.city ||
-							CarriersComponent.noInfoSign} st. ${c.geoLocation
-							.streetAddress ||
-							CarriersComponent.noInfoSign}, hse. № ${c
-							.geoLocation.house ||
-							CarriersComponent.noInfoSign}`,
-						deliveries: c.numberOfDeliveries
-					};
-				});
-
-				await this.loadDataCount();
-
-				const carriersData = new Array(this.dataCount);
-
-				carriersData.splice(
-					perPage * (page - 1),
-					perPage,
-					...carriersVm
-				);
-
-				await this.sourceSmartTable.load(carriersData);
-			});
-	}
-
-	// private async _loadDataSmartTable() {
-	// 	let resultTr = await this._translateService
-	// 		.get('CATEGORY')
-	// 		.pipe(first())
-	// 		.toPromise();
-
-	// 	let carriersAll: Carrier[] = [];
-
-	// 	let loadData = async () => {
-	// 		let ordersByUserId: { [id: string]: Carrier[] } = _.groupBy(
-	// 			carriersAll
-	// 			// (o) => o.user._id
-	// 		);
-
-	// 		let carriersVm = carriersAll.map((c) => {
-	// 			return {
-	// 				id: c.id,
-	// 				image: c.logo || CarriersComponent.noInfoSign,
-	// 				name: `${c.firstName ||
-	// 					CarriersComponent.noInfoSign} ${c.lastName ||
-	// 					CarriersComponent.noInfoSign}`,
-	// 				phone: c.phone || CarriersComponent.noInfoSign,
-	// 				status: {
-	// 					[CarrierStatus.Offline]: 'Offline',
-	// 					[CarrierStatus.Online]: resultTr
-	// 				}[c.status],
-	// 				address: `${c.geoLocation.city ||
-	// 					CarriersComponent.noInfoSign} st. ${c.geoLocation
-	// 					.streetAddress ||
-	// 					CarriersComponent.noInfoSign}, hse. № ${c.geoLocation
-	// 					.house || CarriersComponent.noInfoSign}`,
-	// 				deliveries: c.numberOfDeliveries
-	// 			};
-	// 		});
-
-	// 		await this.sourceSmartTable.load(carriersVm);
-	// 	};
-
-	// 	this._carriersService
-	// 		.getCarriers()
-	// 		.pipe(takeUntil(this.ngDestroy$))
-	// 		.subscribe(async (carrier: Carrier[]) => {
-	// 			carriersAll = carrier;
-	// 			await loadData();
-	// 		});
-	// }
-
-	private async smartTableChange() {
-		this.sourceSmartTable
-			.onChanged()
-			.pipe(takeUntil(this.ngDestroy$))
-			.subscribe(async (event) => {
-				if (event.action === 'page') {
-					const page = event.paging.page;
-					this._loadDataSmartTable(page);
-				}
-			});
-	}
-
-	private async loadDataCount() {
-		this.dataCount = await this._carriersService.getCountOfCarriers();
-	}
-
 	ngOnDestroy() {
 		this.ngDestroy$.next();
 		this.ngDestroy$.complete();
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.module.ts b/admin/website-angular/src/app/pages/+carriers/carriers.module.ts
index e125ec7cb..2a5ccb383 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.module.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.module.ts
@@ -1,34 +1,30 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { ToasterModule } from 'angular2-toaster';
 import { TranslateModule } from '@ngx-translate/core';
 import { CarriersComponent } from './carriers.component';
 import { ThemeModule } from '../../@theme';
 import { FormWizardModule } from 'angular2-wizard';
-import { CarrierMutationModule } from '../../@shared/carrier/carrier-mutation';
 import { CarriersRoutingModule } from './carriers-routing.module';
 import { RenderComponentsModule } from '../../@shared/render-component/render-components.module';
-import { CarriersTableModule } from '../../@shared/render-component/carriers-table/carriers-table.module';
 import { NbSpinnerModule } from '@nebular/theme';
 import { TrackModule } from './track/track.module';
 import { CarrierLocationModule } from './+carrier/location/carrier-location.module';
+import { CarriersSmartTableModule } from 'app/@shared/carrier/carriers-table/carriers-table.module';
 
 @NgModule({
 	imports: [
 		CommonModule,
-		Ng2SmartTableModule,
 		ThemeModule,
 		FormWizardModule,
 		CarriersRoutingModule,
-		CarrierMutationModule,
 		ToasterModule.forChild(),
 		TranslateModule.forChild(),
-		RenderComponentsModule,
-		CarriersTableModule,
 		NbSpinnerModule,
 		CarrierLocationModule,
-		TrackModule
+		TrackModule,
+		CarriersSmartTableModule,
+		RenderComponentsModule
 	],
 	declarations: [CarriersComponent]
 })
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index 9349499d7..747e5525f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -1,30 +1,37 @@
 <nb-card class="setup-merchant-delivery-takeaway">
 	<nb-card-header>Delivery & Takeaway Settings</nb-card-header>
 	<nb-card-body>
-		<div class="row">
-			<div class="form-group offset-md-2 col-md-4">
-				<nb-checkbox [(ngModel)]="isCarrierRequired">
-					Carrier required
-				</nb-checkbox>
+		<div class="main-content">
+			<div class="row">
+				<div class="form-group offset-md-2 col-md-4">
+					<nb-checkbox [(ngModel)]="isCarrierRequired">
+						Carrier required
+					</nb-checkbox>
+				</div>
 			</div>
-		</div>
-		<div class="row">
-			<div class="form-group offset-md-2 col-md-4">
-				<nb-checkbox [(ngModel)]="productsDelivery">
-					Products Delivery (by default)
-				</nb-checkbox>
-			</div>
-			<div class="form-group  col-md-4">
-				<nb-checkbox [(ngModel)]="productsTakeaway">
-					Products Takeaway (by default)
-				</nb-checkbox>
+			<div class="row">
+				<div class="form-group offset-md-2 col-md-4">
+					<nb-checkbox [(ngModel)]="productsDelivery">
+						Products Delivery (by default)
+					</nb-checkbox>
+				</div>
+				<div class="form-group  col-md-4">
+					<nb-checkbox [(ngModel)]="productsTakeaway">
+						Products Takeaway (by default)
+					</nb-checkbox>
+				</div>
 			</div>
-		</div>
-		<div class="row">
-			<div class="form-group offset-md-2 col-md-10">
-				<nb-checkbox [(ngModel)]="hasRestrictedCarriers">
-					Restricted Carriers
-				</nb-checkbox>
+			<div *ngIf="productsDelivery" class="row actions">
+				<div class="form-group offset-md-2 col-md-4">
+					<button nbButton outline status="success">
+						Use selected shared carriers
+					</button>
+				</div>
+				<div class="form-group  col-md-4">
+					<button nbButton outline status="success">
+						Add your carriers
+					</button>
+				</div>
 			</div>
 		</div>
 	</nb-card-body>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss
index abd88e3a6..014ccdd56 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss
@@ -2,4 +2,11 @@
 	nb-card-body {
 		text-align: left;
 	}
+
+	.actions {
+		button {
+			width: 100%;
+			margin: 0;
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index ee630a12b..9c6bd610b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -9,5 +9,4 @@ export class SetupMerchantDeliveryAndTakeawayComponent {
 	isCarrierRequired: boolean;
 	productsDelivery: boolean;
 	productsTakeaway: boolean;
-	hasRestrictedCarriers: boolean;
 }

From 970df29a9291c76439445128ce456ee6ba79d83a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 17:12:22 +0300
Subject: [PATCH 106/382] feat(ever-admin): improved shared carriers table
 EV-1194

---
 .../carriers-table.component.ts               | 118 ++++++-----------
 .../pages/+carriers/carriers.component.html   |   5 +-
 .../app/pages/+carriers/carriers.component.ts | 124 ++++++++++++++++--
 .../components/components.module.ts           |   2 -
 .../delivery-takeaway.component.html          |  24 +++-
 .../delivery-takeaway.component.ts            |   6 +
 .../delivery-takeaway.module.ts               |  24 ++++
 .../+setup/+merchants/merchants.module.ts     |   4 +-
 8 files changed, 209 insertions(+), 98 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts

diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
index e4c6c2bb2..e3612c869 100644
--- a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
@@ -1,4 +1,11 @@
-import { Component, OnDestroy, AfterViewInit } from '@angular/core';
+import {
+	Component,
+	OnDestroy,
+	AfterViewInit,
+	Input,
+	OnInit,
+	EventEmitter
+} from '@angular/core';
 import { LocalDataSource } from 'ng2-smart-table';
 import { TranslateService } from '@ngx-translate/core';
 import { CarrierImageComponent } from 'app/@shared/render-component/carriers-table/carrier-image/carrier-image.component';
@@ -6,42 +13,55 @@ import { RedirectNameComponent } from 'app/@shared/render-component/name-redirec
 import { CarrierPhoneComponent } from 'app/@shared/render-component/carriers-table/carrier-phone/carrier-phone.component';
 import { Observable, forkJoin, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { CarriersService } from 'app/@core/data/carriers.service';
 import Carrier from '@modules/server.common/entities/Carrier';
-import CarrierStatus from '@modules/server.common/enums/CarrierStatus';
 import { CarrierActionsComponent } from 'app/@shared/render-component/carriers-table/carrier-actions/carrier-actions.component';
 
-const perPage = 5;
+let perPage = 5;
+
+export interface CarrierSmartTableObject {
+	id: string;
+	image: string;
+	name: string;
+	phone: string;
+	status: string;
+	address: string;
+	deliveries: number;
+}
 
 @Component({
 	selector: 'ea-carriers-smart-table',
 	templateUrl: 'carriers-table.component.html',
 	styleUrls: ['carriers-table.component.scss']
 })
-export class CarriersSmartTableComponent implements OnDestroy, AfterViewInit {
+export class CarriersSmartTableComponent
+	implements OnDestroy, OnInit, AfterViewInit {
 	static noInfoSign = '';
 
+	@Input()
+	perPage: number;
+
+	pageChange: EventEmitter<number> = new EventEmitter();
+
 	settingsSmartTable: any;
 	sourceSmartTable = new LocalDataSource();
 	selectedCarriers: Carrier[] = [];
 
-	private dataCount: number;
-	private $carriers;
 	private ngDestroy$ = new Subject<void>();
 
-	constructor(
-		private readonly _translateService: TranslateService,
-		private readonly _carriersService: CarriersService
-	) {
-		this._loadSettingsSmartTable();
-		this._loadDataSmartTable();
-		this._applyTranslationOnSmartTable();
+	constructor(private readonly _translateService: TranslateService) {
+		this.loadSettingsSmartTable();
 	}
 
 	get hasSelectedCarriers(): boolean {
 		return this.selectedCarriers.length > 0;
 	}
 
+	ngOnInit(): void {
+		if (this.perPage) {
+			perPage = this.perPage;
+		}
+	}
+
 	ngAfterViewInit() {
 		this._addCustomHTMLElements();
 		this.smartTableChange();
@@ -56,6 +76,10 @@ export class CarriersSmartTableComponent implements OnDestroy, AfterViewInit {
 		this.selectedCarriers = ev.selected;
 	}
 
+	async loadData(carriersData: CarrierSmartTableObject[]) {
+		await this.sourceSmartTable.load(carriersData);
+	}
+
 	// This is just workaround to show some search icon on smart table, in the future maybe we must find better solution.
 	private _addCustomHTMLElements(): any {
 		document.querySelector(
@@ -63,57 +87,7 @@ export class CarriersSmartTableComponent implements OnDestroy, AfterViewInit {
 		).innerHTML = '<i class="fa fa-search" style="font-size: 1.3em"/>';
 	}
 
-	private async _loadDataSmartTable(page = 1) {
-		if (this.$carriers) {
-			await this.$carriers.unsubscribe();
-		}
-
-		this.$carriers = this._carriersService
-			.getCarriers({
-				skip: perPage * (page - 1),
-				limit: perPage
-			})
-			.pipe(takeUntil(this.ngDestroy$))
-			.subscribe(async (data: Carrier[]) => {
-				const carriersVm = data.map((c) => {
-					return {
-						id: c.id,
-						image: c.logo || CarriersSmartTableComponent.noInfoSign,
-						name: `${c.firstName ||
-							CarriersSmartTableComponent.noInfoSign} ${c.lastName ||
-							CarriersSmartTableComponent.noInfoSign}`,
-						phone:
-							c.phone || CarriersSmartTableComponent.noInfoSign,
-						status: {
-							[CarrierStatus.Offline]: 'Offline',
-							[CarrierStatus.Online]: 'Online',
-							[CarrierStatus.Blocked]: 'Blocked'
-						}[c.status],
-						address: `${c.geoLocation.city ||
-							CarriersSmartTableComponent.noInfoSign} st. ${c
-							.geoLocation.streetAddress ||
-							CarriersSmartTableComponent.noInfoSign}, hse. № ${c
-							.geoLocation.house ||
-							CarriersSmartTableComponent.noInfoSign}`,
-						deliveries: c.numberOfDeliveries
-					};
-				});
-
-				await this.loadDataCount();
-
-				const carriersData = new Array(this.dataCount);
-
-				carriersData.splice(
-					perPage * (page - 1),
-					perPage,
-					...carriersVm
-				);
-
-				await this.sourceSmartTable.load(carriersData);
-			});
-	}
-
-	private _loadSettingsSmartTable() {
+	loadSettingsSmartTable() {
 		const columnTitlePrefix = 'CARRIERS_VIEW.SMART_TABLE_COLUMNS.';
 		const getTranslate = (name: string): Observable<string | any> =>
 			this._translateService.get(columnTitlePrefix + name);
@@ -176,13 +150,6 @@ export class CarriersSmartTableComponent implements OnDestroy, AfterViewInit {
 			);
 	}
 
-	private _applyTranslationOnSmartTable() {
-		this._translateService.onLangChange.subscribe(() => {
-			this._loadSettingsSmartTable();
-			this._loadDataSmartTable();
-		});
-	}
-
 	private async smartTableChange() {
 		this.sourceSmartTable
 			.onChanged()
@@ -190,12 +157,9 @@ export class CarriersSmartTableComponent implements OnDestroy, AfterViewInit {
 			.subscribe(async (event) => {
 				if (event.action === 'page') {
 					const page = event.paging.page;
-					this._loadDataSmartTable(page);
+
+					this.pageChange.emit(page);
 				}
 			});
 	}
-
-	private async loadDataCount() {
-		this.dataCount = await this._carriersService.getCountOfCarriers();
-	}
 }
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.html b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
index 746687c87..f3d94e967 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
@@ -26,6 +26,9 @@
 		</button>
 	</nb-card-header>
 	<nb-card-body [nbSpinner]="loading">
-		<ea-carriers-smart-table #carriersTable></ea-carriers-smart-table>
+		<ea-carriers-smart-table
+			[perPage]="perPage"
+			#carriersTable
+		></ea-carriers-smart-table>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
index 357936e55..29eb16afe 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, ViewChild } from '@angular/core';
+import { Component, OnDestroy, ViewChild, AfterViewInit } from '@angular/core';
 
 import { CarriersService } from '../../@core/data/carriers.service';
 import { CarrierMutationComponent } from '../../@shared/carrier/carrier-mutation';
@@ -7,25 +7,37 @@ import { ToasterService } from 'angular2-toaster';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import _ from 'lodash';
 import { CarriersSmartTableComponent } from 'app/@shared/carrier/carriers-table/carriers-table.component';
+import { takeUntil, first } from 'rxjs/operators';
+import Carrier from '@modules/server.common/entities/Carrier';
+import CarrierStatus from '@modules/server.common/enums/CarrierStatus';
+import { TranslateService } from '@ngx-translate/core';
+
+const perPage = 5;
 
 @Component({
 	selector: 'ea-carriers',
 	templateUrl: 'carriers.component.html',
 	styleUrls: ['carriers.component.scss']
 })
-export class CarriersComponent implements OnDestroy {
+export class CarriersComponent implements OnDestroy, AfterViewInit {
 	@ViewChild('carriersTable')
 	carriersTable: CarriersSmartTableComponent;
 
 	loading: boolean;
+	perPage = perPage;
 
+	private dataCount: number;
+	private $carriers;
 	private ngDestroy$ = new Subject<void>();
 
 	constructor(
 		private readonly _carriersService: CarriersService,
 		private readonly _toasterService: ToasterService,
-		private readonly modalService: NgbModal
-	) {}
+		private readonly modalService: NgbModal,
+		private readonly _translateService: TranslateService
+	) {
+		this._applyTranslationOnSmartTable();
+	}
 
 	openWizardNewCarrier() {
 		this.modalService.open(CarrierMutationComponent, {
@@ -36,22 +48,26 @@ export class CarriersComponent implements OnDestroy {
 		});
 	}
 
-	deleteSelectedCarriers() {
+	async deleteSelectedCarriers() {
 		const idsForDelete: string[] = this.carriersTable.selectedCarriers.map(
 			(c) => c.id
 		);
 		this.loading = true;
 
 		try {
-			this._carriersService.removeByIds(idsForDelete).subscribe(() => {
-				this.carriersTable.selectedCarriers.forEach((carrier) =>
-					this._toasterService.pop(
-						`success`,
-						`Carrier ${carrier['name']} DELETED`
-					)
-				);
-				this.carriersTable.selectedCarriers = [];
-			});
+			await this._carriersService
+				.removeByIds(idsForDelete)
+				.pipe(first())
+				.toPromise();
+
+			this.carriersTable.selectedCarriers.forEach((carrier) =>
+				this._toasterService.pop(
+					`success`,
+					`Carrier ${carrier['name']} DELETED`
+				)
+			);
+
+			this.carriersTable.selectedCarriers = [];
 			this.loading = false;
 		} catch (error) {
 			this.loading = false;
@@ -59,8 +75,88 @@ export class CarriersComponent implements OnDestroy {
 		}
 	}
 
+	ngAfterViewInit(): void {
+		this._loadDataSmartTable();
+		this.smartTablePageChange();
+	}
+
 	ngOnDestroy() {
 		this.ngDestroy$.next();
 		this.ngDestroy$.complete();
 	}
+
+	private async _loadDataSmartTable(page = 1) {
+		if (this.$carriers) {
+			await this.$carriers.unsubscribe();
+		}
+
+		this.$carriers = this._carriersService
+			.getCarriers({
+				skip: perPage * (page - 1),
+				limit: perPage
+			})
+			.pipe(takeUntil(this.ngDestroy$))
+			.subscribe(async (data: Carrier[]) => {
+				const carriersVm = data.map((c) => {
+					return {
+						id: c.id,
+						image: c.logo || CarriersSmartTableComponent.noInfoSign,
+						name: `${c.firstName ||
+							CarriersSmartTableComponent.noInfoSign} ${c.lastName ||
+							CarriersSmartTableComponent.noInfoSign}`,
+						phone:
+							c.phone || CarriersSmartTableComponent.noInfoSign,
+						status: {
+							[CarrierStatus.Offline]: 'Offline',
+							[CarrierStatus.Online]: 'Online',
+							[CarrierStatus.Blocked]: 'Blocked'
+						}[c.status],
+						address: `${c.geoLocation.city ||
+							CarriersSmartTableComponent.noInfoSign} st. ${c
+							.geoLocation.streetAddress ||
+							CarriersSmartTableComponent.noInfoSign}, hse. № ${c
+							.geoLocation.house ||
+							CarriersSmartTableComponent.noInfoSign}`,
+						deliveries: c.numberOfDeliveries
+					};
+				});
+
+				await this.loadDataCount();
+
+				const carriersData = new Array(this.dataCount);
+
+				carriersData.splice(
+					perPage * (page - 1),
+					perPage,
+					...carriersVm
+				);
+
+				await this.carriersTable.loadData(carriersData);
+			});
+	}
+
+	private _applyTranslationOnSmartTable() {
+		this._translateService.onLangChange
+			.pipe(takeUntil(this.ngDestroy$))
+			.subscribe(() => {
+				if (this.carriersTable) {
+					this.carriersTable.loadSettingsSmartTable();
+					this._loadDataSmartTable();
+				}
+			});
+	}
+
+	private async loadDataCount() {
+		this.dataCount = await this._carriersService.getCountOfCarriers();
+	}
+
+	private async smartTablePageChange() {
+		if (this.carriersTable) {
+			this.carriersTable.pageChange
+				.pipe(takeUntil(this.ngDestroy$))
+				.subscribe((page) => {
+					this._loadDataSmartTable(page);
+				});
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 792bb06e3..63d910edf 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -10,7 +10,6 @@ import { SetupMerchantBasicInfoComponent } from './basic-info/basic-info.compone
 import { SetupMerchantContactInfoComponent } from './contact-info/contact-info.component';
 import { SetupMerchantPaymentsComponent } from './payments/payments.component';
 import { SetupMerchantManufacturingComponent } from './manufacturing/manufacturing.component';
-import { SetupMerchantDeliveryAndTakeawayComponent } from './settings/delivery-takeaway/delivery-takeaway.component';
 import { SetupMerchantOrdersSettingsComponent } from './settings/orders/orders.component';
 import { NbRadioModule } from '@nebular/theme';
 
@@ -21,7 +20,6 @@ const COMPONENTS = [
 	MerchantsSetupInstructionsComponent,
 	SetupMerchantPaymentsComponent,
 	SetupMerchantManufacturingComponent,
-	SetupMerchantDeliveryAndTakeawayComponent,
 	SetupMerchantOrdersSettingsComponent
 ];
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index 747e5525f..6910d1d36 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -1,7 +1,14 @@
 <nb-card class="setup-merchant-delivery-takeaway">
-	<nb-card-header>Delivery & Takeaway Settings</nb-card-header>
+	<nb-card-header
+		><span *ngIf="currentView == componentViews.main"
+			>Delivery & Takeaway Settings</span
+		>
+		<span *ngIf="currentView == componentViews.carriersTable"
+			>Select from shared carriers</span
+		>
+	</nb-card-header>
 	<nb-card-body>
-		<div class="main-content">
+		<div *ngIf="currentView == componentViews.main" class="main-content">
 			<div class="row">
 				<div class="form-group offset-md-2 col-md-4">
 					<nb-checkbox [(ngModel)]="isCarrierRequired">
@@ -23,7 +30,12 @@
 			</div>
 			<div *ngIf="productsDelivery" class="row actions">
 				<div class="form-group offset-md-2 col-md-4">
-					<button nbButton outline status="success">
+					<button
+						nbButton
+						outline
+						status="success"
+						(click)="currentView = componentViews.carriersTable"
+					>
 						Use selected shared carriers
 					</button>
 				</div>
@@ -34,5 +46,11 @@
 				</div>
 			</div>
 		</div>
+
+		<div class="row">
+			<ea-carriers-smart-table
+				*ngIf="currentView == componentViews.carriersTable"
+			></ea-carriers-smart-table>
+		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index 9c6bd610b..140223241 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -6,6 +6,12 @@ import { Component } from '@angular/core';
 	styleUrls: ['./delivery-takeaway.component.scss']
 })
 export class SetupMerchantDeliveryAndTakeawayComponent {
+	componentViews = {
+		main: 'main',
+		carriersTable: 'carriersTable'
+	};
+	currentView = this.componentViews.main;
+
 	isCarrierRequired: boolean;
 	productsDelivery: boolean;
 	productsTakeaway: boolean;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
new file mode 100644
index 000000000..c518955aa
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
@@ -0,0 +1,24 @@
+import { SetupMerchantDeliveryAndTakeawayComponent } from './delivery-takeaway.component';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { ThemeModule } from 'app/@theme';
+import { FormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+import { CarriersSmartTableModule } from 'app/@shared/carrier/carriers-table/carriers-table.module';
+import { RenderComponentsModule } from 'app/@shared/render-component/render-components.module';
+
+const COMPONENTS = [SetupMerchantDeliveryAndTakeawayComponent];
+
+@NgModule({
+	imports: [
+		CommonModule,
+		ThemeModule,
+		FormsModule,
+		TranslateModule.forChild(),
+		CarriersSmartTableModule,
+		RenderComponentsModule
+	],
+	declarations: COMPONENTS,
+	exports: COMPONENTS
+})
+export class SetupMerchantsDeliveryAndTakeawayModule {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index 827f07bda..a456f1640 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -7,6 +7,7 @@ import { SetupMerchantsComponent } from './merchants.component';
 import { NbStepperModule } from '@nebular/theme';
 import { SetupMerchantsComponentsModule } from './components/components.module';
 import { SetupMerchantsLocationModule } from './components/location/location.module';
+import { SetupMerchantsDeliveryAndTakeawayModule } from './components/settings/delivery-takeaway/delivery-takeaway.module';
 
 const routes: Routes = [
 	{
@@ -23,7 +24,8 @@ const routes: Routes = [
 		TranslateModule.forChild(),
 		NbStepperModule,
 		SetupMerchantsComponentsModule,
-		SetupMerchantsLocationModule
+		SetupMerchantsLocationModule,
+		SetupMerchantsDeliveryAndTakeawayModule
 	],
 	declarations: [SetupMerchantsComponent]
 })

From 9279e9e5d28470207bcc1b8cd4b019101ed91fc3 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 3 Apr 2019 17:53:03 +0300
Subject: [PATCH 107/382] feat(ever-admin): added carriers table for Delivery
 Settings, in Setup Merchants page EV-1194

---
 .../src/app/@core/data/carriers.service.ts    |  17 ++-
 .../app/pages/+carriers/carriers.module.ts    |   4 +-
 .../delivery-takeaway.component.html          |   4 +-
 .../delivery-takeaway.component.ts            |  10 ++
 .../delivery-takeaway.module.ts               |   6 +-
 .../shared-carriers.component.html            |   4 +
 .../shared-carriers.component.ts              | 122 ++++++++++++++++++
 .../+merchants/merchants.component.html       |  38 +++++-
 .../src/graphql/carriers/carrier.resolver.ts  |   4 +-
 9 files changed, 194 insertions(+), 15 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts

diff --git a/admin/website-angular/src/app/@core/data/carriers.service.ts b/admin/website-angular/src/app/@core/data/carriers.service.ts
index d2dce40e3..be4c37b25 100644
--- a/admin/website-angular/src/app/@core/data/carriers.service.ts
+++ b/admin/website-angular/src/app/@core/data/carriers.service.ts
@@ -49,12 +49,21 @@ export class CarriersService {
 		return this.carriers$;
 	}
 
-	getCarriers(pagingOptions?: IPagingOptions): Observable<Carrier[]> {
+	getCarriers(
+		pagingOptions?: IPagingOptions,
+		carriersFindInput?: any
+	): Observable<Carrier[]> {
 		return this._apollo
 			.watchQuery<{ getCarriers: ICarrier[] }>({
 				query: gql`
-					query GetCarriers($pagingOptions: PagingOptionsInput) {
-						getCarriers(pagingOptions: $pagingOptions) {
+					query GetCarriers(
+						$pagingOptions: PagingOptionsInput
+						$carriersFindInput: CarriersFindInput
+					) {
+						getCarriers(
+							pagingOptions: $pagingOptions
+							carriersFindInput: $carriersFindInput
+						) {
 							_id
 							firstName
 							lastName
@@ -76,7 +85,7 @@ export class CarriersService {
 						}
 					}
 				`,
-				variables: { pagingOptions },
+				variables: { pagingOptions, carriersFindInput },
 				pollInterval: 2000
 			})
 			.valueChanges.pipe(
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.module.ts b/admin/website-angular/src/app/pages/+carriers/carriers.module.ts
index 2a5ccb383..b7ff4c097 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.module.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.module.ts
@@ -11,6 +11,7 @@ import { NbSpinnerModule } from '@nebular/theme';
 import { TrackModule } from './track/track.module';
 import { CarrierLocationModule } from './+carrier/location/carrier-location.module';
 import { CarriersSmartTableModule } from 'app/@shared/carrier/carriers-table/carriers-table.module';
+import { CarrierMutationModule } from 'app/@shared/carrier/carrier-mutation';
 
 @NgModule({
 	imports: [
@@ -24,7 +25,8 @@ import { CarriersSmartTableModule } from 'app/@shared/carrier/carriers-table/car
 		CarrierLocationModule,
 		TrackModule,
 		CarriersSmartTableModule,
-		RenderComponentsModule
+		RenderComponentsModule,
+		CarrierMutationModule
 	],
 	declarations: [CarriersComponent]
 })
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index 6910d1d36..7c70ededa 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -48,9 +48,9 @@
 		</div>
 
 		<div class="row">
-			<ea-carriers-smart-table
+			<ea-merchants-setup-shared-carriers
 				*ngIf="currentView == componentViews.carriersTable"
-			></ea-carriers-smart-table>
+			></ea-merchants-setup-shared-carriers>
 		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index 140223241..a39cc7d54 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -15,4 +15,14 @@ export class SetupMerchantDeliveryAndTakeawayComponent {
 	isCarrierRequired: boolean;
 	productsDelivery: boolean;
 	productsTakeaway: boolean;
+
+	add() {
+		if (this.currentView === this.componentViews.carriersTable) {
+		}
+		this.currentView = this.componentViews.main;
+	}
+
+	back() {
+		this.currentView = this.componentViews.main;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
index c518955aa..42de053ad 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
@@ -6,8 +6,12 @@ import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 import { CarriersSmartTableModule } from 'app/@shared/carrier/carriers-table/carriers-table.module';
 import { RenderComponentsModule } from 'app/@shared/render-component/render-components.module';
+import { SetupMerchantSharedCarriersComponent } from './shared-carriers/shared-carriers.component';
 
-const COMPONENTS = [SetupMerchantDeliveryAndTakeawayComponent];
+const COMPONENTS = [
+	SetupMerchantDeliveryAndTakeawayComponent,
+	SetupMerchantSharedCarriersComponent
+];
 
 @NgModule({
 	imports: [
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.html
new file mode 100644
index 000000000..3fde62b5b
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.html
@@ -0,0 +1,4 @@
+<ea-carriers-smart-table
+	[perPage]="perPage"
+	#carriersTable
+></ea-carriers-smart-table>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
new file mode 100644
index 000000000..838b02c0d
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
@@ -0,0 +1,122 @@
+import { Component, ViewChild, OnDestroy, AfterViewInit } from '@angular/core';
+import Carrier from '@modules/server.common/entities/Carrier';
+import { CarriersSmartTableComponent } from 'app/@shared/carrier/carriers-table/carriers-table.component';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+import { CarriersService } from 'app/@core/data/carriers.service';
+import CarrierStatus from '@modules/server.common/enums/CarrierStatus';
+
+const perPage = 5;
+
+@Component({
+	selector: 'ea-merchants-setup-shared-carriers',
+	templateUrl: './shared-carriers.component.html'
+})
+export class SetupMerchantSharedCarriersComponent
+	implements OnDestroy, AfterViewInit {
+	@ViewChild('carriersTable')
+	carriersTable: CarriersSmartTableComponent;
+
+	perPage = perPage;
+	carriers: Carrier[];
+
+	private dataCount: number;
+	private $carriers;
+	private ngDestroy$ = new Subject<void>();
+
+	constructor(
+		private readonly _translateService: TranslateService,
+		private readonly _carriersService: CarriersService
+	) {
+		this._applyTranslationOnSmartTable();
+	}
+
+	ngAfterViewInit(): void {
+		this._loadDataSmartTable();
+		this.smartTablePageChange();
+	}
+
+	ngOnDestroy() {
+		this.ngDestroy$.next();
+		this.ngDestroy$.complete();
+	}
+
+	private async _loadDataSmartTable(page = 1) {
+		if (this.$carriers) {
+			await this.$carriers.unsubscribe();
+		}
+
+		this.$carriers = this._carriersService
+			.getCarriers(
+				{
+					skip: perPage * (page - 1),
+					limit: perPage
+				},
+				{ isSharedCarrier: true }
+			)
+			.pipe(takeUntil(this.ngDestroy$))
+			.subscribe(async (data: Carrier[]) => {
+				const carriersVm = data.map((c) => {
+					return {
+						id: c.id,
+						image: c.logo || CarriersSmartTableComponent.noInfoSign,
+						name: `${c.firstName ||
+							CarriersSmartTableComponent.noInfoSign} ${c.lastName ||
+							CarriersSmartTableComponent.noInfoSign}`,
+						phone:
+							c.phone || CarriersSmartTableComponent.noInfoSign,
+						status: {
+							[CarrierStatus.Offline]: 'Offline',
+							[CarrierStatus.Online]: 'Online',
+							[CarrierStatus.Blocked]: 'Blocked'
+						}[c.status],
+						address: `${c.geoLocation.city ||
+							CarriersSmartTableComponent.noInfoSign} st. ${c
+							.geoLocation.streetAddress ||
+							CarriersSmartTableComponent.noInfoSign}, hse. № ${c
+							.geoLocation.house ||
+							CarriersSmartTableComponent.noInfoSign}`,
+						deliveries: c.numberOfDeliveries
+					};
+				});
+
+				await this.loadDataCount();
+
+				const carriersData = new Array(this.dataCount);
+
+				carriersData.splice(
+					perPage * (page - 1),
+					perPage,
+					...carriersVm
+				);
+
+				await this.carriersTable.loadData(carriersData);
+			});
+	}
+
+	private _applyTranslationOnSmartTable() {
+		this._translateService.onLangChange
+			.pipe(takeUntil(this.ngDestroy$))
+			.subscribe(() => {
+				if (this.carriersTable) {
+					this.carriersTable.loadSettingsSmartTable();
+					this._loadDataSmartTable();
+				}
+			});
+	}
+
+	private async smartTablePageChange() {
+		if (this.carriersTable) {
+			this.carriersTable.pageChange
+				.pipe(takeUntil(this.ngDestroy$))
+				.subscribe((page) => {
+					this._loadDataSmartTable(page);
+				});
+		}
+	}
+
+	private async loadDataCount() {
+		this.dataCount = await this._carriersService.getCountOfCarriers();
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 3dce86d5e..e4d3393e9 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -79,12 +79,40 @@
 							</button>
 						</nb-step>
 						<nb-step label="Delivery & Takeaway Settings">
-							<ea-merchants-setup-delivery-takeaway></ea-merchants-setup-delivery-takeaway>
+							<ea-merchants-setup-delivery-takeaway
+								#deliveryAndTakeaway
+							></ea-merchants-setup-delivery-takeaway>
 
-							<button nbButton nbStepperPrevious>PREV</button>
-							<button nbButton nbStepperNext>
-								NEXT
-							</button>
+							<div
+								*ngIf="
+									deliveryAndTakeaway.currentView ===
+									deliveryAndTakeaway.componentViews.main
+								"
+							>
+								<button nbButton nbStepperPrevious>PREV</button>
+								<button nbButton nbStepperNext>
+									NEXT
+								</button>
+							</div>
+							<div
+								*ngIf="
+									deliveryAndTakeaway.currentView !==
+									deliveryAndTakeaway.componentViews.main
+								"
+							>
+								<button
+									nbButton
+									(click)="deliveryAndTakeaway.back()"
+								>
+									Back
+								</button>
+								<button
+									nbButton
+									(click)="deliveryAndTakeaway.add()"
+								>
+									Add
+								</button>
+							</div>
 						</nb-step>
 						<nb-step label="Orders Settings">
 							<ea-merchants-setup-orders-settings></ea-merchants-setup-orders-settings>
diff --git a/backend/api/src/graphql/carriers/carrier.resolver.ts b/backend/api/src/graphql/carriers/carrier.resolver.ts
index b50df3d06..b974f5ecd 100644
--- a/backend/api/src/graphql/carriers/carrier.resolver.ts
+++ b/backend/api/src/graphql/carriers/carrier.resolver.ts
@@ -29,7 +29,7 @@ export class CarrierResolver {
 	@Query('getCarriers')
 	async getCarriers(
 		_,
-		{ findInput, pagingOptions = {} }
+		{ carriersFindInput, pagingOptions = {} }
 	): Promise<Carrier[]> {
 		// set default paging options
 		if (!pagingOptions || (pagingOptions && !pagingOptions['sort'])) {
@@ -37,7 +37,7 @@ export class CarrierResolver {
 		}
 
 		const carriers = await this._carriersService.getCarriers(
-			findInput,
+			carriersFindInput,
 			pagingOptions
 		);
 

From 5480046e1d55c3be5347413d3b95d8b76b58309a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 4 Apr 2019 12:33:47 +0300
Subject: [PATCH 108/382] feat(ever-admin): improved shared carriers table
 EV-1194

---
 .../carriers-table.component.ts               | 16 ++-
 .../delivery-takeaway.component.html          | 26 ++++-
 .../delivery-takeaway.component.ts            | 98 ++++++++++++++++++-
 .../shared-carriers.component.ts              | 19 +++-
 .../+merchants/merchants.component.html       |  3 +
 .../graphql/carriers/carriers.types.graphql   |  1 +
 6 files changed, 145 insertions(+), 18 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
index e3612c869..91b815348 100644
--- a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
@@ -4,7 +4,8 @@ import {
 	AfterViewInit,
 	Input,
 	OnInit,
-	EventEmitter
+	EventEmitter,
+	Output
 } from '@angular/core';
 import { LocalDataSource } from 'ng2-smart-table';
 import { TranslateService } from '@ngx-translate/core';
@@ -40,6 +41,9 @@ export class CarriersSmartTableComponent
 	@Input()
 	perPage: number;
 
+	@Output()
+	onLoad: EventEmitter<boolean> = new EventEmitter();
+
 	pageChange: EventEmitter<number> = new EventEmitter();
 
 	settingsSmartTable: any;
@@ -63,7 +67,8 @@ export class CarriersSmartTableComponent
 	}
 
 	ngAfterViewInit() {
-		this._addCustomHTMLElements();
+		this.onLoad.emit();
+
 		this.smartTableChange();
 	}
 
@@ -80,13 +85,6 @@ export class CarriersSmartTableComponent
 		await this.sourceSmartTable.load(carriersData);
 	}
 
-	// This is just workaround to show some search icon on smart table, in the future maybe we must find better solution.
-	private _addCustomHTMLElements(): any {
-		document.querySelector(
-			'tr.ng2-smart-filters > th:nth-child(1)'
-		).innerHTML = '<i class="fa fa-search" style="font-size: 1.3em"/>';
-	}
-
 	loadSettingsSmartTable() {
 		const columnTitlePrefix = 'CARRIERS_VIEW.SMART_TABLE_COLUMNS.';
 		const getTranslate = (name: string): Observable<string | any> =>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index 7c70ededa..6b4306927 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -8,7 +8,10 @@
 		>
 	</nb-card-header>
 	<nb-card-body>
-		<div *ngIf="currentView == componentViews.main" class="main-content">
+		<div
+			[hidden]="currentView !== componentViews.main"
+			class="main-content"
+		>
 			<div class="row">
 				<div class="form-group offset-md-2 col-md-4">
 					<nb-checkbox [(ngModel)]="isCarrierRequired">
@@ -18,7 +21,10 @@
 			</div>
 			<div class="row">
 				<div class="form-group offset-md-2 col-md-4">
-					<nb-checkbox [(ngModel)]="productsDelivery">
+					<nb-checkbox
+						(change)="productsDeliveryChange()"
+						[(ngModel)]="productsDelivery"
+					>
 						Products Delivery (by default)
 					</nb-checkbox>
 				</div>
@@ -28,7 +34,7 @@
 					</nb-checkbox>
 				</div>
 			</div>
-			<div *ngIf="productsDelivery" class="row actions">
+			<div [hidden]="!productsDelivery" class="row actions">
 				<div class="form-group offset-md-2 col-md-4">
 					<button
 						nbButton
@@ -39,16 +45,30 @@
 						Use selected shared carriers
 					</button>
 				</div>
+
 				<div class="form-group  col-md-4">
 					<button nbButton outline status="success">
 						Add your carriers
 					</button>
 				</div>
+
+				<div
+					*ngIf="
+						restrictedCarriers && restrictedCarriers.length !== 0
+					"
+				>
+					<ea-carriers-smart-table
+						[perPage]="carriersPerPage"
+						#carriersTable
+					></ea-carriers-smart-table>
+				</div>
 			</div>
 		</div>
 
 		<div class="row">
 			<ea-merchants-setup-shared-carriers
+				#sharedCarriers
+				[existedCarriersIds]="restrictedCarriersIds"
 				*ngIf="currentView == componentViews.carriersTable"
 			></ea-merchants-setup-shared-carriers>
 		</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index a39cc7d54..eb406be59 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -1,28 +1,120 @@
-import { Component } from '@angular/core';
+import { Component, ViewChild, OnDestroy, AfterViewInit } from '@angular/core';
+import { SetupMerchantSharedCarriersComponent } from './shared-carriers/shared-carriers.component';
+import Carrier from '@modules/server.common/entities/Carrier';
+import {
+	CarriersSmartTableComponent,
+	CarrierSmartTableObject
+} from 'app/@shared/carrier/carriers-table/carriers-table.component';
+import { TranslateService } from '@ngx-translate/core';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
 
 @Component({
 	selector: 'ea-merchants-setup-delivery-takeaway',
 	templateUrl: './delivery-takeaway.component.html',
 	styleUrls: ['./delivery-takeaway.component.scss']
 })
-export class SetupMerchantDeliveryAndTakeawayComponent {
+export class SetupMerchantDeliveryAndTakeawayComponent
+	implements AfterViewInit, OnDestroy {
+	@ViewChild('sharedCarriers')
+	sharedCarriers: SetupMerchantSharedCarriersComponent;
+	@ViewChild('carriersTable')
+	carriersTable: CarriersSmartTableComponent;
+
 	componentViews = {
 		main: 'main',
 		carriersTable: 'carriersTable'
 	};
 	currentView = this.componentViews.main;
+	carriersPerPage = 3;
 
 	isCarrierRequired: boolean;
 	productsDelivery: boolean;
 	productsTakeaway: boolean;
 
-	add() {
+	restrictedCarriers: CarrierSmartTableObject[] = [];
+
+	private ngDestroy$ = new Subject<void>();
+
+	constructor(private readonly translateService: TranslateService) {}
+
+	get haveCarriersForAdd() {
+		let hasSelectedCarriers = false;
+
+		if (this.sharedCarriers) {
+			hasSelectedCarriers = this.sharedCarriers.carriersTable
+				.hasSelectedCarriers;
+		}
+		return hasSelectedCarriers;
+	}
+
+	get restrictedCarriersIds() {
+		let ids = [];
+		if (this.restrictedCarriers) {
+			ids = this.restrictedCarriers.map((c) => c.id);
+		}
+
+		return ids;
+	}
+
+	ngAfterViewInit(): void {
+		this.applyTranslationOnSmartTable();
+	}
+
+	async add() {
 		if (this.currentView === this.componentViews.carriersTable) {
+			const carriers = this.sharedCarriers.carriersTable.selectedCarriers.map(
+				this.getCarrierSmartTableObject
+			);
+
+			this.restrictedCarriers.push(...carriers);
 		}
 		this.currentView = this.componentViews.main;
+
+		await this.loadCarriersTable();
 	}
 
 	back() {
 		this.currentView = this.componentViews.main;
 	}
+
+	productsDeliveryChange() {
+		if (!this.productsDelivery) {
+			this.restrictedCarriers = [];
+		}
+	}
+
+	private async loadCarriersTable() {
+		if (this.restrictedCarriers && this.restrictedCarriers.length > 0) {
+			await this.carriersTable.loadData(this.restrictedCarriers);
+		}
+	}
+
+	private getCarrierSmartTableObject(carriers: Carrier) {
+		return {
+			id: carriers.id,
+			image: carriers['image'],
+			name: carriers['name'],
+			phone: carriers.phone,
+			status: carriers.status.toString(),
+			address: carriers['address'],
+			deliveries: carriers['deliveries']
+		};
+	}
+
+	private applyTranslationOnSmartTable() {
+		this.translateService.onLangChange
+			.pipe(takeUntil(this.ngDestroy$))
+			.subscribe(() => {
+				if (this.carriersTable) {
+					this.carriersTable.loadSettingsSmartTable();
+					this.loadCarriersTable();
+				}
+			});
+	}
+
+	ngOnDestroy() {
+		this.ngDestroy$.next();
+		this.ngDestroy$.complete();
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
index 838b02c0d..8feb60039 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
@@ -1,4 +1,10 @@
-import { Component, ViewChild, OnDestroy, AfterViewInit } from '@angular/core';
+import {
+	Component,
+	ViewChild,
+	OnDestroy,
+	AfterViewInit,
+	Input
+} from '@angular/core';
 import Carrier from '@modules/server.common/entities/Carrier';
 import { CarriersSmartTableComponent } from 'app/@shared/carrier/carriers-table/carriers-table.component';
 import { Subject } from 'rxjs';
@@ -18,8 +24,10 @@ export class SetupMerchantSharedCarriersComponent
 	@ViewChild('carriersTable')
 	carriersTable: CarriersSmartTableComponent;
 
+	@Input()
+	existedCarriersIds: string[] = [];
+
 	perPage = perPage;
-	carriers: Carrier[];
 
 	private dataCount: number;
 	private $carriers;
@@ -53,7 +61,12 @@ export class SetupMerchantSharedCarriersComponent
 					skip: perPage * (page - 1),
 					limit: perPage
 				},
-				{ isSharedCarrier: true }
+				{
+					isSharedCarrier: true,
+					_id: {
+						$nin: this.existedCarriersIds
+					}
+				}
 			)
 			.pipe(takeUntil(this.ngDestroy$))
 			.subscribe(async (data: Carrier[]) => {
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index e4d3393e9..7120985d5 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -107,6 +107,9 @@
 									Back
 								</button>
 								<button
+									[disabled]="
+										!deliveryAndTakeaway.haveCarriersForAdd
+									"
 									nbButton
 									(click)="deliveryAndTakeaway.add()"
 								>
diff --git a/backend/api/src/graphql/carriers/carriers.types.graphql b/backend/api/src/graphql/carriers/carriers.types.graphql
index b2acfb04f..f2cecd39d 100644
--- a/backend/api/src/graphql/carriers/carriers.types.graphql
+++ b/backend/api/src/graphql/carriers/carriers.types.graphql
@@ -30,6 +30,7 @@ input CarriersFindInput {
 	isDeleted: Boolean
 	status: Int
 	isSharedCarrier: Boolean
+	_id: Any
 	# TODO geoLocation
 }
 

From cb7000ffef5f4410d08d8556d777a3d14da1d0ad Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 4 Apr 2019 14:36:06 +0300
Subject: [PATCH 109/382] feat(ever-admin): finished carriers table in step
 Delivery & Takeaway Settings EV-1194

---
 .../src/app/@core/data/carriers.service.ts    | 13 ++++++---
 .../carriers-table.component.ts               | 27 ++++++++-----------
 .../app/pages/+carriers/carriers.component.ts |  2 +-
 .../delivery-takeaway.component.html          |  6 ++---
 .../delivery-takeaway.component.ts            | 27 ++-----------------
 .../shared-carriers.component.ts              |  9 +++++--
 .../src/graphql/carriers/carrier.resolver.ts  |  7 +++--
 .../graphql/carriers/carriers.types.graphql   |  2 +-
 8 files changed, 38 insertions(+), 55 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/carriers.service.ts b/admin/website-angular/src/app/@core/data/carriers.service.ts
index be4c37b25..a8cedb5fc 100644
--- a/admin/website-angular/src/app/@core/data/carriers.service.ts
+++ b/admin/website-angular/src/app/@core/data/carriers.service.ts
@@ -207,14 +207,19 @@ export class CarriersService {
 		return res.data['getCarrierCurrentOrder'];
 	}
 
-	async getCountOfCarriers(): Promise<any> {
+	async getCountOfCarriers(carriersFindInput?: any): Promise<any> {
 		const res = await this._apollo
 			.query({
 				query: gql`
-					query GetCountOfCarriers {
-						getCountOfCarriers
+					query GetCountOfCarriers(
+						$carriersFindInput: CarriersFindInput
+					) {
+						getCountOfCarriers(
+							carriersFindInput: $carriersFindInput
+						)
 					}
-				`
+				`,
+				variables: { carriersFindInput }
 			})
 			.toPromise();
 
diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
index 91b815348..62287bce3 100644
--- a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
@@ -4,8 +4,7 @@ import {
 	AfterViewInit,
 	Input,
 	OnInit,
-	EventEmitter,
-	Output
+	EventEmitter
 } from '@angular/core';
 import { LocalDataSource } from 'ng2-smart-table';
 import { TranslateService } from '@ngx-translate/core';
@@ -17,8 +16,6 @@ import { takeUntil } from 'rxjs/operators';
 import Carrier from '@modules/server.common/entities/Carrier';
 import { CarrierActionsComponent } from 'app/@shared/render-component/carriers-table/carrier-actions/carrier-actions.component';
 
-let perPage = 5;
-
 export interface CarrierSmartTableObject {
 	id: string;
 	image: string;
@@ -41,8 +38,8 @@ export class CarriersSmartTableComponent
 	@Input()
 	perPage: number;
 
-	@Output()
-	onLoad: EventEmitter<boolean> = new EventEmitter();
+	@Input()
+	loadWholeData: CarrierSmartTableObject[];
 
 	pageChange: EventEmitter<number> = new EventEmitter();
 
@@ -52,24 +49,22 @@ export class CarriersSmartTableComponent
 
 	private ngDestroy$ = new Subject<void>();
 
-	constructor(private readonly _translateService: TranslateService) {
-		this.loadSettingsSmartTable();
-	}
+	constructor(private readonly _translateService: TranslateService) {}
 
 	get hasSelectedCarriers(): boolean {
 		return this.selectedCarriers.length > 0;
 	}
 
 	ngOnInit(): void {
-		if (this.perPage) {
-			perPage = this.perPage;
-		}
+		this.loadSettingsSmartTable(this.perPage);
 	}
 
 	ngAfterViewInit() {
-		this.onLoad.emit();
-
-		this.smartTableChange();
+		if (this.loadWholeData) {
+			this.loadData(this.loadWholeData);
+		} else {
+			this.smartTableChange();
+		}
 	}
 
 	ngOnDestroy() {
@@ -85,7 +80,7 @@ export class CarriersSmartTableComponent
 		await this.sourceSmartTable.load(carriersData);
 	}
 
-	loadSettingsSmartTable() {
+	loadSettingsSmartTable(perPage) {
 		const columnTitlePrefix = 'CARRIERS_VIEW.SMART_TABLE_COLUMNS.';
 		const getTranslate = (name: string): Observable<string | any> =>
 			this._translateService.get(columnTitlePrefix + name);
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
index 29eb16afe..8619b153a 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
@@ -140,7 +140,7 @@ export class CarriersComponent implements OnDestroy, AfterViewInit {
 			.pipe(takeUntil(this.ngDestroy$))
 			.subscribe(() => {
 				if (this.carriersTable) {
-					this.carriersTable.loadSettingsSmartTable();
+					this.carriersTable.loadSettingsSmartTable(this.perPage);
 					this._loadDataSmartTable();
 				}
 			});
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index 6b4306927..3940789e2 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -8,10 +8,7 @@
 		>
 	</nb-card-header>
 	<nb-card-body>
-		<div
-			[hidden]="currentView !== componentViews.main"
-			class="main-content"
-		>
+		<div *ngIf="currentView === componentViews.main" class="main-content">
 			<div class="row">
 				<div class="form-group offset-md-2 col-md-4">
 					<nb-checkbox [(ngModel)]="isCarrierRequired">
@@ -59,6 +56,7 @@
 				>
 					<ea-carriers-smart-table
 						[perPage]="carriersPerPage"
+						[loadWholeData]="restrictedCarriers"
 						#carriersTable
 					></ea-carriers-smart-table>
 				</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index eb406be59..c5dc5fb1f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -5,9 +5,7 @@ import {
 	CarriersSmartTableComponent,
 	CarrierSmartTableObject
 } from 'app/@shared/carrier/carriers-table/carriers-table.component';
-import { TranslateService } from '@ngx-translate/core';
 import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
 
 @Component({
 	selector: 'ea-merchants-setup-delivery-takeaway',
@@ -36,7 +34,7 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 
 	private ngDestroy$ = new Subject<void>();
 
-	constructor(private readonly translateService: TranslateService) {}
+	constructor() {}
 
 	get haveCarriersForAdd() {
 		let hasSelectedCarriers = false;
@@ -57,9 +55,7 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 		return ids;
 	}
 
-	ngAfterViewInit(): void {
-		this.applyTranslationOnSmartTable();
-	}
+	ngAfterViewInit(): void {}
 
 	async add() {
 		if (this.currentView === this.componentViews.carriersTable) {
@@ -70,8 +66,6 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 			this.restrictedCarriers.push(...carriers);
 		}
 		this.currentView = this.componentViews.main;
-
-		await this.loadCarriersTable();
 	}
 
 	back() {
@@ -84,12 +78,6 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 		}
 	}
 
-	private async loadCarriersTable() {
-		if (this.restrictedCarriers && this.restrictedCarriers.length > 0) {
-			await this.carriersTable.loadData(this.restrictedCarriers);
-		}
-	}
-
 	private getCarrierSmartTableObject(carriers: Carrier) {
 		return {
 			id: carriers.id,
@@ -102,17 +90,6 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 		};
 	}
 
-	private applyTranslationOnSmartTable() {
-		this.translateService.onLangChange
-			.pipe(takeUntil(this.ngDestroy$))
-			.subscribe(() => {
-				if (this.carriersTable) {
-					this.carriersTable.loadSettingsSmartTable();
-					this.loadCarriersTable();
-				}
-			});
-	}
-
 	ngOnDestroy() {
 		this.ngDestroy$.next();
 		this.ngDestroy$.complete();
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
index 8feb60039..833b328a3 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
@@ -113,7 +113,7 @@ export class SetupMerchantSharedCarriersComponent
 			.pipe(takeUntil(this.ngDestroy$))
 			.subscribe(() => {
 				if (this.carriersTable) {
-					this.carriersTable.loadSettingsSmartTable();
+					this.carriersTable.loadSettingsSmartTable(this.perPage);
 					this._loadDataSmartTable();
 				}
 			});
@@ -130,6 +130,11 @@ export class SetupMerchantSharedCarriersComponent
 	}
 
 	private async loadDataCount() {
-		this.dataCount = await this._carriersService.getCountOfCarriers();
+		this.dataCount = await this._carriersService.getCountOfCarriers({
+			isSharedCarrier: true,
+			_id: {
+				$nin: this.existedCarriersIds
+			}
+		});
 	}
 }
diff --git a/backend/api/src/graphql/carriers/carrier.resolver.ts b/backend/api/src/graphql/carriers/carrier.resolver.ts
index b974f5ecd..a2150b949 100644
--- a/backend/api/src/graphql/carriers/carrier.resolver.ts
+++ b/backend/api/src/graphql/carriers/carrier.resolver.ts
@@ -70,8 +70,11 @@ export class CarrierResolver {
 	 * @memberof CarrierResolver
 	 */
 	@Query('getCountOfCarriers')
-	async getCountOfCarriers(): Promise<number> {
-		return this._carriersService.Model.find({ isDeleted: { $eq: false } })
+	async getCountOfCarriers(_, { carriersFindInput }): Promise<number> {
+		return this._carriersService.Model.find({
+			...carriersFindInput,
+			isDeleted: { $eq: false }
+		})
 			.countDocuments()
 			.exec();
 	}
diff --git a/backend/api/src/graphql/carriers/carriers.types.graphql b/backend/api/src/graphql/carriers/carriers.types.graphql
index f2cecd39d..679df0e2f 100644
--- a/backend/api/src/graphql/carriers/carriers.types.graphql
+++ b/backend/api/src/graphql/carriers/carriers.types.graphql
@@ -42,7 +42,7 @@ type Query {
 		pagingOptions: PagingOptionsInput
 	): [Carrier!]!
 	getActiveCarriers: [Carrier]!
-	getCountOfCarriers: Int!
+	getCountOfCarriers(carriersFindInput: CarriersFindInput): Int!
 }
 
 input CarrierCreateInput {

From 72970547baf05b66f9ff69557a2ebd02c3878e46 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 4 Apr 2019 15:57:30 +0300
Subject: [PATCH 110/382] feat(ever-admin): improved shared carriers table
 EV-1194

---
 .../carriers-table.component.html             |  2 ++
 .../carriers-table.component.ts               | 34 +++++++++++++++----
 .../carrier-image.component.html              |  7 +++-
 .../name-redirect.component.html              |  2 +-
 .../delivery-takeaway.component.html          |  4 +++
 .../delivery-takeaway.component.ts            | 12 ++++++-
 .../delivery-takeaway.module.ts               | 10 ++++--
 .../shared-carriers.component.html            |  1 +
 8 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.html b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.html
index c0b3ce74e..dc0dd00b2 100644
--- a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.html
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.html
@@ -2,5 +2,7 @@
 	[settings]="settingsSmartTable"
 	[source]="sourceSmartTable"
 	(userRowSelect)="selectCarrierTmp($event)"
+	(edit)="editRow.emit($event)"
+	(delete)="deleteRow.emit($event)"
 >
 </ng2-smart-table>
diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
index 62287bce3..eecfc64f0 100644
--- a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
@@ -4,7 +4,8 @@ import {
 	AfterViewInit,
 	Input,
 	OnInit,
-	EventEmitter
+	EventEmitter,
+	Output
 } from '@angular/core';
 import { LocalDataSource } from 'ng2-smart-table';
 import { TranslateService } from '@ngx-translate/core';
@@ -37,10 +38,20 @@ export class CarriersSmartTableComponent
 
 	@Input()
 	perPage: number;
-
+	@Input()
+	selectMode = 'multi';
+	@Input()
+	actions: string = '';
+	@Input()
+	redirectPage = 'carriers';
 	@Input()
 	loadWholeData: CarrierSmartTableObject[];
 
+	@Output()
+	editRow = new EventEmitter();
+	@Output()
+	deleteRow = new EventEmitter();
+
 	pageChange: EventEmitter<number> = new EventEmitter();
 
 	settingsSmartTable: any;
@@ -98,8 +109,19 @@ export class CarriersSmartTableComponent
 			.subscribe(
 				([id, image, name, phone, status, address, deliveries]) => {
 					this.settingsSmartTable = {
-						actions: false,
-						selectMode: 'multi',
+						selectMode: this.selectMode,
+						mode: 'external',
+						actions: this.actions === 'show' && {
+							add: false
+						},
+						edit: {
+							editButtonContent: '<i class="nb-edit"></i>'
+						},
+						delete: {
+							deleteButtonContent: '<i class="nb-trash"></i>',
+							confirmDelete: true
+						},
+
 						columns: {
 							images: {
 								title: image,
@@ -107,7 +129,7 @@ export class CarriersSmartTableComponent
 								type: 'custom',
 								renderComponent: CarrierImageComponent,
 								onComponentInitFunction: (instance) => {
-									instance.redirectPage = 'carriers';
+									instance.redirectPage = this.redirectPage;
 								},
 								filter: false
 							},
@@ -116,7 +138,7 @@ export class CarriersSmartTableComponent
 								type: 'custom',
 								renderComponent: RedirectNameComponent,
 								onComponentInitFunction: (instance) => {
-									instance.redirectPage = 'carriers';
+									instance.redirectPage = this.redirectPage;
 								}
 							},
 							phone: {
diff --git a/admin/website-angular/src/app/@shared/render-component/carriers-table/carrier-image/carrier-image.component.html b/admin/website-angular/src/app/@shared/render-component/carriers-table/carrier-image/carrier-image.component.html
index 8690b4b24..251330f40 100644
--- a/admin/website-angular/src/app/@shared/render-component/carriers-table/carrier-image/carrier-image.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/carriers-table/carrier-image/carrier-image.component.html
@@ -1 +1,6 @@
-<img class="redirect-image" (click)="redirect()" src="{{ imageUrl }}" width="60">
\ No newline at end of file
+<img
+	class="{{ redirectPage ? 'redirect-image' : '' }}"
+	(click)="redirect()"
+	src="{{ imageUrl }}"
+	width="60"
+/>
diff --git a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
index f18681cfa..f19e23849 100644
--- a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
@@ -1,4 +1,4 @@
-<div (click)="redirect()" class="redirectBtn">
+<div (click)="redirect()" class="{{ redirectPage ? 'redirectBtn' : '' }}">
 	<h6 class="warehouse-name-smt">
 		<strong>{{ rowData.name }}</strong>
 	</h6>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index 3940789e2..3e348c9c8 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -56,7 +56,11 @@
 				>
 					<ea-carriers-smart-table
 						[perPage]="carriersPerPage"
+						[selectMode]="null"
+						[redirectPage]="''"
+						[actions]="'show'"
 						[loadWholeData]="restrictedCarriers"
+						(deleteRow)="removeCarrier($event)"
 						#carriersTable
 					></ea-carriers-smart-table>
 				</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index c5dc5fb1f..4ad40a9ce 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -63,7 +63,7 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 				this.getCarrierSmartTableObject
 			);
 
-			this.restrictedCarriers.push(...carriers);
+			this.restrictedCarriers.unshift(...carriers);
 		}
 		this.currentView = this.componentViews.main;
 	}
@@ -78,6 +78,16 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 		}
 	}
 
+	removeCarrier(e) {
+		if (this.restrictedCarriers) {
+			this.restrictedCarriers = this.restrictedCarriers.filter(
+				(c) => c.id !== e.data.id
+			);
+		}
+
+		this.carriersTable.loadData(this.restrictedCarriers);
+	}
+
 	private getCarrierSmartTableObject(carriers: Carrier) {
 		return {
 			id: carriers.id,
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
index 42de053ad..60c918045 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
@@ -5,8 +5,11 @@ import { ThemeModule } from 'app/@theme';
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 import { CarriersSmartTableModule } from 'app/@shared/carrier/carriers-table/carriers-table.module';
-import { RenderComponentsModule } from 'app/@shared/render-component/render-components.module';
 import { SetupMerchantSharedCarriersComponent } from './shared-carriers/shared-carriers.component';
+import { CarrierLocationModule } from 'app/pages/+carriers/+carrier/location/carrier-location.module';
+import { TrackModule } from 'app/pages/+carriers/track/track.module';
+import { RenderComponentsModule } from 'app/@shared/render-component/render-components.module';
+import { CarrierMutationModule } from 'app/@shared/carrier/carrier-mutation';
 
 const COMPONENTS = [
 	SetupMerchantDeliveryAndTakeawayComponent,
@@ -20,7 +23,10 @@ const COMPONENTS = [
 		FormsModule,
 		TranslateModule.forChild(),
 		CarriersSmartTableModule,
-		RenderComponentsModule
+		CarrierLocationModule,
+		TrackModule,
+		RenderComponentsModule,
+		CarrierMutationModule
 	],
 	declarations: COMPONENTS,
 	exports: COMPONENTS
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.html
index 3fde62b5b..edb3c0c41 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.html
@@ -1,4 +1,5 @@
 <ea-carriers-smart-table
 	[perPage]="perPage"
+	[redirectPage]="''"
 	#carriersTable
 ></ea-carriers-smart-table>

From 66301db4da1d04af539b840d71a80fc9d601927c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 4 Apr 2019 17:21:08 +0300
Subject: [PATCH 111/382] feat(ever-admin): finished Delivery & Takeaway
 Settings step, in Setup Merchants EV-1194

---
 .../carriers-table.component.ts               | 24 +++++++
 .../basic-info/basic-info-form.component.html |  2 +-
 .../basic-info/basic-info-form.component.scss |  4 ++
 .../basic-info/basic-info-form.component.ts   |  3 +
 .../app/pages/+carriers/carriers.component.ts | 26 +------
 .../components/location/location.component.ts |  5 +-
 .../add-new-carrier.component.html            |  6 ++
 .../add-new-carrier.component.ts              | 22 ++++++
 .../delivery-takeaway.component.html          | 17 ++++-
 .../delivery-takeaway.component.scss          |  4 ++
 .../delivery-takeaway.component.ts            | 71 ++++++++++++++-----
 .../delivery-takeaway.module.ts               |  8 ++-
 .../shared-carriers.component.ts              | 26 +------
 .../+merchants/merchants.component.html       |  1 +
 14 files changed, 150 insertions(+), 69 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts

diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
index eecfc64f0..cca13fd5d 100644
--- a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
@@ -16,6 +16,7 @@ import { Observable, forkJoin, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import Carrier from '@modules/server.common/entities/Carrier';
 import { CarrierActionsComponent } from 'app/@shared/render-component/carriers-table/carrier-actions/carrier-actions.component';
+import CarrierStatus from '@modules/server.common/enums/CarrierStatus';
 
 export interface CarrierSmartTableObject {
 	id: string;
@@ -177,4 +178,27 @@ export class CarriersSmartTableComponent
 				}
 			});
 	}
+
+	static getCarrierSmartTableObject(c: Carrier) {
+		return {
+			id: c.id,
+			image: c.logo || CarriersSmartTableComponent.noInfoSign,
+			name: `${c.firstName ||
+				CarriersSmartTableComponent.noInfoSign} ${c.lastName ||
+				CarriersSmartTableComponent.noInfoSign}`,
+			phone: c.phone || CarriersSmartTableComponent.noInfoSign,
+			status: {
+				[CarrierStatus.Offline]: 'Offline',
+				[CarrierStatus.Online]: 'Online',
+				[CarrierStatus.Blocked]: 'Blocked'
+			}[c.status],
+			address: `${c.geoLocation.city ||
+				CarriersSmartTableComponent.noInfoSign} st. ${c.geoLocation
+				.streetAddress ||
+				CarriersSmartTableComponent.noInfoSign}, hse. № ${c.geoLocation
+				.house || CarriersSmartTableComponent.noInfoSign}`,
+			deliveries: c.numberOfDeliveries,
+			carrier: c
+		};
+	}
 }
diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
index 708ad2a1c..3c2a7a0f5 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
@@ -1,4 +1,4 @@
-<nb-card class="basic-info">
+<nb-card class="basic-info {{ boxShadow === 'none' ? 'no-box-shadow' : '' }}">
 	<div class="col-sm-12" [formGroup]="form" *ngIf="form">
 		<br />
 
diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss
index 6c14a683f..673906c80 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss
@@ -16,3 +16,7 @@
 		font-size: 1.1em;
 	}
 }
+
+.no-box-shadow {
+	box-shadow: none;
+}
diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
index b0537f16d..ade310761 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
@@ -49,6 +49,9 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 	@Input()
 	readonly password?: AbstractControl;
 
+	@Input()
+	boxShadow;
+
 	constructor(private translateService: TranslateService) {}
 
 	get isActive() {
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
index 8619b153a..707a41bf5 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
@@ -97,29 +97,9 @@ export class CarriersComponent implements OnDestroy, AfterViewInit {
 			})
 			.pipe(takeUntil(this.ngDestroy$))
 			.subscribe(async (data: Carrier[]) => {
-				const carriersVm = data.map((c) => {
-					return {
-						id: c.id,
-						image: c.logo || CarriersSmartTableComponent.noInfoSign,
-						name: `${c.firstName ||
-							CarriersSmartTableComponent.noInfoSign} ${c.lastName ||
-							CarriersSmartTableComponent.noInfoSign}`,
-						phone:
-							c.phone || CarriersSmartTableComponent.noInfoSign,
-						status: {
-							[CarrierStatus.Offline]: 'Offline',
-							[CarrierStatus.Online]: 'Online',
-							[CarrierStatus.Blocked]: 'Blocked'
-						}[c.status],
-						address: `${c.geoLocation.city ||
-							CarriersSmartTableComponent.noInfoSign} st. ${c
-							.geoLocation.streetAddress ||
-							CarriersSmartTableComponent.noInfoSign}, hse. № ${c
-							.geoLocation.house ||
-							CarriersSmartTableComponent.noInfoSign}`,
-						deliveries: c.numberOfDeliveries
-					};
-				});
+				const carriersVm = data.map(
+					CarriersSmartTableComponent.getCarrierSmartTableObject
+				);
 
 				await this.loadDataCount();
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
index 656f95f84..be1390fd4 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter } from '@angular/core';
+import { Component, EventEmitter, ViewChild } from '@angular/core';
 import { LocationFormComponent } from 'app/@shared/forms/location';
 import { FormBuilder } from '@angular/forms';
 
@@ -8,6 +8,9 @@ import { FormBuilder } from '@angular/forms';
 	styleUrls: ['./location.component.scss']
 })
 export class SetupMerchantLocationComponent {
+	@ViewChild('locationForm')
+	locationForm: LocationFormComponent;
+
 	location = LocationFormComponent.buildForm(this.formBuilder);
 
 	mapCoordEmitter = new EventEmitter<number[]>();
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.html
new file mode 100644
index 000000000..8cfe951ab
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.html
@@ -0,0 +1,6 @@
+<ea-carrier-basic-info-form
+	#basicInfoForm
+	[form]="basicInfo"
+	[password]="password"
+	[boxShadow]="'none'"
+></ea-carrier-basic-info-form>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
new file mode 100644
index 000000000..73bc7e1a0
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
@@ -0,0 +1,22 @@
+import { Component, ViewChild } from '@angular/core';
+import { BasicInfoFormComponent } from 'app/@shared/carrier/forms/basic-info/basic-info-form.component';
+import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
+
+@Component({
+	selector: 'ea-merchants-setup-add-new-carrier',
+	templateUrl: './add-new-carrier.component.html'
+})
+export class SetupMerchantAddNewCarrierComponent {
+	@ViewChild('basicInfoForm')
+	basicInfoForm: BasicInfoFormComponent;
+
+	readonly form: FormGroup = this.formBuilder.group({
+		basicInfo: BasicInfoFormComponent.buildForm(this.formBuilder),
+		password: BasicInfoFormComponent.buildPasswordForm(this.formBuilder)
+	});
+
+	readonly basicInfo = this.form.get('basicInfo') as FormControl;
+	readonly password = this.form.get('password') as FormControl;
+
+	constructor(private readonly formBuilder: FormBuilder) {}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index 3e348c9c8..2889be6e3 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -6,6 +6,9 @@
 		<span *ngIf="currentView == componentViews.carriersTable"
 			>Select from shared carriers</span
 		>
+		<span *ngIf="currentView == componentViews.addNewCarrier"
+			>Add your carrier</span
+		>
 	</nb-card-header>
 	<nb-card-body>
 		<div *ngIf="currentView === componentViews.main" class="main-content">
@@ -44,7 +47,12 @@
 				</div>
 
 				<div class="form-group  col-md-4">
-					<button nbButton outline status="success">
+					<button
+						nbButton
+						outline
+						status="success"
+						(click)="currentView = componentViews.addNewCarrier"
+					>
 						Add your carriers
 					</button>
 				</div>
@@ -74,5 +82,12 @@
 				*ngIf="currentView == componentViews.carriersTable"
 			></ea-merchants-setup-shared-carriers>
 		</div>
+
+		<div class="row">
+			<ea-merchants-setup-add-new-carrier
+				#newCarrier
+				*ngIf="currentView == componentViews.addNewCarrier"
+			></ea-merchants-setup-add-new-carrier>
+		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss
index 014ccdd56..e9de17d78 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.scss
@@ -9,4 +9,8 @@
 			margin: 0;
 		}
 	}
+
+	ea-merchants-setup-add-new-carrier {
+		margin: auto;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index 4ad40a9ce..2e38ebacf 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -1,4 +1,10 @@
-import { Component, ViewChild, OnDestroy, AfterViewInit } from '@angular/core';
+import {
+	Component,
+	ViewChild,
+	OnDestroy,
+	AfterViewInit,
+	Input
+} from '@angular/core';
 import { SetupMerchantSharedCarriersComponent } from './shared-carriers/shared-carriers.component';
 import Carrier from '@modules/server.common/entities/Carrier';
 import {
@@ -6,6 +12,10 @@ import {
 	CarrierSmartTableObject
 } from 'app/@shared/carrier/carriers-table/carriers-table.component';
 import { Subject } from 'rxjs';
+import { SetupMerchantAddNewCarrierComponent } from './add-new-carrier/add-new-carrier.component';
+import { getDummyImage } from '@modules/server.common/utils';
+import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-router.service';
+import CarrierStatus from '@modules/server.common/enums/CarrierStatus';
 
 @Component({
 	selector: 'ea-merchants-setup-delivery-takeaway',
@@ -14,14 +24,20 @@ import { Subject } from 'rxjs';
 })
 export class SetupMerchantDeliveryAndTakeawayComponent
 	implements AfterViewInit, OnDestroy {
+	@ViewChild('newCarrier')
+	newCarrier: SetupMerchantAddNewCarrierComponent;
 	@ViewChild('sharedCarriers')
 	sharedCarriers: SetupMerchantSharedCarriersComponent;
 	@ViewChild('carriersTable')
 	carriersTable: CarriersSmartTableComponent;
 
+	@Input()
+	locationForm: any;
+
 	componentViews = {
 		main: 'main',
-		carriersTable: 'carriersTable'
+		carriersTable: 'carriersTable',
+		addNewCarrier: 'addNewCarrier'
 	};
 	currentView = this.componentViews.main;
 	carriersPerPage = 3;
@@ -34,7 +50,7 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 
 	private ngDestroy$ = new Subject<void>();
 
-	constructor() {}
+	constructor(private carrierRouter: CarrierRouter) {}
 
 	get haveCarriersForAdd() {
 		let hasSelectedCarriers = false;
@@ -43,6 +59,13 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 			hasSelectedCarriers = this.sharedCarriers.carriersTable
 				.hasSelectedCarriers;
 		}
+
+		if (this.newCarrier) {
+			hasSelectedCarriers =
+				this.newCarrier.form.valid &&
+				this.locationForm &&
+				this.locationForm.form.valid;
+		}
 		return hasSelectedCarriers;
 	}
 
@@ -59,11 +82,35 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 
 	async add() {
 		if (this.currentView === this.componentViews.carriersTable) {
-			const carriers = this.sharedCarriers.carriersTable.selectedCarriers.map(
-				this.getCarrierSmartTableObject
-			);
+			const carriers = this.sharedCarriers.carriersTable.selectedCarriers
+				.map((data) => data['carrier'])
+				.map(CarriersSmartTableComponent.getCarrierSmartTableObject);
 
 			this.restrictedCarriers.unshift(...carriers);
+		} else if (this.currentView === this.componentViews.addNewCarrier) {
+			const geoLocationInput = this.locationForm.getValue();
+			geoLocationInput.loc.coordinates.reverse();
+
+			const carrierCreateObj = {
+				...this.newCarrier.basicInfoForm.getValue(),
+				geoLocation: geoLocationInput
+			};
+
+			if (!carrierCreateObj.logo) {
+				const letter = carrierCreateObj.firstName
+					.charAt(0)
+					.toUpperCase();
+				carrierCreateObj.logo = getDummyImage(300, 300, letter);
+			}
+
+			let carrier = await this.carrierRouter.register({
+				carrier: carrierCreateObj,
+				password: this.newCarrier.basicInfoForm.getPassword()
+			});
+
+			this.restrictedCarriers.unshift(
+				CarriersSmartTableComponent.getCarrierSmartTableObject(carrier)
+			);
 		}
 		this.currentView = this.componentViews.main;
 	}
@@ -88,18 +135,6 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 		this.carriersTable.loadData(this.restrictedCarriers);
 	}
 
-	private getCarrierSmartTableObject(carriers: Carrier) {
-		return {
-			id: carriers.id,
-			image: carriers['image'],
-			name: carriers['name'],
-			phone: carriers.phone,
-			status: carriers.status.toString(),
-			address: carriers['address'],
-			deliveries: carriers['deliveries']
-		};
-	}
-
 	ngOnDestroy() {
 		this.ngDestroy$.next();
 		this.ngDestroy$.complete();
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
index 60c918045..7d31544a0 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.module.ts
@@ -10,10 +10,13 @@ import { CarrierLocationModule } from 'app/pages/+carriers/+carrier/location/car
 import { TrackModule } from 'app/pages/+carriers/track/track.module';
 import { RenderComponentsModule } from 'app/@shared/render-component/render-components.module';
 import { CarrierMutationModule } from 'app/@shared/carrier/carrier-mutation';
+import { SetupMerchantAddNewCarrierComponent } from './add-new-carrier/add-new-carrier.component';
+import { CarrierFormsModule } from 'app/@shared/carrier/forms';
 
 const COMPONENTS = [
 	SetupMerchantDeliveryAndTakeawayComponent,
-	SetupMerchantSharedCarriersComponent
+	SetupMerchantSharedCarriersComponent,
+	SetupMerchantAddNewCarrierComponent
 ];
 
 @NgModule({
@@ -26,7 +29,8 @@ const COMPONENTS = [
 		CarrierLocationModule,
 		TrackModule,
 		RenderComponentsModule,
-		CarrierMutationModule
+		CarrierMutationModule,
+		CarrierFormsModule
 	],
 	declarations: COMPONENTS,
 	exports: COMPONENTS
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
index 833b328a3..c4dcfd61a 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
@@ -70,29 +70,9 @@ export class SetupMerchantSharedCarriersComponent
 			)
 			.pipe(takeUntil(this.ngDestroy$))
 			.subscribe(async (data: Carrier[]) => {
-				const carriersVm = data.map((c) => {
-					return {
-						id: c.id,
-						image: c.logo || CarriersSmartTableComponent.noInfoSign,
-						name: `${c.firstName ||
-							CarriersSmartTableComponent.noInfoSign} ${c.lastName ||
-							CarriersSmartTableComponent.noInfoSign}`,
-						phone:
-							c.phone || CarriersSmartTableComponent.noInfoSign,
-						status: {
-							[CarrierStatus.Offline]: 'Offline',
-							[CarrierStatus.Online]: 'Online',
-							[CarrierStatus.Blocked]: 'Blocked'
-						}[c.status],
-						address: `${c.geoLocation.city ||
-							CarriersSmartTableComponent.noInfoSign} st. ${c
-							.geoLocation.streetAddress ||
-							CarriersSmartTableComponent.noInfoSign}, hse. № ${c
-							.geoLocation.house ||
-							CarriersSmartTableComponent.noInfoSign}`,
-						deliveries: c.numberOfDeliveries
-					};
-				});
+				const carriersVm = data.map(
+					CarriersSmartTableComponent.getCarrierSmartTableObject
+				);
 
 				await this.loadDataCount();
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 7120985d5..7b2de7686 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -80,6 +80,7 @@
 						</nb-step>
 						<nb-step label="Delivery & Takeaway Settings">
 							<ea-merchants-setup-delivery-takeaway
+								[locationForm]="location.locationForm"
 								#deliveryAndTakeaway
 							></ea-merchants-setup-delivery-takeaway>
 

From 9fcba8c24e66f615cda9f33ba8b9a6c0d9cb88e6 Mon Sep 17 00:00:00 2001
From: blagovest <blagovest@ever.co>
Date: Thu, 4 Apr 2019 17:30:56 +0300
Subject: [PATCH 112/382] feat(ever-admin): add translate on merchants setup
 EV-1198

---
 .../components/account/account.component.html | 112 +++++++++++++-----
 .../+merchants/merchants.component.html       |  94 ++++++++++++---
 .../src/app/pages/+setup/setup.component.html |   2 +-
 admin/website-angular/src/assets/i18n/bg.json |  23 +++-
 admin/website-angular/src/assets/i18n/en.json |  23 +++-
 admin/website-angular/src/assets/i18n/he.json |  23 +++-
 admin/website-angular/src/assets/i18n/ru.json |  23 +++-
 7 files changed, 249 insertions(+), 51 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
index ddd067b6f..8dec8824f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
@@ -1,16 +1,25 @@
 <nb-card class="setup-merchant-account">
-	<nb-card-header>Account</nb-card-header>
+	<nb-card-header>
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.ACCOUNT' | translate }}
+	</nb-card-header>
 	<nb-card-body>
 		<form class="row m-0" #accountForm="ngForm">
 			<div class="form-group col-md-6">
-				<label for="email">Email address</label>
+				<label for="email">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.EMAIL_ADDRESS'
+							| translate
+					}}
+				</label>
 				<input
 					nbInput
 					type="email"
 					class="form-control"
 					id="email"
 					name="email-input"
-					placeholder="Email"
+					placeholder="{{
+						'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.EMAIL' | translate
+					}}"
 					[(ngModel)]="accountModel.email"
 					(change)="emailChange()"
 					#email="ngModel"
@@ -27,19 +36,35 @@
 					class="text-danger"
 					*ngIf="email.invalid && (email.dirty || email.touched)"
 				>
-					<span *ngIf="email.errors.required">Email is required</span>
-					<span *ngIf="email.errors.email">Invalid email format</span>
+					<span *ngIf="email.errors.required">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.EMAIL_IS_REQUIRED'
+								| translate
+						}}
+					</span>
+					<span *ngIf="email.errors.email">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.INVALID_EMAIL_FORMAT'
+								| translate
+						}}
+					</span>
 				</small>
 			</div>
 			<div class="form-group col-md-6">
-				<label for="username">Username</label>
+				<label for="username">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.USERNAME' | translate
+					}}
+				</label>
 				<input
 					nbInput
 					type="text"
 					class="form-control"
 					id="username"
 					name="username-input"
-					placeholder="Username"
+					placeholder="{{
+						'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.USERNAME' | translate
+					}}"
 					[(ngModel)]="accountModel.username"
 					#username="ngModel"
 					[ngClass]="{
@@ -63,16 +88,26 @@
 						username.invalid && (username.dirty || username.touched)
 					"
 				>
-					<span *ngIf="username.errors.required"
-						>Username is required</span
-					>
-					<span *ngIf="username.errors.minlength"
-						>Username must be at least 3 characters</span
-					>
+					<span *ngIf="username.errors.required">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.USERNAME_IS_REQUIRED'
+								| translate
+						}}
+					</span>
+					<span *ngIf="username.errors.minlength">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.USERNAME_MUST_BE_AT_LEAST_3_CHARACTERS'
+								| translate
+						}}
+					</span>
 				</small>
 			</div>
 			<div class="form-group col-md-6">
-				<label for="pass">Password</label>
+				<label for="pass">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.PASSWORD' | translate
+					}}
+				</label>
 				<input
 					nbInput
 					type="password"
@@ -81,7 +116,9 @@
 					name="pass-input"
 					[(ngModel)]="accountModel.password"
 					#password="ngModel"
-					placeholder="Password"
+					placeholder="{{
+						'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.PASSWORD' | translate
+					}}"
 					[ngClass]="{
 						'input-danger':
 							password.invalid &&
@@ -99,16 +136,27 @@
 						password.invalid && (password.dirty || password.touched)
 					"
 				>
-					<span *ngIf="password.errors.required"
-						>Password is required</span
-					>
-					<span *ngIf="password.errors.minlength"
-						>Password must be at least 4 characters</span
-					>
+					<span *ngIf="password.errors.required">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.PASSWORD_IS_REQUIRED'
+								| translate
+						}}
+					</span>
+					<span *ngIf="password.errors.minlength">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.PASSWORD_MUST_BE_AT_LEAST_4_CHARACTERS'
+								| translate
+						}}
+					</span>
 				</small>
 			</div>
 			<div class="form-group col-md-6">
-				<label for="r-pass">Repeat password</label>
+				<label for="r-pass">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.REPEAT_PASSWORD'
+							| translate
+					}}
+				</label>
 				<input
 					nbInput
 					type="password"
@@ -117,7 +165,10 @@
 					name="r-pass-input"
 					[(ngModel)]="accountModel.repeatPassword"
 					#rPassword="ngModel"
-					placeholder="Repeat password"
+					placeholder="{{
+						'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.REPEAT_PASSWORD'
+							| translate
+					}}"
 					[ngClass]="{
 						'input-danger':
 							(rPassword.invalid ||
@@ -139,16 +190,23 @@
 						(rPassword.dirty || rPassword.touched)
 					"
 				>
-					<span *ngIf="rPassword.errors?.required"
-						>Repeat password is required</span
-					>
+					<span *ngIf="rPassword.errors?.required">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.REPEAT_PASSWORD_IS_REQUIRED'
+								| translate
+						}}
+					</span>
 					<span
 						*ngIf="
 							!rPassword.errors?.required &&
 							rPassword.value !== password.value
 						"
-						>Passwords do not match</span
 					>
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.ACCOUNT.PASSWORDS_DO_NOT_MATCH'
+								| translate
+						}}
+					</span>
 				</small>
 			</div>
 		</form>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 7b2de7686..af4c75a2d 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -10,14 +10,18 @@
 							></ea-merchants-setup-account>
 
 							<button nbButton disabled nbStepperNext>
-								PREV
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
+								}}
 							</button>
 							<button
 								nbButton
 								nbStepperNext
 								[disabled]="!account.formValid"
 							>
-								NEXT
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
+								}}
 							</button>
 						</nb-step>
 						<nb-step label="Basic info">
@@ -25,13 +29,19 @@
 								#basicInfo
 							></ea-merchants-setup-basic-info>
 
-							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperPrevious>
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
+								}}
+							</button>
 							<button
 								nbButton
 								nbStepperNext
 								[disabled]="!basicInfo.formValid"
 							>
-								NEXT
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
+								}}
 							</button>
 						</nb-step>
 						<nb-step label="Contact info">
@@ -39,13 +49,19 @@
 								#contactInfo
 							></ea-merchants-setup-contact-info>
 
-							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperPrevious>
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
+								}}
+							</button>
 							<button
 								nbButton
 								nbStepperNext
 								[disabled]="contactInfo.contactInfoForm.invalid"
 							>
-								NEXT
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
+								}}
 							</button>
 						</nb-step>
 						<nb-step label="Location">
@@ -53,13 +69,19 @@
 								#location
 							></ea-merchants-setup-location>
 
-							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperPrevious>
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
+								}}
+							</button>
 							<button
 								nbButton
 								nbStepperNext
 								[disabled]="location.location.invalid"
 							>
-								NEXT
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
+								}}
 							</button>
 						</nb-step>
 						<nb-step label="Payments">
@@ -67,15 +89,23 @@
 
 							<button nbButton nbStepperPrevious>PREV</button>
 							<button nbButton nbStepperNext>
-								NEXT
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
+								}}
 							</button>
 						</nb-step>
 						<nb-step label="Manufacturing">
 							<ea-merchants-setup-manufacturing></ea-merchants-setup-manufacturing>
 
-							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperPrevious>
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
+								}}
+							</button>
 							<button nbButton nbStepperNext>
-								NEXT
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
+								}}
 							</button>
 						</nb-step>
 						<nb-step label="Delivery & Takeaway Settings">
@@ -90,9 +120,17 @@
 									deliveryAndTakeaway.componentViews.main
 								"
 							>
-								<button nbButton nbStepperPrevious>PREV</button>
+								<button nbButton nbStepperPrevious>
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.PREV'
+											| translate
+									}}
+								</button>
 								<button nbButton nbStepperNext>
-									NEXT
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.NEXT'
+											| translate
+									}}
 								</button>
 							</div>
 							<div
@@ -121,25 +159,43 @@
 						<nb-step label="Orders Settings">
 							<ea-merchants-setup-orders-settings></ea-merchants-setup-orders-settings>
 
-							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperPrevious>
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
+								}}
+							</button>
 							<button nbButton nbStepperNext>
-								NEXT
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
+								}}
 							</button>
 						</nb-step>
 						<nb-step label="Product categories">
 							<h3>Product categories</h3>
 
-							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperPrevious>
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
+								}}
+							</button>
 							<button nbButton nbStepperNext>
-								NEXT
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
+								}}
 							</button>
 						</nb-step>
 						<nb-step label="Products">
 							<h3>Products</h3>
 
-							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperPrevious>
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
+								}}
+							</button>
 							<button nbButton disabled nbStepperNext>
-								NEXT
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
+								}}
 							</button>
 						</nb-step>
 					</nb-stepper>
diff --git a/admin/website-angular/src/app/pages/+setup/setup.component.html b/admin/website-angular/src/app/pages/+setup/setup.component.html
index 4c896f629..148a92f8f 100644
--- a/admin/website-angular/src/app/pages/+setup/setup.component.html
+++ b/admin/website-angular/src/app/pages/+setup/setup.component.html
@@ -11,7 +11,7 @@ <h1>{{ 'FAKE_DATA.SETUP' | translate }}</h1>
 			class="btn btn-primary"
 			(click)="navigateToSetupMerchantsPage()"
 		>
-			Setup Merchants
+			{{ 'FAKE_DATA.SETUP_MERCHANTS.SETUP_MERCHANTS' | translate }}
 		</button>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index db55e08db..57e557d89 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -207,7 +207,28 @@
 		"CONFIRM_ORDER": "ПОТВЪРДИ ПОРЪЧКАТА",
 		"CREATE_ORDER": "СЪЗДАВАНЕ НА ПОРЪЧКА",
 		"CONFIMR_1st_ORDER": "Потвърдете 1-та поръчка",
-		"CONFIMR_2nd_ORDER": "Потвърдете 2-ра поръчка"
+		"CONFIMR_2nd_ORDER": "Потвърдете 2-ра поръчка",
+		"SETUP_MERCHANTS": {
+			"SETUP_MERCHANTS": "Настройки на ресторантите",
+			"PREV": "НАЗАД",
+			"NEXT": "СЛЕДВАЩИЯ",
+			"ACCOUNT": {
+				"ACCOUNT": "Сметка",
+				"EMAIL_ADDRESS": "Имейл адрес",
+				"EMAIL": "Електронна поща",
+				"PASSWORD": "Парола",
+				"REPEAT_PASSWORD": "Повтори паролата",
+				"EMAIL_IS_REQUIRED": "Изисква се имейл",
+				"INVALID_EMAIL_FORMAT": "Невалиден имейл формат",
+				"USERNAME": "Потребител",
+				"USERNAME_IS_REQUIRED": "Изисква се потребителско име",
+				"USERNAME_MUST_BE_AT_LEAST_3_CHARACTERS": "Потребителското име трябва да съдържа поне 3 знака",
+				"PASSWORD_IS_REQUIRED": "Изисква се парола",
+				"PASSWORD_MUST_BE_AT_LEAST_4_CHARACTERS": "Паролата трябва да съдържа поне 4 знака",
+				"REPEAT_PASSWORD_IS_REQUIRED": "Изисква се повторна парола",
+				"PASSWORDS_DO_NOT_MATCH": "Паролите не съвпадат"
+			}
+		}
 	},
 	"WAREHOUSE_MANAGE": {
 		"TITLE": "Управление на склада",
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 0f84a1f00..5d8a9fdff 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -206,7 +206,28 @@
 		"CONFIRM_ORDER": "CONFIRM ORDER",
 		"CREATE_ORDER": "CREATE ORDER",
 		"CONFIMR_1st_ORDER": "Confirm 1st order",
-		"CONFIMR_2nd_ORDER": "Confirm 2nd order"
+		"CONFIMR_2nd_ORDER": "Confirm 2nd order",
+		"SETUP_MERCHANTS": {
+			"SETUP_MERCHANTS": "Setup merchants",
+			"PREV": "PREV",
+			"NEXT": "NEXT",
+			"ACCOUNT": {
+				"ACCOUNT": "Account",
+				"EMAIL_ADDRESS": "Email address",
+				"EMAIL": "Email",
+				"PASSWORD": "Password",
+				"REPEAT_PASSWORD": "Repeat password",
+				"EMAIL_IS_REQUIRED": "Email is required",
+				"INVALID_EMAIL_FORMAT": "Invalid email format",
+				"USERNAME": "Username",
+				"USERNAME_IS_REQUIRED": "Username is required",
+				"USERNAME_MUST_BE_AT_LEAST_3_CHARACTERS": "Username must be at least 3 characters",
+				"PASSWORD_IS_REQUIRED": "Password is required",
+				"PASSWORD_MUST_BE_AT_LEAST_4_CHARACTERS": "Password must be at least 4 characters",
+				"REPEAT_PASSWORD_IS_REQUIRED": "Repeat password is required",
+				"PASSWORDS_DO_NOT_MATCH": "Passwords do not match"
+			}
+		}
 	},
 	"WAREHOUSE_MANAGE": {
 		"TITLE": "Manage Warehouse",
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 0a8c19378..d2733491c 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -206,7 +206,28 @@
 		"CONFIRM_ORDER": "אשר הזמנה",
 		"CREATE_ORDER": "צור הזמנה",
 		"CONFIMR_1st_ORDER": "אשר הזמנה ראשונה",
-		"CONFIMR_2nd_ORDER": "אשר את ההזמנה השנייה"
+		"CONFIMR_2nd_ORDER": "אשר את ההזמנה השנייה",
+		"SETUP_MERCHANTS": {
+			"SETUP_MERCHANTS": "הגדר סוחרים",
+			"PREV": "PREV",
+			"NEXT": "הבא",
+			"ACCOUNT": {
+				"ACCOUNT": "חשבון",
+				"EMAIL_ADDRESS": "כתובת דוא'ל",
+				"EMAIL": "דוא'ל",
+				"PASSWORD": "סיסמה",
+				"REPEAT_PASSWORD": "חזור על הסיסמה",
+				"EMAIL_IS_REQUIRED": "נדרש דוא'ל",
+				"INVALID_EMAIL_FORMAT": "פורמט דוא'ל לא חוקי",
+				"USERNAME": "שם משתמש",
+				"USERNAME_IS_REQUIRED": "נדרש שם משתמש",
+				"USERNAME_MUST_BE_AT_LEAST_3_CHARACTERS": "שם המשתמש חייב להיות לפחות 3 תווים",
+				"PASSWORD_IS_REQUIRED": "דרושה סיסמא",
+				"PASSWORD_MUST_BE_AT_LEAST_4_CHARACTERS": "הסיסמה צריכה להיות לפחות 4 תווים",
+				"REPEAT_PASSWORD_IS_REQUIRED": "נדרשת סיסמה חוזרת",
+				"PASSWORDS_DO_NOT_MATCH": "סיסמאות לא תואמות"
+			}
+		}
 	},
 	"WAREHOUSE_MANAGE": {
 		"TITLE": "ניהול מחסן",
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 3cd7eb1c8..dc6c801ad 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -206,7 +206,28 @@
 		"CONFIRM_ORDER": "ПОДТВЕРДИТЕ ЗАКАЗ",
 		"CREATE_ORDER": "СОЗДАТЬ ЗАКАЗ",
 		"CONFIMR_1st_ORDER": "Подтвердить 1 заказ",
-		"CONFIMR_2nd_ORDER": "Подтвердить второй заказ"
+		"CONFIMR_2nd_ORDER": "Подтвердить второй заказ",
+		"SETUP_MERCHANTS": {
+			"SETUP_MERCHANTS": "Настройки ресторана",
+			"PREV": "НАЗАД",
+			"NEXT": "СЛЕДУЮЩИЙ",
+			"ACCOUNT": {
+				"ACCOUNT": "Учетная запись",
+				"EMAIL_ADDRESS": "Адрес электронной почты",
+				"EMAIL": "Эл. адрес",
+				"PASSWORD": "Пароль",
+				"REPEAT_PASSWORD": "Повторите пароль",
+				"EMAIL_IS_REQUIRED": "Требуется электронная почта",
+				"INVALID_EMAIL_FORMAT": "Неверный формат электронной почты",
+				"USERNAME": "Имя пользователя",
+				"USERNAME_IS_REQUIRED": "Имя пользователя требуется",
+				"USERNAME_MUST_BE_AT_LEAST_3_CHARACTERS": "Имя пользователя должно быть не менее 3 символов",
+				"PASSWORD_IS_REQUIRED": "Необходим пароль",
+				"PASSWORD_MUST_BE_AT_LEAST_4_CHARACTERS": "Пароль должен содержать не менее 4 символов",
+				"REPEAT_PASSWORD_IS_REQUIRED": "Требуется повторный пароль",
+				"PASSWORDS_DO_NOT_MATCH": "Пароли не совпадают"
+			}
+		}
 	},
 	"WAREHOUSE_MANAGE": {
 		"TITLE": "Управление складом",

From f64a843bbc314f3e95c54ca01c3bf9a7df075a71 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 4 Apr 2019 18:17:35 +0300
Subject: [PATCH 113/382] fix(ever-admin): carrier Basic info form EV-1194

---
 .../src/app/@core/data/carriers.service.ts    |   3 +
 .../basic-info/basic-info-form.component.html | 108 ++++++++++++------
 .../basic-info/basic-info-form.component.ts   |  43 -------
 .../add-new-carrier.component.ts              |  14 ++-
 .../delivery-takeaway.component.html          |  10 +-
 .../delivery-takeaway.component.ts            |   9 +-
 .../graphql/carriers/carriers.types.graphql   |   1 +
 7 files changed, 103 insertions(+), 85 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/carriers.service.ts b/admin/website-angular/src/app/@core/data/carriers.service.ts
index a8cedb5fc..46f3da271 100644
--- a/admin/website-angular/src/app/@core/data/carriers.service.ts
+++ b/admin/website-angular/src/app/@core/data/carriers.service.ts
@@ -73,6 +73,9 @@ export class CarriersService {
 							numberOfDeliveries
 							skippedOrderIds
 							status
+							isActive
+							username
+							isSharedCarrier
 							geoLocation {
 								city
 								streetAddress
diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
index 3c2a7a0f5..e6d8547c8 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
@@ -17,24 +17,31 @@
 						}}"
 						formControlName="firstName"
 					/>
-					<div
-						*ngIf="isFirstNameValid && firstName.errors.required"
-						class="alert alert-danger"
-					>
-						{{
-							'SHARED.FORMS.ERRORS.FIRST_NAME_REQUIRED'
-								| translate
-						}}!
-					</div>
-					<div
-						*ngIf="isFirstNameValid && firstName.errors.pattern"
-						class="alert alert-danger"
+					<span
+						*ngIf="
+							firstName.invalid &&
+							(firstName.dirty || firstName.touched)
+						"
 					>
-						{{
-							'SHARED.FORMS.ERRORS.MUST_CONTAIN_ONLY_LETTERS'
-								| translate
-						}}!
-					</div>
+						<div
+							*ngIf="firstName.errors.required"
+							class="alert alert-danger"
+						>
+							{{
+								'SHARED.FORMS.ERRORS.FIRST_NAME_REQUIRED'
+									| translate
+							}}!
+						</div>
+						<div
+							*ngIf="firstName.errors.pattern"
+							class="alert alert-danger"
+						>
+							{{
+								'SHARED.FORMS.ERRORS.MUST_CONTAIN_ONLY_LETTERS'
+									| translate
+							}}!
+						</div>
+					</span>
 				</div>
 
 				<div class="col-sm-5">
@@ -46,24 +53,31 @@
 						}}"
 						formControlName="lastName"
 					/>
-					<div
-						*ngIf="isLastNameValid && lastName.errors.required"
-						class="alert alert-danger"
-					>
-						{{
-							'SHARED.FORMS.ERRORS.LAST_NAME_REQUIRED'
-								| translate
-						}}!
-					</div>
-					<div
-						*ngIf="isLastNameValid && lastName.errors.pattern"
-						class="alert alert-danger"
+					<span
+						*ngIf="
+							lastName.invalid &&
+							(lastName.dirty || lastName.touched)
+						"
 					>
-						{{
-							'SHARED.FORMS.ERRORS.MUST_CONTAIN_ONLY_LETTERS'
-								| translate
-						}}!
-					</div>
+						<div
+							*ngIf="lastName.errors.required"
+							class="alert alert-danger"
+						>
+							{{
+								'SHARED.FORMS.ERRORS.LAST_NAME_REQUIRED'
+									| translate
+							}}!
+						</div>
+						<div
+							*ngIf="lastName.errors.pattern"
+							class="alert alert-danger"
+						>
+							{{
+								'SHARED.FORMS.ERRORS.MUST_CONTAIN_ONLY_LETTERS'
+									| translate
+							}}!
+						</div>
+					</span>
 				</div>
 			</div>
 		</fieldset>
@@ -81,7 +95,13 @@
 						formControlName="username"
 					/>
 
-					<div *ngIf="isUsernameValid" class="alert alert-danger">
+					<div
+						*ngIf="
+							username.invalid &&
+							(username.dirty || username.touched)
+						"
+						class="alert alert-danger"
+					>
 						{{
 							'SHARED.FORMS.ERRORS.USERNAME_REQUIRED' | translate
 						}}!
@@ -102,7 +122,13 @@
 						[formControl]="password"
 					/>
 
-					<div *ngIf="isPasswordValid" class="alert alert-danger">
+					<div
+						*ngIf="
+							password.invalid &&
+							(password.dirty || password.touched)
+						"
+						class="alert alert-danger"
+					>
 						{{
 							'SHARED.FORMS.ERRORS.PASSWORD_REQUIRED' | translate
 						}}!
@@ -126,7 +152,10 @@
 						formControlName="phone"
 					/>
 
-					<div *ngIf="isPhoneValid" class="alert alert-danger">
+					<div
+						*ngIf="phone.invalid && (phone.dirty || phone.touched)"
+						class="alert alert-danger"
+					>
 						<div [hidden]="!phone.hasError('pattern')">
 							{{
 								'SHARED.FORMS.ERRORS.PHONE_MUST_CONTAINS_ONLY(specail_signs)AND_DIGIT_CHARACTER'
@@ -156,7 +185,10 @@
 						(uploadedImgUrl)="logo.setValue($event)"
 					></e-cu-file-uploader>
 
-					<div *ngIf="isLogoValid" class="alert alert-danger">
+					<div
+						*ngIf="logo.invalid && (logo.dirty || logo.touched)"
+						class="alert alert-danger"
+					>
 						{{
 							'SHARED.FORMS.ERRORS.LOGO_URL_REQUIRED' | translate
 						}}!
diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
index ade310761..fa7af5195 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
@@ -86,49 +86,6 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 		return this.logo && this.logo.value !== '';
 	}
 
-	get isFirstNameValid(): boolean {
-		return (
-			this.firstName.errors &&
-			(this.firstName.dirty || this.firstName.touched)
-		);
-	}
-
-	get isLastNameValid(): boolean {
-		return (
-			this.lastName.errors &&
-			(this.lastName.dirty || this.lastName.touched)
-		);
-	}
-
-	get isActiveValid(): boolean {
-		return (
-			this.isActive.errors &&
-			(this.isActive.dirty || this.isActive.touched)
-		);
-	}
-
-	get isPhoneValid(): boolean {
-		return this.phone.errors && (this.phone.dirty || this.phone.touched);
-	}
-
-	get isUsernameValid(): boolean {
-		return (
-			this.username.errors &&
-			(this.username.dirty || this.username.touched)
-		);
-	}
-
-	get isPasswordValid(): boolean {
-		return (
-			this.password.errors &&
-			(this.password.dirty || this.password.touched)
-		);
-	}
-
-	get isLogoValid(): boolean {
-		return this.logo.errors && (this.logo.dirty || this.logo.touched);
-	}
-
 	static buildForm(formBuilder: FormBuilder): FormGroup {
 		// would be used in the parent component and injected into this.form
 		return formBuilder.group({
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
index 73bc7e1a0..c2cbaf899 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
@@ -1,15 +1,19 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, ViewChild, Input, AfterViewInit } from '@angular/core';
 import { BasicInfoFormComponent } from 'app/@shared/carrier/forms/basic-info/basic-info-form.component';
 import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
+import Carrier from '@modules/server.common/entities/Carrier';
 
 @Component({
 	selector: 'ea-merchants-setup-add-new-carrier',
 	templateUrl: './add-new-carrier.component.html'
 })
-export class SetupMerchantAddNewCarrierComponent {
+export class SetupMerchantAddNewCarrierComponent implements AfterViewInit {
 	@ViewChild('basicInfoForm')
 	basicInfoForm: BasicInfoFormComponent;
 
+	@Input()
+	carrier: Carrier;
+
 	readonly form: FormGroup = this.formBuilder.group({
 		basicInfo: BasicInfoFormComponent.buildForm(this.formBuilder),
 		password: BasicInfoFormComponent.buildPasswordForm(this.formBuilder)
@@ -19,4 +23,10 @@ export class SetupMerchantAddNewCarrierComponent {
 	readonly password = this.form.get('password') as FormControl;
 
 	constructor(private readonly formBuilder: FormBuilder) {}
+
+	ngAfterViewInit(): void {
+		if (this.carrier) {
+			this.basicInfoForm.setValue(this.carrier);
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index 2889be6e3..c2d50f9cc 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -9,6 +9,9 @@
 		<span *ngIf="currentView == componentViews.addNewCarrier"
 			>Add your carrier</span
 		>
+		<span *ngIf="currentView == componentViews.editCarrier"
+			>Edir carrier</span
+		>
 	</nb-card-header>
 	<nb-card-body>
 		<div *ngIf="currentView === componentViews.main" class="main-content">
@@ -69,6 +72,7 @@
 						[actions]="'show'"
 						[loadWholeData]="restrictedCarriers"
 						(deleteRow)="removeCarrier($event)"
+						(editRow)="editCarrier($event)"
 						#carriersTable
 					></ea-carriers-smart-table>
 				</div>
@@ -86,7 +90,11 @@
 		<div class="row">
 			<ea-merchants-setup-add-new-carrier
 				#newCarrier
-				*ngIf="currentView == componentViews.addNewCarrier"
+				[carrier]="carrierData"
+				*ngIf="
+					currentView == componentViews.addNewCarrier ||
+					currentView == componentViews.editCarrier
+				"
 			></ea-merchants-setup-add-new-carrier>
 		</div>
 	</nb-card-body>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index 2e38ebacf..0ca2cca6d 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -37,10 +37,12 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 	componentViews = {
 		main: 'main',
 		carriersTable: 'carriersTable',
-		addNewCarrier: 'addNewCarrier'
+		addNewCarrier: 'addNewCarrier',
+		editCarrier: 'editCarrier'
 	};
 	currentView = this.componentViews.main;
 	carriersPerPage = 3;
+	carrierData: Carrier;
 
 	isCarrierRequired: boolean;
 	productsDelivery: boolean;
@@ -135,6 +137,11 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 		this.carriersTable.loadData(this.restrictedCarriers);
 	}
 
+	editCarrier(e) {
+		this.carrierData = e['data'].carrier;
+		this.currentView = this.componentViews.editCarrier;
+	}
+
 	ngOnDestroy() {
 		this.ngDestroy$.next();
 		this.ngDestroy$.complete();
diff --git a/backend/api/src/graphql/carriers/carriers.types.graphql b/backend/api/src/graphql/carriers/carriers.types.graphql
index 679df0e2f..715a413bb 100644
--- a/backend/api/src/graphql/carriers/carriers.types.graphql
+++ b/backend/api/src/graphql/carriers/carriers.types.graphql
@@ -13,6 +13,7 @@ type Carrier {
 	geoLocation: GeoLocation!
 	devicesIds: [String!]!
 	apartment: String
+	isActive: Boolean
 	isSharedCarrier: Boolean
 	# Resolved
 	devices: [Device!]!

From 8408285271f45a6857a04997694e44beb097b88c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 5 Apr 2019 11:38:13 +0300
Subject: [PATCH 114/382] feat(ever-admin): edit carrier in Setup page EV-1194

---
 .../add-new-carrier.component.ts              | 44 +++++++++++++++----
 .../delivery-takeaway.component.html          |  2 +-
 .../delivery-takeaway.component.ts            | 34 ++++++++++++--
 .../+merchants/merchants.component.html       | 20 +++++++++
 4 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
index c2cbaf899..6d54135a7 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
@@ -1,32 +1,58 @@
-import { Component, ViewChild, Input, AfterViewInit } from '@angular/core';
+import {
+	Component,
+	ViewChild,
+	Input,
+	AfterViewInit,
+	OnInit
+} from '@angular/core';
 import { BasicInfoFormComponent } from 'app/@shared/carrier/forms/basic-info/basic-info-form.component';
 import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
-import Carrier from '@modules/server.common/entities/Carrier';
+import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-router.service';
+import { first } from 'rxjs/operators';
 
 @Component({
 	selector: 'ea-merchants-setup-add-new-carrier',
 	templateUrl: './add-new-carrier.component.html'
 })
-export class SetupMerchantAddNewCarrierComponent implements AfterViewInit {
+export class SetupMerchantAddNewCarrierComponent
+	implements AfterViewInit, OnInit {
 	@ViewChild('basicInfoForm')
 	basicInfoForm: BasicInfoFormComponent;
 
 	@Input()
-	carrier: Carrier;
+	carrierId: string;
 
-	readonly form: FormGroup = this.formBuilder.group({
+	form: FormGroup = this.formBuilder.group({
 		basicInfo: BasicInfoFormComponent.buildForm(this.formBuilder),
 		password: BasicInfoFormComponent.buildPasswordForm(this.formBuilder)
 	});
 
 	readonly basicInfo = this.form.get('basicInfo') as FormControl;
-	readonly password = this.form.get('password') as FormControl;
+	password: FormControl;
 
-	constructor(private readonly formBuilder: FormBuilder) {}
+	constructor(
+		private readonly formBuilder: FormBuilder,
+		private carrierRouter: CarrierRouter
+	) {}
+
+	ngOnInit(): void {
+		if (!this.carrierId) {
+			this.password = this.form.get('password') as FormControl;
+		}
+	}
 
 	ngAfterViewInit(): void {
-		if (this.carrier) {
-			this.basicInfoForm.setValue(this.carrier);
+		this.laodData();
+	}
+
+	private async laodData() {
+		if (this.carrierId) {
+			const carrier = await this.carrierRouter
+				.get(this.carrierId)
+				.pipe(first())
+				.toPromise();
+
+			this.basicInfoForm.setValue(carrier);
 		}
 	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index c2d50f9cc..63303f4cb 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -90,7 +90,7 @@
 		<div class="row">
 			<ea-merchants-setup-add-new-carrier
 				#newCarrier
-				[carrier]="carrierData"
+				[carrierId]="carrierId"
 				*ngIf="
 					currentView == componentViews.addNewCarrier ||
 					currentView == componentViews.editCarrier
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index 0ca2cca6d..0a23e205b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -6,7 +6,6 @@ import {
 	Input
 } from '@angular/core';
 import { SetupMerchantSharedCarriersComponent } from './shared-carriers/shared-carriers.component';
-import Carrier from '@modules/server.common/entities/Carrier';
 import {
 	CarriersSmartTableComponent,
 	CarrierSmartTableObject
@@ -15,7 +14,6 @@ import { Subject } from 'rxjs';
 import { SetupMerchantAddNewCarrierComponent } from './add-new-carrier/add-new-carrier.component';
 import { getDummyImage } from '@modules/server.common/utils';
 import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-router.service';
-import CarrierStatus from '@modules/server.common/enums/CarrierStatus';
 
 @Component({
 	selector: 'ea-merchants-setup-delivery-takeaway',
@@ -42,7 +40,7 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 	};
 	currentView = this.componentViews.main;
 	carriersPerPage = 3;
-	carrierData: Carrier;
+	carrierId: string;
 
 	isCarrierRequired: boolean;
 	productsDelivery: boolean;
@@ -71,6 +69,16 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 		return hasSelectedCarriers;
 	}
 
+	get isBasicInfoValid() {
+		let res = false;
+
+		if (this.newCarrier) {
+			res = this.newCarrier.basicInfoForm.form.valid;
+		}
+
+		return res;
+	}
+
 	get restrictedCarriersIds() {
 		let ids = [];
 		if (this.restrictedCarriers) {
@@ -117,6 +125,24 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 		this.currentView = this.componentViews.main;
 	}
 
+	async save() {
+		const basicInfo = this.newCarrier.basicInfoForm.getValue();
+
+		const carrier = await this.carrierRouter.updateById(this.carrierId, {
+			...basicInfo
+		});
+
+		this.restrictedCarriers = this.restrictedCarriers.filter(
+			(c) => c.id !== this.carrierId
+		);
+		this.restrictedCarriers.unshift(
+			CarriersSmartTableComponent.getCarrierSmartTableObject(carrier)
+		);
+		this.carrierId = null;
+
+		this.currentView = this.componentViews.main;
+	}
+
 	back() {
 		this.currentView = this.componentViews.main;
 	}
@@ -138,7 +164,7 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 	}
 
 	editCarrier(e) {
-		this.carrierData = e['data'].carrier;
+		this.carrierId = e.data.id;
 		this.currentView = this.componentViews.editCarrier;
 	}
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index af4c75a2d..a00f817ad 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -146,6 +146,11 @@
 									Back
 								</button>
 								<button
+									*ngIf="
+										deliveryAndTakeaway.currentView !==
+										deliveryAndTakeaway.componentViews
+											.editCarrier
+									"
 									[disabled]="
 										!deliveryAndTakeaway.haveCarriersForAdd
 									"
@@ -154,6 +159,21 @@
 								>
 									Add
 								</button>
+
+								<button
+									*ngIf="
+										deliveryAndTakeaway.currentView ===
+										deliveryAndTakeaway.componentViews
+											.editCarrier
+									"
+									[disabled]="
+										!deliveryAndTakeaway.isBasicInfoValid
+									"
+									nbButton
+									(click)="deliveryAndTakeaway.save()"
+								>
+									Save
+								</button>
 							</div>
 						</nb-step>
 						<nb-step label="Orders Settings">

From 6d38aa02b3e5115a411cefd024cd21cd12d7b8cc Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 5 Apr 2019 11:47:53 +0300
Subject: [PATCH 115/382] feat(ever-admin): add translate on merchants setup
 basic info EV-1198

---
 .../basic-info/basic-info.component.html      | 71 ++++++++++++++-----
 .../basic-info/basic-info.component.ts        | 29 +++++++-
 admin/website-angular/src/assets/i18n/bg.json | 12 ++++
 admin/website-angular/src/assets/i18n/en.json | 12 ++++
 admin/website-angular/src/assets/i18n/he.json | 12 ++++
 admin/website-angular/src/assets/i18n/ru.json | 12 ++++
 6 files changed, 129 insertions(+), 19 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
index 5ade2d2dd..f239680b6 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
@@ -1,16 +1,24 @@
 <nb-card class="setup-merchant-basic-info">
-	<nb-card-header>Basic info</nb-card-header>
+	<nb-card-header>
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.BASIC_INFO' | translate }}
+	</nb-card-header>
 	<nb-card-body>
 		<form class="row m-0" #basicInfoForm="ngForm">
 			<div class="form-group offset-md-2 col-md-8">
-				<label for="name">Name</label>
+				<label for="name">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.NAME' | translate
+					}}
+				</label>
 				<input
 					nbInput
 					type="text"
 					class="form-control"
 					id="name"
 					name="name-input"
-					placeholder="Name"
+					placeholder="{{
+						'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.NAME' | translate
+					}}"
 					[(ngModel)]="basicInfoModel.name"
 					#name="ngModel"
 					(change)="nameChange()"
@@ -27,14 +35,26 @@
 					class="text-danger"
 					*ngIf="name.invalid && (name.dirty || name.touched)"
 				>
-					<span *ngIf="name.errors.required">Name is required</span>
-					<span *ngIf="name.errors.minlength"
-						>Name must be at least 4 characters</span
-					>
+					<span *ngIf="name.errors.required">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.NAME_IS_REQUIRED'
+								| translate
+						}}
+					</span>
+					<span *ngIf="name.errors.minlength">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.NAME_MUST_BE_AT_LEAST_4_CHARACTERS'
+								| translate
+						}}
+					</span>
 				</small>
 			</div>
 			<div class="offset-md-2 col-md-8">
-				<label for="name">Photo</label>
+				<label for="name">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.PHOTO' | translate
+					}}
+				</label>
 				<e-cu-file-uploader
 					[placeholder]="uploaderPlaceholder"
 					[name]="name.value"
@@ -53,9 +73,12 @@
 					class="text-danger"
 					*ngIf="invalidUrl && basicInfoModel.logo !== ''"
 				>
-					<span *ngIf="invalidUrl"
-						>Enter a valid logo URL or browse from a device</span
-					>
+					<span *ngIf="invalidUrl">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.ENTER_A_VALID_LOGO_URL_OR_BROWSE_FROM_A_DEVICE'
+								| translate
+						}}
+					</span>
 				</small>
 			</div>
 			<div
@@ -74,7 +97,10 @@
 						<div class="remove-icon" (click)="deleteImg()">
 							<span
 								class="ion-md-remove-circle text-danger pl-2"
-								title="Remove"
+								title="{{
+									'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.REMOVE'
+										| translate
+								}}"
 							></span>
 						</div>
 					</div>
@@ -83,14 +109,22 @@
 
 			<div class="mb-3 col-12 p-0">
 				<div class="form-group offset-md-2 col-md-8 mt-3 mb-0">
-					<label for="barcodeData">Barcode Data</label>
+					<label for="barcodeData">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.BARCODE_DATA'
+								| translate
+						}}
+					</label>
 					<input
 						nbInput
 						type="text"
 						class="form-control"
 						id="barcodeData"
 						name="barcode-data-input"
-						placeholder="Barcode data"
+						placeholder="{{
+							'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.BARCODE_DATA'
+								| translate
+						}}"
 						[(ngModel)]="basicInfoModel.barcodeData"
 						(change)="barcodeDataChange()"
 						#barcodeData="ngModel"
@@ -113,9 +147,12 @@
 							(barcodeData.dirty || barcodeData.touched)
 						"
 					>
-						<span *ngIf="barcodeData.errors.required"
-							>Barcode Data is required</span
-						>
+						<span *ngIf="barcodeData.errors.required">
+							{{
+								'FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.BARCODE_DATA_IS_REQUIRED'
+									| translate
+							}}
+						</span>
 					</small>
 				</div>
 				<div class="offset-md-2 col-md-8" [hidden]="!barcodetDataUrl">
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index 55148298f..c37c3bed6 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -1,19 +1,24 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { NgForm, NgModel } from '@angular/forms';
 import QRCode from 'qrcode';
+import { TranslateService } from '@ngx-translate/core';
+import { first, takeUntil } from 'rxjs/operators';
+import { Subject } from 'rxjs';
 
 @Component({
 	selector: 'ea-merchants-setup-basic-info',
 	templateUrl: './basic-info.component.html',
 	styleUrls: ['./basic-info.component.scss']
 })
-export class SetupMerchantBasicInfoComponent {
+export class SetupMerchantBasicInfoComponent implements OnInit, OnDestroy {
 	@ViewChild('basicInfoForm')
 	basicInfoForm: NgForm;
 
 	@ViewChild('name')
 	name: NgModel;
 
+	private _ngDestroy$ = new Subject<void>();
+
 	// TODO add translate
 	uploaderPlaceholder: string = 'Photo (optional)';
 	barcodetDataUrl: string;
@@ -24,6 +29,12 @@ export class SetupMerchantBasicInfoComponent {
 		barcodeData: ''
 	};
 
+	constructor(private translateService: TranslateService) {}
+
+	ngOnInit(): void {
+		this.getUploaderPlaceholderText();
+	}
+
 	get formValid() {
 		return (
 			this.basicInfoForm.valid &&
@@ -52,4 +63,18 @@ export class SetupMerchantBasicInfoComponent {
 			this.barcodetDataUrl = null;
 		}
 	}
+
+	getUploaderPlaceholderText() {
+		this.translateService
+			.stream('FAKE_DATA.SETUP_MERCHANTS.BASIC_INFO.PHOTO_OPTIONAL')
+			.pipe(takeUntil(this._ngDestroy$))
+			.subscribe((text) => {
+				this.uploaderPlaceholder = text;
+			});
+	}
+
+	ngOnDestroy() {
+		this._ngDestroy$.next();
+		this._ngDestroy$.complete();
+	}
 }
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 57e557d89..19259c3c9 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -227,6 +227,18 @@
 				"PASSWORD_MUST_BE_AT_LEAST_4_CHARACTERS": "Паролата трябва да съдържа поне 4 знака",
 				"REPEAT_PASSWORD_IS_REQUIRED": "Изисква се повторна парола",
 				"PASSWORDS_DO_NOT_MATCH": "Паролите не съвпадат"
+			},
+			"BASIC_INFO": {
+				"BASIC_INFO": "Основна информация",
+				"NAME": "Име",
+				"NAME_IS_REQUIRED": "Изисква се име",
+				"NAME_MUST_BE_AT_LEAST_4_CHARACTERS": "Името трябва да е най-малко 4 знака",
+				"PHOTO": "Снимка",
+				"ENTER_A_VALID_LOGO_URL_OR_BROWSE_FROM_A_DEVICE": "Въведете валиден URL адрес на лого или прегледайте от устройството",
+				"REMOVE": "Премахване",
+				"PHOTO_OPTIONAL": "Снимка (по избор)",
+				"BARCODE_DATA": "Данни за баркод",
+				"BARCODE_DATA_IS_REQUIRED": "Необходими са данни за баркода"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 5d8a9fdff..93b87fe67 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -226,6 +226,18 @@
 				"PASSWORD_MUST_BE_AT_LEAST_4_CHARACTERS": "Password must be at least 4 characters",
 				"REPEAT_PASSWORD_IS_REQUIRED": "Repeat password is required",
 				"PASSWORDS_DO_NOT_MATCH": "Passwords do not match"
+			},
+			"BASIC_INFO": {
+				"BASIC_INFO": "Basic info",
+				"NAME": "Name",
+				"NAME_IS_REQUIRED": "Name is required",
+				"NAME_MUST_BE_AT_LEAST_4_CHARACTERS": "Name must be at least 4 characters",
+				"PHOTO": "Photo",
+				"ENTER_A_VALID_LOGO_URL_OR_BROWSE_FROM_A_DEVICE": "Enter a valid logo URL or browse from a device",
+				"REMOVE": "Remove",
+				"PHOTO_OPTIONAL": "Photo (optional)",
+				"BARCODE_DATA": "Barcode Data",
+				"BARCODE_DATA_IS_REQUIRED": "Barcode Data is required"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index d2733491c..455bbbcc4 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -226,6 +226,18 @@
 				"PASSWORD_MUST_BE_AT_LEAST_4_CHARACTERS": "הסיסמה צריכה להיות לפחות 4 תווים",
 				"REPEAT_PASSWORD_IS_REQUIRED": "נדרשת סיסמה חוזרת",
 				"PASSWORDS_DO_NOT_MATCH": "סיסמאות לא תואמות"
+			},
+			"BASIC_INFO": {
+				"BASIC_INFO": "מידע בסיסי",
+				"NAME": "שם",
+				"NAME_IS_REQUIRED": "נדרש שם",
+				"NAME_MUST_BE_AT_LEAST_4_CHARACTERS": "השם חייב להיות לפחות 4 תווים",
+				"PHOTO": "תמונה",
+				"ENTER_A_VALID_LOGO_URL_OR_BROWSE_FROM_A_DEVICE": "הזן כתובת אתר חוקית של לוגו או דפדף ממכשיר",
+				"REMOVE": "הסר",
+				"PHOTO_OPTIONAL": "תמונה (אופציונלי)",
+				"BARCODE_DATA": "נתוני ברקוד",
+				"BARCODE_DATA_IS_REQUIRED": "נתוני ברקוד נדרשים"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index dc6c801ad..b33bd4472 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -226,6 +226,18 @@
 				"PASSWORD_MUST_BE_AT_LEAST_4_CHARACTERS": "Пароль должен содержать не менее 4 символов",
 				"REPEAT_PASSWORD_IS_REQUIRED": "Требуется повторный пароль",
 				"PASSWORDS_DO_NOT_MATCH": "Пароли не совпадают"
+			},
+			"BASIC_INFO": {
+				"BASIC_INFO": "Базовая информация",
+				"NAME": "Название",
+				"NAME_IS_REQUIRED": "Имя обязательно",
+				"NAME_MUST_BE_AT_LEAST_4_CHARACTERS": "Имя должно содержать не менее 4 символов",
+				"PHOTO": "Фото",
+				"ENTER_A_VALID_LOGO_URL_OR_BROWSE_FROM_A_DEVICE": "Введите действительный URL-адрес логотипа или перейдите с устройства",
+				"REMOVE": "Удалить",
+				"PHOTO_OPTIONAL": "Фото (необязательно)",
+				"BARCODE_DATA": "Данные штрих-кода",
+				"BARCODE_DATA_IS_REQUIRED": "Данные штрих-кода обязательны"
 			}
 		}
 	},

From cb2d413689fe858b39d4bd13dba2bbf7199ae5dc Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 5 Apr 2019 11:57:50 +0300
Subject: [PATCH 116/382] fix(ever-admin): show only list of available (shared)
 carriers, when Merchant wanna to add as Restricted

---
 .../forms/basic-info/basic-info-form.component.ts  |  5 ++++-
 .../warehouse-manage-tabs-details.component.ts     | 14 ++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
index e47d3ce47..bd755b23a 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
@@ -194,10 +194,13 @@ export class BasicInfoFormComponent implements OnInit {
 	}
 
 	private async loadCarriersOptions() {
-		const carriers = await this.carrierRouter
+		let carriers = await this.carrierRouter
 			.getAllActive()
 			.pipe(first())
 			.toPromise();
+
+		carriers = carriers.filter((c) => c.isSharedCarrier);
+
 		this.carriersOptions = carriers.map((c) => {
 			return {
 				id: c.id,
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
index f4f47926a..65cd3f902 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
@@ -55,12 +55,14 @@ export class WarehouseManageTabsDetailsComponent
 		Observable.of([]),
 		this._carrierRouter.getAllActive().pipe(
 			map((carriers) =>
-				carriers.map((c) => {
-					return {
-						id: c.id,
-						name: `${c.firstName} ${c.lastName}`
-					};
-				})
+				carriers
+					.filter((c) => c.isSharedCarrier)
+					.map((c) => {
+						return {
+							id: c.id,
+							name: `${c.firstName} ${c.lastName}`
+						};
+					})
 			)
 		)
 	);

From 270952cca788634500810cf508083dc603dda748 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 5 Apr 2019 13:54:29 +0300
Subject: [PATCH 117/382] feat(ever-admin): add translate on merchants setup
 contact info EV-1198

---
 .../contact-info/contact-info.component.html  | 97 ++++++++++++++-----
 admin/website-angular/src/assets/i18n/bg.json | 12 +++
 admin/website-angular/src/assets/i18n/en.json | 12 +++
 admin/website-angular/src/assets/i18n/he.json | 12 +++
 admin/website-angular/src/assets/i18n/ru.json | 12 +++
 5 files changed, 121 insertions(+), 24 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
index b46fddf44..c1beeb01e 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
@@ -1,16 +1,26 @@
 <nb-card class="setup-merchant-contact-info">
-	<nb-card-header>Contact info</nb-card-header>
+	<nb-card-header>
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.CONTACT_INFO' | translate }}
+	</nb-card-header>
 	<nb-card-body>
 		<form class="row m-0" #contactInfoForm="ngForm">
 			<div class="form-group offset-md-2 col-md-8">
-				<label for="contactPhone">Contact Phone</label>
+				<label for="contactPhone">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.CONTACT_PHONE'
+							| translate
+					}}
+				</label>
 				<input
 					nbInput
 					type="text"
 					class="form-control"
 					id="contactPhone"
 					name="contact-phone-input"
-					placeholder="Contact Phone"
+					placeholder="{{
+						'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.CONTACT_PHONE'
+							| translate
+					}}"
 					[(ngModel)]="contactInfoModel.contactPhone"
 					#contactPhone="ngModel"
 					pattern="^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9x]*$"
@@ -31,9 +41,12 @@
 						(contactPhone.dirty || contactPhone.touched)
 					"
 				>
-					<span *ngIf="contactPhone.errors.pattern"
-						>Invalid phone number format</span
-					>
+					<span *ngIf="contactPhone.errors.pattern">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.INVALID_PHONE_NUMBER_FORMAT'
+								| translate
+						}}
+					</span>
 				</small>
 			</div>
 
@@ -41,29 +54,45 @@
 				<nb-checkbox
 					[value]="forwardingEmail"
 					(change)="forwardingEmail = !forwardingEmail"
-					>Order Forwarding Email</nb-checkbox
 				>
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.ORDER_FORWARDING_EMAIL'
+							| translate
+					}}
+				</nb-checkbox>
 			</div>
 			<div class="form-group  col-md-4">
 				<nb-checkbox
 					[value]="forwardingPhone"
 					(change)="forwardingPhone = !forwardingPhone"
-					>Order Forwarding Phone</nb-checkbox
 				>
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.ORDER_FORWARDING_PHONE'
+							| translate
+					}}
+				</nb-checkbox>
 			</div>
 
 			<div
 				*ngIf="forwardingEmail"
 				class="form-group offset-md-2 col-md-8"
 			>
-				<label for="ordersEmail">Orders Email</label>
+				<label for="ordersEmail">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.ORDERS_EMAIL'
+							| translate
+					}}
+				</label>
 				<input
 					nbInput
 					type="email"
 					class="form-control"
 					id="ordersEmail"
 					name="orders-email-input"
-					placeholder="Orders Email"
+					placeholder="{{
+						'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.ORDERS_EMAIL'
+							| translate
+					}}"
 					[(ngModel)]="contactInfoModel.ordersEmail"
 					#ordersEmail="ngModel"
 					required
@@ -90,12 +119,18 @@
 							ordersEmail.value !== '')
 					"
 				>
-					<span *ngIf="ordersEmail.errors.required"
-						>Orders email is required</span
-					>
-					<span *ngIf="ordersEmail.errors.email"
-						>Invalid email format</span
-					>
+					<span *ngIf="ordersEmail.errors.required">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.ORDERS_EMAIL_IS_REQUIRED'
+								| translate
+						}}
+					</span>
+					<span *ngIf="ordersEmail.errors.email">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.INVALID_EMAIL_FORMAT'
+								| translate
+						}}
+					</span>
 				</small>
 			</div>
 
@@ -103,14 +138,22 @@
 				*ngIf="forwardingPhone"
 				class="form-group offset-md-2 col-md-8"
 			>
-				<label for="ordersPhone">Orders Phone</label>
+				<label for="ordersPhone">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.ORDERS_PHONE'
+							| translate
+					}}
+				</label>
 				<input
 					nbInput
 					type="text"
 					class="form-control"
 					id="ordersPhone"
 					name="orders-phone-input"
-					placeholder="Orders Phone"
+					placeholder="{{
+						'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.ORDERS_PHONE'
+							| translate
+					}}"
 					[(ngModel)]="contactInfoModel.ordersPhone"
 					#ordersPhone="ngModel"
 					required
@@ -137,12 +180,18 @@
 							ordersPhone.value !== '')
 					"
 				>
-					<span *ngIf="ordersPhone.errors.required"
-						>Orders phone is required</span
-					>
-					<span *ngIf="ordersPhone.errors.pattern"
-						>Invalid phone number format</span
-					>
+					<span *ngIf="ordersPhone.errors.required">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.ORDERS_PHONE_IS_REQUIRED'
+								| translate
+						}}
+					</span>
+					<span *ngIf="ordersPhone.errors.pattern">
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.CONTACT_INFO.INVALID_PHONE_NUMBER_FORMAT'
+								| translate
+						}}
+					</span>
 				</small>
 			</div>
 		</form>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 19259c3c9..f8d3d789c 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -239,6 +239,18 @@
 				"PHOTO_OPTIONAL": "Снимка (по избор)",
 				"BARCODE_DATA": "Данни за баркод",
 				"BARCODE_DATA_IS_REQUIRED": "Необходими са данни за баркода"
+			},
+			"CONTACT_INFO": {
+				"CONTACT_INFO": "Информация за контакт",
+				"CONTACT_PHONE": "Телефон за връзка",
+				"INVALID_PHONE_NUMBER_FORMAT": "Невалиден формат на телефонния номер",
+				"ORDER_FORWARDING_EMAIL": "Избери изпращане на имейл",
+				"ORDER_FORWARDING_PHONE": "Избери изпращане телефон",
+				"ORDERS_EMAIL": "Имейл за поръчки",
+				"ORDERS_EMAIL_IS_REQUIRED": "Изисква се имейл за поръчки",
+				"INVALID_EMAIL_FORMAT": "Невалиден имейл формат",
+				"ORDERS_PHONE": "Телефон за поръчки",
+				"ORDERS_PHONE_IS_REQUIRED": "Изисква се телефонна поръчка"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 93b87fe67..f8e178e4a 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -238,6 +238,18 @@
 				"PHOTO_OPTIONAL": "Photo (optional)",
 				"BARCODE_DATA": "Barcode Data",
 				"BARCODE_DATA_IS_REQUIRED": "Barcode Data is required"
+			},
+			"CONTACT_INFO": {
+				"CONTACT_INFO": "Contact info",
+				"CONTACT_PHONE": "Contact Phone",
+				"INVALID_PHONE_NUMBER_FORMAT": "Invalid phone number format",
+				"ORDER_FORWARDING_EMAIL": "Order Forwarding Email",
+				"ORDER_FORWARDING_PHONE": "Order Forwarding Phone",
+				"ORDERS_EMAIL": "Orders Email",
+				"ORDERS_EMAIL_IS_REQUIRED": "Orders email is required",
+				"INVALID_EMAIL_FORMAT": "Invalid email format",
+				"ORDERS_PHONE": "Orders Phone",
+				"ORDERS_PHONE_IS_REQUIRED": "Orders phone is required"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 455bbbcc4..b5a197692 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -238,6 +238,18 @@
 				"PHOTO_OPTIONAL": "תמונה (אופציונלי)",
 				"BARCODE_DATA": "נתוני ברקוד",
 				"BARCODE_DATA_IS_REQUIRED": "נתוני ברקוד נדרשים"
+			},
+			"CONTACT_INFO": {
+				"CONTACT_INFO": "פרטים ליצירת קשר",
+				"CONTACT_PHONE": "צור קשר עם הטלפון",
+				"INVALID_PHONE_NUMBER_FORMAT": "פורמט מספר טלפון לא חוקי",
+				"ORDER_FORWARDING_EMAIL": "סדר העברת דואר אלקטרוני",
+				"ORDER_FORWARDING_PHONE": "הזמנת טלפון העברה",
+				"ORDERS_EMAIL": "דוא'ל דוא'ל",
+				"ORDERS_EMAIL_IS_REQUIRED": "יש צורך בהודעות דוא'ל",
+				"INVALID_EMAIL_FORMAT": "פורמט דוא'ל לא חוקי",
+				"ORDERS_PHONE": "טלפון הטלפונים",
+				"ORDERS_PHONE_IS_REQUIRED": "טלפון הטלפון נדרש"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index b33bd4472..8d5ee485b 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -238,6 +238,18 @@
 				"PHOTO_OPTIONAL": "Фото (необязательно)",
 				"BARCODE_DATA": "Данные штрих-кода",
 				"BARCODE_DATA_IS_REQUIRED": "Данные штрих-кода обязательны"
+			},
+			"CONTACT_INFO": {
+				"CONTACT_INFO": "Контактная информация",
+				"CONTACT_PHONE": "Контактный телефон",
+				"INVALID_PHONE_NUMBER_FORMAT": "Неверный формат номера телефона",
+				"ORDER_FORWARDING_EMAIL": "Пересылка заказа по электронной почте",
+				"ORDER_FORWARDING_PHONE": "Заказать переадресацию телефона",
+				"ORDERS_EMAIL": "Электронная почта заказов",
+				"ORDERS_EMAIL_IS_REQUIRED": "Заказы по электронной почте требуется",
+				"INVALID_EMAIL_FORMAT": "Неверный формат электронной почты",
+				"ORDERS_PHONE": "Заказ телефона",
+				"ORDERS_PHONE_IS_REQUIRED": "Заказы по телефону обязательны"
 			}
 		}
 	},

From dfb231ae26a34baaf3705c00a24ebda3ec1e8cdb Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 5 Apr 2019 14:26:22 +0300
Subject: [PATCH 118/382] feat(ever-admin): finished Orders Settings step
 EV-1195

---
 .../basic-info/basic-info.component.ts        |  13 ++-
 .../settings/orders/orders.component.ts       |   2 +-
 .../+merchants/merchants.component.html       |  20 +++-
 .../+setup/+merchants/merchants.component.ts  | 110 +++++++++++++++++-
 .../+setup/+merchants/merchants.module.ts     |   4 +-
 5 files changed, 140 insertions(+), 9 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index c37c3bed6..24bf58ac9 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -4,6 +4,7 @@ import QRCode from 'qrcode';
 import { TranslateService } from '@ngx-translate/core';
 import { first, takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
+import { getDummyImage } from '@modules/server.common/utils';
 
 @Component({
 	selector: 'ea-merchants-setup-basic-info',
@@ -23,7 +24,7 @@ export class SetupMerchantBasicInfoComponent implements OnInit, OnDestroy {
 	uploaderPlaceholder: string = 'Photo (optional)';
 	barcodetDataUrl: string;
 	invalidUrl: boolean;
-	basicInfoModel = {
+	private basicInfoModel = {
 		name: '',
 		logo: '',
 		barcodeData: ''
@@ -35,6 +36,16 @@ export class SetupMerchantBasicInfoComponent implements OnInit, OnDestroy {
 		this.getUploaderPlaceholderText();
 	}
 
+	get basicInfoCreateObj() {
+		const model = { ...this.basicInfoModel };
+		if (!model.logo && model.name) {
+			const letter = model.name.charAt(0).toUpperCase();
+			const pictureUrl = getDummyImage(300, 300, letter);
+			model.logo = pictureUrl;
+		}
+		return model;
+	}
+
 	get formValid() {
 		return (
 			this.basicInfoForm.valid &&
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
index f627002a1..827e58ef3 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
@@ -7,7 +7,7 @@ import OrderBarcodeTypes from '@modules/server.common/enums/OrderBarcodeTypes';
 	styleUrls: ['./orders.component.scss']
 })
 export class SetupMerchantOrdersSettingsComponent {
-	iorderBarcodeType: OrderBarcodeTypes;
+	iorderBarcodeType: OrderBarcodeTypes = OrderBarcodeTypes.QR;
 
 	orderBarcodeTypes = [
 		{ label: 'QR', value: OrderBarcodeTypes.QR },
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index a00f817ad..3b7191363 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -1,3 +1,5 @@
+<toaster-container></toaster-container>
+
 <div class="setup-merchants-page">
 	<div class="row">
 		<div class="col-md-9">
@@ -85,7 +87,9 @@
 							</button>
 						</nb-step>
 						<nb-step label="Payments">
-							<ea-merchants-setup-payments></ea-merchants-setup-payments>
+							<ea-merchants-setup-payments
+								#payments
+							></ea-merchants-setup-payments>
 
 							<button nbButton nbStepperPrevious>PREV</button>
 							<button nbButton nbStepperNext>
@@ -95,7 +99,9 @@
 							</button>
 						</nb-step>
 						<nb-step label="Manufacturing">
-							<ea-merchants-setup-manufacturing></ea-merchants-setup-manufacturing>
+							<ea-merchants-setup-manufacturing
+								#manufacturing
+							></ea-merchants-setup-manufacturing>
 
 							<button nbButton nbStepperPrevious>
 								{{
@@ -177,14 +183,20 @@
 							</div>
 						</nb-step>
 						<nb-step label="Orders Settings">
-							<ea-merchants-setup-orders-settings></ea-merchants-setup-orders-settings>
+							<ea-merchants-setup-orders-settings
+								#ordersSettings
+							></ea-merchants-setup-orders-settings>
 
 							<button nbButton nbStepperPrevious>
 								{{
 									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
 								}}
 							</button>
-							<button nbButton nbStepperNext>
+							<button
+								nbButton
+								(click)="createMerchant()"
+								[disabled]="!canCreateMerchant"
+							>
 								{{
 									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
 								}}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
index 320ccae97..55e4edb95 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
@@ -1,7 +1,113 @@
-import { Component } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
+import { SetupMerchantAccountComponent } from './components/account/account.component';
+import { SetupMerchantBasicInfoComponent } from './components/basic-info/basic-info.component';
+import { SetupMerchantContactInfoComponent } from './components/contact-info/contact-info.component';
+import { SetupMerchantLocationComponent } from './components/location/location.component';
+import { SetupMerchantPaymentsComponent } from './components/payments/payments.component';
+import { SetupMerchantManufacturingComponent } from './components/manufacturing/manufacturing.component';
+import { SetupMerchantDeliveryAndTakeawayComponent } from './components/settings/delivery-takeaway/delivery-takeaway.component';
+import { SetupMerchantOrdersSettingsComponent } from './components/settings/orders/orders.component';
+import { IWarehouseCreateObject } from '@modules/server.common/interfaces/IWarehouse';
+import GeoLocation from '@modules/server.common/entities/GeoLocation';
+import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
+import { ToasterService } from 'angular2-toaster';
+import { NbStepperComponent } from '@nebular/theme';
 
 @Component({
 	styleUrls: ['./merchants.component.scss'],
 	templateUrl: './merchants.component.html'
 })
-export class SetupMerchantsComponent {}
+export class SetupMerchantsComponent {
+	@ViewChild('nbStepper')
+	nbStepper: NbStepperComponent;
+
+	@ViewChild('account')
+	stepAccount: SetupMerchantAccountComponent;
+	@ViewChild('basicInfo')
+	stepBasicInfo: SetupMerchantBasicInfoComponent;
+	@ViewChild('contactInfo')
+	stepContactInfo: SetupMerchantContactInfoComponent;
+	@ViewChild('location')
+	stepLocation: SetupMerchantLocationComponent;
+	@ViewChild('payments')
+	stepPayments: SetupMerchantPaymentsComponent;
+	@ViewChild('manufacturing')
+	stepManufacturing: SetupMerchantManufacturingComponent;
+	@ViewChild('deliveryAndTakeaway')
+	stepDeliveryAndTakeaway: SetupMerchantDeliveryAndTakeawayComponent;
+	@ViewChild('ordersSettings')
+	stepOrdersSettings: SetupMerchantOrdersSettingsComponent;
+
+	get canCreateMerchant() {
+		return (
+			this.stepAccount.formValid &&
+			this.stepBasicInfo.formValid &&
+			this.stepContactInfo.contactInfoForm.valid &&
+			this.stepLocation.location.valid
+		);
+	}
+
+	constructor(
+		private warehouseRouter: WarehouseRouter,
+		private readonly toasterService: ToasterService
+	) {}
+
+	async createMerchant() {
+		try {
+			const merchant = await this.warehouseRouter.register(
+				this.getMerchantCreateObj()
+			);
+
+			this.toasterService.pop(
+				'success',
+				`Warehouse ${merchant.name} was created!`
+			);
+
+			this.nbStepper.next();
+		} catch (error) {
+			this.toasterService.pop({
+				type: 'error',
+				title: `Error in creating warehouse: "${error.message}"`,
+				timeout: 0
+			});
+		}
+	}
+
+	private getMerchantCreateObj(): {
+		warehouse: IWarehouseCreateObject;
+		password: string;
+	} {
+		let warehouse: IWarehouseCreateObject;
+		let password: string;
+
+		if (this.canCreateMerchant) {
+			const geoLocationInput = this.stepLocation.locationForm.getValue();
+			geoLocationInput.loc.coordinates.reverse();
+
+			const accountModel = this.stepAccount.accountModel;
+
+			warehouse = {
+				contactEmail: accountModel.email,
+				username: accountModel.username,
+				...this.stepBasicInfo.basicInfoCreateObj,
+				...this.stepContactInfo.contactInfoModel,
+				geoLocation: geoLocationInput as GeoLocation,
+				isPaymentEnabled: this.stepPayments.isPaymentEnabled,
+				isManufacturing: this.stepManufacturing.isManufacturing,
+				isCarrierRequired: this.stepDeliveryAndTakeaway
+					.isCarrierRequired,
+				productsDelivery: this.stepDeliveryAndTakeaway.productsDelivery,
+				productsTakeaway: this.stepDeliveryAndTakeaway.productsTakeaway,
+				hasRestrictedCarriers:
+					this.stepDeliveryAndTakeaway.restrictedCarriersIds.length >
+					0,
+				carriersIds: this.stepDeliveryAndTakeaway.restrictedCarriersIds,
+				orderBarcodeType: this.stepOrdersSettings.iorderBarcodeType,
+				isActive: true
+			};
+
+			password = accountModel.password;
+		}
+		return { warehouse, password };
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index a456f1640..67502c00b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -8,6 +8,7 @@ import { NbStepperModule } from '@nebular/theme';
 import { SetupMerchantsComponentsModule } from './components/components.module';
 import { SetupMerchantsLocationModule } from './components/location/location.module';
 import { SetupMerchantsDeliveryAndTakeawayModule } from './components/settings/delivery-takeaway/delivery-takeaway.module';
+import { ToasterModule } from 'angular2-toaster';
 
 const routes: Routes = [
 	{
@@ -25,7 +26,8 @@ const routes: Routes = [
 		NbStepperModule,
 		SetupMerchantsComponentsModule,
 		SetupMerchantsLocationModule,
-		SetupMerchantsDeliveryAndTakeawayModule
+		SetupMerchantsDeliveryAndTakeawayModule,
+		ToasterModule.forRoot()
 	],
 	declarations: [SetupMerchantsComponent]
 })

From 7276e26cb50a20bcfb4da7288900f4efea22e0a7 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 5 Apr 2019 14:40:11 +0300
Subject: [PATCH 119/382] feat(ever-admin): add translate on merchants setup
 location info EV-1198

---
 .../+merchants/components/location/location.component.html    | 4 +++-
 admin/website-angular/src/assets/i18n/bg.json                 | 3 +++
 admin/website-angular/src/assets/i18n/en.json                 | 3 +++
 admin/website-angular/src/assets/i18n/he.json                 | 3 +++
 admin/website-angular/src/assets/i18n/ru.json                 | 3 +++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
index b36fe160c..4bfe0df29 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
@@ -1,5 +1,7 @@
 <nb-card class="setup-merchant-location">
-	<nb-card-header>Location</nb-card-header>
+	<nb-card-header>
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.LOCATION.LOCATION' | translate }}
+	</nb-card-header>
 	<nb-card-body>
 		<ea-location-form
 			#locationForm
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index f8d3d789c..ac1c59576 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -251,6 +251,9 @@
 				"INVALID_EMAIL_FORMAT": "Невалиден имейл формат",
 				"ORDERS_PHONE": "Телефон за поръчки",
 				"ORDERS_PHONE_IS_REQUIRED": "Изисква се телефонна поръчка"
+			},
+			"LOCATION": {
+				"LOCATION": "Место нахождения"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index f8e178e4a..e8fd25b19 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -250,6 +250,9 @@
 				"INVALID_EMAIL_FORMAT": "Invalid email format",
 				"ORDERS_PHONE": "Orders Phone",
 				"ORDERS_PHONE_IS_REQUIRED": "Orders phone is required"
+			},
+			"LOCATION": {
+				"LOCATION": "Location"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index b5a197692..bf4018d51 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -250,6 +250,9 @@
 				"INVALID_EMAIL_FORMAT": "פורמט דוא'ל לא חוקי",
 				"ORDERS_PHONE": "טלפון הטלפונים",
 				"ORDERS_PHONE_IS_REQUIRED": "טלפון הטלפון נדרש"
+			},
+			"LOCATION": {
+				"LOCATION": "מקום"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 8d5ee485b..84994309d 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -250,6 +250,9 @@
 				"INVALID_EMAIL_FORMAT": "Неверный формат электронной почты",
 				"ORDERS_PHONE": "Заказ телефона",
 				"ORDERS_PHONE_IS_REQUIRED": "Заказы по телефону обязательны"
+			},
+			"LOCATION": {
+				"LOCATION": "Место нахождения"
 			}
 		}
 	},

From 5427784a869eaa0c396b7311835bd89a1321326c Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 5 Apr 2019 14:52:06 +0300
Subject: [PATCH 120/382] feat(ever-admin): add translate setup manufacturing
 info EV-1198

---
 .../manufacturing/manufacturing.component.html        | 11 +++++++++--
 admin/website-angular/src/assets/i18n/bg.json         |  4 ++++
 admin/website-angular/src/assets/i18n/en.json         |  4 ++++
 admin/website-angular/src/assets/i18n/he.json         |  4 ++++
 admin/website-angular/src/assets/i18n/ru.json         |  4 ++++
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
index fdf2ec94a..0d267cf35 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
@@ -1,10 +1,17 @@
 <nb-card class="setup-merchant-manufacturing">
-	<nb-card-header>Manufacturing</nb-card-header>
+	<nb-card-header>
+		{{
+			'FAKE_DATA.SETUP_MERCHANTS.MANUFACTURING.MANUFACTURING' | translate
+		}}
+	</nb-card-header>
 	<nb-card-body>
 		<div class="row m-0">
 			<div class="form-group offset-md-2 col-md-4">
 				<nb-checkbox [(ngModel)]="isManufacturing">
-					Products Manufacturing
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.MANUFACTURING.PRODUCTS_MANUFACTURING'
+							| translate
+					}}
 				</nb-checkbox>
 			</div>
 		</div>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index ac1c59576..8bb466383 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -254,6 +254,10 @@
 			},
 			"LOCATION": {
 				"LOCATION": "Место нахождения"
+			},
+			"MANUFACTURING": {
+				"MANUFACTURING": "Производство",
+				"PRODUCTS_MANUFACTURING": "Продукти Производство"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index e8fd25b19..b10b4f799 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -253,6 +253,10 @@
 			},
 			"LOCATION": {
 				"LOCATION": "Location"
+			},
+			"MANUFACTURING": {
+				"MANUFACTURING": "Manufacturing",
+				"PRODUCTS_MANUFACTURING": "Products Manufacturing"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index bf4018d51..5fb9bf7a0 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -253,6 +253,10 @@
 			},
 			"LOCATION": {
 				"LOCATION": "מקום"
+			},
+			"MANUFACTURING": {
+				"MANUFACTURING": "ייצור",
+				"PRODUCTS_MANUFACTURING": "ייצור מוצרים"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 84994309d..7fc48167d 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -253,6 +253,10 @@
 			},
 			"LOCATION": {
 				"LOCATION": "Место нахождения"
+			},
+			"MANUFACTURING": {
+				"MANUFACTURING": "Производство",
+				"PRODUCTS_MANUFACTURING": "Производство продукции"
 			}
 		}
 	},

From 2888ff030d16926e9a334f34ff3db68b4b9a176a Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 5 Apr 2019 15:23:23 +0300
Subject: [PATCH 121/382] feat(ever-admin): add translate on setup payments
 info EV-1198

---
 .../payments/payments.component.html          |  9 ++++++--
 .../+merchants/merchants.component.html       | 21 +++++++++++++++----
 admin/website-angular/src/assets/i18n/bg.json |  7 +++++++
 admin/website-angular/src/assets/i18n/en.json |  7 +++++++
 admin/website-angular/src/assets/i18n/he.json |  7 +++++++
 admin/website-angular/src/assets/i18n/ru.json |  7 +++++++
 6 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
index 98bdfd5f9..b5182c5f8 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
@@ -1,10 +1,15 @@
 <nb-card class="setup-merchant-payments">
-	<nb-card-header>Payments</nb-card-header>
+	<nb-card-header>
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYMENTS' | translate }}
+	</nb-card-header>
 	<nb-card-body>
 		<div class="row m-0">
 			<div class="form-group offset-md-2 col-md-4">
 				<nb-checkbox [(ngModel)]="isPaymentEnabled">
-					Allow online payments?
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.ALLOW_ONLINE_PAYMENT'
+							| translate
+					}}
 				</nb-checkbox>
 			</div>
 		</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 3b7191363..7551d949a 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -91,7 +91,11 @@
 								#payments
 							></ea-merchants-setup-payments>
 
-							<button nbButton nbStepperPrevious>PREV</button>
+							<button nbButton nbStepperPrevious>
+								{{
+									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
+								}}
+							</button>
 							<button nbButton nbStepperNext>
 								{{
 									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
@@ -149,7 +153,10 @@
 									nbButton
 									(click)="deliveryAndTakeaway.back()"
 								>
-									Back
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.BACK'
+											| translate
+									}}
 								</button>
 								<button
 									*ngIf="
@@ -163,7 +170,10 @@
 									nbButton
 									(click)="deliveryAndTakeaway.add()"
 								>
-									Add
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.ADD'
+											| translate
+									}}
 								</button>
 
 								<button
@@ -178,7 +188,10 @@
 									nbButton
 									(click)="deliveryAndTakeaway.save()"
 								>
-									Save
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.SAVE'
+											| translate
+									}}
 								</button>
 							</div>
 						</nb-step>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 8bb466383..d8481f4f0 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -212,6 +212,9 @@
 			"SETUP_MERCHANTS": "Настройки на ресторантите",
 			"PREV": "НАЗАД",
 			"NEXT": "СЛЕДВАЩИЯ",
+			"ADD": "Добави",
+			"BACK": "Обратно",
+			"SAVE": "Запази",
 			"ACCOUNT": {
 				"ACCOUNT": "Сметка",
 				"EMAIL_ADDRESS": "Имейл адрес",
@@ -255,6 +258,10 @@
 			"LOCATION": {
 				"LOCATION": "Место нахождения"
 			},
+			"PAYMENTS": {
+				"PAYMENTS": "Плащания",
+				"ALLOW_ONLINE_PAYMENT": "Разрешаване на онлайн плащания?"
+			},
 			"MANUFACTURING": {
 				"MANUFACTURING": "Производство",
 				"PRODUCTS_MANUFACTURING": "Продукти Производство"
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index b10b4f799..03d96e05b 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -211,6 +211,9 @@
 			"SETUP_MERCHANTS": "Setup merchants",
 			"PREV": "PREV",
 			"NEXT": "NEXT",
+			"ADD": "Add",
+			"BACK": "Back",
+			"SAVE": "Save",
 			"ACCOUNT": {
 				"ACCOUNT": "Account",
 				"EMAIL_ADDRESS": "Email address",
@@ -254,6 +257,10 @@
 			"LOCATION": {
 				"LOCATION": "Location"
 			},
+			"PAYMENTS": {
+				"PAYMENTS": "Payments",
+				"ALLOW_ONLINE_PAYMENT": "Allow online payments?"
+			},
 			"MANUFACTURING": {
 				"MANUFACTURING": "Manufacturing",
 				"PRODUCTS_MANUFACTURING": "Products Manufacturing"
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 5fb9bf7a0..6d116692b 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -211,6 +211,9 @@
 			"SETUP_MERCHANTS": "הגדר סוחרים",
 			"PREV": "PREV",
 			"NEXT": "הבא",
+			"ADD": "הוסף",
+			"BACK": "חזור",
+			"SAVE": "להציל",
 			"ACCOUNT": {
 				"ACCOUNT": "חשבון",
 				"EMAIL_ADDRESS": "כתובת דוא'ל",
@@ -254,6 +257,10 @@
 			"LOCATION": {
 				"LOCATION": "מקום"
 			},
+			"PAYMENTS": {
+				"PAYMENTS": "תשלומים",
+				"ALLOW_ONLINE_PAYMENT": "האם לאפשר תשלומים מקוונים?"
+			},
 			"MANUFACTURING": {
 				"MANUFACTURING": "ייצור",
 				"PRODUCTS_MANUFACTURING": "ייצור מוצרים"
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 7fc48167d..33b822398 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -211,6 +211,9 @@
 			"SETUP_MERCHANTS": "Настройки ресторана",
 			"PREV": "НАЗАД",
 			"NEXT": "СЛЕДУЮЩИЙ",
+			"ADD": "Добавлять",
+			"BACK": "Назад",
+			"SAVE": "Сохранить",
 			"ACCOUNT": {
 				"ACCOUNT": "Учетная запись",
 				"EMAIL_ADDRESS": "Адрес электронной почты",
@@ -254,6 +257,10 @@
 			"LOCATION": {
 				"LOCATION": "Место нахождения"
 			},
+			"PAYMENTS": {
+				"PAYMENTS": "Плащания",
+				"ALLOW_ONLINE_PAYMENT": "Разрешаване на онлайн плащания?"
+			},
 			"MANUFACTURING": {
 				"MANUFACTURING": "Производство",
 				"PRODUCTS_MANUFACTURING": "Производство продукции"

From 39243a6b5fa16c8d24d387826730a1793b4fb2fe Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 5 Apr 2019 15:33:54 +0300
Subject: [PATCH 122/382] feat(ever-admin): create shared category form EV-1196

---
 .../category-create.component.html            |  78 +---------
 .../category-create.component.scss            |  19 ---
 .../category-create.component.ts              | 136 ++----------------
 .../basic-info/basic-info-form.component.html |  70 +++++++++
 .../basic-info/basic-info-form.component.scss |  18 +++
 .../basic-info/basic-info-form.component.ts   | 129 +++++++++++++++++
 .../categories/forms/basic-info/index.ts      |   1 +
 .../forms/product-categories-forms.module.ts  |  20 +++
 .../app/pages/+products/products.module.ts    |   4 +-
 9 files changed, 257 insertions(+), 218 deletions(-)
 create mode 100644 admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.html
 create mode 100644 admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.scss
 create mode 100644 admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
 create mode 100644 admin/website-angular/src/app/@shared/product/categories/forms/basic-info/index.ts
 create mode 100644 admin/website-angular/src/app/@shared/product/categories/forms/product-categories-forms.module.ts

diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
index 4484bcdd1..20d1b4cfc 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
@@ -6,77 +6,9 @@
 </div>
 
 <div class="modal-body" [nbSpinner]="loading">
-	<form class="form-horizontal pt-4 pb-0" [formGroup]="form">
-		<div class="form-group row">
-			<label class="col-sm-2 control-label">{{
-				'CATEGORY_VIEW.CREATE.CATEGORY_NAME' | translate
-			}}</label>
-			<div class="col-sm-9">
-				<input
-					type="text"
-					class="form-control"
-					placeholder="{{
-						'CATEGORY_VIEW.CREATE.CATEGORY_NAME' | translate
-					}}"
-					formControlName="name"
-				/>
-
-				<div
-					*ngIf="name.invalid && (name.dirty || name.touched)"
-					class="alert alert-danger"
-				>
-					{{
-						'CATEGORY_VIEW.CREATE.ENTER_THE_CATEGORY_NAME'
-							| translate
-					}}!
-				</div>
-			</div>
-		</div>
-
-		<div class="form-group row">
-			<label class="col-sm-2 control-label">{{
-				'CATEGORY_VIEW.CREATE.PHOTO' | translate
-			}}</label>
-
-			<div class="col-sm-9">
-				<e-cu-file-uploader
-					[placeholder]="uploaderPlaceholder"
-					[name]="name?.value"
-					[fileUrl]="image?.value"
-					(uploadedImgUrl)="image.setValue($event)"
-				></e-cu-file-uploader>
-
-				<div *ngIf="image.invalid" class="alert alert-danger">
-					{{ 'CATEGORY_VIEW.CREATE.INVALID_URL' | translate }}!
-				</div>
-			</div>
-		</div>
-
-		<div class="form-group row" [hidden]="image.invalid">
-			<label class="col-sm-2 control-label"></label>
-			<div class="col-sm-9">
-				<div class="row preview-img" [hidden]="!showImageMeta">
-					<div>
-						<img
-							#imagePreview
-							src="{{ image.value }}"
-							alt="Invalid image"
-							class="img-rounded"
-						/>
-					</div>
-					<div class="remove-icon text-danger" (click)="deleteImg()">
-						<div
-							class="ion-md-remove-circle"
-							placeholder="Remove image"
-							title="{{
-								'CATEGORY_VIEW.CREATE.REMOVE_IMAGE' | translate
-							}}"
-						></div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</form>
+	<ea-product-category-basic-info-form
+		#basicInfo
+	></ea-product-category-basic-info-form>
 </div>
 
 <div class="modal-footer row">
@@ -85,8 +17,8 @@
 		<button
 			class="btn btn-success"
 			type="button"
-			(click)="createCategory()"
-			[disabled]="!isFormModelValid"
+			(click)="createCategory(basicInfo.createObject)"
+			[disabled]="basicInfo.form.invalid"
 		>
 			{{ 'CATEGORY_VIEW.CREATE.DONE' | translate }}
 		</button>
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.scss b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.scss
index 1b2a0da83..9b90e6725 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.scss
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.scss
@@ -1,22 +1,3 @@
-.preview-img {
-	padding-left: 14px;
-	padding-right: 16px;
-}
-
-.img-rounded {
-	max-height: 70px;
-}
-
-.remove-icon {
-	div {
-		cursor: pointer;
-	}
-
-	padding-left: 7px;
-	padding-right: 7px;
-	padding-top: 2px;
-}
-
 div.modal-footer {
 	padding-top: 7px;
 	margin-left: 23px;
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
index b789594a3..fb87b15a6 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
@@ -1,150 +1,55 @@
-import {
-	Component,
-	OnDestroy,
-	OnInit,
-	ViewChild,
-	ElementRef,
-	AfterViewInit
-} from '@angular/core';
-import {
-	FormBuilder,
-	FormGroup,
-	Validators,
-	AbstractControl
-} from '@angular/forms';
-import { TranslateService } from '@ngx-translate/core';
+import { Component, OnDestroy } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
-import { ProductsCategoryService } from '../../../../@core/data/productsCategory.service';
-import { IProductsCategoryCreateObject } from '@modules/server.common/interfaces/IProductsCategory';
 
-import * as _ from 'lodash';
-import * as isUrl from 'is-url';
 import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
 import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
+import { TranslateService } from '@ngx-translate/core';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
+import { first } from 'rxjs/operators';
+import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
 
 @Component({
 	selector: 'ea-category-create',
 	templateUrl: './category-create.component.html',
 	styleUrls: ['./category-create.component.scss']
 })
-export class CategoryCreateComponent
-	implements OnInit, AfterViewInit, OnDestroy {
-	@ViewChild('imagePreview')
-	imagePreviewElement: ElementRef;
-
+export class CategoryCreateComponent implements OnDestroy {
 	productId: any;
 	userId: any;
 	loading: boolean;
-	uploaderPlaceholder: string;
-
-	readonly form: FormGroup = this.fb.group({
-		name: ['', Validators.required],
-		image: [
-			'',
-			[
-				(control: AbstractControl) => {
-					const imageUrl = control.value;
-
-					if (!isUrl(imageUrl) && !_.isEmpty(imageUrl)) {
-						return { invalidUrl: true };
-					}
-
-					return null;
-				}
-			]
-		]
-	});
 
 	private _ngDestroy$ = new Subject<void>();
 
 	constructor(
 		private readonly activeModal: NgbActiveModal,
-		private readonly fb: FormBuilder,
-		private readonly _productsCategoryService: ProductsCategoryService,
-		private readonly _langTranslateService: TranslateService,
 		private readonly _productLocalesService: ProductLocalesService,
-		private readonly _notifyService: NotifyService
+		private readonly _langTranslateService: TranslateService,
+		private readonly _notifyService: NotifyService,
+		private readonly _productsCategoryService: ProductsCategoryService
 	) {}
 
-	get image() {
-		return this.form.get('image');
-	}
-
-	get name() {
-		return this.form.get('name');
-	}
-
-	get isFormModelValid(): boolean {
-		return this.form.valid;
-	}
-
-	get showImageMeta() {
-		return this.image && this.image.value !== '';
-	}
-
-	ngOnInit() {
-		this.getUploaderPlaceholderText();
-	}
-
-	ngAfterViewInit() {
-		this._setupLogoUrlValidation();
-	}
-
 	ngOnDestroy() {
 		this._ngDestroy$.next();
 		this._ngDestroy$.complete();
 	}
 
-	deleteImg() {
-		this.image.setValue('');
-	}
-
 	cancel() {
 		this.activeModal.dismiss('canceled');
 	}
 
-	async createCategory() {
-		let usedLanguage = this._langTranslateService.currentLang;
-		switch (usedLanguage) {
-			case 'en':
-				usedLanguage += '-US';
-				break;
-			case 'bg':
-				usedLanguage += '-BG';
-				break;
-			case 'he':
-				usedLanguage += '-IL';
-				break;
-			case 'ru':
-				usedLanguage += '-RU';
-				break;
-			default:
-				usedLanguage = 'en-US';
-		}
-
-		const categoryRaw: IProductsCategoryCreateObject = {
-			name: [{ locale: usedLanguage, value: this.name.value }]
-		};
-
-		if (this.showImageMeta) {
-			categoryRaw.image = this.image.value;
-		}
-
+	async createCategory(createObject) {
 		try {
 			this.loading = true;
 			await this._productsCategoryService
-				.create(categoryRaw)
+				.create(createObject)
 				.pipe(first())
 				.toPromise();
 			this.loading = false;
 			const message = `Category ${this.localeTranslate(
-				categoryRaw.name
+				createObject.name
 			)} is added!`;
 			this._notifyService.success(message);
-
 			this.cancel();
 		} catch (err) {
 			this.loading = false;
@@ -156,23 +61,4 @@ export class CategoryCreateComponent
 	localeTranslate(member: ILocaleMember[]) {
 		return this._productLocalesService.getTranslate(member);
 	}
-
-	private _setupLogoUrlValidation() {
-		this.imagePreviewElement.nativeElement.onload = () => {
-			this.image.setErrors(null);
-		};
-
-		this.imagePreviewElement.nativeElement.onerror = () => {
-			if (this.showImageMeta) {
-				this.image.setErrors({ invalidUrl: true });
-			}
-		};
-	}
-
-	private async getUploaderPlaceholderText() {
-		this.uploaderPlaceholder = await this._langTranslateService
-			.get('CATEGORY_VIEW.CREATE.PHOTO_OPTIONAL')
-			.pipe(first())
-			.toPromise();
-	}
 }
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.html b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.html
new file mode 100644
index 000000000..73fbf9858
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.html
@@ -0,0 +1,70 @@
+<form class="form-horizontal pt-4 pb-0" [formGroup]="form">
+	<div class="form-group row">
+		<label class="col-sm-2 control-label">{{
+			'CATEGORY_VIEW.CREATE.CATEGORY_NAME' | translate
+		}}</label>
+		<div class="col-sm-9">
+			<input
+				type="text"
+				class="form-control"
+				placeholder="{{
+					'CATEGORY_VIEW.CREATE.CATEGORY_NAME' | translate
+				}}"
+				formControlName="name"
+			/>
+
+			<div
+				*ngIf="name.invalid && (name.dirty || name.touched)"
+				class="alert alert-danger"
+			>
+				{{
+					'CATEGORY_VIEW.CREATE.ENTER_THE_CATEGORY_NAME' | translate
+				}}!
+			</div>
+		</div>
+	</div>
+
+	<div class="form-group row">
+		<label class="col-sm-2 control-label">{{
+			'CATEGORY_VIEW.CREATE.PHOTO' | translate
+		}}</label>
+
+		<div class="col-sm-9">
+			<e-cu-file-uploader
+				[placeholder]="uploaderPlaceholder"
+				[name]="name?.value"
+				[fileUrl]="image?.value"
+				(uploadedImgUrl)="image.setValue($event)"
+			></e-cu-file-uploader>
+
+			<div *ngIf="image.invalid" class="alert alert-danger">
+				{{ 'CATEGORY_VIEW.CREATE.INVALID_URL' | translate }}!
+			</div>
+		</div>
+	</div>
+
+	<div class="form-group row" [hidden]="image.invalid">
+		<label class="col-sm-2 control-label"></label>
+		<div class="col-sm-9">
+			<div class="row preview-img" [hidden]="!showImageMeta">
+				<div>
+					<img
+						#imagePreview
+						src="{{ image.value }}"
+						alt="Invalid image"
+						class="img-rounded"
+					/>
+				</div>
+				<div class="remove-icon text-danger" (click)="deleteImg()">
+					<div
+						class="ion-md-remove-circle"
+						placeholder="Remove image"
+						title="{{
+							'CATEGORY_VIEW.CREATE.REMOVE_IMAGE' | translate
+						}}"
+					></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.scss b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.scss
new file mode 100644
index 000000000..7593d2c1b
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.scss
@@ -0,0 +1,18 @@
+.preview-img {
+	padding-left: 14px;
+	padding-right: 16px;
+}
+
+.img-rounded {
+	max-height: 70px;
+}
+
+.remove-icon {
+	div {
+		cursor: pointer;
+	}
+
+	padding-left: 7px;
+	padding-right: 7px;
+	padding-top: 2px;
+}
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
new file mode 100644
index 000000000..0ef0d28c4
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
@@ -0,0 +1,129 @@
+import {
+	Component,
+	ViewChild,
+	ElementRef,
+	OnInit,
+	AfterViewInit
+} from '@angular/core';
+import {
+	FormGroup,
+	Validators,
+	AbstractControl,
+	FormBuilder
+} from '@angular/forms';
+import * as isUrl from 'is-url';
+import * as _ from 'lodash';
+import { TranslateService } from '@ngx-translate/core';
+import { first } from 'rxjs/operators';
+import { IProductsCategoryCreateObject } from '@modules/server.common/interfaces/IProductsCategory';
+
+@Component({
+	selector: 'ea-product-category-basic-info-form',
+	templateUrl: 'basic-info-form.component.html',
+	styleUrls: ['basic-info-form.component.scss']
+})
+export class BasicInfoFormComponent implements OnInit, AfterViewInit {
+	@ViewChild('imagePreview')
+	imagePreviewElement: ElementRef;
+
+	uploaderPlaceholder: string;
+
+	readonly form: FormGroup = this.fb.group({
+		name: ['', Validators.required],
+		image: [
+			'',
+			[
+				(control: AbstractControl) => {
+					const imageUrl = control.value;
+
+					if (!isUrl(imageUrl) && !_.isEmpty(imageUrl)) {
+						return { invalidUrl: true };
+					}
+
+					return null;
+				}
+			]
+		]
+	});
+
+	constructor(
+		private readonly fb: FormBuilder,
+		private readonly _langTranslateService: TranslateService
+	) {}
+
+	get image() {
+		return this.form.get('image');
+	}
+
+	get name() {
+		return this.form.get('name');
+	}
+
+	get isFormModelValid(): boolean {
+		return this.form.valid;
+	}
+
+	get showImageMeta() {
+		return this.image && this.image.value !== '';
+	}
+
+	get createObject() {
+		let usedLanguage = this._langTranslateService.currentLang;
+		switch (usedLanguage) {
+			case 'en':
+				usedLanguage += '-US';
+				break;
+			case 'bg':
+				usedLanguage += '-BG';
+				break;
+			case 'he':
+				usedLanguage += '-IL';
+				break;
+			case 'ru':
+				usedLanguage += '-RU';
+				break;
+			default:
+				usedLanguage = 'en-US';
+		}
+
+		const categoryObject: IProductsCategoryCreateObject = {
+			name: [{ locale: usedLanguage, value: this.name.value }]
+		};
+		if (this.showImageMeta) {
+			categoryObject.image = this.image.value;
+		}
+
+		return categoryObject;
+	}
+
+	ngOnInit() {
+		this.getUploaderPlaceholderText();
+	}
+
+	deleteImg() {
+		this.image.setValue('');
+	}
+
+	ngAfterViewInit() {
+		this._setupLogoUrlValidation();
+	}
+
+	private async getUploaderPlaceholderText() {
+		this.uploaderPlaceholder = await this._langTranslateService
+			.get('CATEGORY_VIEW.CREATE.PHOTO_OPTIONAL')
+			.pipe(first())
+			.toPromise();
+	}
+
+	private _setupLogoUrlValidation() {
+		this.imagePreviewElement.nativeElement.onload = () => {
+			this.image.setErrors(null);
+		};
+
+		this.imagePreviewElement.nativeElement.onerror = () => {
+			if (this.showImageMeta) {
+				this.image.setErrors({ invalidUrl: true });
+			}
+		};
+	}
+}
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/index.ts b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/index.ts
new file mode 100644
index 000000000..91afc0575
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/index.ts
@@ -0,0 +1 @@
+export * from './basic-info-form.component';
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/product-categories-forms.module.ts b/admin/website-angular/src/app/@shared/product/categories/forms/product-categories-forms.module.ts
new file mode 100644
index 000000000..38496b6db
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/product-categories-forms.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { BasicInfoFormComponent } from './basic-info';
+import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
+import { ThemeModule } from 'app/@theme';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+@NgModule({
+	imports: [
+		CommonModule,
+		ThemeModule,
+		TranslateModule.forChild(),
+		FileUploaderModule,
+		FormsModule
+	],
+	exports: [BasicInfoFormComponent],
+	declarations: [BasicInfoFormComponent]
+})
+export class ProductCategoriesFormsModule {}
diff --git a/admin/website-angular/src/app/pages/+products/products.module.ts b/admin/website-angular/src/app/pages/+products/products.module.ts
index f171317f3..35a6b0a10 100644
--- a/admin/website-angular/src/app/pages/+products/products.module.ts
+++ b/admin/website-angular/src/app/pages/+products/products.module.ts
@@ -16,6 +16,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 import { ConfirmationModalModule } from '../../@shared/confirmation-modal/confirmation-modal.module';
 import { CategoryImageComponent } from 'app/@shared/product/categories/categories-table/category-image.component';
 import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
+import { ProductCategoriesFormsModule } from 'app/@shared/product/categories/forms/product-categories-forms.module';
 
 const routes: Routes = [
 	{
@@ -44,7 +45,8 @@ const routes: Routes = [
 		ProductFormsModule,
 		NbSpinnerModule,
 		ConfirmationModalModule,
-		FileUploaderModule
+		FileUploaderModule,
+		ProductCategoriesFormsModule
 	],
 	declarations: [
 		ProductsComponent,

From 81d84dcad35e6dfe1c35ffca06f501a83377b3c6 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 5 Apr 2019 15:50:10 +0300
Subject: [PATCH 123/382] feat(ever-admin): add translate on setup delivery
 info EV-1198

---
 .../delivery-takeaway.component.html          | 61 +++++++++++++------
 admin/website-angular/src/assets/i18n/bg.json | 11 ++++
 admin/website-angular/src/assets/i18n/en.json | 11 ++++
 admin/website-angular/src/assets/i18n/he.json | 11 ++++
 admin/website-angular/src/assets/i18n/ru.json | 11 ++++
 5 files changed, 88 insertions(+), 17 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index 63303f4cb..ddba7a0ed 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -1,24 +1,39 @@
 <nb-card class="setup-merchant-delivery-takeaway">
 	<nb-card-header
-		><span *ngIf="currentView == componentViews.main"
-			>Delivery & Takeaway Settings</span
-		>
-		<span *ngIf="currentView == componentViews.carriersTable"
-			>Select from shared carriers</span
-		>
-		<span *ngIf="currentView == componentViews.addNewCarrier"
-			>Add your carrier</span
-		>
-		<span *ngIf="currentView == componentViews.editCarrier"
-			>Edir carrier</span
-		>
+		><span *ngIf="currentView == componentViews.main">
+			{{
+				'FAKE_DATA.SETUP_MERCHANTS.DELIVERY_AND_TAKEAWAY_SETTINGS.DELIVERY_AND_TAKEAWAY_SETTINGS'
+					| translate
+			}}
+		</span>
+		<span *ngIf="currentView == componentViews.carriersTable">
+			{{
+				'FAKE_DATA.SETUP_MERCHANTS.DELIVERY_AND_TAKEAWAY_SETTINGS.SELECT_FROM_SHARED_CARRIERS'
+					| translate
+			}}
+		</span>
+		<span *ngIf="currentView == componentViews.addNewCarrier">
+			{{
+				'FAKE_DATA.SETUP_MERCHANTS.DELIVERY_AND_TAKEAWAY_SETTINGS.ADD_YOUR_CARRIER'
+					| translate
+			}}
+		</span>
+		<span *ngIf="currentView == componentViews.editCarrier">
+			{{
+				'FAKE_DATA.SETUP_MERCHANTS.DELIVERY_AND_TAKEAWAY_SETTINGS.EDIT_CARRIER'
+					| translate
+			}}
+		</span>
 	</nb-card-header>
 	<nb-card-body>
 		<div *ngIf="currentView === componentViews.main" class="main-content">
 			<div class="row">
 				<div class="form-group offset-md-2 col-md-4">
 					<nb-checkbox [(ngModel)]="isCarrierRequired">
-						Carrier required
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.DELIVERY_AND_TAKEAWAY_SETTINGS.CARRIER_REQUIRED'
+								| translate
+						}}
 					</nb-checkbox>
 				</div>
 			</div>
@@ -28,12 +43,18 @@
 						(change)="productsDeliveryChange()"
 						[(ngModel)]="productsDelivery"
 					>
-						Products Delivery (by default)
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.DELIVERY_AND_TAKEAWAY_SETTINGS.PRODUCTS_DELIVERY_BY_DEFAULT'
+								| translate
+						}}
 					</nb-checkbox>
 				</div>
 				<div class="form-group  col-md-4">
 					<nb-checkbox [(ngModel)]="productsTakeaway">
-						Products Takeaway (by default)
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.DELIVERY_AND_TAKEAWAY_SETTINGS.PRODUCTS_TAKEAWAY_BY_DEFAULT'
+								| translate
+						}}
 					</nb-checkbox>
 				</div>
 			</div>
@@ -45,7 +66,10 @@
 						status="success"
 						(click)="currentView = componentViews.carriersTable"
 					>
-						Use selected shared carriers
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.DELIVERY_AND_TAKEAWAY_SETTINGS.USE_SELECTED_SHARED_CARRIERS'
+								| translate
+						}}
 					</button>
 				</div>
 
@@ -56,7 +80,10 @@
 						status="success"
 						(click)="currentView = componentViews.addNewCarrier"
 					>
-						Add your carriers
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.DELIVERY_AND_TAKEAWAY_SETTINGS.ADD_YOUR_CARRIERS'
+								| translate
+						}}
 					</button>
 				</div>
 
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index d8481f4f0..05fa03fe7 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -265,6 +265,17 @@
 			"MANUFACTURING": {
 				"MANUFACTURING": "Производство",
 				"PRODUCTS_MANUFACTURING": "Продукти Производство"
+			},
+			"DELIVERY_AND_TAKEAWAY_SETTINGS": {
+				"DELIVERY_AND_TAKEAWAY_SETTINGS": "Настройки за доставка и за вкъщи",
+				"SELECT_FROM_SHARED_CARRIERS": "Изберете от споделени превозвачи",
+				"ADD_YOUR_CARRIER": "Добавете своя оператор",
+				"EDIT_CARRIER": "Редактиране на носителя",
+				"CARRIER_REQUIRED": "Необходим е превозвач",
+				"PRODUCTS_DELIVERY_BY_DEFAULT": "Доставка на продукти (по подразбиране)",
+				"PRODUCTS_TAKEAWAY_BY_DEFAULT": "Продукти за вкъщи (по подразбиране)",
+				"USE_SELECTED_SHARED_CARRIERS": "Използвайте избрани споделени оператори",
+				"ADD_YOUR_CARRIERS": "Добавете операторите си"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 03d96e05b..6b49280b4 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -264,6 +264,17 @@
 			"MANUFACTURING": {
 				"MANUFACTURING": "Manufacturing",
 				"PRODUCTS_MANUFACTURING": "Products Manufacturing"
+			},
+			"DELIVERY_AND_TAKEAWAY_SETTINGS": {
+				"DELIVERY_AND_TAKEAWAY_SETTINGS": "Delivery & Takeaway Settings",
+				"SELECT_FROM_SHARED_CARRIERS": "Select from shared carriers",
+				"ADD_YOUR_CARRIER": "Add your carrier",
+				"EDIT_CARRIER": "Edit carrier",
+				"CARRIER_REQUIRED": "Carrier required",
+				"PRODUCTS_DELIVERY_BY_DEFAULT": "Products Delivery (by default)",
+				"PRODUCTS_TAKEAWAY_BY_DEFAULT": "Products Takeaway (by default)",
+				"USE_SELECTED_SHARED_CARRIERS": "Use selected shared carriers",
+				"ADD_YOUR_CARRIERS": "Add your carriers"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 6d116692b..529a53520 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -264,6 +264,17 @@
 			"MANUFACTURING": {
 				"MANUFACTURING": "ייצור",
 				"PRODUCTS_MANUFACTURING": "ייצור מוצרים"
+			},
+			"DELIVERY_AND_TAKEAWAY_SETTINGS": {
+				"DELIVERY_AND_TAKEAWAY_SETTINGS": "הגדרות משלוח & Takeaway",
+				"SELECT_FROM_SHARED_CARRIERS": "בחר מתוך ספקים משותפים",
+				"ADD_YOUR_CARRIER": "הוסף את הספק שלך",
+				"EDIT_CARRIER": "ערוך ספק",
+				"CARRIER_REQUIRED": "נדרש נושא",
+				"PRODUCTS_DELIVERY_BY_DEFAULT": "משלוח מוצרים (כברירת מחדל)",
+				"PRODUCTS_TAKEAWAY_BY_DEFAULT": "מוצרים Takeaway (כברירת מחדל)",
+				"USE_SELECTED_SHARED_CARRIERS": "השתמש במפעילים משותפים נבחרים",
+				"ADD_YOUR_CARRIERS": "הוסף את הספקים שלך"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 33b822398..4d8773979 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -264,6 +264,17 @@
 			"MANUFACTURING": {
 				"MANUFACTURING": "Производство",
 				"PRODUCTS_MANUFACTURING": "Производство продукции"
+			},
+			"DELIVERY_AND_TAKEAWAY_SETTINGS": {
+				"DELIVERY_AND_TAKEAWAY_SETTINGS": "Настройки доставки и выноса",
+				"SELECT_FROM_SHARED_CARRIERS": "Выберите из общих перевозчиков",
+				"ADD_YOUR_CARRIER": "Добавьте ваш оператор",
+				"EDIT_CARRIER": "Редактировать перевозчик",
+				"CARRIER_REQUIRED": "Требуется перевозчик",
+				"PRODUCTS_DELIVERY_BY_DEFAULT": "Доставка продуктов (по умолчанию)",
+				"PRODUCTS_TAKEAWAY_BY_DEFAULT": "Продукты на вынос (по умолчанию)",
+				"USE_SELECTED_SHARED_CARRIERS": "Использовать выбранные общие носители",
+				"ADD_YOUR_CARRIERS": "Добавьте своих перевозчиков"
 			}
 		}
 	},

From 9c2abca849b1b6641cabff6bf8d9df8bf6152d56 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 5 Apr 2019 16:13:20 +0300
Subject: [PATCH 124/382] feat(ever-admin): used shared component Edit prod.
 category EV-1196

---
 .../category-edit.component.html              |  82 ++-----------
 .../category-edit/category-edit.component.ts  | 110 +++---------------
 .../basic-info/basic-info-form.component.ts   |  23 +++-
 3 files changed, 45 insertions(+), 170 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
index 0969641d1..952b8c598 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
+++ b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
@@ -1,6 +1,7 @@
 <div class="modal-header">
 	<span class="modal-title">
-		{{ 'CATEGORY_VIEW.EDIT.EDIT_CATEGORY' | translate }} {{ name.value }}
+		{{ 'CATEGORY_VIEW.EDIT.EDIT_CATEGORY' | translate }}
+		{{ basicInfo?.name.value }}
 	</span>
 	<button class="close" aria-label="Close" (click)="cancel()">
 		<span aria-hidden="true">&times;</span>
@@ -8,85 +9,18 @@
 </div>
 
 <div class="modal-body">
-	<form class="form-horizontal" [formGroup]="form">
-		<div class="form-group row">
-			<label class="col-sm-2 control-label">{{
-				'CATEGORY_VIEW.EDIT.CATEGORY_NAME' | translate
-			}}</label>
-			<div class="col-sm-9">
-				<input
-					type="text"
-					class="form-control"
-					placeholder="{{
-						'CATEGORY_VIEW.EDIT.CATEGORY_NAME' | translate
-					}}"
-					formControlName="name"
-					value="name.value"
-				/>
-
-				<div
-					*ngIf="name.invalid && (name.dirty || name.touched)"
-					class="alert alert-danger"
-				>
-					{{
-						'CATEGORY_VIEW.EDIT.ENTER_THE_CATEGORY_NAME' | translate
-					}}
-				</div>
-			</div>
-		</div>
-
-		<div class="form-group row">
-			<label class="col-sm-2 control-label">{{
-				'CATEGORY_VIEW.CREATE.PHOTO' | translate
-			}}</label>
-
-			<div class="col-sm-9">
-				<e-cu-file-uploader
-					[placeholder]="uploaderPlaceholder"
-					[name]="name?.value"
-					[fileUrl]="image?.value"
-					(uploadedImgUrl)="image.setValue($event)"
-				></e-cu-file-uploader>
-
-				<div *ngIf="image.invalid" class="alert alert-danger">
-					{{ 'CATEGORY_VIEW.CREATE.INVALID_URL' | translate }}!
-				</div>
-			</div>
-		</div>
-
-		<div class="form-group row" [hidden]="image.invalid">
-			<label class="col-sm-2 control-label"></label>
-			<div class="col-sm-9">
-				<div class="row preview-img" [hidden]="!showImageMeta">
-					<div>
-						<img
-							#imagePreview
-							src="{{ image.value }}"
-							alt="Invalid image"
-							class="img-rounded"
-						/>
-					</div>
-					<div class="remove-icon text-danger" (click)="deleteImg()">
-						<div
-							class="ion-md-remove-circle"
-							placeholder="Remove image"
-							title="{{
-								'CATEGORY_VIEW.CREATE.REMOVE_IMAGE' | translate
-							}}"
-						></div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</form>
+	<ea-product-category-basic-info-form
+		[category]="currentCategory"
+		#basicInfo
+	></ea-product-category-basic-info-form>
 </div>
 
 <div class="modal-footer">
 	<button
 		class="btn btn-success"
 		type="button"
-		(click)="editCategory()"
-		[disabled]="!isFormModelValid"
+		(click)="editCategory(basicInfo.editObject)"
+		[disabled]="basicInfo.form.invalid"
 	>
 		{{ 'CATEGORY_VIEW.EDIT.DONE' | translate }}!
 	</button>
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts
index 5db04654c..8717a555b 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts
@@ -1,17 +1,5 @@
-import {
-	Component,
-	OnDestroy,
-	OnInit,
-	ViewChild,
-	ElementRef,
-	AfterViewInit
-} from '@angular/core';
-import {
-	FormBuilder,
-	FormGroup,
-	Validators,
-	AbstractControl
-} from '@angular/forms';
+import { Component, OnDestroy } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import 'rxjs/operators/map';
 import { Subject } from 'rxjs';
@@ -22,8 +10,6 @@ import {
 	IProductsCategoryName
 } from '@modules/server.common/interfaces/IProductsCategory';
 import { TranslateService } from '@ngx-translate/core';
-import * as _ from 'lodash';
-import * as isUrl from 'is-url';
 import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
 import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
@@ -33,10 +19,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	templateUrl: './category-edit.component.html',
 	styleUrls: ['./category-edit.component.scss']
 })
-export class CategoryEditComponent implements OnInit, AfterViewInit, OnDestroy {
-	@ViewChild('imagePreview')
-	imagePreviewElement: ElementRef;
-
+export class CategoryEditComponent implements OnDestroy {
 	currentCategory: {
 		id: string;
 		image: string;
@@ -45,64 +28,17 @@ export class CategoryEditComponent implements OnInit, AfterViewInit, OnDestroy {
 	};
 
 	userId: any;
-	uploaderPlaceholder: string;
-
-	readonly form: FormGroup = this._formBuilder.group({
-		name: ['', Validators.required],
-		image: [
-			'',
-			[
-				(control: AbstractControl) => {
-					const imageUrl = control.value;
-
-					if (!isUrl(imageUrl) && !_.isEmpty(imageUrl)) {
-						return { invalidUrl: true };
-					}
-
-					return null;
-				}
-			]
-		]
-	});
 
 	private _ngDestroy$ = new Subject<void>();
 
 	constructor(
 		private readonly _activeModal: NgbActiveModal,
-		private readonly _formBuilder: FormBuilder,
 		private readonly _productsCategoryService: ProductsCategoryService,
 		private readonly _langTranslateService: TranslateService,
 		private readonly _productLocalesService: ProductLocalesService,
 		private readonly _notifyService: NotifyService
 	) {}
 
-	get image() {
-		return this.form.get('image');
-	}
-
-	get name() {
-		return this.form.get('name');
-	}
-
-	get isFormModelValid(): boolean {
-		return this.form.valid;
-	}
-
-	get showImageMeta() {
-		return this.image && this.image.value !== '';
-	}
-
-	ngOnInit() {
-		this.name.setValue(this.currentCategory.title);
-		this.image.setValue(this.currentCategory.image || '');
-
-		this.getUploaderPlaceholderText();
-	}
-
-	ngAfterViewInit() {
-		this._setupLogoUrlValidation();
-	}
-
 	ngOnDestroy() {
 		this._ngDestroy$.next();
 		this._ngDestroy$.complete();
@@ -112,11 +48,7 @@ export class CategoryEditComponent implements OnInit, AfterViewInit, OnDestroy {
 		this._activeModal.dismiss('canceled');
 	}
 
-	deleteImg() {
-		this.image.setValue('');
-	}
-
-	async editCategory() {
+	async editCategory(categoryObject) {
 		let usedLanguage = this._langTranslateService.currentLang;
 		switch (usedLanguage) {
 			case 'en':
@@ -135,7 +67,10 @@ export class CategoryEditComponent implements OnInit, AfterViewInit, OnDestroy {
 				usedLanguage = 'en-US';
 		}
 
-		const categoryRaw = this._setupCategoryBeforeUpdate(usedLanguage);
+		const categoryRaw = this._setupCategoryBeforeUpdate(
+			categoryObject,
+			usedLanguage
+		);
 
 		try {
 			await this._productsCategoryService
@@ -159,46 +94,31 @@ export class CategoryEditComponent implements OnInit, AfterViewInit, OnDestroy {
 	}
 
 	private _setupCategoryBeforeUpdate(
+		categoryObject,
 		usedLanguage: string
 	): IProductsCategoryCreateObject {
 		const newCategoryNames = this.currentCategory._nameLocaleValues.map(
 			({ locale, value }) => {
 				return locale === usedLanguage
-					? { locale: usedLanguage, value: this.name.value }
+					? {
+							locale: usedLanguage,
+							value: categoryObject.name
+					  }
 					: { locale, value };
 			}
 		);
 		if (!newCategoryNames.some((c) => c.locale === usedLanguage)) {
 			newCategoryNames.push({
 				locale: usedLanguage,
-				value: this.name.value
+				value: categoryObject.name
 			});
 		}
 
 		const categoryRaw: IProductsCategoryCreateObject = {
 			name: newCategoryNames,
-			image: this.image.value
+			image: categoryObject.image
 		};
 
 		return categoryRaw;
 	}
-
-	private _setupLogoUrlValidation() {
-		this.imagePreviewElement.nativeElement.onload = () => {
-			this.image.setErrors(null);
-		};
-
-		this.imagePreviewElement.nativeElement.onerror = () => {
-			if (this.showImageMeta) {
-				this.image.setErrors({ invalidUrl: true });
-			}
-		};
-	}
-
-	private async getUploaderPlaceholderText() {
-		this.uploaderPlaceholder = await this._langTranslateService
-			.get('CATEGORY_VIEW.CREATE.PHOTO_OPTIONAL')
-			.pipe(first())
-			.toPromise();
-	}
 }
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
index 0ef0d28c4..d51b04fb8 100644
--- a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
@@ -3,7 +3,8 @@ import {
 	ViewChild,
 	ElementRef,
 	OnInit,
-	AfterViewInit
+	AfterViewInit,
+	Input
 } from '@angular/core';
 import {
 	FormGroup,
@@ -26,6 +27,9 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 	@ViewChild('imagePreview')
 	imagePreviewElement: ElementRef;
 
+	@Input()
+	category: { title: string; image: string };
+
 	uploaderPlaceholder: string;
 
 	readonly form: FormGroup = this.fb.group({
@@ -96,7 +100,24 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 		return categoryObject;
 	}
 
+	get editObject() {
+		const editObject = {
+			name: this.name.value
+		};
+
+		if (this.showImageMeta) {
+			editObject['image'] = this.image.value;
+		}
+
+		return editObject;
+	}
+
 	ngOnInit() {
+		if (this.category) {
+			this.name.setValue(this.category.title);
+			this.image.setValue(this.category.image);
+		}
+
 		this.getUploaderPlaceholderText();
 	}
 

From 86d38541531119365778c3d7876ac1d0614b4882 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 5 Apr 2019 16:53:57 +0300
Subject: [PATCH 125/382] feat(ever-admin): created step "Product categories"
 EV-1196

---
 .../components/components.module.ts           | 12 +++-
 .../product-categories.component.html         | 28 ++++++++++
 .../product-categories.component.scss         |  5 ++
 .../product-categories.component.ts           | 55 +++++++++++++++++++
 .../+merchants/merchants.component.html       | 30 +++++++++-
 5 files changed, 124 insertions(+), 6 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 63d910edf..74fce39e4 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -12,6 +12,9 @@ import { SetupMerchantPaymentsComponent } from './payments/payments.component';
 import { SetupMerchantManufacturingComponent } from './manufacturing/manufacturing.component';
 import { SetupMerchantOrdersSettingsComponent } from './settings/orders/orders.component';
 import { NbRadioModule } from '@nebular/theme';
+import { SetupMerchantProductCategoriesComponent } from './product-categories/product-categories.component';
+import { ProductCategoriesFormsModule } from 'app/@shared/product/categories/forms/product-categories-forms.module';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
 
 const COMPONENTS = [
 	SetupMerchantAccountComponent,
@@ -20,7 +23,8 @@ const COMPONENTS = [
 	MerchantsSetupInstructionsComponent,
 	SetupMerchantPaymentsComponent,
 	SetupMerchantManufacturingComponent,
-	SetupMerchantOrdersSettingsComponent
+	SetupMerchantOrdersSettingsComponent,
+	SetupMerchantProductCategoriesComponent
 ];
 
 @NgModule({
@@ -30,9 +34,11 @@ const COMPONENTS = [
 		FormsModule,
 		NbRadioModule,
 		TranslateModule.forChild(),
-		FileUploaderModule
+		FileUploaderModule,
+		ProductCategoriesFormsModule
 	],
 	declarations: COMPONENTS,
-	exports: COMPONENTS
+	exports: COMPONENTS,
+	providers: [NotifyService]
 })
 export class SetupMerchantsComponentsModule {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
new file mode 100644
index 000000000..ff0878ae1
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
@@ -0,0 +1,28 @@
+<nb-card class="setup-merchant-product-categories">
+	<nb-card-header>
+		Product categories
+	</nb-card-header>
+	<nb-card-body>
+		<div class="row actions">
+			<div
+				*ngIf="!showCreateForm"
+				class="form-group offset-md-4 col-md-4 text-center"
+			>
+				<button
+					nbButton
+					outline
+					status="success"
+					(click)="showCreateForm = true"
+				>
+					Add own product category
+				</button>
+			</div>
+
+			<div class="offset-md-1 col-md-11" *ngIf="showCreateForm">
+				<ea-product-category-basic-info-form
+					#basicInfo
+				></ea-product-category-basic-info-form>
+			</div>
+		</div>
+	</nb-card-body>
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.scss
new file mode 100644
index 000000000..8376a4c9d
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.scss
@@ -0,0 +1,5 @@
+.setup-merchant-product-categories {
+	nb-card-body {
+		text-align: left;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
new file mode 100644
index 000000000..af60597a5
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
@@ -0,0 +1,55 @@
+import { Component, ViewChild } from '@angular/core';
+import { NgForm } from '@angular/forms';
+import { first } from 'rxjs/operators';
+import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
+import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
+import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
+import { BasicInfoFormComponent } from 'app/@shared/product/categories/forms/basic-info';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
+
+@Component({
+	selector: 'ea-merchants-setup-product-categories',
+	templateUrl: './product-categories.component.html',
+	styleUrls: ['./product-categories.component.scss']
+})
+export class SetupMerchantProductCategoriesComponent {
+	@ViewChild('basicInfo')
+	basicInfo: BasicInfoFormComponent;
+
+	showCreateForm: boolean = false;
+
+	constructor(
+		private productsCategoryService: ProductsCategoryService,
+		private readonly notifyService: NotifyService,
+		private readonly productLocalesService: ProductLocalesService
+	) {}
+
+	async create() {
+		try {
+			await this.productsCategoryService
+				.create(this.basicInfo.createObject)
+				.pipe(first())
+				.toPromise();
+			const message = `Category ${this.localeTranslate(
+				this.basicInfo.createObject.name
+			)} is added!`;
+			this.notifyService.success(message);
+		} catch (err) {
+			const message = `Something went wrong!`;
+			this.notifyService.error(message);
+		}
+	}
+
+	get isValidForm() {
+		let res = false;
+		if (this.basicInfo) {
+			res = this.basicInfo.form.valid;
+		}
+
+		return res;
+	}
+
+	localeTranslate(member: ILocaleMember[]) {
+		return this.productLocalesService.getTranslate(member);
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 7551d949a..37a558278 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -216,14 +216,38 @@
 							</button>
 						</nb-step>
 						<nb-step label="Product categories">
-							<h3>Product categories</h3>
+							<ea-merchants-setup-product-categories
+								#productCategories
+							></ea-merchants-setup-product-categories>
+							<button
+								*ngIf="productCategories.showCreateForm"
+								nbButton
+								(click)="
+									productCategories.showCreateForm = false
+								"
+							>
+								Back
+							</button>
 
-							<button nbButton nbStepperPrevious>
+							<button
+								*ngIf="!productCategories.showCreateForm"
+								nbButton
+								nbStepperPrevious
+							>
 								{{
 									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
 								}}
 							</button>
-							<button nbButton nbStepperNext>
+							<button
+								nbButton
+								nbStepperNext
+								[disabled]="
+									productCategories.showCreateForm
+										? !productCategories.isValidForm
+										: false
+								"
+								(click)="productCategories.create()"
+							>
 								{{
 									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
 								}}

From a564cab6ff085e7438b1072be2bc1a119cb4d36a Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 5 Apr 2019 19:47:00 +0300
Subject: [PATCH 126/382] docs: add DeepScan badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8f8ca86ae..1edd0ce90 100644
--- a/README.md
+++ b/README.md
@@ -334,6 +334,7 @@ All other brand and product names are trademarks, registered trademarks or servi
 [![Circle CI](https://circleci.com/gh/ever-co/ever.svg?style=svg)](https://circleci.com/gh/ever-co/ever)
 [![codecov](https://codecov.io/gh/ever-co/ever/branch/master/graph/badge.svg)](https://codecov.io/gh/ever-co/ever)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e7b2b38660f44963989ac9d49ae76d4d)](https://www.codacy.com/app/Ever/ever?utm_source=github.com&utm_medium=referral&utm_content=ever-co/ever&utm_campaign=Badge_Grade)
+[![DeepScan grade](https://deepscan.io/api/teams/3293/projects/4849/branches/38566/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=3293&pid=4849&bid=38566)
 [![Known Vulnerabilities](https://snyk.io/test/github/ever-co/ever/badge.svg)](https://snyk.io/test/github/ever-co/ever)
 [![Greenkeeper badge](https://badges.greenkeeper.io/ever-co/ever.svg)](https://greenkeeper.io)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fever-co%2Fever.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fever-co%2Fever?ref=badge_shield)

From 58293ba0bef09dddf74c26237d6af624a9677bae Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Sat, 6 Apr 2019 18:05:09 +0300
Subject: [PATCH 127/382] docs: add note about Gitflow

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 1edd0ce90..f3fa7b1a4 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,8 @@ For quick overview of each project in the Platform (Server, Admin, Shops, etc),
 
 ## Getting Started
 
+We follow [Gitflow Workflow](https://nvie.com/posts/a-successful-git-branching-model) so the [`develop` branch](https://github.com/ever-co/ever/tree/develop) may be in an unstable or even broken state during development. Please use [releases](https://github.com/ever-co/ever/releases) or [`master` branch](https://github.com/ever-co/ever/tree/master) instead of the `develop` branch in order to get more stable code.
+
 ### Clone Repo
 
 Clone the Ever Platform Git repo:

From 53d72d9478a0119602a2c5d783c22d2c8a5af3e4 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Sat, 6 Apr 2019 21:37:10 +0300
Subject: [PATCH 128/382] docs: update a bit project description

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f3fa7b1a4..02ab31d20 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 [Ever](https://ever.co)® is an Open-Source, Real-Time, Reactive, **On-Demand** Commerce Platform build with [TypeScript](http://www.typescriptlang.org).
 
-Out-of-the-box Ever® Platform™ provides everything required to quickly build, manage and expand Multi-Store (Multi-Vendor Marketplace) or Single-Store **On-Demand** Commerce Solutions with customized e-commerce Websites (shops), Mobile ordering apps (Hybrid and PWA), Carrier (Driver) apps, Merchant apps and Admin interface website.
+Out-of-the-box Ever® Platform™ provides everything required to quickly build, manage and expand Multi-Store (Multi-Vendor / Peer-to-Peer Marketplace) or Single-Store **On-Demand** Commerce Solutions with customized e-commerce Websites (Shops), Mobile ordering Apps (Hybrid and PWA), Carrier (Driver) Mobile Apps, Merchant Apps and Admin interface Website.
 
 ![overview](https://docs.ever.co/docs/assets/overview.jpg)
 

From 1907a1767bd20bdc6d5aa9f5316486cb5d010b37 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:15 +0000
Subject: [PATCH 129/382] chore(package): update @types/yargs to version 13.0.0

---
 admin/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index d9e86dc42..022b64124 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -173,7 +173,7 @@
 		"@types/socket.io-client": "^1.4.32",
 		"@types/stripe": "^6.25.7",
 		"@types/uuid": "^3.4.4",
-		"@types/yargs": "^12.0.9",
+		"@types/yargs": "^13.0.0",
 		"babel-loader": "^8.0.5",
 		"codelyzer": "^4.5.0",
 		"cross-env": "^5.2.0",

From 2a286badc06744ba1d5affe9b1606b608df8153c Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:18 +0000
Subject: [PATCH 130/382] chore(package): update @types/yargs to version 13.0.0

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index d09400e69..624308b60 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -184,7 +184,7 @@
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/uuid": "^3.4.4",
-		"@types/yargs": "^12.0.10",
+		"@types/yargs": "^13.0.0",
 		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
 		"codelyzer": "^5.0.0-beta.1",

From c2b0724ef653a66e53b160c5b5d13b1b7f842036 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:21 +0000
Subject: [PATCH 131/382] chore(package): update @types/yargs to version 13.0.0

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index dc16be46d..288a26356 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -198,7 +198,7 @@
 		"@types/socket.io-client": "^1.4.32",
 		"@types/stripe": "^6.25.7",
 		"@types/uuid": "^3.4.4",
-		"@types/yargs": "^12.0.9",
+		"@types/yargs": "^13.0.0",
 		"codelyzer": "^5.0.0-beta.1",
 		"cpr": "^3.0.1",
 		"cross-env": "^5.2.0",

From 0e1036c0579ca70386466d87f3c78e0db7bdbdc5 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:24 +0000
Subject: [PATCH 132/382] chore(package): update @types/yargs to version 13.0.0

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index df0d941c9..2960305f8 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -171,7 +171,7 @@
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/uuid": "^3.4.4",
-		"@types/yargs": "^12.0.10",
+		"@types/yargs": "^13.0.0",
 		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
 		"codelyzer": "^5.0.0-beta.1",

From ebca48dcc3976edaece7be88b0dda9e3130aef19 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:27 +0000
Subject: [PATCH 133/382] chore(package): update @types/yargs to version 13.0.0

---
 shop/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index e02dbc03e..08768079c 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -182,7 +182,7 @@
 		"@types/uglify-js": "^3.0.4",
 		"@types/uuid": "^3.4.4",
 		"@types/webpack": "^4.4.25",
-		"@types/yargs": "^12.0.9",
+		"@types/yargs": "^13.0.0",
 		"add-asset-html-webpack-plugin": "^3.1.3",
 		"angular2-template-loader": "^0.6.2",
 		"assets-webpack-plugin": "^3.9.10",

From dccc5fc324b3c35755690a67c5375ce4ece1c4fb Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:31 +0000
Subject: [PATCH 134/382] chore(package): update lockfile
 shop/website-angular/yarn.lock

---
 shop/website-angular/yarn.lock | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 68935972c..f0612ea12 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -629,10 +629,17 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-"@types/yargs@^12.0.9":
-  version "12.0.9"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
-  integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
+"@types/yargs-parser@*":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
+  integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw==
+
+"@types/yargs@^13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.0.tgz#d2acb3bec0047d8f648ebacdab6b928a900c42c4"
+  integrity sha512-hY0o+kcz9M6kH32NUeb6VURghqMuCVkiUx+8Btsqhj4Hhov/hVGUx9DmBJeIkzlp1uAQK4wngQBCjqWdUUkFyA==
+  dependencies:
+    "@types/yargs-parser" "*"
 
 "@types/zen-observable@^0.8.0":
   version "0.8.0"

From 995a55f5161f3e2584c3bef497c0c573c7da39b9 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:35 +0000
Subject: [PATCH 135/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 34 ++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 9dc333b9c..21d28cb18 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -684,9 +684,9 @@
 			}
 		},
 		"@angular/service-worker": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.3.tgz",
-			"integrity": "sha512-9ldQdzwg82FJJzvJMBctvSOYbZfgxXRcfozfpt2mdDtVDZoojl8GnqjskCZQlrTgh6bFm7aREKqVZxyu2dyG2A==",
+			"version": "7.2.12",
+			"resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-7.2.12.tgz",
+			"integrity": "sha512-0hvKy+EXPoGrLujqzXK02gfVUZ187o/aDvmBuH2Io9us93RgGew/Se1iFl2YaawhPYSsuwwbrcjoSVMznoI1GQ==",
 			"requires": {
 				"tslib": "^1.9.0"
 			}
@@ -2877,9 +2877,18 @@
 			}
 		},
 		"@types/yargs": {
-			"version": "12.0.10",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.10.tgz",
-			"integrity": "sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==",
+			"version": "13.0.0",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.0.tgz",
+			"integrity": "sha512-hY0o+kcz9M6kH32NUeb6VURghqMuCVkiUx+8Btsqhj4Hhov/hVGUx9DmBJeIkzlp1uAQK4wngQBCjqWdUUkFyA==",
+			"dev": true,
+			"requires": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"@types/yargs-parser": {
+			"version": "13.0.0",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.0.0.tgz",
+			"integrity": "sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw==",
 			"dev": true
 		},
 		"@types/zen-observable": {
@@ -7746,7 +7755,8 @@
 				"ansi-regex": {
 					"version": "2.1.1",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+					"optional": true
 				},
 				"aproba": {
 					"version": "1.2.0",
@@ -8161,7 +8171,8 @@
 				"safe-buffer": {
 					"version": "5.1.2",
 					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+					"optional": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
@@ -8217,6 +8228,7 @@
 					"version": "3.0.1",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
 					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+					"optional": true,
 					"requires": {
 						"ansi-regex": "^2.0.0"
 					}
@@ -8260,12 +8272,14 @@
 				"wrappy": {
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+					"optional": true
 				},
 				"yallist": {
 					"version": "3.0.3",
 					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
+					"integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+					"optional": true
 				}
 			}
 		},

From 082121781ca65bab20adbb443065d357fb1dee86 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:38 +0000
Subject: [PATCH 136/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 79a26909a..60dbcdc23 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -1074,10 +1074,17 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/yargs@^12.0.9":
-  version "12.0.9"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
-  integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
+"@types/yargs-parser@*":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
+  integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw==
+
+"@types/yargs@^13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.0.tgz#d2acb3bec0047d8f648ebacdab6b928a900c42c4"
+  integrity sha512-hY0o+kcz9M6kH32NUeb6VURghqMuCVkiUx+8Btsqhj4Hhov/hVGUx9DmBJeIkzlp1uAQK4wngQBCjqWdUUkFyA==
+  dependencies:
+    "@types/yargs-parser" "*"
 
 "@types/zen-observable@^0.8.0":
   version "0.8.0"
@@ -11082,7 +11089,7 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@4.2.1:
+webpack-merge@4.2.1, webpack-merge@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
   integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==

From 4762b0710388c5a1ca8a56df0cac274861ed17ed Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:42 +0000
Subject: [PATCH 137/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index c6bb3d8a5..f209c5ff9 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -1050,10 +1050,17 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/yargs@^12.0.10":
-  version "12.0.10"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.10.tgz#17a8ec65cd8e88f51b418ceb271af18d3137df67"
-  integrity sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==
+"@types/yargs-parser@*":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
+  integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw==
+
+"@types/yargs@^13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.0.tgz#d2acb3bec0047d8f648ebacdab6b928a900c42c4"
+  integrity sha512-hY0o+kcz9M6kH32NUeb6VURghqMuCVkiUx+8Btsqhj4Hhov/hVGUx9DmBJeIkzlp1uAQK4wngQBCjqWdUUkFyA==
+  dependencies:
+    "@types/yargs-parser" "*"
 
 "@types/zen-observable@^0.8.0":
   version "0.8.0"

From 54a3710e3a8dbad12684c88c8c0902b4d5852e42 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 02:02:45 +0000
Subject: [PATCH 138/382] chore(package): update lockfile
 admin/website-angular/yarn.lock

---
 admin/website-angular/yarn.lock | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 2c2c2f8e0..0a71a4354 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -1611,10 +1611,17 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/yargs@^12.0.9":
-  version "12.0.9"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
-  integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
+"@types/yargs-parser@*":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
+  integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw==
+
+"@types/yargs@^13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.0.tgz#d2acb3bec0047d8f648ebacdab6b928a900c42c4"
+  integrity sha512-hY0o+kcz9M6kH32NUeb6VURghqMuCVkiUx+8Btsqhj4Hhov/hVGUx9DmBJeIkzlp1uAQK4wngQBCjqWdUUkFyA==
+  dependencies:
+    "@types/yargs-parser" "*"
 
 "@types/zen-observable@^0.8.0":
   version "0.8.0"

From 0ac38fdc53ede91f0e88bcbe1f541e102f5e970c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 8 Apr 2019 11:22:54 +0300
Subject: [PATCH 139/382] feat(ever-admin): improved Product Categories table,
 and used it step "Product categories" on Setup Merchants page EV-1196

---
 .../@core/data/productsCategory.service.ts    |  1 +
 .../categories-table.component.ts             | 49 ++++++++++++++-----
 .../forms/product-categories-forms.module.ts  | 19 +++++--
 .../product/forms/product-forms.module.ts     | 13 +----
 .../app/pages/+products/products.module.ts    | 10 +---
 .../product-categories.component.html         | 18 +++++--
 .../product-categories.component.ts           | 49 +++++++++++++++++--
 .../+merchants/merchants.component.html       | 27 ++++++----
 8 files changed, 135 insertions(+), 51 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/productsCategory.service.ts b/admin/website-angular/src/app/@core/data/productsCategory.service.ts
index 9cd65cca5..e460f029f 100644
--- a/admin/website-angular/src/app/@core/data/productsCategory.service.ts
+++ b/admin/website-angular/src/app/@core/data/productsCategory.service.ts
@@ -50,6 +50,7 @@ export class ProductsCategoryService {
 					) {
 						createProductsCategory(createInput: $productsCategory) {
 							id
+							image
 							name {
 								locale
 								value
diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
index fc4990bf1..67eb46b91 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
@@ -1,4 +1,11 @@
-import { Component, OnDestroy } from '@angular/core';
+import {
+	Component,
+	OnDestroy,
+	Input,
+	OnInit,
+	Output,
+	EventEmitter
+} from '@angular/core';
 import { LocalDataSource } from 'ng2-smart-table';
 import ProductsCategory from '@modules/server.common/entities/ProductsCategory';
 import { ProductsCategoryService } from '../../../../@core/data/productsCategory.service';
@@ -26,18 +33,28 @@ interface ProductViewModel {
 	styleUrls: ['./categories-table.component.scss'],
 	templateUrl: './categories-table.component.html'
 })
-export class CategoriesTableComponent implements OnDestroy {
-	private ngDestroy$ = new Subject<void>();
+export class CategoriesTableComponent implements OnInit, OnDestroy {
+	@Input()
+	selectMode = 'multi';
+	@Input()
+	showPerPage = 7;
+
+	@Output()
+	editRow = new EventEmitter();
+	@Output()
+	deleteRow = new EventEmitter();
 
-	public confirmSub$: Subscription;
+	productsCategories: ProductsCategory[] = [];
+	loading: boolean;
+
+	confirmSub$: Subscription;
 
 	settingsSmartTable: object;
 	sourceSmartTable = new LocalDataSource();
 
 	private static noInfoSign = '';
 	private _selectedCategories: ProductViewModel[] = [];
-	public productsCategories: ProductsCategory[] = [];
-	public loading: boolean;
+	private ngDestroy$ = new Subject<void>();
 
 	constructor(
 		private readonly _translateService: TranslateService,
@@ -46,10 +63,7 @@ export class CategoriesTableComponent implements OnDestroy {
 		private readonly _modalService: NgbModal,
 		private readonly _notifyService: NotifyService,
 		private readonly modalService: NgbModal
-	) {
-		this._loadSettingsSmartTable();
-		this._applyTranslationOnSmartTable();
-	}
+	) {}
 
 	get hasSelectedCategories(): boolean {
 		return this._selectedCategories.length > 0;
@@ -59,6 +73,10 @@ export class CategoriesTableComponent implements OnDestroy {
 		return [...this._selectedCategories];
 	}
 
+	ngOnInit(): void {
+		this._loadSettingsSmartTable();
+		this._applyTranslationOnSmartTable();
+	}
 	edit(ev) {
 		const activeModal = this._modalService.open(CategoryEditComponent, {
 			size: 'lg',
@@ -87,13 +105,18 @@ export class CategoriesTableComponent implements OnDestroy {
 
 				try {
 					this.loading = true;
+
 					this._productsCategoryService
 						.removeByIds(idsArray)
 						.pipe()
 						.toPromise();
+
 					this.loading = false;
+
 					const message = `Category '${e.data.title}' deleted`;
 					this._notifyService.success(message);
+
+					this.deleteRow.emit(e.data);
 				} catch (error) {
 					this.loading = false;
 					const message = `Something went wrong!`;
@@ -124,7 +147,7 @@ export class CategoriesTableComponent implements OnDestroy {
 		this.sourceSmartTable.load(categoriesVM);
 	}
 
-	protected localeTranslate(member: ILocaleMember[]) {
+	localeTranslate(member: ILocaleMember[]) {
 		return this._productLocalesService.getTranslate(member);
 	}
 
@@ -144,7 +167,7 @@ export class CategoriesTableComponent implements OnDestroy {
 			.pipe(takeUntil(this.ngDestroy$))
 			.subscribe(([image, titleTr]) => {
 				this.settingsSmartTable = {
-					selectMode: 'multi',
+					selectMode: this.selectMode,
 					mode: 'external',
 					actions: {
 						add: false,
@@ -169,7 +192,7 @@ export class CategoriesTableComponent implements OnDestroy {
 					},
 					pager: {
 						display: true,
-						perPage: 7
+						perPage: this.showPerPage
 					}
 				};
 			});
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/product-categories-forms.module.ts b/admin/website-angular/src/app/@shared/product/categories/forms/product-categories-forms.module.ts
index 38496b6db..a3475ed3b 100644
--- a/admin/website-angular/src/app/@shared/product/categories/forms/product-categories-forms.module.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/product-categories-forms.module.ts
@@ -5,6 +5,11 @@ import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.modu
 import { ThemeModule } from 'app/@theme';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
+import { CategoriesTableComponent } from '../categories-table';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { NbSpinnerModule } from '@nebular/theme';
+import { CategoryImageComponent } from '../categories-table/category-image.component';
+import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
 
 @NgModule({
 	imports: [
@@ -12,9 +17,17 @@ import { FormsModule } from '@angular/forms';
 		ThemeModule,
 		TranslateModule.forChild(),
 		FileUploaderModule,
-		FormsModule
+		Ng2SmartTableModule,
+		NbSpinnerModule,
+		FormsModule,
+		ConfirmationModalModule
 	],
-	exports: [BasicInfoFormComponent],
-	declarations: [BasicInfoFormComponent]
+	declarations: [
+		BasicInfoFormComponent,
+		CategoriesTableComponent,
+		CategoryImageComponent
+	],
+	exports: [BasicInfoFormComponent, CategoriesTableComponent],
+	entryComponents: [CategoryImageComponent]
 })
 export class ProductCategoriesFormsModule {}
diff --git a/admin/website-angular/src/app/@shared/product/forms/product-forms.module.ts b/admin/website-angular/src/app/@shared/product/forms/product-forms.module.ts
index ae5ef37c2..c362a9a49 100644
--- a/admin/website-angular/src/app/@shared/product/forms/product-forms.module.ts
+++ b/admin/website-angular/src/app/@shared/product/forms/product-forms.module.ts
@@ -4,7 +4,6 @@ import { FormWizardModule } from 'angular2-wizard';
 import { ThemeModule } from '../../../@theme/theme.module';
 import { BasicInfoFormComponent } from './basic-info';
 import { ProductsTableComponent } from './products-table';
-import { CategoriesTableComponent } from '../categories/categories-table/categories-table.component';
 import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { MultiselectDropdownModule } from 'angular-2-dropdown-multiselect';
 import { ProductCategoriesModule } from '../../render-component/product-categories/product-categories.module';
@@ -28,15 +27,7 @@ import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.modu
 		ConfirmationModalModule,
 		RenderComponentsModule
 	],
-	exports: [
-		BasicInfoFormComponent,
-		ProductsTableComponent,
-		CategoriesTableComponent
-	],
-	declarations: [
-		BasicInfoFormComponent,
-		ProductsTableComponent,
-		CategoriesTableComponent
-	]
+	exports: [BasicInfoFormComponent, ProductsTableComponent],
+	declarations: [BasicInfoFormComponent, ProductsTableComponent]
 })
 export class ProductFormsModule {}
diff --git a/admin/website-angular/src/app/pages/+products/products.module.ts b/admin/website-angular/src/app/pages/+products/products.module.ts
index 35a6b0a10..1a88f8869 100644
--- a/admin/website-angular/src/app/pages/+products/products.module.ts
+++ b/admin/website-angular/src/app/pages/+products/products.module.ts
@@ -14,7 +14,6 @@ import { CategoryEditComponent } from '../../@shared/product/categories/category
 import { NbSpinnerModule } from '@nebular/theme';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
 import { ConfirmationModalModule } from '../../@shared/confirmation-modal/confirmation-modal.module';
-import { CategoryImageComponent } from 'app/@shared/product/categories/categories-table/category-image.component';
 import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
 import { ProductCategoriesFormsModule } from 'app/@shared/product/categories/forms/product-categories-forms.module';
 
@@ -52,14 +51,9 @@ const routes: Routes = [
 		ProductsComponent,
 		CategoryCreateComponent,
 		CategoryEditComponent,
-		CategoriesComponent,
-		CategoryImageComponent
-	],
-	entryComponents: [
-		CategoryCreateComponent,
-		CategoryEditComponent,
-		CategoryImageComponent
+		CategoriesComponent
 	],
+	entryComponents: [CategoryCreateComponent, CategoryEditComponent],
 	providers: [JsonPipe, NotifyService]
 })
 export class ProductsModule {
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
index ff0878ae1..364c1ec0c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
@@ -5,24 +5,36 @@
 	<nb-card-body>
 		<div class="row actions">
 			<div
-				*ngIf="!showCreateForm"
+				*ngIf="!showMutationForm"
 				class="form-group offset-md-4 col-md-4 text-center"
 			>
 				<button
 					nbButton
 					outline
 					status="success"
-					(click)="showCreateForm = true"
+					(click)="showMutationForm = true"
 				>
 					Add own product category
 				</button>
 			</div>
 
-			<div class="offset-md-1 col-md-11" *ngIf="showCreateForm">
+			<div class="offset-md-1 col-md-11" *ngIf="showMutationForm">
 				<ea-product-category-basic-info-form
 					#basicInfo
 				></ea-product-category-basic-info-form>
 			</div>
+
+			<div
+				[hidden]="showMutationForm || productCategories.length == 0"
+				class="col-md-12 p-0"
+			>
+				<ea-categories-table
+					[selectMode]="null"
+					[showPerPage]="showPerPage"
+					(deleteRow)="removeCategory($event)"
+					#categoriesTable
+				></ea-categories-table>
+			</div>
 		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
index af60597a5..55c9aa259 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
@@ -6,6 +6,8 @@ import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
 import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
 import { BasicInfoFormComponent } from 'app/@shared/product/categories/forms/basic-info';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
+import ProductsCategory from '@modules/server.common/entities/ProductsCategory';
+import { CategoriesTableComponent } from 'app/@shared/product/categories/categories-table';
 
 @Component({
 	selector: 'ea-merchants-setup-product-categories',
@@ -16,7 +18,13 @@ export class SetupMerchantProductCategoriesComponent {
 	@ViewChild('basicInfo')
 	basicInfo: BasicInfoFormComponent;
 
-	showCreateForm: boolean = false;
+	@ViewChild('categoriesTable')
+	categoriesTable: CategoriesTableComponent;
+
+	productCategories: ProductsCategory[] = [];
+	showPerPage = 3;
+
+	private _showMutationForm: boolean = false;
 
 	constructor(
 		private productsCategoryService: ProductsCategoryService,
@@ -24,19 +32,26 @@ export class SetupMerchantProductCategoriesComponent {
 		private readonly productLocalesService: ProductLocalesService
 	) {}
 
-	async create() {
+	async add() {
 		try {
-			await this.productsCategoryService
+			const category = await this.productsCategoryService
 				.create(this.basicInfo.createObject)
 				.pipe(first())
 				.toPromise();
+			this.productCategories.unshift(category);
+
 			const message = `Category ${this.localeTranslate(
 				this.basicInfo.createObject.name
 			)} is added!`;
 			this.notifyService.success(message);
+
+			this.showMutationForm = false;
 		} catch (err) {
 			const message = `Something went wrong!`;
-			this.notifyService.error(message);
+			const body = err.message
+				? '\n' + `Error message: ${err.message}`
+				: '';
+			this.notifyService.error(message, body);
 		}
 	}
 
@@ -49,6 +64,32 @@ export class SetupMerchantProductCategoriesComponent {
 		return res;
 	}
 
+	get showMutationForm() {
+		return this._showMutationForm;
+	}
+
+	set showMutationForm(isShow: boolean) {
+		this._showMutationForm = isShow;
+
+		if (!isShow) {
+			this.loadCategories();
+		}
+	}
+
+	loadCategories() {
+		if (this.productCategories.length > 0) {
+			this.categoriesTable.loadDataSmartTable(this.productCategories);
+		}
+	}
+
+	removeCategory(category) {
+		this.productCategories = this.productCategories.filter(
+			(c) => c.id !== category.id
+		);
+
+		this.loadCategories();
+	}
+
 	localeTranslate(member: ILocaleMember[]) {
 		return this.productLocalesService.getTranslate(member);
 	}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 37a558278..7a61bc1bf 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -220,17 +220,30 @@
 								#productCategories
 							></ea-merchants-setup-product-categories>
 							<button
-								*ngIf="productCategories.showCreateForm"
+								*ngIf="productCategories.showMutationForm"
 								nbButton
 								(click)="
-									productCategories.showCreateForm = false
+									productCategories.showMutationForm = false
 								"
 							>
 								Back
 							</button>
 
 							<button
-								*ngIf="!productCategories.showCreateForm"
+								*ngIf="productCategories.showMutationForm"
+								nbButton
+								[disabled]="
+									productCategories.showMutationForm
+										? !productCategories.isValidForm
+										: false
+								"
+								(click)="productCategories.add()"
+							>
+								Add
+							</button>
+
+							<button
+								*ngIf="!productCategories.showMutationForm"
 								nbButton
 								nbStepperPrevious
 							>
@@ -238,15 +251,11 @@
 									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
 								}}
 							</button>
+
 							<button
 								nbButton
 								nbStepperNext
-								[disabled]="
-									productCategories.showCreateForm
-										? !productCategories.isValidForm
-										: false
-								"
-								(click)="productCategories.create()"
+								*ngIf="!productCategories.showMutationForm"
 							>
 								{{
 									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate

From 51ef66c5bf8d45caceef71b126faa73f0eff1aa4 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Mon, 8 Apr 2019 11:23:51 +0300
Subject: [PATCH 140/382] feat(ever-admin): add translate on setup delivery
 info EV-1198

---
 .../basic-info/basic-info-form.component.html    | 16 ++++++++++------
 admin/website-angular/src/assets/i18n/bg.json    |  1 +
 admin/website-angular/src/assets/i18n/en.json    |  1 +
 admin/website-angular/src/assets/i18n/he.json    |  1 +
 admin/website-angular/src/assets/i18n/ru.json    |  1 +
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
index e6d8547c8..09f3697f4 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
@@ -223,14 +223,18 @@
 
 			<div class="form-group row">
 				<!-- TODO add translate -->
-				<nb-checkbox class="col-sm-12" formControlName="isSharedCarrier"
-					>Carrier can be shared?</nb-checkbox
+				<nb-checkbox
+					class="col-sm-12"
+					formControlName="isSharedCarrier"
 				>
-				<nb-checkbox class="col-sm-12" formControlName="isActive">
 					{{
-						'CARRIERS_VIEW.CARRIER_PAGE.ACTIVE' | translate
-					}}</nb-checkbox
-				>
+						'CARRIERS_VIEW.CARRIER_PAGE.CARRIER_CAN_BE_SHARED'
+							| translate
+					}}
+				</nb-checkbox>
+				<nb-checkbox class="col-sm-12" formControlName="isActive">
+					{{ 'CARRIERS_VIEW.CARRIER_PAGE.ACTIVE' | translate }}
+				</nb-checkbox>
 			</div>
 		</fieldset>
 	</div>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 05fa03fe7..37771da11 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -772,6 +772,7 @@
 			"CLIENT_REFUSE_ORDER": "Поръчка отказана от клиента",
 			"AVAIBLE_ORDER_TO_PICK_UP": "Налични поръчки за набиране (всеки превозвач може да вземе няколко поръчки)",
 			"ACTIVE": "Активен",
+			"CARRIER_CAN_BE_SHARED": "Превозвачът може да бъде споделен?",
 			"NOT_ACTIVE": "Неактивен",
 			"WORKING": "Работещ",
 			"NOT_WORKING": "Не работещ",
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 6b49280b4..1eb2a037e 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -771,6 +771,7 @@
 			"CLIENT_REFUSE_ORDER": "Client Refuse Order",
 			"AVAIBLE_ORDER_TO_PICK_UP": "Available Orders to pick up (each carrier can pick up multiple orders)",
 			"ACTIVE": "Active",
+			"CARRIER_CAN_BE_SHARED": "Carrier can be shared?",
 			"NOT_ACTIVE": "Not Active",
 			"WORKING": "Working",
 			"NOT_WORKING": "Not Working",
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 529a53520..cf1df12e4 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -771,6 +771,7 @@
 			"CLIENT_REFUSE_ORDER": "הזמנת לקוח",
 			"AVAIBLE_ORDER_TO_PICK_UP": "הזמנות זמינות להרים (כל מוביל יכול לאסוף הזמנות מרובות)",
 			"ACTIVE": "פָּעִיל",
+			"CARRIER_CAN_BE_SHARED": "ניתן לשתף את המוביל?",
 			"NOT_ACTIVE": "לא פעיל",
 			"WORKING": "עובד",
 			"NOT_WORKING": "לא עובד",
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 4d8773979..31155dcc5 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -768,6 +768,7 @@
 			"CLIENT_REFUSE_ORDER": "Заказ клиента",
 			"AVAIBLE_ORDER_TO_PICK_UP": "Доступные заказы для подбора (каждый перевозчик может выбрать несколько заказов)",
 			"ACTIVE": "Активный",
+			"CARRIER_CAN_BE_SHARED": "Перевозчик может быть общим?",
 			"NOT_ACTIVE": "Не активен",
 			"WORKING": "За работой",
 			"NOT_WORKING": "Не работает",

From 1a5bd84ce665528af52c6bea0653539bb35daf81 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 8 Apr 2019 12:32:27 +0300
Subject: [PATCH 141/382] feat(ever-admin): improved edit Prod. Category
 EV-1196

---
 .../categories-table.component.ts             | 22 +++--
 .../category-edit.component.html              |  2 +-
 .../category-edit/category-edit.component.ts  | 62 +-----------
 .../basic-info/basic-info-form.component.ts   | 55 +++++++----
 .../product-categories.component.html         |  3 +
 .../product-categories.component.ts           | 61 ++++++++----
 .../+merchants/merchants.component.html       | 94 +++++++++++--------
 7 files changed, 153 insertions(+), 146 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
index 67eb46b91..49e80e59a 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
@@ -38,6 +38,8 @@ export class CategoriesTableComponent implements OnInit, OnDestroy {
 	selectMode = 'multi';
 	@Input()
 	showPerPage = 7;
+	@Input()
+	editWithModal = true;
 
 	@Output()
 	editRow = new EventEmitter();
@@ -78,14 +80,18 @@ export class CategoriesTableComponent implements OnInit, OnDestroy {
 		this._applyTranslationOnSmartTable();
 	}
 	edit(ev) {
-		const activeModal = this._modalService.open(CategoryEditComponent, {
-			size: 'lg',
-			container: 'nb-layout',
-			backdrop: 'static'
-		});
-		const modalComponent: CategoryEditComponent =
-			activeModal.componentInstance;
-		modalComponent.currentCategory = ev.data;
+		if (this.editWithModal) {
+			const activeModal = this._modalService.open(CategoryEditComponent, {
+				size: 'lg',
+				container: 'nb-layout',
+				backdrop: 'static'
+			});
+			const modalComponent: CategoryEditComponent =
+				activeModal.componentInstance;
+			modalComponent.currentCategory = ev.data;
+		} else {
+			this.editRow.emit(ev.data);
+		}
 	}
 
 	async deleteCategory(e) {
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
index 952b8c598..07c03970c 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
+++ b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
@@ -19,7 +19,7 @@
 	<button
 		class="btn btn-success"
 		type="button"
-		(click)="editCategory(basicInfo.editObject)"
+		(click)="editCategory(basicInfo.getEditObject(currentCategory))"
 		[disabled]="basicInfo.form.invalid"
 	>
 		{{ 'CATEGORY_VIEW.EDIT.DONE' | translate }}!
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts
index 8717a555b..8a5f0fa1e 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts
@@ -1,15 +1,10 @@
 import { Component, OnDestroy } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import 'rxjs/operators/map';
 import { Subject } from 'rxjs';
 import { first } from 'rxjs/operators';
 import { ProductsCategoryService } from '../../../../@core/data/productsCategory.service';
-import {
-	IProductsCategoryCreateObject,
-	IProductsCategoryName
-} from '@modules/server.common/interfaces/IProductsCategory';
-import { TranslateService } from '@ngx-translate/core';
+import { IProductsCategoryName } from '@modules/server.common/interfaces/IProductsCategory';
 import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
 import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
@@ -34,7 +29,6 @@ export class CategoryEditComponent implements OnDestroy {
 	constructor(
 		private readonly _activeModal: NgbActiveModal,
 		private readonly _productsCategoryService: ProductsCategoryService,
-		private readonly _langTranslateService: TranslateService,
 		private readonly _productLocalesService: ProductLocalesService,
 		private readonly _notifyService: NotifyService
 	) {}
@@ -48,30 +42,7 @@ export class CategoryEditComponent implements OnDestroy {
 		this._activeModal.dismiss('canceled');
 	}
 
-	async editCategory(categoryObject) {
-		let usedLanguage = this._langTranslateService.currentLang;
-		switch (usedLanguage) {
-			case 'en':
-				usedLanguage += '-US';
-				break;
-			case 'bg':
-				usedLanguage += '-BG';
-				break;
-			case 'he':
-				usedLanguage += '-IL';
-				break;
-			case 'ru':
-				usedLanguage += '-RU';
-				break;
-			default:
-				usedLanguage = 'en-US';
-		}
-
-		const categoryRaw = this._setupCategoryBeforeUpdate(
-			categoryObject,
-			usedLanguage
-		);
-
+	async editCategory(categoryRaw) {
 		try {
 			await this._productsCategoryService
 				.update(this.currentCategory.id, categoryRaw)
@@ -92,33 +63,4 @@ export class CategoryEditComponent implements OnDestroy {
 	localeTranslate(member: ILocaleMember[]) {
 		return this._productLocalesService.getTranslate(member);
 	}
-
-	private _setupCategoryBeforeUpdate(
-		categoryObject,
-		usedLanguage: string
-	): IProductsCategoryCreateObject {
-		const newCategoryNames = this.currentCategory._nameLocaleValues.map(
-			({ locale, value }) => {
-				return locale === usedLanguage
-					? {
-							locale: usedLanguage,
-							value: categoryObject.name
-					  }
-					: { locale, value };
-			}
-		);
-		if (!newCategoryNames.some((c) => c.locale === usedLanguage)) {
-			newCategoryNames.push({
-				locale: usedLanguage,
-				value: categoryObject.name
-			});
-		}
-
-		const categoryRaw: IProductsCategoryCreateObject = {
-			name: newCategoryNames,
-			image: categoryObject.image
-		};
-
-		return categoryRaw;
-	}
 }
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
index d51b04fb8..f47d69661 100644
--- a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
@@ -71,24 +71,28 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 		return this.image && this.image.value !== '';
 	}
 
-	get createObject() {
+	get usedLanguage() {
 		let usedLanguage = this._langTranslateService.currentLang;
 		switch (usedLanguage) {
 			case 'en':
-				usedLanguage += '-US';
-				break;
+				return (usedLanguage += '-US');
+
 			case 'bg':
-				usedLanguage += '-BG';
-				break;
+				return (usedLanguage += '-BG');
+
 			case 'he':
-				usedLanguage += '-IL';
-				break;
+				return (usedLanguage += '-IL');
+
 			case 'ru':
-				usedLanguage += '-RU';
-				break;
+				return (usedLanguage += '-RU');
+
 			default:
-				usedLanguage = 'en-US';
+				return 'en-US';
 		}
+	}
+
+	get createObject() {
+		const usedLanguage = this.usedLanguage;
 
 		const categoryObject: IProductsCategoryCreateObject = {
 			name: [{ locale: usedLanguage, value: this.name.value }]
@@ -100,16 +104,31 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 		return categoryObject;
 	}
 
-	get editObject() {
-		const editObject = {
-			name: this.name.value
-		};
-
-		if (this.showImageMeta) {
-			editObject['image'] = this.image.value;
+	getEditObject(currentCategory) {
+		const usedLanguage = this.usedLanguage;
+		const newCategoryNames = currentCategory._nameLocaleValues.map(
+			({ locale, value }) => {
+				return locale === usedLanguage
+					? {
+							locale: usedLanguage,
+							value: this.name.value
+					  }
+					: { locale, value };
+			}
+		);
+		if (!newCategoryNames.some((c) => c.locale === usedLanguage)) {
+			newCategoryNames.push({
+				locale: usedLanguage,
+				value: this.name.value
+			});
 		}
 
-		return editObject;
+		const categoryRaw: IProductsCategoryCreateObject = {
+			name: newCategoryNames,
+			image: this.image.value
+		};
+
+		return categoryRaw;
 	}
 
 	ngOnInit() {
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
index 364c1ec0c..f26868a37 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
@@ -20,6 +20,7 @@
 
 			<div class="offset-md-1 col-md-11" *ngIf="showMutationForm">
 				<ea-product-category-basic-info-form
+					[category]="currentCategory"
 					#basicInfo
 				></ea-product-category-basic-info-form>
 			</div>
@@ -31,7 +32,9 @@
 				<ea-categories-table
 					[selectMode]="null"
 					[showPerPage]="showPerPage"
+					[editWithModal]="false"
 					(deleteRow)="removeCategory($event)"
+					(editRow)="editCategory($event)"
 					#categoriesTable
 				></ea-categories-table>
 			</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
index 55c9aa259..e9a4fcf66 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
@@ -21,9 +21,11 @@ export class SetupMerchantProductCategoriesComponent {
 	@ViewChild('categoriesTable')
 	categoriesTable: CategoriesTableComponent;
 
+	currentCategory: ProductsCategory;
 	productCategories: ProductsCategory[] = [];
 	showPerPage = 3;
 
+	mutationType: 'add' | 'edit' = 'add';
 	private _showMutationForm: boolean = false;
 
 	constructor(
@@ -32,6 +34,36 @@ export class SetupMerchantProductCategoriesComponent {
 		private readonly productLocalesService: ProductLocalesService
 	) {}
 
+	get isValidForm() {
+		let res = false;
+		if (this.basicInfo) {
+			res = this.basicInfo.form.valid;
+		}
+
+		return res;
+	}
+
+	get isInvalidValidForm() {
+		let res = false;
+		if (this.basicInfo) {
+			res = this.basicInfo.form.invalid;
+		}
+
+		return res;
+	}
+
+	get showMutationForm() {
+		return this._showMutationForm;
+	}
+
+	set showMutationForm(isShow: boolean) {
+		this._showMutationForm = isShow;
+		this.mutationType = 'add';
+		if (!isShow) {
+			this.loadCategories();
+		}
+	}
+
 	async add() {
 		try {
 			const category = await this.productsCategoryService
@@ -55,26 +87,7 @@ export class SetupMerchantProductCategoriesComponent {
 		}
 	}
 
-	get isValidForm() {
-		let res = false;
-		if (this.basicInfo) {
-			res = this.basicInfo.form.valid;
-		}
-
-		return res;
-	}
-
-	get showMutationForm() {
-		return this._showMutationForm;
-	}
-
-	set showMutationForm(isShow: boolean) {
-		this._showMutationForm = isShow;
-
-		if (!isShow) {
-			this.loadCategories();
-		}
-	}
+	async edit() {}
 
 	loadCategories() {
 		if (this.productCategories.length > 0) {
@@ -90,6 +103,14 @@ export class SetupMerchantProductCategoriesComponent {
 		this.loadCategories();
 	}
 
+	editCategory(category) {
+		console.error(category);
+		return;
+		this.currentCategory = category;
+		this.showMutationForm = true;
+		this.mutationType = 'edit';
+	}
+
 	localeTranslate(member: ILocaleMember[]) {
 		return this.productLocalesService.getTranslate(member);
 	}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 7a61bc1bf..46be82022 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -219,48 +219,64 @@
 							<ea-merchants-setup-product-categories
 								#productCategories
 							></ea-merchants-setup-product-categories>
-							<button
-								*ngIf="productCategories.showMutationForm"
-								nbButton
-								(click)="
-									productCategories.showMutationForm = false
-								"
-							>
-								Back
-							</button>
 
-							<button
-								*ngIf="productCategories.showMutationForm"
-								nbButton
-								[disabled]="
-									productCategories.showMutationForm
-										? !productCategories.isValidForm
-										: false
-								"
-								(click)="productCategories.add()"
-							>
-								Add
-							</button>
+							<div *ngIf="!productCategories.showMutationForm">
+								<button nbButton nbStepperPrevious>
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.PREV'
+											| translate
+									}}
+								</button>
 
-							<button
-								*ngIf="!productCategories.showMutationForm"
-								nbButton
-								nbStepperPrevious
-							>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
-								}}
-							</button>
+								<button nbButton nbStepperNext>
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.NEXT'
+											| translate
+									}}
+								</button>
+							</div>
 
-							<button
-								nbButton
-								nbStepperNext
-								*ngIf="!productCategories.showMutationForm"
-							>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
-								}}
-							</button>
+							<div *ngIf="productCategories.showMutationForm">
+								<button
+									nbButton
+									(click)="
+										productCategories.showMutationForm = false
+									"
+								>
+									Back
+								</button>
+
+								<button
+									*ngIf="
+										productCategories.mutationType === 'add'
+									"
+									nbButton
+									[disabled]="
+										productCategories.showMutationForm
+											? !productCategories.isValidForm
+											: false
+									"
+									(click)="productCategories.add()"
+								>
+									Add
+								</button>
+
+								<button
+									*ngIf="
+										productCategories.mutationType ===
+										'edit'
+									"
+									nbButton
+									[disabled]="
+										productCategories.showMutationForm
+											? productCategories.isInvalidValidForm
+											: false
+									"
+									(click)="productCategories.edit()"
+								>
+									Save
+								</button>
+							</div>
 						</nb-step>
 						<nb-step label="Products">
 							<h3>Products</h3>

From 899b8404391a51828e7c9517a0bd9911c65bf0a4 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 8 Apr 2019 13:41:16 +0300
Subject: [PATCH 142/382] feat(ever-admin): edit product category from step - 
 "Product categories" on Setup Merchants page EV-1196

---
 .../@core/data/productsCategory.service.ts    |  2 ++
 .../product-categories.component.ts           | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/productsCategory.service.ts b/admin/website-angular/src/app/@core/data/productsCategory.service.ts
index e460f029f..f7b777c7c 100644
--- a/admin/website-angular/src/app/@core/data/productsCategory.service.ts
+++ b/admin/website-angular/src/app/@core/data/productsCategory.service.ts
@@ -87,6 +87,8 @@ export class ProductsCategoryService {
 							id: $id
 							updateInput: $productsCategory
 						) {
+							id
+							image
 							name {
 								locale
 								value
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
index e9a4fcf66..0c33fbe6d 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
@@ -87,7 +87,32 @@ export class SetupMerchantProductCategoriesComponent {
 		}
 	}
 
-	async edit() {}
+	async edit() {
+		try {
+			const editObj = this.basicInfo.getEditObject(this.currentCategory);
+			const category = await this.productsCategoryService
+				.update(this.currentCategory.id, editObj)
+				.pipe(first())
+				.toPromise();
+			this.productCategories = this.productCategories.filter(
+				(c) => c.id !== category.id
+			);
+			this.productCategories.unshift(category);
+
+			const message = `Category ${this.localeTranslate(
+				this.basicInfo.createObject.name
+			)} is edited`;
+			this.notifyService.success(message);
+
+			this.showMutationForm = false;
+		} catch (err) {
+			const message = `Something went wrong!`;
+			const body = err.message
+				? '\n' + `Error message: ${err.message}`
+				: '';
+			this.notifyService.error(message, body);
+		}
+	}
 
 	loadCategories() {
 		if (this.productCategories.length > 0) {
@@ -104,8 +129,6 @@ export class SetupMerchantProductCategoriesComponent {
 	}
 
 	editCategory(category) {
-		console.error(category);
-		return;
 		this.currentCategory = category;
 		this.showMutationForm = true;
 		this.mutationType = 'edit';

From eda75ecdbea79796831c7b6cf6a039498d38aa45 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 8 Apr 2019 13:53:12 +0300
Subject: [PATCH 143/382] fix(ever-admin): small fix on step "Product
 categories" EV-1196

---
 .../product-categories/product-categories.component.ts         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
index 0c33fbe6d..0c88db715 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
@@ -58,6 +58,7 @@ export class SetupMerchantProductCategoriesComponent {
 
 	set showMutationForm(isShow: boolean) {
 		this._showMutationForm = isShow;
+		this.currentCategory = null;
 		this.mutationType = 'add';
 		if (!isShow) {
 			this.loadCategories();
@@ -129,9 +130,9 @@ export class SetupMerchantProductCategoriesComponent {
 	}
 
 	editCategory(category) {
-		this.currentCategory = category;
 		this.showMutationForm = true;
 		this.mutationType = 'edit';
+		this.currentCategory = category;
 	}
 
 	localeTranslate(member: ILocaleMember[]) {

From 00658cde62247e84bf47a1d80c074c32b7013700 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 8 Apr 2019 14:50:57 +0300
Subject: [PATCH 144/382] feat(ever-admin): improved step "Orders Settings"
 EV-1195

---
 .../settings/orders/orders.component.html     | 27 ++++++++++++-------
 .../settings/orders/orders.component.scss     | 11 ++++++++
 .../settings/orders/orders.component.ts       | 24 +++++++++++++++++
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
index 7fd8c8c1b..2add9975f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
@@ -1,16 +1,23 @@
 <nb-card class="setup-merchant-orders-settings">
 	<nb-card-header>Orders Settings</nb-card-header>
 	<nb-card-body>
-		<div class="form-group offset-md-2 col-md-8">
-			<label>Order Barcode/QR code types</label>
-			<nb-radio-group [(ngModel)]="iorderBarcodeType">
-				<nb-radio
-					*ngFor="let type of orderBarcodeTypes"
-					[value]="type.value"
-				>
-					{{ type.label }}
-				</nb-radio>
-			</nb-radio-group>
+		<div class="form-group offset-md-2 col-md-8 row">
+			<div class="col">
+				<label>Order Barcode/QR code types</label>
+				<nb-radio-group [(ngModel)]="iorderBarcodeType">
+					<nb-radio
+						*ngFor="let type of orderBarcodeTypes"
+						[value]="type.value"
+					>
+						{{ type.label }}
+					</nb-radio>
+				</nb-radio-group>
+			</div>
+			<div class="col">
+				<div class="row preview-barcode">
+					<img src="{{ barcodetDataUrl }}" alt="Invalid image" />
+				</div>
+			</div>
 		</div>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.scss
index cca2686dd..d990fd653 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.scss
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.scss
@@ -1,5 +1,16 @@
 .setup-merchant-orders-settings {
 	nb-card-body {
 		text-align: left;
+
+		.preview-barcode {
+			padding: 8px;
+			background: #dedede;
+			display: inline-block;
+
+			img {
+				margin: 0;
+				max-height: 5rem;
+			}
+		}
 	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
index 827e58ef3..cbb9c3520 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
@@ -1,5 +1,7 @@
 import { Component } from '@angular/core';
 import OrderBarcodeTypes from '@modules/server.common/enums/OrderBarcodeTypes';
+import QRCode from 'qrcode';
+import { Types } from 'mongoose';
 
 @Component({
 	selector: 'ea-merchants-setup-orders-settings',
@@ -8,6 +10,7 @@ import OrderBarcodeTypes from '@modules/server.common/enums/OrderBarcodeTypes';
 })
 export class SetupMerchantOrdersSettingsComponent {
 	iorderBarcodeType: OrderBarcodeTypes = OrderBarcodeTypes.QR;
+	barcodetDataUrl: string;
 
 	orderBarcodeTypes = [
 		{ label: 'QR', value: OrderBarcodeTypes.QR },
@@ -15,4 +18,25 @@ export class SetupMerchantOrdersSettingsComponent {
 		{ label: 'CODE39', value: OrderBarcodeTypes.CODE39 },
 		{ label: 'pharmacode', value: OrderBarcodeTypes.pharmacode }
 	];
+
+	constructor() {
+		this.loadBarcodetDataUrl(OrderBarcodeTypes.QR);
+	}
+
+	async loadBarcodetDataUrl(type: OrderBarcodeTypes) {
+		const dummyId = Date.now();
+		switch (type) {
+			case OrderBarcodeTypes.QR:
+				this.barcodetDataUrl = await QRCode.toDataURL(
+					dummyId.toString()
+				);
+				break;
+
+			default:
+				this.barcodetDataUrl = await QRCode.toDataURL(
+					dummyId.toString()
+				);
+				break;
+		}
+	}
 }

From a5693c86ec62523283d341992b61ab420d684ee0 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 8 Apr 2019 15:14:09 +0300
Subject: [PATCH 145/382] feat(ever-admin): exported ngx-barcode in shared
 modules EV-1195

---
 .../components/ngx-barcode/ngx-barcode.component.ts             | 0
 .../core-angular}/components/ngx-barcode/ngx-barcode.module.ts  | 0
 .../+products/+order/takeaway/common/takeaway-common.module.ts  | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename {shop/mobile-ionic/src/app => shared/core-angular}/components/ngx-barcode/ngx-barcode.component.ts (100%)
 rename {shop/mobile-ionic/src/app => shared/core-angular}/components/ngx-barcode/ngx-barcode.module.ts (100%)

diff --git a/shop/mobile-ionic/src/app/components/ngx-barcode/ngx-barcode.component.ts b/shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts
similarity index 100%
rename from shop/mobile-ionic/src/app/components/ngx-barcode/ngx-barcode.component.ts
rename to shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts
diff --git a/shop/mobile-ionic/src/app/components/ngx-barcode/ngx-barcode.module.ts b/shared/core-angular/components/ngx-barcode/ngx-barcode.module.ts
similarity index 100%
rename from shop/mobile-ionic/src/app/components/ngx-barcode/ngx-barcode.module.ts
rename to shared/core-angular/components/ngx-barcode/ngx-barcode.module.ts
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/common/takeaway-common.module.ts b/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/common/takeaway-common.module.ts
index 61957e7d6..7353932bb 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/common/takeaway-common.module.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/common/takeaway-common.module.ts
@@ -4,7 +4,7 @@ import { TakeawayStoreInfoComponent } from './store-info/store-info.component';
 import { TakeawayTitleComponent } from './title/title.component';
 import { TakeawayOrderInfoComponent } from './order-info/order-info.component';
 import { TranslateModule } from '@ngx-translate/core';
-import { NgxBarcodeModule } from 'app/components/ngx-barcode/ngx-barcode.module';
+import { NgxBarcodeModule } from '@modules/client.common.angular2/components/ngx-barcode/ngx-barcode.module';
 
 const COMPONENTS = [
 	TakeawayStoreInfoComponent,

From ae29ca1cf84640a792713a08c095f901ce12039a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 8 Apr 2019 15:55:20 +0300
Subject: [PATCH 146/382] feat(ever-admin): used "ngx-barcode" in step "Orders
 Settings" EV-1195

---
 admin/website-angular/package.json            |    8 +-
 .../components/components.module.ts           |    4 +-
 .../settings/orders/orders.component.html     |   19 +-
 .../settings/orders/orders.component.ts       |   23 +-
 admin/website-angular/yarn.lock               | 2276 +++++++++++------
 5 files changed, 1502 insertions(+), 828 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 0b90cfc66..3faabbdef 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -112,6 +112,7 @@
 		"ionicons": "^4.5.5",
 		"is-url": "^1.2.4",
 		"jquery": "^3.3.1",
+		"jsbarcode": "^3.11.0",
 		"leaflet": "^1.4.0",
 		"moment": "^2.24.0",
 		"nebular-icons": "1.1.0",
@@ -147,10 +148,9 @@
 		"zone.js": "^0.8.29"
 	},
 	"devDependencies": {
-		"conventional-changelog-cli": "^2.0.12",
+		"@angular-devkit/architect": "^0.13.7",
 		"@angular-devkit/build-angular": "^0.13.7",
 		"@angular-devkit/build-webpack": "^0.13.7",
-		"@angular-devkit/architect": "^0.13.7",
 		"@angular-devkit/core": "^7.3.7",
 		"@angular-devkit/schematics": "^7.3.7",
 		"@angular/cli": "^7.3.7",
@@ -198,9 +198,9 @@
 		"ts-node": "^8.0.2",
 		"tslint": "^5.12.1",
 		"tslint-language-service": "^0.9.9",
-		"yargs": "^13.1.0",
+		"typescript": "~3.1.6",
 		"webpack-dev-server": "^3.2.1",
-		"typescript": "~3.1.6"
+		"yargs": "^13.1.0"
 	},
 	"engines": {
 		"node": ">=10.15.0",
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index 74fce39e4..c8c5fcc45 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -15,6 +15,7 @@ import { NbRadioModule } from '@nebular/theme';
 import { SetupMerchantProductCategoriesComponent } from './product-categories/product-categories.component';
 import { ProductCategoriesFormsModule } from 'app/@shared/product/categories/forms/product-categories-forms.module';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
+import { NgxBarcodeModule } from '@modules/client.common.angular2/components/ngx-barcode/ngx-barcode.module';
 
 const COMPONENTS = [
 	SetupMerchantAccountComponent,
@@ -35,7 +36,8 @@ const COMPONENTS = [
 		NbRadioModule,
 		TranslateModule.forChild(),
 		FileUploaderModule,
-		ProductCategoriesFormsModule
+		ProductCategoriesFormsModule,
+		NgxBarcodeModule
 	],
 	declarations: COMPONENTS,
 	exports: COMPONENTS,
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
index 2add9975f..d33297077 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
@@ -4,7 +4,10 @@
 		<div class="form-group offset-md-2 col-md-8 row">
 			<div class="col">
 				<label>Order Barcode/QR code types</label>
-				<nb-radio-group [(ngModel)]="iorderBarcodeType">
+				<nb-radio-group
+					(valueChange)="typeChange($event)"
+					[(ngModel)]="iorderBarcodeType"
+				>
 					<nb-radio
 						*ngFor="let type of orderBarcodeTypes"
 						[value]="type.value"
@@ -15,7 +18,19 @@
 			</div>
 			<div class="col">
 				<div class="row preview-barcode">
-					<img src="{{ barcodetDataUrl }}" alt="Invalid image" />
+					<img
+						*ngIf="isQRCode"
+						src="{{ barcodetDataUrl }}"
+						alt="Invalid image"
+					/>
+					<ngx-barcode
+						*ngIf="!isQRCode"
+						[bc-value]="barcodetData"
+						[bc-format]="'CODE128'"
+						[bc-element-type]="img"
+						[bc-height]="30"
+						[bc-width]="1.5"
+					></ngx-barcode>
 				</div>
 			</div>
 		</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
index cbb9c3520..9a15022e8 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
@@ -10,7 +10,9 @@ import { Types } from 'mongoose';
 })
 export class SetupMerchantOrdersSettingsComponent {
 	iorderBarcodeType: OrderBarcodeTypes = OrderBarcodeTypes.QR;
+	barcodetData: string;
 	barcodetDataUrl: string;
+	isQRCode: boolean = true;
 
 	orderBarcodeTypes = [
 		{ label: 'QR', value: OrderBarcodeTypes.QR },
@@ -20,23 +22,16 @@ export class SetupMerchantOrdersSettingsComponent {
 	];
 
 	constructor() {
-		this.loadBarcodetDataUrl(OrderBarcodeTypes.QR);
+		this.loadBarcodetDataUrl();
 	}
 
-	async loadBarcodetDataUrl(type: OrderBarcodeTypes) {
+	async loadBarcodetDataUrl() {
 		const dummyId = Date.now();
-		switch (type) {
-			case OrderBarcodeTypes.QR:
-				this.barcodetDataUrl = await QRCode.toDataURL(
-					dummyId.toString()
-				);
-				break;
+		this.barcodetDataUrl = await QRCode.toDataURL(dummyId.toString());
+		this.barcodetData = dummyId.toString();
+	}
 
-			default:
-				this.barcodetDataUrl = await QRCode.toDataURL(
-					dummyId.toString()
-				);
-				break;
-		}
+	typeChange(type) {
+		this.isQRCode = type === OrderBarcodeTypes.QR;
 	}
 }
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 00cd5b60b..e3fdb8bbb 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -307,34 +307,35 @@
     "@babel/helper-explode-assignable-expression" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-call-delegate@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
-  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
+"@babel/helper-call-delegate@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.0.tgz#f308eabe0d44f451217853aedf4dea5f6fe3294f"
+  integrity sha512-SdqDfbVdNQCBp3WhK2mNdDvHd3BD6qbmIc43CAyjnsfCmgHMeqgDcM3BzY2lchi7HBJGJ2CVdynLWbezaE4mmQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.4.0"
+    "@babel/traverse" "^7.4.0"
+    "@babel/types" "^7.4.0"
 
-"@babel/helper-create-class-features-plugin@^7.3.0":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.2.tgz#ba1685603eb1c9f2f51c9106d5180135c163fe73"
-  integrity sha512-tdW8+V8ceh2US4GsYdNVNoohq5uVwOf9k6krjwW4E1lINcHgttnWcNqgdoessn12dAy8QkbezlbQh2nXISNY+A==
+"@babel/helper-create-class-features-plugin@^7.4.0":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.3.tgz#5bbd279c6c3ac6a60266b89bbfe7f8021080a1ef"
+  integrity sha512-UMl3TSpX11PuODYdWGrUeW6zFkdYhDn7wRLrOuNVM6f9L+S9CzmDXYyrp3MTHcwWjnzur1f/Op8A7iYZWya2Yg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.2.3"
+    "@babel/helper-replace-supers" "^7.4.0"
+    "@babel/helper-split-export-declaration" "^7.4.0"
 
-"@babel/helper-define-map@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
-  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
+"@babel/helper-define-map@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.0.tgz#cbfd8c1b2f12708e262c26f600cd16ed6a3bc6c9"
+  integrity sha512-wAhQ9HdnLIywERVcSvX40CEJwKdAa1ID4neI9NXQPDOHwwA+57DqwLiPEVy2AIyWzAk0CQ8qx4awO0VUURwLtA==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
+    "@babel/types" "^7.4.0"
+    lodash "^4.17.11"
 
 "@babel/helper-explode-assignable-expression@^7.1.0":
   version "7.1.0"
@@ -360,12 +361,12 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-hoist-variables@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
-  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
+"@babel/helper-hoist-variables@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.0.tgz#25b621399ae229869329730a62015bbeb0a6fbd6"
+  integrity sha512-/NErCuoe/et17IlAQFKWM24qtyYYie7sFIrW/tIQXpck6vAu2hhtYYsKLBWQV+BQZMbcIYPU/QMYuTufrY4aQw==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.0"
 
 "@babel/helper-member-expression-to-functions@^7.0.0":
   version "7.0.0"
@@ -393,6 +394,18 @@
     "@babel/types" "^7.2.2"
     lodash "^4.17.10"
 
+"@babel/helper-module-transforms@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.3.tgz#b1e357a1c49e58a47211a6853abb8e2aaefeb064"
+  integrity sha512-H88T9IySZW25anu5uqyaC1DaQre7ofM+joZtAaO2F8NBdFfupH0SZ4gKjgSFVcvtx/aAirqA9L9Clio2heYbZA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-simple-access" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/template" "^7.2.2"
+    "@babel/types" "^7.2.2"
+    lodash "^4.17.11"
+
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
@@ -412,6 +425,13 @@
   dependencies:
     lodash "^4.17.10"
 
+"@babel/helper-regex@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.3.tgz#9d6e5428bfd638ab53b37ae4ec8caf0477495147"
+  integrity sha512-hnoq5u96pLCfgjXuj8ZLX3QQ+6nAulS+zSgi6HulUwFbEruRAKwbGLU5OvXkE14L8XW6XsQEKsIDfgthKLRAyA==
+  dependencies:
+    lodash "^4.17.11"
+
 "@babel/helper-remap-async-to-generator@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
@@ -423,7 +443,7 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.2.3":
+"@babel/helper-replace-supers@^7.1.0":
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz#19970020cf22677d62b3a689561dbd9644d8c5e5"
   integrity sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==
@@ -433,6 +453,16 @@
     "@babel/traverse" "^7.2.3"
     "@babel/types" "^7.0.0"
 
+"@babel/helper-replace-supers@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.0.tgz#4f56adb6aedcd449d2da9399c2dcf0545463b64c"
+  integrity sha512-PVwCVnWWAgnal+kJ+ZSAphzyl58XrFeSKSAJRiqg5QToTsjL+Xu1f9+RJ+d+Q0aPhPfBGaYfkox66k86thxNSg==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/traverse" "^7.4.0"
+    "@babel/types" "^7.4.0"
+
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
@@ -511,12 +541,12 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@^7.2.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd"
-  integrity sha512-wNHxLkEKTQ2ay0tnsam2z7fGZUi+05ziDJflEt3AZTP3oXLKHJp9HqhfroB/vdMvt3sda9fAbq7FsG8QPDrZBg==
+"@babel/plugin-proposal-class-properties@^7.3.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.0.tgz#d70db61a2f1fd79de927eea91f6411c964e084b8"
+  integrity sha512-t2ECPNOXsIeK1JxJNKmgbzQtoG27KIlVE61vTqX0DKR9E9sZlVVxWUtEW9D5FlZ8b8j7SBNCHY47GgPKCKlpPg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.3.0"
+    "@babel/helper-create-class-features-plugin" "^7.4.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-proposal-json-strings@^7.2.0":
@@ -527,10 +557,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.3.1":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz#6d1859882d4d778578e41f82cc5d7bf3d5daf6c1"
-  integrity sha512-DjeMS+J2+lpANkYLLO+m6GjoTMygYglKmRe6cDTbFv3L9i6mmiE8fe6B8MtCSLZpVXscD5kn7s6SgtHrDoBWoA==
+"@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.3.tgz#be27cd416eceeba84141305b93c282f5de23bbb4"
+  integrity sha512-xC//6DNSSHVjq8O2ge0dyYlhshsH4T7XdCVoxbi5HzLYWfsC5ooFlJjrXk8RcAT+hjHAK9UjBXdylzSoDK3t4g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -543,14 +573,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
-  integrity sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.0.tgz#202d91ee977d760ef83f4f416b280d568be84623"
+  integrity sha512-h/KjEZ3nK9wv1P1FSNb9G079jXrNYR0Ko+7XkOx85+gM24iZbPn0rh4vCftk+5QKY7y1uByFataBTmX7irEF1w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.2.0"
+    regexpu-core "^4.5.4"
 
 "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
@@ -559,6 +589,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-dynamic-import@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
+  integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
@@ -587,10 +624,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz#68b8a438663e88519e65b776f8938f3445b1a2ff"
-  integrity sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==
+"@babel/plugin-transform-async-to-generator@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.0.tgz#234fe3e458dce95865c0d152d256119b237834b0"
+  integrity sha512-EeaFdCeUULM+GPFEsf7pFcNSxM7hYjoj5fiYbyuiXobW4JhFnjAv9OWzNwHyHcKoPNpAfeRDuW6VyaXEDUBa7g==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -603,26 +640,26 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz#f17c49d91eedbcdf5dd50597d16f5f2f770132d4"
-  integrity sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==
+"@babel/plugin-transform-block-scoping@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.0.tgz#164df3bb41e3deb954c4ca32ffa9fcaa56d30bcb"
+  integrity sha512-AWyt3k+fBXQqt2qb9r97tn3iBwFpiv9xdAiG+Gr2HpAZpuayvbL55yWrsV3MyHvXk/4vmSiedhDRl1YI2Iy5nQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/plugin-transform-classes@^7.2.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz#6c90542f210ee975aa2aa8c8b5af7fa73a126953"
-  integrity sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==
+"@babel/plugin-transform-classes@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.3.tgz#adc7a1137ab4287a555d429cc56ecde8f40c062c"
+  integrity sha512-PUaIKyFUDtG6jF5DUJOfkBdwAS/kFFV3XFk7Nn0a6vR7ZT8jYw5cGtIlat77wcnd0C6ViGqo/wyNf4ZHytF/nQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.1.0"
+    "@babel/helper-define-map" "^7.4.0"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.4.0"
+    "@babel/helper-split-export-declaration" "^7.4.0"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.2.0":
@@ -632,21 +669,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.2.0":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz#f2f5520be055ba1c38c41c0e094d8a461dd78f2d"
-  integrity sha512-Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw==
+"@babel/plugin-transform-destructuring@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.3.tgz#1a95f5ca2bf2f91ef0648d5de38a8d472da4350f"
+  integrity sha512-rVTLLZpydDFDyN4qnXdzwoVpk1oaXHIvPEOkOLyr88o7oHxVc/LyrnDx+amuBWGOwUb7D1s/uLsKBNTx08htZg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz#f0aabb93d120a8ac61e925ea0ba440812dbe0e49"
-  integrity sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==
+"@babel/plugin-transform-dotall-regex@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.3.tgz#fceff1c16d00c53d32d980448606f812cd6d02bf"
+  integrity sha512-9Arc2I0AGynzXRR/oPdSALv3k0rM38IMFyto7kOCwb5F9sLUt2Ykdo3V9yUPR+Bgr4kb6bVEyLkPEiBhzcTeoA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+    "@babel/helper-regex" "^7.4.3"
+    regexpu-core "^4.5.4"
 
 "@babel/plugin-transform-duplicate-keys@^7.2.0":
   version "7.2.0"
@@ -663,17 +700,17 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-for-of@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz#ab7468befa80f764bb03d3cb5eef8cc998e1cad9"
-  integrity sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==
+"@babel/plugin-transform-for-of@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.3.tgz#c36ff40d893f2b8352202a2558824f70cd75e9fe"
+  integrity sha512-UselcZPwVWNSURnqcfpnxtMehrb8wjXYOimlYQPBnup/Zld426YzIhNEvuRsEWVHfESIECGrxoI6L5QqzuLH5Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz#f7930362829ff99a3174c39f0afcc024ef59731a"
-  integrity sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==
+"@babel/plugin-transform-function-name@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.3.tgz#130c27ec7fb4f0cba30e958989449e5ec8d22bbd"
+  integrity sha512-uT5J/3qI/8vACBR9I1GlAuU/JqBtWdfCrynuOkrWG6nCDieZd5przB1vfP59FRHBZQ9DC2IUfqr/xKqzOD5x0A==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -685,6 +722,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-member-expression-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
+  integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-modules-amd@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
@@ -693,21 +737,21 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz#c4f1933f5991d5145e9cfad1dfd848ea1727f404"
-  integrity sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==
+"@babel/plugin-transform-modules-commonjs@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.3.tgz#3917f260463ac08f8896aa5bd54403f6e1fed165"
+  integrity sha512-sMP4JqOTbMJMimqsSZwYWsMjppD+KRyDIUVW91pd7td0dZKAvPmhCaxhOzkzLParKwgQc7bdL9UNv+rpJB0HfA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-module-transforms" "^7.4.3"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz#912bfe9e5ff982924c81d0937c92d24994bb9068"
-  integrity sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==
+"@babel/plugin-transform-modules-systemjs@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.0.tgz#c2495e55528135797bc816f5d50f851698c586a1"
+  integrity sha512-gjPdHmqiNhVoBqus5qK60mWPp1CmYWp/tkh11mvb0rrys01HycEGD7NvvSoKXlWEfSM9TcL36CpsK8ElsADptQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.4.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-modules-umd@^7.2.0":
@@ -718,17 +762,17 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz#140b52985b2d6ef0cb092ef3b29502b990f9cd50"
-  integrity sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.4.2":
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.2.tgz#800391136d6cbcc80728dbdba3c1c6e46f86c12e"
+  integrity sha512-NsAuliSwkL3WO2dzWTOL1oZJHm0TM8ZY8ZSxk2ANyKkt5SQlToGA4pzctmq1BEjoacurdwZ3xp2dCQWJkME0gQ==
   dependencies:
     regexp-tree "^0.1.0"
 
-"@babel/plugin-transform-new-target@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
-  integrity sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==
+"@babel/plugin-transform-new-target@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.0.tgz#67658a1d944edb53c8d4fa3004473a0dd7838150"
+  integrity sha512-6ZKNgMQmQmrEX/ncuCwnnw1yVGoaOW5KpxNhoWI7pCQdA0uZ0HqHGqenCUIENAnxRjy2WwNQ30gfGdIgqJXXqw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -740,21 +784,43 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.1.0"
 
-"@babel/plugin-transform-parameters@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz#0d5ad15dc805e2ea866df4dd6682bfe76d1408c2"
-  integrity sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==
+"@babel/plugin-transform-parameters@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.3.tgz#e5ff62929fdf4cf93e58badb5e2430303003800d"
+  integrity sha512-ULJYC2Vnw96/zdotCZkMGr2QVfKpIT/4/K+xWWY0MbOJyMZuk660BGkr3bEKWQrrciwz6xpmft39nA4BF7hJuA==
   dependencies:
-    "@babel/helper-call-delegate" "^7.1.0"
+    "@babel/helper-call-delegate" "^7.4.0"
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-regenerator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
-  integrity sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==
+"@babel/plugin-transform-property-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
+  integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
   dependencies:
-    regenerator-transform "^0.13.3"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-react-constant-elements@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.2.0.tgz#ed602dc2d8bff2f0cb1a5ce29263dbdec40779f7"
+  integrity sha512-YYQFg6giRFMsZPKUM9v+VcHOdfSQdz9jHCx3akAi3UYgyjndmdYGSXylQ/V+HswQt4fL8IklchD9HTsaOCrWQQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-regenerator@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.3.tgz#2a697af96887e2bbf5d303ab0221d139de5e739c"
+  integrity sha512-kEzotPuOpv6/iSlHroCDydPkKYw7tiJGKlmYp6iJn4a6C/+b2FdttlJsLKYxolYHgotTJ5G5UY5h0qey5ka3+A==
+  dependencies:
+    regenerator-transform "^0.13.4"
+
+"@babel/plugin-transform-reserved-words@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
+  integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.2.0":
   version "7.2.0"
@@ -793,63 +859,68 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-unicode-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz#4eb8db16f972f8abb5062c161b8b115546ade08b"
-  integrity sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==
+"@babel/plugin-transform-unicode-regex@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.3.tgz#3868703fc0e8f443dda65654b298df576f7b863b"
+  integrity sha512-lnSNgkVjL8EMtnE8eSS7t2ku8qvKH3eqNf/IwIfnSPUqzgqYmRwzdsQWv4mNQAN9Nuo6Gz1Y0a4CSmdpu1Pp6g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+    "@babel/helper-regex" "^7.4.3"
+    regexpu-core "^4.5.4"
 
-"@babel/preset-env@^7.2.0":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.1.tgz#389e8ca6b17ae67aaf9a2111665030be923515db"
-  integrity sha512-FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ==
+"@babel/preset-env@^7.4.1":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.3.tgz#e71e16e123dc0fbf65a52cbcbcefd072fbd02880"
+  integrity sha512-FYbZdV12yHdJU5Z70cEg0f6lvtpZ8jFSDakTm7WXeJbLXh4R0ztGEu/SW7G1nJ2ZvKwDhz8YrbA84eYyprmGqw==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.3.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.4.3"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.2.0"
+    "@babel/plugin-transform-async-to-generator" "^7.4.0"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.2.0"
-    "@babel/plugin-transform-classes" "^7.2.0"
+    "@babel/plugin-transform-block-scoping" "^7.4.0"
+    "@babel/plugin-transform-classes" "^7.4.3"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.2.0"
-    "@babel/plugin-transform-dotall-regex" "^7.2.0"
+    "@babel/plugin-transform-destructuring" "^7.4.3"
+    "@babel/plugin-transform-dotall-regex" "^7.4.3"
     "@babel/plugin-transform-duplicate-keys" "^7.2.0"
     "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.2.0"
-    "@babel/plugin-transform-function-name" "^7.2.0"
+    "@babel/plugin-transform-for-of" "^7.4.3"
+    "@babel/plugin-transform-function-name" "^7.4.3"
     "@babel/plugin-transform-literals" "^7.2.0"
+    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
     "@babel/plugin-transform-modules-amd" "^7.2.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.2.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.4.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.4.0"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.3.0"
-    "@babel/plugin-transform-new-target" "^7.0.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.2"
+    "@babel/plugin-transform-new-target" "^7.4.0"
     "@babel/plugin-transform-object-super" "^7.2.0"
-    "@babel/plugin-transform-parameters" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.0.0"
+    "@babel/plugin-transform-parameters" "^7.4.3"
+    "@babel/plugin-transform-property-literals" "^7.2.0"
+    "@babel/plugin-transform-regenerator" "^7.4.3"
+    "@babel/plugin-transform-reserved-words" "^7.2.0"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
     "@babel/plugin-transform-spread" "^7.2.0"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
     "@babel/plugin-transform-template-literals" "^7.2.0"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.2.0"
-    browserslist "^4.3.4"
+    "@babel/plugin-transform-unicode-regex" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    browserslist "^4.5.2"
+    core-js-compat "^3.0.0"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
-    semver "^5.3.0"
+    semver "^5.5.0"
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2":
   version "7.3.1"
@@ -858,6 +929,13 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
+"@babel/runtime@^7.2.0", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
+  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/runtime@^7.3.1":
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.2.tgz#f5ab6897320f16decd855eed70b705908a313fe8"
@@ -992,109 +1070,106 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
-"@emotion/cache@^0.8.8":
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-0.8.8.tgz#2c3bd1aa5fdb88f1cc2325176a3f3201739e726c"
-  integrity sha512-yaQQjNAVkKclMX6D8jTU3rhQKjCnXU1KS+Ok0lgZcarGHI2yydU/kKHyF3PZnQhbTpIFBK5W4+HmLCtCie7ESw==
-  dependencies:
-    "@emotion/sheet" "^0.8.1"
-    "@emotion/stylis" "^0.7.1"
-    "@emotion/utils" "^0.8.2"
-
-"@emotion/core@^0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-0.13.1.tgz#4fa4983e18dbf089fa16584486c8033ca50013ea"
-  integrity sha512-5qzKP6bTe2Ah7Wvh1sgtzgy6ycdpxwgMAjQ/K/VxvqBxveG9PCpq+Z0GdVg7Houb1AwYjTfNtXstjSk4sqi/7g==
-  dependencies:
-    "@emotion/cache" "^0.8.8"
-    "@emotion/css" "^0.9.8"
-    "@emotion/serialize" "^0.9.1"
-    "@emotion/sheet" "^0.8.1"
-    "@emotion/utils" "^0.8.2"
-
-"@emotion/css@^0.9.8":
-  version "0.9.8"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-0.9.8.tgz#43fd45c576656d4ed9cc3b8b427c66a2ed6af30a"
-  integrity sha512-Stov3+9+KWZAte/ED9Hts3r4DVBADd5erDrhrywokM31ctQsRPD3qk8W4d1ca48ry57g/nc0qUHNis/xd1SoFg==
-  dependencies:
-    "@emotion/serialize" "^0.9.1"
-    "@emotion/utils" "^0.8.2"
-
-"@emotion/hash@^0.6.6":
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44"
-  integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ==
-
-"@emotion/is-prop-valid@^0.6.8":
-  version "0.6.8"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz#68ad02831da41213a2089d2cab4e8ac8b30cbd85"
-  integrity sha512-IMSL7ekYhmFlILXcouA6ket3vV7u9BqStlXzbKOF9HBtpUPMMlHU+bBxrLOa2NvleVwNIxeq/zL8LafLbeUXcA==
-  dependencies:
-    "@emotion/memoize" "^0.6.6"
-
-"@emotion/memoize@^0.6.6":
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b"
-  integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ==
-
-"@emotion/provider@^0.11.2":
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/@emotion/provider/-/provider-0.11.2.tgz#7099f1df5641969ee4d6ff5cf1561295914030aa"
-  integrity sha512-y/BRd6cJ9tyxsy4EK8WheD2X1/RfmudMYILpa8sgI3dKCjVWeEZuQM17wXRVEyhrisaRaIp1qT4h0eWUaaqNLg==
-  dependencies:
-    "@emotion/cache" "^0.8.8"
-    "@emotion/weak-memoize" "^0.1.3"
+"@emotion/cache@^10.0.9":
+  version "10.0.9"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.9.tgz#e0c7b7a289f7530edcfad4dcf3858bd2e5700a6f"
+  integrity sha512-f7MblpE2xoimC4fCMZ9pivmsIn7hyWRIvY75owMDi8pdOSeh+w5tH3r4hBJv/LLrwiMM7cTQURqTPcYoL5pWnw==
+  dependencies:
+    "@emotion/sheet" "0.9.2"
+    "@emotion/stylis" "0.8.3"
+    "@emotion/utils" "0.11.1"
+    "@emotion/weak-memoize" "0.2.2"
+
+"@emotion/core@^10.0.7":
+  version "10.0.10"
+  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.10.tgz#8d3114e5a2f8b178a7067c603a2937516f180b08"
+  integrity sha512-U1aE2cOWUscjc8ZJ3Cx32udOzLeRoJwGxBH93xQD850oQFpwPKZARzdUtdc9SByUOwzSFYxhDhrpXnV34FJmWg==
+  dependencies:
+    "@emotion/cache" "^10.0.9"
+    "@emotion/css" "^10.0.9"
+    "@emotion/serialize" "^0.11.6"
+    "@emotion/sheet" "0.9.2"
+    "@emotion/utils" "0.11.1"
+
+"@emotion/css@^10.0.9":
+  version "10.0.9"
+  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.9.tgz#ea0df431965a308f6cb1d61386df8ad61e5befb5"
+  integrity sha512-jtHhUSWw+L7yxYgNtC+KJ3Ory90/jiAtpG1qT+gTQQ/RR5AMiigs9/lDHu/vnwljaq2S48FoKb/FZZMlJcC4bw==
+  dependencies:
+    "@emotion/serialize" "^0.11.6"
+    "@emotion/utils" "0.11.1"
+    babel-plugin-emotion "^10.0.9"
+
+"@emotion/hash@0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.1.tgz#9833722341379fb7d67f06a4b00ab3c37913da53"
+  integrity sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA==
 
-"@emotion/serialize@^0.9.1":
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145"
-  integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==
+"@emotion/is-prop-valid@0.7.3":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.7.3.tgz#a6bf4fa5387cbba59d44e698a4680f481a8da6cc"
+  integrity sha512-uxJqm/sqwXw3YPA5GXX365OBcJGFtxUVkB6WyezqFHlNe9jqUWH5ur2O2M8dGBz61kn1g3ZBlzUunFQXQIClhA==
   dependencies:
-    "@emotion/hash" "^0.6.6"
-    "@emotion/memoize" "^0.6.6"
-    "@emotion/unitless" "^0.6.7"
-    "@emotion/utils" "^0.8.2"
-
-"@emotion/sheet@^0.8.1":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.8.1.tgz#6eed686c927a1c39f5045ec45ecfa36de896819d"
-  integrity sha512-p82hFBHbNkPLZ410HOeaRJZMrN1uh9rI7JAaRXIp62PP5evspPXyi3xYtxZc1+sCSlwjnQPuOIa6N88iJNtPXw==
+    "@emotion/memoize" "0.7.1"
 
-"@emotion/styled-base@^0.10.6":
-  version "0.10.6"
-  resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-0.10.6.tgz#c95631b6b4f19da97e7b44ee4e3ee1931afde264"
-  integrity sha512-7RfdJm2oEXiy3isFRY63mHRmWWjScFXFoZTFkCJPaL8NhX+H724WwIoQOt3WA1Jd+bb97xkJg31JbYYsSqnEaQ==
-  dependencies:
-    "@emotion/is-prop-valid" "^0.6.8"
-    "@emotion/serialize" "^0.9.1"
-    "@emotion/utils" "^0.8.2"
+"@emotion/memoize@0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.1.tgz#e93c13942592cf5ef01aa8297444dc192beee52f"
+  integrity sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg==
+
+"@emotion/serialize@^0.11.6":
+  version "0.11.6"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.6.tgz#78be8b9ee9ff49e0196233ba6ec1c1768ba1e1fc"
+  integrity sha512-n4zVv2qGLmspF99jaEUwnMV0fnEGsyUMsC/8KZKUSUTZMYljHE+j+B6rSD8PIFtaUIhHaxCG2JawN6L+OgLN0Q==
+  dependencies:
+    "@emotion/hash" "0.7.1"
+    "@emotion/memoize" "0.7.1"
+    "@emotion/unitless" "0.7.3"
+    "@emotion/utils" "0.11.1"
+    csstype "^2.5.7"
+
+"@emotion/sheet@0.9.2":
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.2.tgz#74e5c6b5e489a1ba30ab246ab5eedd96916487c4"
+  integrity sha512-pVBLzIbC/QCHDKJF2E82V2H/W/B004mDFQZiyo/MSR+VC4pV5JLG0TF/zgQDFvP3fZL/5RTPGEmXlYJBMUuJ+A==
+
+"@emotion/styled-base@^10.0.10":
+  version "10.0.10"
+  resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.10.tgz#ffb811295c9dcd9b3c12bf93301d7d8bcb02e6f4"
+  integrity sha512-uZwKrBfcH7jCRAQi5ZxsEGIZ+1Zr9/lof4TMsIolC0LSwpnWkQ+JRJLy+p4ZyATee9SdmyCV0sG/VTngVSnrpA==
+  dependencies:
+    "@emotion/is-prop-valid" "0.7.3"
+    "@emotion/serialize" "^0.11.6"
+    "@emotion/utils" "0.11.1"
+    object-assign "^4.1.1"
 
-"@emotion/styled@^0.10.6":
-  version "0.10.6"
-  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-0.10.6.tgz#1f6af1d3d4bf9fdeb05a4d220046ce11ad21a7ca"
-  integrity sha512-DFNW8jlMjy1aYCj/PKsvBoJVZAQXzjmSCwtKXLs31qZzNPaUEPbTYSIKnMUtIiAOYsu0pUTGXM+l0a+MYNm4lA==
+"@emotion/styled@^10.0.7":
+  version "10.0.10"
+  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.10.tgz#ec241a9389a585b2c2638b709c262c28469ed92e"
+  integrity sha512-k4p5WxwYJUVYKBlwOmfpqxeSwdPHqUycLHJY9ftleEvMfphYLB8lt9oPEkEty5XH4URh/wyUfZ2wW2ojrHODWA==
   dependencies:
-    "@emotion/styled-base" "^0.10.6"
+    "@emotion/styled-base" "^10.0.10"
+    babel-plugin-emotion "^10.0.9"
 
-"@emotion/stylis@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5"
-  integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ==
+"@emotion/stylis@0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.3.tgz#3ca7e9bcb31b3cb4afbaeb66156d86ee85e23246"
+  integrity sha512-M3nMfJ6ndJMYloSIbYEBq6G3eqoYD41BpDOxreE8j0cb4fzz/5qvmqU9Mb2hzsXcCnIlGlWhS03PCzVGvTAe0Q==
 
-"@emotion/unitless@^0.6.7":
-  version "0.6.7"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397"
-  integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg==
+"@emotion/unitless@0.7.3":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.3.tgz#6310a047f12d21a1036fb031317219892440416f"
+  integrity sha512-4zAPlpDEh2VwXswwr/t8xGNDGg8RQiPxtxZ3qQEXyQsBV39ptTdESCjuBvGze1nLMVrxmTIKmnO/nAV8Tqjjzg==
 
-"@emotion/utils@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc"
-  integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw==
+"@emotion/utils@0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.1.tgz#8529b7412a6eb4b48bdf6e720cc1b8e6e1e17628"
+  integrity sha512-8M3VN0hetwhsJ8dH8VkVy7xo5/1VoBsDOk/T4SJOeXwTO1c4uIqVNx2qyecLFnnUWD5vvUqHQ1gASSeUN6zcTg==
 
-"@emotion/weak-memoize@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.1.3.tgz#b700d97385fa91affed60c71dfd51c67e9dad762"
-  integrity sha512-QsYGKdhhuDFNq7bjm2r44y0mp5xW3uO3csuTPDWZc0OIiMQv+AIY5Cqwd4mJiC5N8estVl7qlvOx1hbtOuUWbw==
+"@emotion/weak-memoize@0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e"
+  integrity sha512-n/VQ4mbfr81aqkx/XmVicOLjviMuy02eenSdJY33SVA7S2J42EU0P1H0mOogfYedb3wXA0d/LVtBrgTSm04WEA==
 
 "@fortawesome/fontawesome-free@^5.7.2":
   version "5.7.2"
@@ -1175,6 +1250,17 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
+"@reach/router@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.2.1.tgz#34ae3541a5ac44fa7796e5506a5d7274a162be4e"
+  integrity sha512-kTaX08X4g27tzIFQGRukaHmNbtMYDS3LEWIS8+l6OayGIw6Oyo1HIF/JzeuR2FoF9z6oV+x/wJSVSq4v8tcUGQ==
+  dependencies:
+    create-react-context "^0.2.1"
+    invariant "^2.2.3"
+    prop-types "^15.6.1"
+    react-lifecycles-compat "^3.0.4"
+    warning "^3.0.0"
+
 "@schematics/angular@7.3.7":
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
@@ -1198,152 +1284,199 @@
     semver "5.6.0"
     semver-intersect "1.4.0"
 
-"@storybook/addon-actions@^4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-4.1.11.tgz#8946ea78f050ae2d06a2f2231ec56d1831942e15"
-  integrity sha512-iVsxEPmOCuPMAaJhHbpxQhzEPzKnZad4GELNfKrwmmvv3mY+3UN/z208HguW4NHjhMJZVYSS3H/qic8CQS+pHw==
-  dependencies:
-    "@emotion/core" "^0.13.1"
-    "@emotion/provider" "^0.11.2"
-    "@emotion/styled" "^0.10.6"
-    "@storybook/addons" "4.1.11"
-    "@storybook/components" "4.1.11"
-    "@storybook/core-events" "4.1.11"
-    core-js "^2.5.7"
-    deep-equal "^1.0.1"
+"@storybook/addon-actions@^5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.0.6.tgz#78cf9c05b8b6cde1d5d46961ffb95d92be16bf46"
+  integrity sha512-Qbenp6Dv8uphDKsIemtW8bSu3PNYIDSB5av7bW9GieYex8QL6ntv7dja0DaD6NmIfjOZdO0Q0U3Nc9CAgHGOBQ==
+  dependencies:
+    "@storybook/addons" "5.0.6"
+    "@storybook/components" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/theming" "5.0.6"
+    core-js "^2.6.5"
+    fast-deep-equal "^2.0.1"
     global "^4.3.2"
     lodash "^4.17.11"
     make-error "^1.3.5"
+    polished "^2.3.3"
     prop-types "^15.6.2"
+    react "^16.8.1"
     react-inspector "^2.3.0"
     uuid "^3.3.2"
 
-"@storybook/addons@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-4.1.11.tgz#a0d537bd10d123ecee6cb1f5f149b148ce250e57"
-  integrity sha512-n9oDs7GgJbiN5NYPkR3B3e5W0Tr6bIZvFfcJzgyP4dn50AUvS1IE1CEthezfn1L/nc2suw/8Oe30bOXOyTl/SQ==
+"@storybook/addons@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.0.6.tgz#3ecb7fd8421e6557b1abc71ebede905e8decfebc"
+  integrity sha512-VZFYnckWRErkOTZG3a3y7jvnPUjOsTCbWSxvJVMM5SfPzlZbcUz16wJDCJ/pQWI0VzhHFEAVfae9DcuiF031Ow==
   dependencies:
-    "@storybook/channels" "4.1.11"
-    "@storybook/components" "4.1.11"
+    "@storybook/channels" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    core-js "^2.6.5"
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/angular@^4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/angular/-/angular-4.1.11.tgz#231e523dd53b9353c6d531bfae1a0e20349770e7"
-  integrity sha512-16sjBItZOWURK90czHZGEuolh0qKREkBQMuRTIpjb4voIPM7lkChD8T7emixIezG0Sw/DWvtlTLsUBB7PZjV7g==
+"@storybook/angular@^5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/angular/-/angular-5.0.6.tgz#b177cb5e0409a1d86ca434e3d5c20125dea7fc09"
+  integrity sha512-fY1mZ5rQSua8LTjMpU+heSE5h3ygzUcDj9fkIclfBk8V2/E9p+FilPXM3TfaZtAEtsw6VMzRLGZXnA+yc535/w==
   dependencies:
-    "@storybook/core" "4.1.11"
-    "@storybook/node-logger" "4.1.11"
+    "@storybook/core" "5.0.6"
+    "@storybook/node-logger" "5.0.6"
     angular2-template-loader "^0.6.2"
-    core-js "^2.5.7"
-    fork-ts-checker-webpack-plugin "^0.4.14"
+    core-js "^2.6.5"
+    fork-ts-checker-webpack-plugin "^0.5.2"
     global "^4.3.2"
-    react "^16.6.0"
-    react-dom "^16.6.0"
+    react "^16.8.1"
+    react-dom "^16.8.1"
     regenerator-runtime "^0.12.1"
     sass-loader "^7.1.0"
-    ts-loader "^5.2.2"
+    ts-loader "^5.3.2"
     tsconfig-paths-webpack-plugin "^3.2.0"
-    webpack "^4.23.1"
+    webpack "^4.29.0"
 
-"@storybook/channel-postmessage@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-4.1.11.tgz#3320a5f3e05652466eff1c53843205c262a92dfb"
-  integrity sha512-/9p4I5CZWVl6mszY5AR5XPRdQ88LUaAt4iyhdxMIaqNRiVo3Rq4ptMXiw35eCr+sLQuG2KO2SiPIwaA4/FgQuw==
+"@storybook/channel-postmessage@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.0.6.tgz#a774cd548d9f229456a56915754db7fd9da7429a"
+  integrity sha512-62gAChPQSnmmdcsCgeU+g/tSqOHLX/nNzmKEsP20v57NqhFwTNfKLMTbQxrl8ttigTafxQZZjQA4EecN0eu16g==
   dependencies:
-    "@storybook/channels" "4.1.11"
+    "@storybook/channels" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    core-js "^2.6.5"
     global "^4.3.2"
-    json-stringify-safe "^5.0.1"
+    telejson "^2.1.0"
 
-"@storybook/channels@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-4.1.11.tgz#d161497fa3cd848cc9d518aa1c37052857e22e3c"
-  integrity sha512-zYusY8cno4keMozn2lDpBgyNSOueFh+hrPETioSB5Z8Kd3F5OjM7681vJC8QA67yOBEie2hHk0CVxRpuxziMwA==
+"@storybook/channels@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.0.6.tgz#bf056194d633cae873875d6e238c1abadb301dbe"
+  integrity sha512-3Q3uKP5R8q8Q0w6us0f/rlS864ySwl/dN1MZsRg1EaFU+YCy09Mx+3IQDF3FlxseXaQ6UtHcBnMcST4j6FO0ew==
+  dependencies:
+    core-js "^2.6.5"
 
-"@storybook/client-logger@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-4.1.11.tgz#2b1e34e892045199592fdb01656e5dcdcd1999d7"
-  integrity sha512-Xxy6sY7Zd405o28wUAhlpqY2FbSZsTrsN3g/uo4Mqo4XD2f0Z4wIv1GOuM5DI2KlHpHGI+36YPO2VFx5Bq+yiQ==
+"@storybook/client-api@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.0.6.tgz#a1622c46abaf1417fcfbbfab4fa8f032b564cd00"
+  integrity sha512-GtqHP5JrWmPOs9VcUdcLi40WLFKw8PdOnM+zMajm+vucyAr/wkc81VtnPjRAOVlZ4TdzGmsSWgFUOewniXlw6g==
+  dependencies:
+    "@storybook/addons" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/router" "5.0.6"
+    common-tags "^1.8.0"
+    core-js "^2.6.5"
+    eventemitter3 "^3.1.0"
+    global "^4.3.2"
+    is-plain-object "^2.0.4"
+    lodash.debounce "^4.0.8"
+    lodash.isequal "^4.5.0"
+    lodash.mergewith "^4.6.1"
+    memoizerific "^1.11.3"
+    qs "^6.5.2"
+
+"@storybook/client-logger@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.0.6.tgz#d183534ccc8c864039113dcc33407e7f1f5d7594"
+  integrity sha512-WYF3E2A5UzAPcCVs3A2xqbdrDfGi/g6zByDZYnmgW46U7NkvmGRPLGMt/lTXBQNwB3LVNlg7SRQO/AJwgqIJ0Q==
+  dependencies:
+    core-js "^2.6.5"
 
-"@storybook/components@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-4.1.11.tgz#25458a4a4f2edd836b1e4b944cfcfcb4a3567036"
-  integrity sha512-KJA8Nr8MbXiibDLcndx1GRVmVDyBBL2Tbb1kfQfr58vDwz6qhYxempejY6W+voaEqohnFxrOtnnbqlCyf8peUQ==
+"@storybook/components@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.0.6.tgz#de77af3443f771d94a692edb719bc0d8c0149daf"
+  integrity sha512-C++A39n9O09PU2e4Y8x/zbZ+Tf0t/mfPw83Mkh8d8OHS4rHdVKEhq6QC8oDuqT9YBNhJOohtg5d9n+7s8sqZyQ==
   dependencies:
-    "@emotion/core" "^0.13.1"
-    "@emotion/provider" "^0.11.2"
-    "@emotion/styled" "^0.10.6"
+    "@storybook/addons" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/router" "5.0.6"
+    "@storybook/theming" "5.0.6"
+    core-js "^2.6.5"
     global "^4.3.2"
-    lodash "^4.17.11"
+    immer "^1.12.0"
+    js-beautify "^1.8.9"
+    lodash.pick "^4.4.0"
+    lodash.throttle "^4.1.1"
+    memoizerific "^1.11.3"
+    polished "^2.3.3"
     prop-types "^15.6.2"
+    react "^16.8.1"
+    react-dom "^16.8.1"
+    react-focus-lock "^1.17.7"
+    react-helmet-async "^0.2.0"
     react-inspector "^2.3.0"
-    react-split-pane "^0.1.84"
+    react-popper-tooltip "^2.8.0"
+    react-syntax-highlighter "^8.0.1"
     react-textarea-autosize "^7.0.4"
+    reactjs-popup "^1.3.2"
+    recompose "^0.30.0"
     render-fragment "^0.1.1"
 
-"@storybook/core-events@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-4.1.11.tgz#78cfb2b4014ca27909421cdebfa9c96533929a5a"
-  integrity sha512-rVb76xFLJkTFcBHL1oTdJW8O2N7q+Cc6Mo7v9u3TnM4WuRk08/GyzzO7sRvEg3Mvo59AOLu1uqYovRMo4tZEnQ==
-
-"@storybook/core@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-4.1.11.tgz#f91cf77d4750edeb92717f6b2a2a4258b0a06c64"
-  integrity sha512-iUrtFCav7xJicCLhp4zdqbhaOXRWXrx4wMPSs0keBD2G7NQtSg/TQMUdx2VYFBl5thIFT1jt5dAm66y0Q2OCTQ==
-  dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.2.0"
-    "@babel/preset-env" "^7.2.0"
-    "@emotion/core" "^0.13.1"
-    "@emotion/provider" "^0.11.2"
-    "@emotion/styled" "^0.10.6"
-    "@storybook/addons" "4.1.11"
-    "@storybook/channel-postmessage" "4.1.11"
-    "@storybook/client-logger" "4.1.11"
-    "@storybook/core-events" "4.1.11"
-    "@storybook/node-logger" "4.1.11"
-    "@storybook/ui" "4.1.11"
+"@storybook/core-events@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.0.6.tgz#ead92a1e463d53fa57151b62192e74f8e3f45b3b"
+  integrity sha512-OpNHSAxgaok1JYbF5AOML23rIyIyTxir7Ou/s4McN2k0Z2huLaIBA3aeu7vSMygOvN+q6VGMc4uC7f6WQ6kwUg==
+  dependencies:
+    core-js "^2.6.5"
+
+"@storybook/core@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.0.6.tgz#142b4d98888dce6e4e6d1b235d09777954cee2de"
+  integrity sha512-Uzl0CzM2Th24T47TLImis0sFiCzDy2tExDt24p/ojMy2HYA/aT+kTGUN5OMXBZTKDbRFQgv0P2vzHCWyS//Zmw==
+  dependencies:
+    "@babel/plugin-proposal-class-properties" "^7.3.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.3.2"
+    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+    "@babel/plugin-transform-react-constant-elements" "^7.2.0"
+    "@babel/preset-env" "^7.4.1"
+    "@storybook/addons" "5.0.6"
+    "@storybook/channel-postmessage" "5.0.6"
+    "@storybook/client-api" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/node-logger" "5.0.6"
+    "@storybook/router" "5.0.6"
+    "@storybook/theming" "5.0.6"
+    "@storybook/ui" "5.0.6"
     airbnb-js-shims "^1 || ^2"
-    autoprefixer "^9.3.1"
-    babel-plugin-macros "^2.4.2"
+    autoprefixer "^9.4.7"
+    babel-plugin-add-react-displayname "^0.0.5"
+    babel-plugin-emotion "^10.0.7"
+    babel-plugin-macros "^2.4.5"
     babel-preset-minify "^0.5.0 || 0.6.0-alpha.5"
-    boxen "^2.0.0"
-    case-sensitive-paths-webpack-plugin "^2.1.2"
-    chalk "^2.4.1"
+    boxen "^2.1.0"
+    case-sensitive-paths-webpack-plugin "^2.2.0"
+    chalk "^2.4.2"
     child-process-promise "^2.2.1"
     cli-table3 "0.5.1"
     commander "^2.19.0"
     common-tags "^1.8.0"
-    core-js "^2.5.7"
-    css-loader "^1.0.1"
+    core-js "^2.6.5"
+    css-loader "^2.1.0"
     detect-port "^1.2.3"
-    dotenv-webpack "^1.5.7"
+    dotenv-webpack "^1.7.0"
     ejs "^2.6.1"
-    eventemitter3 "^3.1.0"
     express "^4.16.3"
-    file-loader "^2.0.0"
+    file-loader "^3.0.1"
     file-system-cache "^1.0.5"
     find-cache-dir "^2.0.0"
     fs-extra "^7.0.1"
     global "^4.3.2"
     html-webpack-plugin "^4.0.0-beta.2"
     inquirer "^6.2.0"
-    interpret "^1.1.0"
+    interpret "^1.2.0"
     ip "^1.1.5"
     json5 "^2.1.0"
     lazy-universal-dotenv "^2.0.0"
     node-fetch "^2.2.0"
+    object.omit "^3.0.0"
     opn "^5.4.0"
     postcss-flexbugs-fixes "^4.1.0"
     postcss-loader "^3.0.0"
     pretty-hrtime "^1.0.3"
     prop-types "^15.6.2"
-    qs "^6.5.2"
-    raw-loader "^0.5.1"
-    react-dev-utils "^6.1.0"
-    redux "^4.0.1"
+    raw-loader "^1.0.0"
+    react-dev-utils "^7.0.0"
     regenerator-runtime "^0.12.1"
-    resolve "^1.8.1"
+    resolve "^1.10.0"
     resolve-from "^4.0.0"
     semver "^5.6.0"
     serve-favicon "^2.5.0"
@@ -1351,95 +1484,96 @@
     spawn-promise "^0.1.8"
     style-loader "^0.23.1"
     svg-url-loader "^2.3.2"
-    terser-webpack-plugin "^1.1.0"
+    terser-webpack-plugin "^1.2.1"
     url-loader "^1.1.2"
-    webpack "^4.23.1"
-    webpack-dev-middleware "^3.4.0"
+    util-deprecate "^1.0.2"
+    webpack "^4.29.0"
+    webpack-dev-middleware "^3.5.1"
     webpack-hot-middleware "^2.24.3"
 
-"@storybook/mantra-core@^1.7.2":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@storybook/mantra-core/-/mantra-core-1.7.2.tgz#e10c7faca29769e97131e0e0308ef7cfb655b70c"
-  integrity sha512-GD4OYJ8GsayVhIg306sfgcKDk9j8YfuSKIAWvdB/g7IDlw0pDgueONALVEEE2XWJtCwcsUyDtCYzXFgCBWLEjA==
-  dependencies:
-    "@storybook/react-komposer" "^2.0.1"
-    "@storybook/react-simple-di" "^1.2.1"
-    babel-runtime "6.x.x"
-
-"@storybook/node-logger@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-4.1.11.tgz#8ea9779eb6260a02bf06c02eafbff5925b883f9f"
-  integrity sha512-rCXk1PUcakkV72oyTR+nOVDUGnkk1On8/sm9u3NtBEUuwsCtm4p+jh42Pp4jsTtWpG36AVABDtiN65VgCfS+9w==
+"@storybook/node-logger@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.0.6.tgz#80044c2b9d278c9c191ee5bc9e15e93247146b3a"
+  integrity sha512-8KKhhsftxjpew1VOXHZDudylzF7y3SUHxvChykK3V4yjZlbtR5a5U8EGE5Bx5HW0aoInFk08uYTMqsHDRvccfw==
   dependencies:
-    chalk "^2.4.1"
-    core-js "^2.5.7"
+    chalk "^2.4.2"
+    core-js "^2.6.5"
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
     regenerator-runtime "^0.12.1"
 
-"@storybook/podda@^1.2.3":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/podda/-/podda-1.2.3.tgz#53c4a1a3f8c7bbd5755dff5c34576fd1af9d38ba"
-  integrity sha512-g7dsdsn50AhlGZ8iIDKdF8bi7Am++iFOq+QN+hNKz3FvgLuf8Dz+mpC/BFl90eE9bEYxXqXKeMf87399Ec5Qhw==
+"@storybook/router@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.0.6.tgz#1856aaa2771145a7ace804d893fa92bc73418039"
+  integrity sha512-mK+chRfpoINrDEWXQ7P2Gff179hl3q0bPfDo4DwbGO0wf0yOKDGXf+S/vlIF29+5weyhrMe4Si9PALq4ibsl6Q==
   dependencies:
-    babel-runtime "^6.11.6"
-    immutable "^3.8.1"
-
-"@storybook/react-komposer@^2.0.1", "@storybook/react-komposer@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.5.tgz#0c23163f28b2e1bd2aeeb4421fed382bb512de0e"
-  integrity sha512-zX5UITgAh37tmD0MWnUFR29S5YM8URMHc/9iwczX/P1f3tM4nPn8VAzxG/UWQecg1xZVphmqkZoux+SDrtTZOQ==
-  dependencies:
-    "@storybook/react-stubber" "^1.0.0"
-    babel-runtime "^6.11.6"
-    hoist-non-react-statics "^1.2.0"
-    lodash "^4.17.11"
-    shallowequal "^1.1.0"
+    "@reach/router" "^1.2.1"
+    "@storybook/theming" "5.0.6"
+    core-js "^2.6.5"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    qs "^6.5.2"
 
-"@storybook/react-simple-di@^1.2.1":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@storybook/react-simple-di/-/react-simple-di-1.3.0.tgz#13116d89a2f42898716a7f8c4095b47415526371"
-  integrity sha512-RH6gPQaYMs/VzQX2dgbZU8DQMKFXVOv1ruohHjjNPys4q+YdqMFMDe5jOP1AUE3j9g01x0eW7bVjRawSpl++Ew==
+"@storybook/theming@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.0.6.tgz#5827d780eb45a031ad27cd19bd87cd70a818546f"
+  integrity sha512-Kz0/ujHknhan7DHApLIdSzfLAMbpo7AEKmi+R060ZV0ImGmAP9O7Ytqws7u1O25fgA4AgCDyeDpT4N9i83la+w==
   dependencies:
-    babel-runtime "6.x.x"
-    create-react-class "^15.6.2"
-    hoist-non-react-statics "1.x.x"
-    prop-types "^15.6.0"
-
-"@storybook/react-stubber@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@storybook/react-stubber/-/react-stubber-1.0.1.tgz#8c312c2658b9eeafce470e1c39e4193f0b5bf9b1"
-  integrity sha512-k+CHH+vA8bQfCmzBTtJsPkITFgD+C/w19KuByZ9WeEvNUFtnDaCqfP+Vp3/OR+3IAfAXYYOWolqPLxNPcEqEjw==
-  dependencies:
-    babel-runtime "^6.5.0"
-
-"@storybook/ui@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-4.1.11.tgz#0c6fc34a8096028ef236a5196e7b91831702f2fb"
-  integrity sha512-bgIagh2Z4flGA7jv4JN++ThLwGq8CI8Wq+1/vhCiTxjTE3H1j9VNPdJfhNgxrQypcLRVHl5AKhf0mlSMyz0S1A==
-  dependencies:
-    "@emotion/core" "^0.13.1"
-    "@emotion/provider" "^0.11.2"
-    "@emotion/styled" "^0.10.6"
-    "@storybook/components" "4.1.11"
-    "@storybook/core-events" "4.1.11"
-    "@storybook/mantra-core" "^1.7.2"
-    "@storybook/podda" "^1.2.3"
-    "@storybook/react-komposer" "^2.0.5"
-    deep-equal "^1.0.1"
-    eventemitter3 "^3.1.0"
-    fuse.js "^3.3.0"
+    "@emotion/core" "^10.0.7"
+    "@emotion/styled" "^10.0.7"
+    "@storybook/client-logger" "5.0.6"
+    common-tags "^1.8.0"
+    core-js "^2.6.5"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.7"
+    global "^4.3.2"
+    lodash.isequal "^4.5.0"
+    lodash.mergewith "^4.6.1"
+    memoizerific "^1.11.3"
+    polished "^2.3.3"
+    prop-types "^15.6.2"
+    react-inspector "^2.3.1"
+
+"@storybook/ui@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.0.6.tgz#954b1284d0a21e8c0154e56c2f76e58e66fe09fe"
+  integrity sha512-XmyJokPE7gWKmZXAVXnlRZgU3vQKyUMt6KJrg8Q6GqbvyaPN6p5OlLVDZMgPA/5DpCGfMUEp3BMbJpl9SI97tA==
+  dependencies:
+    "@storybook/addons" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    "@storybook/components" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/router" "5.0.6"
+    "@storybook/theming" "5.0.6"
+    core-js "^2.6.5"
+    fast-deep-equal "^2.0.1"
+    fuzzy-search "^3.0.1"
     global "^4.3.2"
+    history "^4.7.2"
     keycode "^2.2.0"
-    lodash "^4.17.11"
+    lodash.debounce "^4.0.8"
+    lodash.isequal "^4.5.0"
+    lodash.mergewith "^4.6.1"
+    lodash.pick "^4.4.0"
+    lodash.sortby "^4.7.0"
+    lodash.throttle "^4.1.1"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^2.3.3"
     prop-types "^15.6.2"
     qs "^6.5.2"
-    react "^16.7.0"
-    react-dom "^16.7.0"
-    react-fuzzy "^0.5.2"
+    react "^16.8.1"
+    react-dom "^16.8.1"
+    react-draggable "^3.1.1"
+    react-helmet-async "^0.2.0"
+    react-hotkeys "2.0.0-pre4"
     react-lifecycles-compat "^3.0.4"
-    react-modal "^3.6.1"
-    react-treebeard "^3.1.0"
+    react-modal "^3.8.1"
+    react-resize-detector "^3.2.1"
+    recompose "^0.30.0"
+    semver "^5.6.0"
+    telejson "^2.1.1"
+    util-deprecate "^1.0.2"
 
 "@swimlane/ngx-charts@^10.0.0":
   version "10.0.0"
@@ -1630,21 +1764,45 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
     "@webassemblyjs/wast-parser" "1.7.11"
 
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
 "@webassemblyjs/floating-point-hex-parser@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
   integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
 
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
 "@webassemblyjs/helper-api-error@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
   integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
 
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
 "@webassemblyjs/helper-buffer@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
   integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
 
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
 "@webassemblyjs/helper-code-frame@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
@@ -1652,21 +1810,46 @@
   dependencies:
     "@webassemblyjs/wast-printer" "1.7.11"
 
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
 "@webassemblyjs/helper-fsm@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
   integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
 
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
 "@webassemblyjs/helper-module-context@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
   integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
 
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
 "@webassemblyjs/helper-wasm-bytecode@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
   integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
 
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
 "@webassemblyjs/helper-wasm-section@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
@@ -1677,6 +1860,16 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
     "@webassemblyjs/wasm-gen" "1.7.11"
 
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
 "@webassemblyjs/ieee754@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
@@ -1684,6 +1877,13 @@
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
 "@webassemblyjs/leb128@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
@@ -1691,11 +1891,23 @@
   dependencies:
     "@xtuc/long" "4.2.1"
 
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
 "@webassemblyjs/utf8@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
   integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
 
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
 "@webassemblyjs/wasm-edit@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
@@ -1710,6 +1922,20 @@
     "@webassemblyjs/wasm-parser" "1.7.11"
     "@webassemblyjs/wast-printer" "1.7.11"
 
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
 "@webassemblyjs/wasm-gen@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
@@ -1721,6 +1947,17 @@
     "@webassemblyjs/leb128" "1.7.11"
     "@webassemblyjs/utf8" "1.7.11"
 
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
 "@webassemblyjs/wasm-opt@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
@@ -1731,6 +1968,16 @@
     "@webassemblyjs/wasm-gen" "1.7.11"
     "@webassemblyjs/wasm-parser" "1.7.11"
 
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
 "@webassemblyjs/wasm-parser@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
@@ -1743,6 +1990,18 @@
     "@webassemblyjs/leb128" "1.7.11"
     "@webassemblyjs/utf8" "1.7.11"
 
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
 "@webassemblyjs/wast-parser@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
@@ -1755,6 +2014,18 @@
     "@webassemblyjs/helper-fsm" "1.7.11"
     "@xtuc/long" "4.2.1"
 
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
 "@webassemblyjs/wast-printer@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
@@ -1764,6 +2035,15 @@
     "@webassemblyjs/wast-parser" "1.7.11"
     "@xtuc/long" "4.2.1"
 
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -1774,6 +2054,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
   integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
 
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -2423,7 +2708,7 @@ autoprefixer@9.4.6:
     postcss "^7.0.13"
     postcss-value-parser "^3.3.1"
 
-autoprefixer@^9.0.0, autoprefixer@^9.3.1:
+autoprefixer@^9.0.0:
   version "9.4.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.7.tgz#f997994f9a810eae47b38fa6d8a119772051c4ff"
   integrity sha512-qS5wW6aXHkm53Y4z73tFGsUhmZu4aMPV9iHXYlF0c/wxjknXNHuj/1cIQb+6YH692DbJGGWcckAXX+VxKvahMA==
@@ -2435,6 +2720,18 @@ autoprefixer@^9.0.0, autoprefixer@^9.3.1:
     postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
+autoprefixer@^9.4.7:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
+  dependencies:
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.14"
+    postcss-value-parser "^3.3.1"
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -2520,13 +2817,35 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-macros@^2.4.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.5.0.tgz#01f4d3b50ed567a67b80a30b9da066e94f4097b6"
-  integrity sha512-BWw0lD0kVZAXRD3Od1kMrdmfudqzDzYv2qrN3l2ISR1HVp1EgLKfbOrYV9xmY5k3qx3RIu5uPAUZZZHpo0o5Iw==
+babel-plugin-add-react-displayname@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5"
+  integrity sha1-M51M3be2X9YtHfnbn+BN4TQSK9U=
+
+babel-plugin-emotion@^10.0.7, babel-plugin-emotion@^10.0.9:
+  version "10.0.9"
+  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.9.tgz#04a0404d5a4084d5296357a393d344c0f8303ae4"
+  integrity sha512-IfWP12e9/wHtWHxVTzD692Nbcmrmcz2tip7acp6YUqtrP7slAyr5B+69hyZ8jd55GsyNSZwryNnmuDEVe0j+7w==
   dependencies:
-    cosmiconfig "^5.0.5"
-    resolve "^1.8.1"
+    "@babel/helper-module-imports" "^7.0.0"
+    "@emotion/hash" "0.7.1"
+    "@emotion/memoize" "0.7.1"
+    "@emotion/serialize" "^0.11.6"
+    babel-plugin-macros "^2.0.0"
+    babel-plugin-syntax-jsx "^6.18.0"
+    convert-source-map "^1.5.0"
+    escape-string-regexp "^1.0.5"
+    find-root "^1.1.0"
+    source-map "^0.5.7"
+
+babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.4.5:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.5.1.tgz#4a119ac2c2e19b458c259b9accd7ee34fd57ec6f"
+  integrity sha512-xN3KhAxPzsJ6OQTktCanNpIFnnMsCV+t8OloKxIL72D6+SUZYFn9qfklPgef5HyyDtzYZqqb+fs1S12+gQY82Q==
+  dependencies:
+    "@babel/runtime" "^7.4.2"
+    cosmiconfig "^5.2.0"
+    resolve "^1.10.0"
 
 babel-plugin-minify-builtins@^0.5.0:
   version "0.5.0"
@@ -2602,6 +2921,11 @@ babel-plugin-minify-type-constructors@^0.4.3:
   dependencies:
     babel-helper-is-void-0 "^0.4.3"
 
+babel-plugin-syntax-jsx@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+  integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
+
 babel-plugin-transform-inline-consecutive-adds@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz#323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"
@@ -2699,7 +3023,7 @@ babel-polyfill@6.23.0:
     babel-plugin-transform-undefined-to-void "^6.9.4"
     lodash.isplainobject "^4.0.6"
 
-babel-runtime@6.x.x, babel-runtime@^6.11.6, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0:
+babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, 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=
@@ -2916,7 +3240,7 @@ bootstrap@^4.0.0-alpha.6, bootstrap@^4.3.1:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
   integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
 
-boxen@^2.0.0:
+boxen@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-2.1.0.tgz#8d576156e33fc26a34d6be8635fd16b1d745f0b2"
   integrity sha512-luq3RQOt2U5sUX+fiu+qnT+wWnHDcATLpEe63jvge6GUZO99AKbVRfp97d2jgLvq1iQa0ORzaAm4lGVG52ZSlw==
@@ -3057,16 +3381,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
-  integrity sha512-VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==
-  dependencies:
-    caniuse-lite "^1.0.30000884"
-    electron-to-chromium "^1.3.62"
-    node-releases "^1.0.0-alpha.11"
-
-browserslist@^4.3.4, browserslist@^4.4.1:
+browserslist@4.4.1, browserslist@^4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
   integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
@@ -3075,6 +3390,15 @@ browserslist@^4.3.4, browserslist@^4.4.1:
     electron-to-chromium "^1.3.103"
     node-releases "^1.1.3"
 
+browserslist@^4.5.2, browserslist@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
+  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
+  dependencies:
+    caniuse-lite "^1.0.30000955"
+    electron-to-chromium "^1.3.122"
+    node-releases "^1.1.13"
+
 browserstack@^1.5.1:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.2.tgz#17d8bb76127a1cc0ea416424df80d218f803673f"
@@ -3292,6 +3616,11 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
   integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
 
+camelcase@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 can-promise@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/can-promise/-/can-promise-0.0.1.tgz#7a7597ad801fb14c8b22341dfec314b6bd6ad8d3"
@@ -3299,17 +3628,22 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
-caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000932:
+caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000932:
   version "1.0.30000936"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000936.tgz#5d33b118763988bf721b9b8ad436d0400e4a116b"
   integrity sha512-orX4IdpbFhdNO7bTBhSbahp1EBpqzBc+qrvTRVUFfZgA4zta7TdM6PN5ZxkEUgDnz36m+PfWGcdX7AVfFWItJw==
 
+caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.30000957:
+  version "1.0.30000957"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
+  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
   integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
 
-case-sensitive-paths-webpack-plugin@^2.1.2:
+case-sensitive-paths-webpack-plugin@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"
   integrity sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g==
@@ -3335,16 +3669,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.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"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3353,6 +3678,11 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+change-emitter@^0.1.2:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
+  integrity sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=
+
 character-entities-html4@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.2.tgz#c44fdde3ce66b52e8d321d6c1bf46101f0150610"
@@ -3579,6 +3909,15 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
+clipboard@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d"
+  integrity sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
+
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
@@ -3716,6 +4055,13 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+comma-separated-tokens@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.5.tgz#b13793131d9ea2d2431cf5b507ddec258f0ce0db"
+  integrity sha512-Cg90/fcK93n0ecgYTAz1jaA3zvnQ0ExlmKY1rdbyHqAx6BHxwoJc+J7HDu0iuQ7ixEs1qaa+WyQ6oeuBpYP1iA==
+  dependencies:
+    trim "0.0.1"
+
 commander@2, commander@^2.12.1, commander@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -3799,6 +4145,14 @@ concat-stream@^1.5.0, concat-stream@~1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+config-chain@^1.1.12:
+  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"
+
 connect-history-api-fallback@^1.3.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
@@ -3856,7 +4210,7 @@ conventional-changelog-atom@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-cli@^2.0.12:
+conventional-changelog-cli@^2.0.11:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-2.0.12.tgz#ffe04f5430fbc339dc7fa28634c2e0de5dd76e2e"
   integrity sha512-6wh9W5Gpr9DM40E8cFi0qa6JotVm4Jq+suksuqgKnm544H8ZXsRhgGNXShDASOteY9brv9fX8/+fE/QL1wHqbA==
@@ -4035,6 +4389,26 @@ copy-webpack-plugin@4.6.0:
     p-limit "^1.0.0"
     serialize-javascript "^1.4.0"
 
+core-js-compat@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.0.1.tgz#bff73ba31ca8687431b9c88f78d3362646fb76f0"
+  integrity sha512-2pC3e+Ht/1/gD7Sim/sqzvRplMiRnFQVlPpDVaHtY9l7zZP7knamr3VRD6NyGfHd84MrDC0tAM9ulNxYMW0T3g==
+  dependencies:
+    browserslist "^4.5.4"
+    core-js "3.0.1"
+    core-js-pure "3.0.1"
+    semver "^6.0.0"
+
+core-js-pure@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.0.1.tgz#37358fb0d024e6b86d443d794f4e37e949098cbe"
+  integrity sha512-mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g==
+
+core-js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
@@ -4045,6 +4419,11 @@ core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.4:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d"
   integrity sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A==
 
+core-js@^2.6.5:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
+  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
+
 core-js@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
@@ -4073,7 +4452,7 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.0, cosmiconfig@^5.0.5, cosmiconfig@^5.0.7:
+cosmiconfig@^5.0.0, cosmiconfig@^5.0.7:
   version "5.0.7"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
   integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
@@ -4083,7 +4462,7 @@ cosmiconfig@^5.0.0, cosmiconfig@^5.0.5, cosmiconfig@^5.0.7:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
-cosmiconfig@^5.1.0:
+cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
   integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
@@ -4124,14 +4503,21 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-class@^15.6.2:
-  version "15.6.3"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
-  integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==
+create-react-context@<=0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.2.tgz#9836542f9aaa22868cd7d4a6f82667df38019dca"
+  integrity sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==
   dependencies:
-    fbjs "^0.8.9"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
+    fbjs "^0.8.0"
+    gud "^1.0.0"
+
+create-react-context@^0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3"
+  integrity sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==
+  dependencies:
+    fbjs "^0.8.0"
+    gud "^1.0.0"
 
 cross-env@^5.2.0:
   version "5.2.0"
@@ -4206,23 +4592,22 @@ crypto-js@^3.1.9-1:
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
   integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=
 
-css-loader@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
-  integrity sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==
+css-loader@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea"
+  integrity sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==
   dependencies:
-    babel-code-frame "^6.26.0"
-    css-selector-tokenizer "^0.7.0"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash "^4.17.11"
-    postcss "^6.0.23"
-    postcss-modules-extract-imports "^1.2.0"
-    postcss-modules-local-by-default "^1.2.0"
-    postcss-modules-scope "^1.1.0"
-    postcss-modules-values "^1.3.0"
+    camelcase "^5.2.0"
+    icss-utils "^4.1.0"
+    loader-utils "^1.2.3"
+    normalize-path "^3.0.0"
+    postcss "^7.0.14"
+    postcss-modules-extract-imports "^2.0.0"
+    postcss-modules-local-by-default "^2.0.6"
+    postcss-modules-scope "^2.1.0"
+    postcss-modules-values "^2.0.0"
     postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
+    schema-utils "^1.0.0"
 
 css-parse@1.7.x:
   version "1.7.0"
@@ -4265,6 +4650,16 @@ cssesc@^0.1.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
   integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+csstype@^2.5.7:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.3.tgz#b701e5968245bf9b08d54ac83d00b624e622a9fa"
+  integrity sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg==
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -4690,7 +5085,7 @@ debug@*, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8:
+debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4751,6 +5146,11 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+deep-object-diff@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
+  integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
+
 deepmerge@^2.0.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
@@ -4838,6 +5238,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+delegate@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+  integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -4972,13 +5377,6 @@ dom-converter@~0.2:
   dependencies:
     utila "~0.4"
 
-dom-helpers@^3.3.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
-  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -5085,7 +5483,7 @@ dotenv-expand@^4.2.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
   integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=
 
-dotenv-webpack@^1.5.7:
+dotenv-webpack@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz#4384d8c57ee6f405c296278c14a9f9167856d3a1"
   integrity sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==
@@ -5134,6 +5532,16 @@ echarts@^4.2.1-rc.1:
   dependencies:
     zrender "4.0.6"
 
+editorconfig@^0.15.2:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
+  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
+  dependencies:
+    commander "^2.19.0"
+    lru-cache "^4.1.5"
+    semver "^5.6.0"
+    sigmund "^1.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -5144,11 +5552,16 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.62:
+electron-to-chromium@^1.3.103:
   version "1.3.113"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
   integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
 
+electron-to-chromium@^1.3.122:
+  version "1.3.124"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
+  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -5172,6 +5585,15 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
+emotion-theming@^10.0.7:
+  version "10.0.10"
+  resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.10.tgz#efe8751119751bdc70fdc1795fe4cde0fb0cf14c"
+  integrity sha512-E4SQ3Y91avxxydDgubi/po/GaC5MM1XHm8kcClKg1PA/TeOye0PiLBzAzlgt9dBzDRV9+qHDunsayPvzVYIYng==
+  dependencies:
+    "@emotion/weak-memoize" "0.2.2"
+    hoist-non-react-statics "^3.3.0"
+    object-assign "^4.1.1"
+
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -5472,13 +5894,6 @@ events@^3.0.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
   integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
 
-eventsource@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
-  integrity sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=
-  dependencies:
-    original ">=0.0.5"
-
 eventsource@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
@@ -5580,13 +5995,6 @@ expand-range@^0.1.0:
     is-number "^0.1.1"
     repeat-string "^0.2.2"
 
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
 express@^4.16.2, express@^4.16.3:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
@@ -5752,7 +6160,14 @@ fastparse@^1.1.1:
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
   integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
-faye-websocket@0.11.x, faye-websocket@~0.11.0, faye-websocket@~0.11.1:
+fault@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz#c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa"
+  integrity sha512-o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw==
+  dependencies:
+    format "^0.2.2"
+
+faye-websocket@0.11.x, faye-websocket@~0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
   integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
@@ -5766,7 +6181,7 @@ faye-websocket@^0.10.0:
   dependencies:
     websocket-driver ">=0.5.1"
 
-fbjs@^0.8.9:
+fbjs@^0.8.0, fbjs@^0.8.1:
   version "0.8.17"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
   integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
@@ -5806,7 +6221,7 @@ file-loader@1.1.11:
     loader-utils "^1.0.2"
     schema-utils "^0.4.5"
 
-file-loader@3.0.1:
+file-loader@3.0.1, file-loader@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
   integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
@@ -5814,14 +6229,6 @@ file-loader@3.0.1:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
-file-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
-  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
-  dependencies:
-    loader-utils "^1.0.2"
-    schema-utils "^1.0.0"
-
 file-system-cache@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-1.0.5.tgz#84259b36a2bbb8d3d6eb1021d3132ffe64cfff4f"
@@ -5898,6 +6305,11 @@ find-cache-dir@^2.0.0:
     make-dir "^1.0.0"
     pkg-dir "^3.0.0"
 
+find-root@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
+
 find-up@3.0.0, find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -5952,6 +6364,11 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
+focus-lock@^0.6.0:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.6.2.tgz#d8ac9dbc46250779789c3e6f43d978c7dfa59dcd"
+  integrity sha512-Wuq6TSOgsGQmzbpvinl1TcEw4BAUhD9T06myl5HvaBlO0geAz9ABtqBIqPkkNyO3AgPzEDazetL5hSRgj+2iqQ==
+
 follow-redirects@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
@@ -6003,18 +6420,16 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@^0.4.14:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.4.15.tgz#7cd9f94f3dd58cd1fe8f953f876e72090eda3f6d"
-  integrity sha512-qNYuygh2GxXehBvQZ5rI5YlQFn+7ZV6kmkyD9Sgs33dWl73NZdUOB5aCp8v0EXJn176AhPrZP8YCMT3h01fs+g==
+fork-ts-checker-webpack-plugin@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.5.2.tgz#a73b3630bd0a69409a6e4824e54c03a62fe82d8f"
+  integrity sha512-a5IG+xXyKnpruI0CP/anyRLAoxWtp3lzdG6flxicANnoSzz64b12dJ7ASAVRrI2OaWwZR2JyBaMHFQqInhWhIw==
   dependencies:
     babel-code-frame "^6.22.0"
     chalk "^2.4.1"
     chokidar "^2.0.4"
-    lodash "^4.17.11"
     micromatch "^3.1.10"
     minimatch "^3.0.4"
-    resolve "^1.5.0"
     tapable "^1.0.0"
 
 form-data@~2.3.2:
@@ -6026,6 +6441,11 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
+format@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
+  integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
+
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -6155,10 +6575,10 @@ function.prototype.name@^1.1.0:
     function-bind "^1.1.1"
     is-callable "^1.1.3"
 
-fuse.js@^3.0.1, fuse.js@^3.3.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.4.2.tgz#d7a638c436ecd7b9c4c0051478c09594eb956212"
-  integrity sha512-WVbrm+cAxPtyMqdtL7cYhR7aZJPhtOfjNClPya8GKMVukKDYs7pEnPINeRVX1C9WmWgU8MdYGYbUPAP2AJXdoQ==
+fuzzy-search@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fuzzy-search/-/fuzzy-search-3.0.1.tgz#14a4964508a9607d6e9a88818e7ff634108260b6"
+  integrity sha512-rjUvzdsMlOyarm0oD5k6zVQwgvt4Tb5Xe3YdIGU+Vogw54+ueAGPUTMU2B9jfPQEie5cD11i/S9J9d+MNBSQ3Q==
 
 gauge@~2.7.3:
   version "2.7.4"
@@ -6312,33 +6732,13 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glo
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-modules@1.0.0, global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-modules@^2.0.0:
+global-modules@2.0.0, global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
   integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
   dependencies:
     global-prefix "^3.0.0"
 
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
 global-prefix@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
@@ -6366,13 +6766,13 @@ globals@^9.18.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
-globby@8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
-  integrity sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==
+globby@8.0.2, globby@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
+  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
   dependencies:
     array-union "^1.0.1"
-    dir-glob "^2.0.0"
+    dir-glob "2.0.0"
     fast-glob "^2.0.2"
     glob "^7.1.2"
     ignore "^3.3.5"
@@ -6414,19 +6814,6 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globby@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
-  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
 globby@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-9.0.0.tgz#3800df736dc711266df39b4ce33fe0d481f94c23"
@@ -6461,6 +6848,13 @@ gonzales-pe@^4.2.3:
   dependencies:
     minimist "1.1.x"
 
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+  integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
+  dependencies:
+    delegate "^3.1.2"
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
@@ -6478,6 +6872,11 @@ graphql@^14.1.1:
   dependencies:
     iterall "^1.2.2"
 
+gud@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
+  integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==
+
 gzip-size@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"
@@ -6614,6 +7013,21 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hast-util-parse-selector@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.1.tgz#4ddbae1ae12c124e3eb91b581d2556441766f0ab"
+  integrity sha512-Xyh0v+nHmQvrOqop2Jqd8gOdyQtE8sIP9IQf7mlVDqp924W4w/8Liuguk2L2qei9hARnQSG2m+wAOCxM7npJVw==
+
+hastscript@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-5.0.0.tgz#fee10382c1bc4ba3f1be311521d368c047d2c43a"
+  integrity sha512-xJtuJ8D42Xtq5yJrnDg/KAIxl2cXBXKoiIJwmWX9XMf8113qHTGl/Bf7jEsxmENJ4w6q4Tfl8s/Y6mEZo8x8qw==
+  dependencies:
+    comma-separated-tokens "^1.0.0"
+    hast-util-parse-selector "^2.2.0"
+    property-information "^5.0.1"
+    space-separated-tokens "^1.0.0"
+
 he@1.2.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -6624,6 +7038,23 @@ highlight.js@^9.14.2:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.14.2.tgz#efbfb22dc701406e4da406056ef8c2b70ebe5b26"
   integrity sha512-Nc6YNECYpxyJABGYJAyw7dBAYbXEuIzwzkqoJnwbc1nIpCiN+3ioYf0XrBnLiyyG0JLuJhpPtt2iTSbXiKLoyA==
 
+highlight.js@~9.12.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
+  integrity sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=
+
+history@^4.7.2:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz#84587c2068039ead8af769e9d6a6860a14fa1bca"
+  integrity sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    loose-envify "^1.2.0"
+    resolve-pathname "^2.2.0"
+    tiny-invariant "^1.0.2"
+    tiny-warning "^1.0.0"
+    value-equal "^0.4.0"
+
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -6638,17 +7069,17 @@ hoek@6.x.x:
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
   integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
 
-hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
-  integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
+hoist-non-react-statics@^2.3.1:
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
+  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-homedir-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
+hoist-non-react-statics@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
+  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
   dependencies:
-    parse-passwd "^1.0.0"
+    react-is "^16.7.0"
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
@@ -6865,12 +7296,12 @@ icss-replace-symbols@^1.1.0:
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
   integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
 
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
+icss-utils@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.0.tgz#339dbbffb9f8729a243b701e1c29d4cc58c52f0e"
+  integrity sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.14"
 
 ieee754@^1.1.4:
   version "1.1.12"
@@ -6914,21 +7345,21 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immer@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-1.7.2.tgz#a51e9723c50b27e132f6566facbec1c85fc69547"
-  integrity sha512-4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA==
+immer@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d"
+  integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==
+
+immer@^1.12.0:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-1.12.1.tgz#40c6e5b292c00560836c2993bda3a24379d466f5"
+  integrity sha512-3fmKM6ovaqDt0CdC9daXpNi5x/YCYS3i4cwLdTVkhJdk5jrDXoPs7lCm3IqM3yhfSnz4tjjxbRG2CziQ7m8ztg==
 
 immutable-tuple@^0.4.9:
   version "0.4.10"
   resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.10.tgz#e0b1625384f514084a7a84b749a3bb26e9179929"
   integrity sha512-45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q==
 
-immutable@^3.8.1:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
-
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -7032,29 +7463,10 @@ inquirer@3.0.6:
     figures "^2.0.0"
     lodash "^4.3.0"
     mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx "^4.1.0"
-    string-width "^2.0.0"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-inquirer@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
-  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.0"
-    figures "^2.0.0"
-    lodash "^4.17.10"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.1.0"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
+    run-async "^2.2.0"
+    rx "^4.1.0"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.0"
     through "^2.3.6"
 
 inquirer@6.2.1:
@@ -7116,7 +7528,7 @@ internal-ip@^4.2.0:
     default-gateway "^4.0.1"
     ipaddr.js "^1.9.0"
 
-interpret@^1.0.0, interpret@^1.1.0:
+interpret@^1.0.0, interpret@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
@@ -7131,7 +7543,7 @@ intl@1.2.5:
   resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
   integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
 
-invariant@^2.2.2:
+invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -7304,7 +7716,7 @@ is-extendable@^0.1.0, is-extendable@^0.1.1:
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
   integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
-is-extendable@^1.0.1:
+is-extendable@^1.0.0, is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
   integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
@@ -7335,6 +7747,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-function@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
+  integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -7709,6 +8126,17 @@ js-base64@^2.1.8:
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
   integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
 
+js-beautify@^1.8.9:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.9.1.tgz#6f9ef915f5d8d92b9f907606fce63795884c8040"
+  integrity sha512-oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ==
+  dependencies:
+    config-chain "^1.1.12"
+    editorconfig "^0.15.2"
+    glob "^7.1.3"
+    mkdirp "~0.5.0"
+    nopt "~4.0.1"
+
 js-levenshtein@^1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@@ -7740,6 +8168,11 @@ js-yaml@^3.13.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsbarcode@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/jsbarcode/-/jsbarcode-3.11.0.tgz#20623e008b101ef45d0cce9c8022cdf49be28547"
+  integrity sha512-/ozCd7wsa+VIHo9sUc03HneVEQrH7cVWfJolUT/WOW1m8mJ2e3iYZje6C9X3LFHdczlesqFHRpxLtbVsNtjyow==
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -8132,7 +8565,7 @@ loader-utils@1.1.0:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, 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==
@@ -8167,6 +8600,11 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+lodash-es@^4.17.11:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
+  integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -8187,21 +8625,41 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
+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.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
   integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
-lodash.mergewith@^4.6.0:
+lodash.mergewith@^4.6.0, lodash.mergewith@^4.6.1:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
   integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
+lodash.pick@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+  integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
+
 lodash.some@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
   integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
 
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -8222,6 +8680,11 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
+
 lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
@@ -8255,7 +8718,7 @@ longest-streak@^2.0.1:
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e"
   integrity sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -8275,7 +8738,15 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lowlight@~1.9.1:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.9.2.tgz#0b9127e3cec2c3021b7795dd81005c709a42fdd1"
+  integrity sha512-Ek18ElVCf/wF/jEm1b92gTnigh94CtBNWiZ2ad+vTgW7cTmQxUY3I98BjHK68gZAJEWmybGBZgx9qv3QxLQB/Q==
+  dependencies:
+    fault "^1.0.2"
+    highlight.js "~9.12.0"
+
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -8343,6 +8814,11 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
 map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -8365,6 +8841,11 @@ map-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
   integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
+map-or-similar@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08"
+  integrity sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=
+
 map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
@@ -8387,6 +8868,14 @@ markdown-table@^1.1.0:
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz#c78db948fa879903a41bce522e3b96f801c63786"
   integrity sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==
 
+markdown-to-jsx@^6.9.1:
+  version "6.9.3"
+  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.9.3.tgz#31719e3c54517ba9805db81d53701b89f5d2ed7e"
+  integrity sha512-iXteiv317VZd1vk/PBH5MWMD4r0XWekoWCHRVVadBcnCtxavhtfV1UaEaQgq9KyckTv31L60ASh5ZVVrOh37Qg==
+  dependencies:
+    prop-types "^15.6.2"
+    unquote "^1.1.0"
+
 marked@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.1.tgz#a63addde477bca9613028de4b2bc3629e53a0562"
@@ -8439,6 +8928,13 @@ mem@^4.0.0:
     mimic-fn "^1.0.0"
     p-is-promise "^2.0.0"
 
+memoizerific@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
+  integrity sha1-fIekZGREwy11Q4VwkF8tvRsagFo=
+  dependencies:
+    map-or-similar "^1.5.0"
+
 memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -9019,7 +9515,14 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.0-alpha.11, node-releases@^1.1.3:
+node-releases@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.13.tgz#8c03296b5ae60c08e2ff4f8f22ae45bd2f210083"
+  integrity sha512-fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA==
+  dependencies:
+    semver "^5.3.0"
+
+node-releases@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.7.tgz#b09a10394d0ed8f7778f72bb861dde68b146303b"
   integrity sha512-bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA==
@@ -9063,7 +9566,7 @@ node-version@^1.0.0:
   dependencies:
     abbrev "1"
 
-nopt@^4.0.1:
+nopt@^4.0.1, nopt@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
   integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
@@ -9275,6 +9778,13 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
+object.omit@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-3.0.0.tgz#0e3edc2fce2ba54df5577ff529f6d97bd8a522af"
+  integrity sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ==
+  dependencies:
+    is-extendable "^1.0.0"
+
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -9377,7 +9887,7 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-original@>=0.0.5, original@^1.0.0:
+original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
   integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
@@ -9586,6 +10096,18 @@ parse-entities@^1.0.2, parse-entities@^1.1.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
+parse-entities@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.1.tgz#2c761ced065ba7dc68148580b5a225e4918cdd69"
+  integrity sha512-NBWYLQm1KSoDKk7GAHyioLTvCZ5QjdH/ASBBQTD3iLiAWJXS5bg1jEWI8nIJ+vgVvsceBVBcDGRWSo0KVQBvvg==
+  dependencies:
+    character-entities "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    character-reference-invalid "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-hexadecimal "^1.0.0"
+
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
@@ -9611,11 +10133,6 @@ parse-node-version@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -9830,11 +10347,28 @@ please-upgrade-node@^3.1.1:
   dependencies:
     semver-compare "^1.0.0"
 
+png-js@>=0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/png-js/-/png-js-0.1.1.tgz#1cc7c212303acabe74263ec3ac78009580242d93"
+  integrity sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=
+
 pngjs@^3.3.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
+polished@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/polished/-/polished-2.3.3.tgz#bdbaba962ba8271b0e11aa287f2befd4c87be99a"
+  integrity sha512-59V4fDbdxtH4I1m9TWxFsoGJbC8nnOpUYo5uFmvMfKp9Qh+6suo4VMUle1TGIIUZIGxfkW+Rs485zPk0wcwR2Q==
+  dependencies:
+    "@babel/runtime" "^7.2.0"
+
+popper.js@^1.14.4:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
+  integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
+
 popper.js@^1.14.7:
   version "1.14.7"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
@@ -9923,36 +10457,37 @@ postcss-media-query-parser@^0.2.3:
   resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
   integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
 
-postcss-modules-extract-imports@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
-  integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==
+postcss-modules-extract-imports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.5"
 
-postcss-modules-local-by-default@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
+postcss-modules-local-by-default@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz#dd9953f6dd476b5fd1ef2d8830c8929760b56e63"
+  integrity sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
+    postcss-selector-parser "^6.0.0"
+    postcss-value-parser "^3.3.1"
 
-postcss-modules-scope@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
+postcss-modules-scope@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz#ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"
+  integrity sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
+    postcss-selector-parser "^6.0.0"
 
-postcss-modules-values@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
+postcss-modules-values@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64"
+  integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==
   dependencies:
     icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
 
 postcss-reporter@^6.0.0:
   version "6.0.1"
@@ -10000,6 +10535,15 @@ postcss-selector-parser@^3.1.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
+  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
 postcss-syntax@^0.36.2:
   version "0.36.2"
   resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
@@ -10010,7 +10554,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.7:
+postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -10019,15 +10563,6 @@ postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^6.0.1, postcss@^6.0.23:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -10046,6 +10581,13 @@ pretty-hrtime@^1.0.3:
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
   integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
+prismjs@^1.8.4, prismjs@~1.16.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.16.0.tgz#406eb2c8aacb0f5f0f1167930cb83835d10a4308"
+  integrity sha512-OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA==
+  optionalDependencies:
+    clipboard "^2.0.0"
+
 private@^0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -10105,7 +10647,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
+prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -10114,6 +10656,18 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.5.9,
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
+property-information@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.0.1.tgz#c3b09f4f5750b1634c0b24205adbf78f18bdf94f"
+  integrity sha512-nAtBDVeSwFM3Ot/YxT7s4NqZmqXI7lLzf46BThvotEtYf2uk2yH0ACYuWQkJ7gxKs49PPtKVY0UlDGkyN9aJlw==
+  dependencies:
+    xtend "^4.0.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=
+
 protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
@@ -10322,7 +10876,7 @@ raw-body@2.3.3:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-raw-loader@1.0.0:
+raw-loader@1.0.0, raw-loader@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405"
   integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==
@@ -10330,11 +10884,6 @@ raw-loader@1.0.0:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
 
-raw-loader@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
-
 rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -10345,62 +10894,100 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dev-utils@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-6.1.1.tgz#a07e3e8923c4609d9f27e5af5207e3ca20724895"
-  integrity sha512-ThbJ86coVd6wV/QiTo8klDTvdAJ1WsFCGQN07+UkN+QN9CtCSsl/+YuDJToKGeG8X4j9HMGXNKbk2QhPAZr43w==
+react-clientside-effect@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.0.tgz#db823695f75e9616a5e4dd6d908e5ea627fb2516"
+  integrity sha512-cVIsGG7SNHsQsCP4+fw7KFUB0HiYiU8hbvL640XaLCbZ31aK8/lj0qOKJ2K+xRjuQz/IM4Q4qclI0aEqTtcXtA==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    shallowequal "^1.1.0"
+
+react-dev-utils@^7.0.0:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-7.0.5.tgz#cb95375d01ae71ca27b3c7616006ef7a77d14e8e"
+  integrity sha512-zJnqqb0x6gd63E3xoz5pXAxBPNaW75Hyz7GgQp0qPhMroBCRQtRvG67AoTZZY1z4yCYVJQZAfQJFdnea0Ujbug==
   dependencies:
     "@babel/code-frame" "7.0.0"
     address "1.0.3"
-    browserslist "4.1.1"
-    chalk "2.4.1"
+    browserslist "4.4.1"
+    chalk "2.4.2"
     cross-spawn "6.0.5"
     detect-port-alt "1.1.6"
     escape-string-regexp "1.0.5"
     filesize "3.6.1"
     find-up "3.0.0"
-    global-modules "1.0.0"
-    globby "8.0.1"
+    global-modules "2.0.0"
+    globby "8.0.2"
     gzip-size "5.0.0"
-    immer "1.7.2"
-    inquirer "6.2.0"
+    immer "1.10.0"
+    inquirer "6.2.1"
     is-root "2.0.0"
-    loader-utils "1.1.0"
+    loader-utils "1.2.3"
     opn "5.4.0"
     pkg-up "2.0.0"
-    react-error-overlay "^5.1.0"
+    react-error-overlay "^5.1.4"
     recursive-readdir "2.2.2"
     shell-quote "1.6.1"
-    sockjs-client "1.1.5"
-    strip-ansi "4.0.0"
+    sockjs-client "1.3.0"
+    strip-ansi "5.0.0"
     text-table "0.2.0"
 
-react-dom@^16.6.0, react-dom@^16.6.3, react-dom@^16.7.0:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.1.tgz#ec860f98853d09d39bafd3a6f1e12389d283dbb4"
-  integrity sha512-N74IZUrPt6UiDjXaO7UbDDFXeUXnVhZzeRLy/6iqqN1ipfjrhR60Bp5NuBK+rv3GMdqdIuwIl22u1SYwf330bg==
+react-dom@^16.8.1:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
+  integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.1"
-
-react-error-overlay@^5.1.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.3.tgz#16fcbde75ed4dc6161dc6dc959b48e92c6ffa9ad"
-  integrity sha512-GoqeM3Xadie7XUApXOjkY3Qhs8RkwB/Za4WMedBGrOKH1eTuKGyoAECff7jiVonJchOx6KZ9i8ILO5XIoHB+Tg==
+    scheduler "^0.13.6"
 
-react-fuzzy@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/react-fuzzy/-/react-fuzzy-0.5.2.tgz#fc13bf6f0b785e5fefe908724efebec4935eaefe"
-  integrity sha512-qIZZxaCheb/HhcBi5fABbiCFg85+K5r1TCps1D4uaL0LAMMD/1zm/x1/kNR130Tx7nnY9V7mbFyY0DquPYeLAw==
+react-draggable@^3.1.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.2.1.tgz#45d09a9a227988dc85674b23ab3c75b6e820dae5"
+  integrity sha512-r+3Bs9InID2lyIEbR8UIRVtpn4jgu1ArFEZgIy8vibJjijLSdNLX7rH9U68BBVD4RD9v44RXbaK4EHLyKXzNQw==
   dependencies:
-    babel-runtime "^6.23.0"
     classnames "^2.2.5"
-    fuse.js "^3.0.1"
-    prop-types "^15.5.9"
+    prop-types "^15.6.0"
+
+react-error-overlay@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.4.tgz#88dfb88857c18ceb3b9f95076f850d7121776991"
+  integrity sha512-fp+U98OMZcnduQ+NSEiQa4s/XMsbp+5KlydmkbESOw4P69iWZ68ZMFM5a2BuE0FgqPBKApJyRuYHR95jM8lAmg==
+
+react-fast-compare@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
+  integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
+
+react-focus-lock@^1.17.7:
+  version "1.18.3"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-1.18.3.tgz#19d84afeab935c0b5de196922f71db7c481baba4"
+  integrity sha512-4fPAHnsr8oCYPgVmcMZ8NbAE9jm/OshPjXEM5PHseu2lDernzm/b1sHhYzZUO4OoW9D/u1AQsV6n4trRllow7w==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    focus-lock "^0.6.0"
+    prop-types "^15.6.2"
+    react-clientside-effect "^1.2.0"
+
+react-helmet-async@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-0.2.0.tgz#d20d8725c1dcdcc95d54e281a1040af47c3abffa"
+  integrity sha512-xo8oN+SUt0YkgQscKPTqhZZIOn5ni18FMv/H3KuBDt5+yAXTGktPEf3HU2EyufbHAF0TQ8qI+JrA3ILnjVfqNA==
+  dependencies:
+    invariant "^2.2.4"
+    prop-types "^15.6.1"
+    react-fast-compare "^2.0.2"
+    shallowequal "^1.0.2"
+
+react-hotkeys@2.0.0-pre4:
+  version "2.0.0-pre4"
+  resolved "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-2.0.0-pre4.tgz#a1c248a51bdba4282c36bf3204f80d58abc73333"
+  integrity sha512-oa+UncSWyOwMK3GExt+oELXaR7T3ItgcMolsupQFdKvwkEhVAluJd5rYczsRSQpQlVkdNoHG46De2NUeuS+88Q==
+  dependencies:
+    prop-types "^15.6.1"
 
-react-inspector@^2.3.0:
+react-inspector@^2.3.0, react-inspector@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-2.3.1.tgz#f0eb7f520669b545b441af9d38ec6d706e5f649c"
   integrity sha512-tUUK7t3KWgZEIUktOYko5Ic/oYwvjEvQUFAGC1UeMeDaQ5za2yZFtItJa2RTwBJB//NxPr000WQK6sEbqC6y0Q==
@@ -10409,17 +10996,22 @@ react-inspector@^2.3.0:
     is-dom "^1.0.9"
     prop-types "^15.6.1"
 
+react-is@^16.7.0:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
+  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
+
 react-is@^16.8.1:
   version "16.8.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb"
   integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA==
 
-react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
+react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2, 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@^3.6.1:
+react-modal@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.8.1.tgz#7300f94a6f92a2e17994de0be6ccb61734464c9e"
   integrity sha512-aLKeZM9pgXpIKVwopRHMuvqKWiBajkqisDA8UzocdCF6S4fyKVfLWmZR5G1Q0ODBxxxxf2XIwiCP8G/11GJAuw==
@@ -10429,23 +11021,46 @@ react-modal@^3.6.1:
     react-lifecycles-compat "^3.0.0"
     warning "^3.0.0"
 
-react-split-pane@^0.1.84:
-  version "0.1.85"
-  resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.85.tgz#64819946a99b617ffa2d20f6f45a0056b6ee4faa"
-  integrity sha512-3GhaYs6+eVNrewgN4eQKJoNMQ4pcegNMTMhR5bO/NFO91K6/98qdD1sCuWPpsefCjzxNTjkvVYWQC0bMaC45mA==
+react-popper-tooltip@^2.8.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-2.8.1.tgz#bbaec88b729e3b7e9f26521857e7f908bccdecf3"
+  integrity sha512-eL0PT5yz9H9lkG934TMh7czZWwDlqFady7CcJKMP5RcmBxTFBY4U7k71FEyxNaHd07nhMhUwbk0/Fgf2yw3LEg==
   dependencies:
-    prop-types "^15.5.10"
-    react "^16.6.3"
-    react-dom "^16.6.3"
-    react-lifecycles-compat "^3.0.4"
-    react-style-proptype "^3.0.0"
+    "@babel/runtime" "^7.3.4"
+    react-popper "^1.3.3"
 
-react-style-proptype@^3.0.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/react-style-proptype/-/react-style-proptype-3.2.2.tgz#d8e998e62ce79ec35b087252b90f19f1c33968a0"
-  integrity sha512-ywYLSjNkxKHiZOqNlso9PZByNEY+FTyh3C+7uuziK0xFXu9xzdyfHwg4S9iyiRRoPCR4k2LqaBBsWVmSBwCWYQ==
+react-popper@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.3.tgz#2c6cef7515a991256b4f0536cd4bdcb58a7b6af6"
+  integrity sha512-ynMZBPkXONPc5K4P5yFWgZx5JGAUIP3pGGLNs58cfAPgK67olx7fmLp+AdpZ0+GoQ+ieFDa/z4cdV6u7sioH6w==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    create-react-context "<=0.2.2"
+    popper.js "^1.14.4"
+    prop-types "^15.6.1"
+    typed-styles "^0.0.7"
+    warning "^4.0.2"
+
+react-resize-detector@^3.2.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-3.4.0.tgz#2ccd399958a0efe9b7c52c5db5a13d87e47cd585"
+  integrity sha512-T96I8Iqa1hGWyooeFA2Sl6FdPoMhXWINfEKg2/EJLxhP37+/94VNuyuyz9CRqpmApD83IWRR+lbB3r0ADMoKJg==
+  dependencies:
+    lodash "^4.17.11"
+    lodash-es "^4.17.11"
+    prop-types "^15.6.2"
+    resize-observer-polyfill "^1.5.1"
+
+react-syntax-highlighter@^8.0.1:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-8.1.0.tgz#59103ff17a828a27ed7c8f035ae2558f09b6b78c"
+  integrity sha512-G2bkZxmF3VOa4atEdXIDSfwwCqjw6ZQX5znfTaHcErA1WqHIS0o6DaSCDKFPVaOMXQEB9Hf1UySYQvuJmV8CXg==
   dependencies:
-    prop-types "^15.5.4"
+    babel-runtime "^6.18.0"
+    highlight.js "~9.12.0"
+    lowlight "~1.9.1"
+    prismjs "^1.8.4"
+    refractor "^2.4.1"
 
 react-textarea-autosize@^7.0.4:
   version "7.1.0"
@@ -10455,38 +11070,20 @@ react-textarea-autosize@^7.0.4:
     "@babel/runtime" "^7.1.2"
     prop-types "^15.6.0"
 
-react-transition-group@^2.0.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.3.tgz#26de363cab19e5c88ae5dbae105c706cf953bb92"
-  integrity sha512-2DGFck6h99kLNr8pOFk+z4Soq3iISydwOFeeEVPjTN6+Y01CmvbWmnN02VuTWyFdnRtIDPe+wy2q6Ui8snBPZg==
-  dependencies:
-    dom-helpers "^3.3.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
-
-react-treebeard@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/react-treebeard/-/react-treebeard-3.1.0.tgz#e380b9e75f900e538044280ac365d29092583642"
-  integrity sha512-u4OEzwZk1Xcxp2s55Ny/Ofp8fHRwlabKOAeGbzQ7XUE9YXFbPj8ajl0FInbXEP4Ys9+E1vHCtgqJ6VBsgbCPVg==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    "@emotion/core" "^0.13.1"
-    "@emotion/styled" "^0.10.6"
-    deep-equal "^1.0.1"
-    prop-types "^15.6.2"
-    shallowequal "^1.1.0"
-    velocity-react "^1.4.1"
-
-react@^16.6.0, react@^16.6.3, react@^16.7.0:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.1.tgz#ae11831f6cb2a05d58603a976afc8a558e852c4a"
-  integrity sha512-wLw5CFGPdo7p/AgteFz7GblI2JPOos0+biSoxf1FPsGxWQZdN/pj6oToJs1crn61DL3Ln7mN86uZ4j74p31ELQ==
+react@^16.8.1:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
+  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.1"
+    scheduler "^0.13.6"
+
+reactjs-popup@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/reactjs-popup/-/reactjs-popup-1.3.2.tgz#7f7861443fc5edfb0184da1d01838dbd5db690cd"
+  integrity sha512-BwfaOkKpLHNHxSmiMcX/yc61twJvjGbJ/SBE+fYovJudFlaZDYXGPSp+3dTCE0UoNsEqF8oc/pNkYlGgmrnsrw==
 
 read-cache@^1.0.0:
   version "1.0.0"
@@ -10615,6 +11212,18 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
+recompose@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.30.0.tgz#82773641b3927e8c7d24a0d87d65aeeba18aabd0"
+  integrity sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    change-emitter "^0.1.2"
+    fbjs "^0.8.1"
+    hoist-non-react-statics "^2.3.1"
+    react-lifecycles-compat "^3.0.2"
+    symbol-observable "^1.0.4"
+
 recursive-readdir@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
@@ -10638,23 +11247,24 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-redux@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
-  integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
-  dependencies:
-    loose-envify "^1.4.0"
-    symbol-observable "^1.2.0"
-
 reflect-metadata@^0.1.13, reflect-metadata@^0.1.2:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
   integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
 
-regenerate-unicode-properties@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
-  integrity sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==
+refractor@^2.4.1:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/refractor/-/refractor-2.8.0.tgz#29d7b2254e823edd2e3e476af286af1c11472bfa"
+  integrity sha512-w+jG49/1MX60GeE9u8lyx1KYMBRdAHjOIfgcDJ0wq2ogOnEmab0MgIj+AtPq6kelw0mr1l9U0i2rFvLlOCkxiw==
+  dependencies:
+    hastscript "^5.0.0"
+    parse-entities "^1.1.2"
+    prismjs "~1.16.0"
+
+regenerate-unicode-properties@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662"
+  integrity sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==
   dependencies:
     regenerate "^1.4.0"
 
@@ -10683,10 +11293,10 @@ regenerator-runtime@^0.13.2:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
   integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
 
-regenerator-transform@^0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
-  integrity sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==
+regenerator-transform@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"
+  integrity sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==
   dependencies:
     private "^0.1.6"
 
@@ -10723,17 +11333,17 @@ regexpu-core@^1.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^4.1.3, regexpu-core@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.4.0.tgz#8d43e0d1266883969720345e70c275ee0aec0d32"
-  integrity sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==
+regexpu-core@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
+  integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
   dependencies:
     regenerate "^1.4.0"
-    regenerate-unicode-properties "^7.0.0"
+    regenerate-unicode-properties "^8.0.2"
     regjsgen "^0.5.0"
     regjsparser "^0.6.0"
     unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.0.2"
+    unicode-match-property-value-ecmascript "^1.1.0"
 
 regjsgen@^0.2.0:
   version "0.2.0"
@@ -10913,6 +11523,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.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"
@@ -10920,14 +11535,6 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-dir@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -10938,6 +11545,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-pathname@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
+  integrity sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -10948,7 +11560,7 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.8.1:
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
@@ -11073,6 +11685,11 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-eval@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/safe-eval/-/safe-eval-0.4.1.tgz#e54ba5a1bbdec795d488f6c8765e0c2a78b4cdc0"
+  integrity sha512-wmiu4RSYVZ690RP1+cv/LxfPK1dIlEN35aW7iv4SMYdqDrHbkll4+NJcHmKm7PbCuI1df1otOcPwgcc2iFR85g==
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -11129,10 +11746,10 @@ sax@>=0.6.0, sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scheduler@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591"
-  integrity sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A==
+scheduler@^0.13.6:
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
+  integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -11174,6 +11791,11 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+  integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
+
 selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
@@ -11215,6 +11837,11 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -11335,7 +11962,7 @@ shallow-copy@~0.0.1:
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
   integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
 
-shallowequal@^1.1.0:
+shallowequal@^1.0.2, shallowequal@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
@@ -11371,6 +11998,11 @@ shelljs@^0.8.1, shelljs@^0.8.2:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
+
 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"
@@ -11510,18 +12142,6 @@ socket.io@2.1.1:
     socket.io-client "2.1.1"
     socket.io-parser "~3.2.0"
 
-sockjs-client@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83"
-  integrity sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=
-  dependencies:
-    debug "^2.6.6"
-    eventsource "0.1.6"
-    faye-websocket "~0.11.0"
-    inherits "^2.0.1"
-    json3 "^3.3.2"
-    url-parse "^1.1.8"
-
 sockjs-client@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
@@ -11646,6 +12266,13 @@ sourcemap-codec@^1.4.4:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
   integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
 
+space-separated-tokens@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.2.tgz#e95ab9d19ae841e200808cd96bc7bd0adbbb3412"
+  integrity sha512-G3jprCEw+xFEs0ORweLmblJ3XLymGGr6hxZYTYZjIlvDti9vOBUjRQa1Rzjt012aRrocKstHwdNi+F7HguPsEA==
+  dependencies:
+    trim "0.0.1"
+
 spawn-promise@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/spawn-promise/-/spawn-promise-0.1.8.tgz#a5bea98814c48f52cbe02720e7fe2d6fc3b5119a"
@@ -11988,12 +12615,12 @@ stringify-entities@^1.0.1:
     is-alphanumerical "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-strip-ansi@4.0.0, strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+strip-ansi@5.0.0, strip-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
+  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
   dependencies:
-    ansi-regex "^3.0.0"
+    ansi-regex "^4.0.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
@@ -12002,12 +12629,12 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^3.0.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
@@ -12163,7 +12790,7 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.1.0, supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -12190,7 +12817,7 @@ svg-url-loader@^2.3.2:
     file-loader "1.1.11"
     loader-utils "1.1.0"
 
-symbol-observable@1.2.0, symbol-observable@^1.0.2, symbol-observable@^1.0.4, symbol-observable@^1.2.0:
+symbol-observable@1.2.0, symbol-observable@^1.0.2, symbol-observable@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
@@ -12239,6 +12866,20 @@ tar@^4, tar@^4.4.8:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
+telejson@^2.1.0, telejson@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/telejson/-/telejson-2.1.1.tgz#cd8835ce90198c9341078dbe80849e39d1a2b73c"
+  integrity sha512-tc9Jdrhro4zzYgN6y5DNzCXIyIsWT7znGEfK7G4KMPF0X0tC2cVw2SPKnJObao/cxP7/FSnG8bJe0JD390My5g==
+  dependencies:
+    global "^4.3.2"
+    is-function "^1.0.1"
+    is-regex "^1.0.4"
+    is-symbol "^1.0.2"
+    isobject "^3.0.1"
+    lodash.get "^4.4.2"
+    memoizerific "^1.11.3"
+    safe-eval "^0.4.1"
+
 tempfile@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
@@ -12268,6 +12909,20 @@ terser-webpack-plugin@1.2.2, terser-webpack-plugin@^1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+terser-webpack-plugin@^1.2.1:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
+  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.16.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
 terser@^3.16.1:
   version "3.16.1"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
@@ -12317,11 +12972,26 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-emitter@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
+  integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
+
 tiny-inflate@^1.0.0, tiny-inflate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
   integrity sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=
 
+tiny-invariant@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.4.tgz#346b5415fd93cb696b0c4e8a96697ff590f92463"
+  integrity sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g==
+
+tiny-warning@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28"
+  integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==
+
 tinymce@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.0.0.tgz#03e819e8f3a2ce116fc445541fa493d6b7f5d827"
@@ -12446,7 +13116,7 @@ trough@^1.0.0:
   dependencies:
     glob "^7.1.2"
 
-ts-loader@^5.2.2:
+ts-loader@^5.3.2:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.3.tgz#8b4af042e773132d86b3c99ef0acf3b4d325f473"
   integrity sha512-KwF1SplmOJepnoZ4eRIloH/zXL195F51skt7reEsS6jvDqzgc/YSbz9b8E07GxIUwLXdcD4ssrJu6v8CwaTafA==
@@ -12573,6 +13243,11 @@ type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+typed-styles@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
+  integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -12647,10 +13322,10 @@ 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.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
-  integrity sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==
+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-properties@^1.0.0:
   version "1.1.0"
@@ -12769,6 +13444,11 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
+unquote@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
+  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -12813,7 +13493,7 @@ url-loader@^1.1.2:
     mime "^2.0.3"
     schema-utils "^1.0.0"
 
-url-parse@^1.1.8, url-parse@^1.4.3:
+url-parse@^1.4.3:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
   integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
@@ -12909,26 +13589,16 @@ validator@^10.11.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
   integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==
 
+value-equal@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
+  integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==
+
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-velocity-animate@^1.4.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105"
-  integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==
-
-velocity-react@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/velocity-react/-/velocity-react-1.4.1.tgz#1d0b41859cdf2521c08a8b57f44e93ed2d54b5fc"
-  integrity sha512-ZyXBm+9C/6kNUNyc+aeNKEhtTu/Mn+OfpsNBGuTxU8S2DUcis/KQL0rTN6jWL+7ygdOrun18qhheNZTA7YERmg==
-  dependencies:
-    lodash "^4.17.5"
-    prop-types "^15.5.8"
-    react-transition-group "^2.0.0"
-    velocity-animate "^1.4.0"
-
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -12989,6 +13659,13 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
+warning@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
+  dependencies:
+    loose-envify "^1.0.0"
+
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -13063,16 +13740,6 @@ webpack-dev-middleware@3.5.1:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@^3.4.0:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.2.tgz#d768b6194f3fe8d72d51feded49de359e8d96ffb"
-  integrity sha512-nPmshdt1ckcwWjI0Ubrdp8KroeuprW6xFKYqk0u3MflNMBXvHPnMATsC7/L/enwav2zvLCfj/Usr47qnF3KQyA==
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
 webpack-dev-middleware@^3.5.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
@@ -13225,15 +13892,15 @@ webpack@4.29.0:
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
-webpack@^4.23.1:
-  version "4.29.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.3.tgz#e0b406a7b4201ed5e4fb4f84fd7359f9a7db4647"
-  integrity sha512-xPJvFeB+8tUflXFq+OgdpiSnsCD5EANyv56co5q8q8+YtEasn5Sj3kzY44mta+csCIEB0vneSxnuaHkOL2h94A==
+webpack@^4.29.0:
+  version "4.29.6"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
+  integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
@@ -13288,7 +13955,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -13314,11 +13981,6 @@ window-or-global@^1.0.1:
   resolved "https://registry.yarnpkg.com/window-or-global/-/window-or-global-1.0.1.tgz#dbe45ba2a291aabc56d62cf66c45b7fa322946de"
   integrity sha1-2+RboqKRqrxW1iz2bEW3+jIpRt4=
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
-
 windows-release@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e"

From ac6fbd55f1a5cc6263bf861094e616e7884577de Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 8 Apr 2019 16:20:25 +0300
Subject: [PATCH 147/382] feat(ever-admin): preview barcodes" step "Orders
 Settings" EV-1195

---
 .../settings/orders/orders.component.html     |  4 +--
 .../settings/orders/orders.component.ts       | 29 +++++++++++++++----
 shared/core/enums/OrderBarcodeTypes.ts        |  5 +++-
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
index d33297077..ec02a964b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
@@ -26,10 +26,10 @@
 					<ngx-barcode
 						*ngIf="!isQRCode"
 						[bc-value]="barcodetData"
-						[bc-format]="'CODE128'"
+						[bc-format]="ngxBarcodeFormat"
 						[bc-element-type]="img"
 						[bc-height]="30"
-						[bc-width]="1.5"
+						[bc-width]="1"
 					></ngx-barcode>
 				</div>
 			</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
index 9a15022e8..bd1c0a823 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import OrderBarcodeTypes from '@modules/server.common/enums/OrderBarcodeTypes';
+import OrderBarcodeTypes, {
+	orderBarcodeTypesToString
+} from '@modules/server.common/enums/OrderBarcodeTypes';
 import QRCode from 'qrcode';
-import { Types } from 'mongoose';
 
 @Component({
 	selector: 'ea-merchants-setup-orders-settings',
@@ -13,12 +14,25 @@ export class SetupMerchantOrdersSettingsComponent {
 	barcodetData: string;
 	barcodetDataUrl: string;
 	isQRCode: boolean = true;
+	ngxBarcodeFormat: string;
 
 	orderBarcodeTypes = [
-		{ label: 'QR', value: OrderBarcodeTypes.QR },
-		{ label: 'CODE128', value: OrderBarcodeTypes.CODE128 },
-		{ label: 'CODE39', value: OrderBarcodeTypes.CODE39 },
-		{ label: 'pharmacode', value: OrderBarcodeTypes.pharmacode }
+		{
+			label: orderBarcodeTypesToString(OrderBarcodeTypes.QR),
+			value: OrderBarcodeTypes.QR
+		},
+		{
+			label: orderBarcodeTypesToString(OrderBarcodeTypes.CODE128),
+			value: OrderBarcodeTypes.CODE128
+		},
+		{
+			label: orderBarcodeTypesToString(OrderBarcodeTypes.CODE39),
+			value: OrderBarcodeTypes.CODE39
+		},
+		{
+			label: orderBarcodeTypesToString(OrderBarcodeTypes.MSI),
+			value: OrderBarcodeTypes.MSI
+		}
 	];
 
 	constructor() {
@@ -33,5 +47,8 @@ export class SetupMerchantOrdersSettingsComponent {
 
 	typeChange(type) {
 		this.isQRCode = type === OrderBarcodeTypes.QR;
+		if (!this.isQRCode) {
+			this.ngxBarcodeFormat = orderBarcodeTypesToString(type);
+		}
 	}
 }
diff --git a/shared/core/enums/OrderBarcodeTypes.ts b/shared/core/enums/OrderBarcodeTypes.ts
index 4a7ae1aed..5a019f6bf 100644
--- a/shared/core/enums/OrderBarcodeTypes.ts
+++ b/shared/core/enums/OrderBarcodeTypes.ts
@@ -7,7 +7,8 @@ enum OrderBarcodeTypes {
 	QR = 0,
 	CODE128 = 1,
 	CODE39 = 2,
-	pharmacode = 3
+	pharmacode = 3,
+	MSI = 4
 }
 
 export function orderBarcodeTypesToString(status: OrderBarcodeTypes): string {
@@ -20,6 +21,8 @@ export function orderBarcodeTypesToString(status: OrderBarcodeTypes): string {
 			return 'CODE39';
 		case OrderBarcodeTypes.pharmacode:
 			return 'pharmacode';
+		case OrderBarcodeTypes.MSI:
+			return 'MSI';
 		default:
 			return 'BAD_STATUS';
 	}

From c4f875675c20982f6b0bc0080f27335604783fdc Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 8 Apr 2019 17:56:42 +0300
Subject: [PATCH 148/382] feat(ever-admin): initialize step "Products" in Setup
 Merchants EV-1197

---
 .../products-catalog.component.html           |  6 ++
 .../products-catalog.component.ts             | 64 +++++++++++++++++++
 .../products/products.component.html          | 50 +++++++++++++++
 .../products/products.component.scss          | 12 ++++
 .../components/products/products.component.ts | 45 +++++++++++++
 .../components/products/products.module.ts    | 26 ++++++++
 .../+merchants/merchants.component.html       | 56 ++++++++++++----
 .../+setup/+merchants/merchants.module.ts     |  2 +
 8 files changed, 250 insertions(+), 11 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.html
new file mode 100644
index 000000000..e4a81ab7a
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.html
@@ -0,0 +1,6 @@
+<ea-products-table
+	[perPage]="perPage"
+	[hiddenTableActions]="true"
+	#productsTable
+>
+</ea-products-table>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
new file mode 100644
index 000000000..759d47768
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
@@ -0,0 +1,64 @@
+import { Component, ViewChild, Input, OnInit, OnDestroy } from '@angular/core';
+import { ProductsTableComponent } from 'app/@shared/product/forms/products-table';
+import { first, takeUntil } from 'rxjs/operators';
+import { ProductsService } from 'app/@core/data/products.service';
+import { Subject } from 'rxjs';
+
+@Component({
+	selector: 'ea-merchants-setup-products-catalog',
+	templateUrl: './products-catalog.component.html'
+})
+export class SetupMerchantProductsCatalogComponent
+	implements OnInit, OnDestroy {
+	@ViewChild('productsTable')
+	productsTable: ProductsTableComponent;
+
+	@Input()
+	existedProductsIds: string[];
+	perPage = 3;
+
+	private ngDestroy$ = new Subject<void>();
+
+	constructor(private readonly productsService: ProductsService) {}
+
+	ngOnInit(): void {
+		this.loadData();
+		this.smartTablePageChange();
+	}
+
+	ngOnDestroy() {
+		this.ngDestroy$.next();
+		this.ngDestroy$.complete();
+	}
+
+	private async loadData(page = 1) {
+		let products = await this.productsService
+			.getProducts(
+				{
+					skip: this.perPage * (page - 1),
+					limit: this.perPage
+				},
+				this.existedProductsIds
+			)
+			.pipe(first())
+			.toPromise();
+
+		const dataCount = await this.getDataCount(this.existedProductsIds);
+
+		this.productsTable.loadDataSmartTable(products, dataCount, page);
+	}
+
+	private async smartTablePageChange() {
+		if (this.productsTable) {
+			this.productsTable.pagesChanges$
+				.pipe(takeUntil(this.ngDestroy$))
+				.subscribe((page) => {
+					this.loadData(page);
+				});
+		}
+	}
+
+	private async getDataCount(existedProductsIds: string[]) {
+		return this.productsService.getCountOfProducts(existedProductsIds);
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
new file mode 100644
index 000000000..d3108530a
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -0,0 +1,50 @@
+<nb-card class="setup-merchant-products">
+	<nb-card-header>
+		<span *ngIf="currentView == componentViews.main">
+			Products
+		</span>
+		<span *ngIf="currentView == componentViews.productsTable">
+			Select from products catalog
+		</span>
+		<span *ngIf="currentView == componentViews.addNewProduct">
+			Create new product
+		</span>
+	</nb-card-header>
+	<nb-card-body>
+		<div *ngIf="currentView === componentViews.main" class="main-content">
+			<div class="row actions">
+				<div class="form-group offset-md-2 col-md-4">
+					<button
+						nbButton
+						outline
+						status="success"
+						(click)="currentView = componentViews.productsTable"
+					>
+						Select from products catalog
+					</button>
+				</div>
+
+				<div class="form-group  col-md-4">
+					<button
+						nbButton
+						outline
+						status="success"
+						(click)="currentView = componentViews.addNewProduct"
+					>
+						Create new product
+					</button>
+				</div>
+			</div>
+		</div>
+
+		<div *ngIf="currentView == componentViews.productsTable" class="row">
+			<ea-merchants-setup-products-catalog
+				#productsCatalog
+			></ea-merchants-setup-products-catalog>
+		</div>
+
+		<div *ngIf="currentView == componentViews.addNewProduct" class="row">
+			<h4>Add new product</h4>
+		</div>
+	</nb-card-body></nb-card
+>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.scss
new file mode 100644
index 000000000..013430706
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.scss
@@ -0,0 +1,12 @@
+.setup-merchant-products {
+	nb-card-body {
+		text-align: left;
+	}
+
+	.actions {
+		button {
+			width: 100%;
+			margin: 0;
+		}
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
new file mode 100644
index 000000000..1651bc023
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -0,0 +1,45 @@
+import { Component, ViewChild } from '@angular/core';
+import { SetupMerchantProductsCatalogComponent } from './products-catalog/products-catalog.component';
+import Product from '@modules/server.common/entities/Product';
+
+@Component({
+	selector: 'ea-merchants-setup-products',
+	templateUrl: './products.component.html',
+	styleUrls: ['./products.component.scss']
+})
+export class SetupMerchantProductsComponent {
+	@ViewChild('productsCatalog')
+	productsCatalog: SetupMerchantProductsCatalogComponent;
+
+	componentViews = {
+		main: 'main',
+		productsTable: 'productsTable',
+		addNewProduct: 'addNewProduct',
+		addWarehouseProducts: 'addWarehouseProducts'
+	};
+	currentView = this.componentViews.main;
+	productsPerPage = 3;
+
+	productsForAdd = [];
+
+	get haveProductsForAdd() {
+		let hasSelectedCarriers = false;
+
+		if (this.productsCatalog) {
+			hasSelectedCarriers = this.productsCatalog.productsTable
+				.hasSelectedProducts;
+		}
+
+		return hasSelectedCarriers;
+	}
+
+	add() {
+		if (this.currentView === this.componentViews.productsTable) {
+			this.productsForAdd = this.productsCatalog.productsTable.selectedProducts;
+		}
+	}
+
+	back() {
+		this.currentView = this.componentViews.main;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
new file mode 100644
index 000000000..b4ba95682
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ThemeModule } from 'app/@theme';
+import { FormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+import { SetupMerchantProductsComponent } from './products.component';
+import { SetupMerchantProductsCatalogComponent } from './products-catalog/products-catalog.component';
+import { ProductFormsModule } from 'app/@shared/product/forms';
+
+const COMPONENTS = [
+	SetupMerchantProductsComponent,
+	SetupMerchantProductsCatalogComponent
+];
+
+@NgModule({
+	imports: [
+		CommonModule,
+		ThemeModule,
+		FormsModule,
+		TranslateModule.forChild(),
+		ProductFormsModule
+	],
+	declarations: COMPONENTS,
+	exports: COMPONENTS
+})
+export class SetupMerchantsProductsModule {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 46be82022..78ed56705 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -279,18 +279,52 @@
 							</div>
 						</nb-step>
 						<nb-step label="Products">
-							<h3>Products</h3>
+							<ea-merchants-setup-products
+								#products
+							></ea-merchants-setup-products>
 
-							<button nbButton nbStepperPrevious>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
-								}}
-							</button>
-							<button nbButton disabled nbStepperNext>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
-								}}
-							</button>
+							<div
+								*ngIf="
+									products.currentView ===
+									products.componentViews.main
+								"
+							>
+								<button nbButton nbStepperPrevious>
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.PREV'
+											| translate
+									}}
+								</button>
+								<button nbButton nbStepperNext>
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.NEXT'
+											| translate
+									}}
+								</button>
+							</div>
+							<div
+								*ngIf="
+									products.currentView !==
+									products.componentViews.main
+								"
+							>
+								<button nbButton (click)="products.back()">
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.BACK'
+											| translate
+									}}
+								</button>
+								<button
+									[disabled]="!products.haveProductsForAdd"
+									nbButton
+									(click)="products.add()"
+								>
+									{{
+										'FAKE_DATA.SETUP_MERCHANTS.ADD'
+											| translate
+									}}
+								</button>
+							</div>
 						</nb-step>
 					</nb-stepper>
 				</nb-card-body>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index 67502c00b..6bba671d0 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -9,6 +9,7 @@ import { SetupMerchantsComponentsModule } from './components/components.module';
 import { SetupMerchantsLocationModule } from './components/location/location.module';
 import { SetupMerchantsDeliveryAndTakeawayModule } from './components/settings/delivery-takeaway/delivery-takeaway.module';
 import { ToasterModule } from 'angular2-toaster';
+import { SetupMerchantsProductsModule } from './components/products/products.module';
 
 const routes: Routes = [
 	{
@@ -27,6 +28,7 @@ const routes: Routes = [
 		SetupMerchantsComponentsModule,
 		SetupMerchantsLocationModule,
 		SetupMerchantsDeliveryAndTakeawayModule,
+		SetupMerchantsProductsModule,
 		ToasterModule.forRoot()
 	],
 	declarations: [SetupMerchantsComponent]

From 9c96cccd45cdaf93a362b6474d0e91ff2b7ae920 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:50:58 +0000
Subject: [PATCH 149/382] chore(package): update mongoose to version 5.5.0

---
 backend/api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index 05c1ffdb9..1adccd5db 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -100,7 +100,7 @@
 		"moment": "^2.24.0",
 		"mongodb": "^3.2.1",
 		"mongodb-memory-server": "^4.2.1",
-		"mongoose": "^5.4.19",
+		"mongoose": "^5.5.0",
 		"morgan": "^1.9.1",
 		"ms": "^2.1.1",
 		"node-sass": "^4.11.0",

From 314a50156d5feb32ca879cc546418c8562ad0962 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:51:01 +0000
Subject: [PATCH 150/382] chore(package): update mongoose to version 5.5.0

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index d09400e69..e3e551d46 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -133,7 +133,7 @@
 		"ionicons": "^4.5.5",
 		"kareem": "^2.3.0",
 		"lodash": "^4.17.11",
-		"mongoose": "^5.4.19",
+		"mongoose": "^5.5.0",
 		"mpath": "^0.5.1",
 		"mquery": "^3.2.0",
 		"mx.ferreyra.callnumber": "0.0.2",

From 53444deb3cfdaa687ae79236512d9524510fbf82 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:51:05 +0000
Subject: [PATCH 151/382] chore(package): update mongoose to version 5.5.0

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index dc16be46d..bc107c2fe 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -145,7 +145,7 @@
 		"lodash": "^4.17.11",
 		"masonry-layout": "^4.2.2",
 		"moment": "^2.24.0",
-		"mongoose": "^5.4.19",
+		"mongoose": "^5.5.0",
 		"mx.ferreyra.callnumber": "^0.0.2",
 		"ng2-completer": "^2.0.8",
 		"ng2-file-upload": "^1.3.0",

From 655068f60ae4355f219c0f22712eb668a067ae9f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:51:10 +0000
Subject: [PATCH 152/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 50 ++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 79a26909a..e685ae2c9 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -2303,10 +2303,10 @@ browserslist@^4.4.1:
     electron-to-chromium "^1.3.113"
     node-releases "^1.1.8"
 
-bson@^1.1.0, bson@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.0.tgz#bee57d1fb6a87713471af4e32bcae36de814b5b0"
-  integrity sha512-9Aeai9TacfNtWXOYarkFJRW2CWo+dRon+fuLZYJmvLV3+MiUp0bEI6IAZfXEIg7/Pl/7IWlLaDnhzTsD81etQA==
+bson@^1.1.1, bson@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.1.tgz#4330f5e99104c4e751e7351859e2d408279f2f13"
+  integrity sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg==
 
 buffer-equal@0.0.1:
   version "0.0.1"
@@ -7221,45 +7221,46 @@ moment@^2.24.0:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-mongodb-core@3.1.11:
-  version "3.1.11"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.1.11.tgz#b253038dbb4d7329f3d1c2ee5400bb0c9221fde5"
-  integrity sha512-rD2US2s5qk/ckbiiGFHeu+yKYDXdJ1G87F6CG3YdaZpzdOm5zpoAZd/EKbPmFO6cQZ+XVXBXBJ660sSI0gc6qg==
+mongodb-core@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.2.tgz#d1c084b34c102a98b4734087800115e639d907c5"
+  integrity sha512-YRgC39MuzKL0uoGoRdTmV1e9m47NbMnYmuEx4IOkgWAGXPSEzRY7cwb3N0XMmrDMnD9vp7MysNyAriIIeGgIQg==
   dependencies:
-    bson "^1.1.0"
+    bson "^1.1.1"
     require_optional "^1.0.1"
     safe-buffer "^5.1.2"
   optionalDependencies:
     saslprep "^1.0.0"
 
-mongodb@3.1.13:
-  version "3.1.13"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.1.13.tgz#f8cdcbb36ad7a08b570bd1271c8525753f75f9f4"
-  integrity sha512-sz2dhvBZQWf3LRNDhbd30KHVzdjZx9IKC0L+kSZ/gzYquCF5zPOgGqRz6sSCqYZtKP2ekB4nfLxhGtzGHnIKxA==
+mongodb@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.2.tgz#49b592be3cd50097f78e0964488d18c2e189de20"
+  integrity sha512-xQ6apOOV+w7VFApdaJpWhYhzartpjIDFQjG0AwgJkLh7dBs7PTsq4A3Bia2QWpDohmAzTBIdQVLMqqLy0mwt3Q==
   dependencies:
-    mongodb-core "3.1.11"
+    mongodb-core "3.2.2"
     safe-buffer "^5.1.2"
 
 mongoose-legacy-pluralize@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
 
-mongoose@^5.4.19:
-  version "5.4.19"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.4.19.tgz#fdca94ee7f71da2cf0e941d02255aa02007c55c0"
-  integrity sha512-paRU3nbCrPIUVw1GAlxo11uIIqrYORctUx1kcLj7i2NhkxPQuy5OK2/FYj8+tglsaixycmONSyop2HQp1IUQSA==
+mongoose@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.0.tgz#e1bf07cf9953840aaaafb25df163bc12ed70365c"
+  integrity sha512-GZdhdbTXTgikInIgtxR7ODcF3+MoJTumTsKYinX3zxJcQgMVr+Y0jBuFoLJ9YtVdF2nq1ukLnhS6RHfta1ptgQ==
   dependencies:
     async "2.6.1"
-    bson "~1.1.0"
+    bson "~1.1.1"
     kareem "2.3.0"
-    mongodb "3.1.13"
-    mongodb-core "3.1.11"
+    mongodb "3.2.2"
+    mongodb-core "3.2.2"
     mongoose-legacy-pluralize "1.0.2"
     mpath "0.5.1"
     mquery "3.2.0"
     ms "2.1.1"
     regexp-clone "0.0.1"
     safe-buffer "5.1.2"
+    sift "7.0.1"
     sliced "1.0.1"
 
 morgan@^1.9.1:
@@ -9581,6 +9582,11 @@ shimmer@~1.2.0:
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
   integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
 
+sift@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/sift/-/sift-7.0.1.tgz#47d62c50b159d316f1372f8b53f9c10cd21a4b08"
+  integrity sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==
+
 signal-exit@3.0.2, 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"
@@ -11082,7 +11088,7 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@4.2.1:
+webpack-merge@4.2.1, webpack-merge@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
   integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==

From d29a8f22f5b88556846b9c8bafa3dd4226d0177e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:51:13 +0000
Subject: [PATCH 153/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 48 +++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index c6bb3d8a5..45a44eef2 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -2270,10 +2270,10 @@ browserstack@^1.5.1:
   dependencies:
     https-proxy-agent "^2.2.1"
 
-bson@^1.1.0, bson@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.0.tgz#bee57d1fb6a87713471af4e32bcae36de814b5b0"
-  integrity sha512-9Aeai9TacfNtWXOYarkFJRW2CWo+dRon+fuLZYJmvLV3+MiUp0bEI6IAZfXEIg7/Pl/7IWlLaDnhzTsD81etQA==
+bson@^1.1.1, bson@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.1.tgz#4330f5e99104c4e751e7351859e2d408279f2f13"
+  integrity sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg==
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
@@ -7400,45 +7400,46 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkd
   dependencies:
     minimist "0.0.8"
 
-mongodb-core@3.1.11:
-  version "3.1.11"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.1.11.tgz#b253038dbb4d7329f3d1c2ee5400bb0c9221fde5"
-  integrity sha512-rD2US2s5qk/ckbiiGFHeu+yKYDXdJ1G87F6CG3YdaZpzdOm5zpoAZd/EKbPmFO6cQZ+XVXBXBJ660sSI0gc6qg==
+mongodb-core@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.2.tgz#d1c084b34c102a98b4734087800115e639d907c5"
+  integrity sha512-YRgC39MuzKL0uoGoRdTmV1e9m47NbMnYmuEx4IOkgWAGXPSEzRY7cwb3N0XMmrDMnD9vp7MysNyAriIIeGgIQg==
   dependencies:
-    bson "^1.1.0"
+    bson "^1.1.1"
     require_optional "^1.0.1"
     safe-buffer "^5.1.2"
   optionalDependencies:
     saslprep "^1.0.0"
 
-mongodb@3.1.13:
-  version "3.1.13"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.1.13.tgz#f8cdcbb36ad7a08b570bd1271c8525753f75f9f4"
-  integrity sha512-sz2dhvBZQWf3LRNDhbd30KHVzdjZx9IKC0L+kSZ/gzYquCF5zPOgGqRz6sSCqYZtKP2ekB4nfLxhGtzGHnIKxA==
+mongodb@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.2.tgz#49b592be3cd50097f78e0964488d18c2e189de20"
+  integrity sha512-xQ6apOOV+w7VFApdaJpWhYhzartpjIDFQjG0AwgJkLh7dBs7PTsq4A3Bia2QWpDohmAzTBIdQVLMqqLy0mwt3Q==
   dependencies:
-    mongodb-core "3.1.11"
+    mongodb-core "3.2.2"
     safe-buffer "^5.1.2"
 
 mongoose-legacy-pluralize@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
 
-mongoose@^5.4.19:
-  version "5.4.19"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.4.19.tgz#fdca94ee7f71da2cf0e941d02255aa02007c55c0"
-  integrity sha512-paRU3nbCrPIUVw1GAlxo11uIIqrYORctUx1kcLj7i2NhkxPQuy5OK2/FYj8+tglsaixycmONSyop2HQp1IUQSA==
+mongoose@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.0.tgz#e1bf07cf9953840aaaafb25df163bc12ed70365c"
+  integrity sha512-GZdhdbTXTgikInIgtxR7ODcF3+MoJTumTsKYinX3zxJcQgMVr+Y0jBuFoLJ9YtVdF2nq1ukLnhS6RHfta1ptgQ==
   dependencies:
     async "2.6.1"
-    bson "~1.1.0"
+    bson "~1.1.1"
     kareem "2.3.0"
-    mongodb "3.1.13"
-    mongodb-core "3.1.11"
+    mongodb "3.2.2"
+    mongodb-core "3.2.2"
     mongoose-legacy-pluralize "1.0.2"
     mpath "0.5.1"
     mquery "3.2.0"
     ms "2.1.1"
     regexp-clone "0.0.1"
     safe-buffer "5.1.2"
+    sift "7.0.1"
     sliced "1.0.1"
 
 morgan@^1.9.1:
@@ -9687,6 +9688,11 @@ shelljs@^0.8.1:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+sift@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/sift/-/sift-7.0.1.tgz#47d62c50b159d316f1372f8b53f9c10cd21a4b08"
+  integrity sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==
+
 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"

From d6bce5936acea17608b07194fa854c9f26d57288 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:51:17 +0000
Subject: [PATCH 154/382] chore(package): update lockfile backend/api/yarn.lock

---
 backend/api/yarn.lock | 54 ++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 7502d57e2..20e3672d0 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -2273,11 +2273,7 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
-bson@^1.1.0, bson@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.0.tgz#bee57d1fb6a87713471af4e32bcae36de814b5b0"
-
-bson@^1.1.1:
+bson@^1.1.1, bson@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.1.tgz#4330f5e99104c4e751e7351859e2d408279f2f13"
   integrity sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg==
@@ -7050,21 +7046,21 @@ moment@^2.24.0:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-mongodb-core@3.1.11:
-  version "3.1.11"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.1.11.tgz#b253038dbb4d7329f3d1c2ee5400bb0c9221fde5"
-  integrity sha512-rD2US2s5qk/ckbiiGFHeu+yKYDXdJ1G87F6CG3YdaZpzdOm5zpoAZd/EKbPmFO6cQZ+XVXBXBJ660sSI0gc6qg==
+mongodb-core@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.1.tgz#aac98998abc7b3f8a5e841e9a3f85b4304eadfc5"
+  integrity sha512-vvnl5F6QhvFhi28umNx+Ymyb8wVQOhvEjU30JF3TjBBomS2tamJFK4eA0uwOa6FxLi9qCQWejbF66B0rb/UUiw==
   dependencies:
-    bson "^1.1.0"
+    bson "^1.1.1"
     require_optional "^1.0.1"
     safe-buffer "^5.1.2"
   optionalDependencies:
     saslprep "^1.0.0"
 
-mongodb-core@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.1.tgz#aac98998abc7b3f8a5e841e9a3f85b4304eadfc5"
-  integrity sha512-vvnl5F6QhvFhi28umNx+Ymyb8wVQOhvEjU30JF3TjBBomS2tamJFK4eA0uwOa6FxLi9qCQWejbF66B0rb/UUiw==
+mongodb-core@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.2.tgz#d1c084b34c102a98b4734087800115e639d907c5"
+  integrity sha512-YRgC39MuzKL0uoGoRdTmV1e9m47NbMnYmuEx4IOkgWAGXPSEzRY7cwb3N0XMmrDMnD9vp7MysNyAriIIeGgIQg==
   dependencies:
     bson "^1.1.1"
     require_optional "^1.0.1"
@@ -7090,12 +7086,12 @@ mongodb-memory-server@^4.2.1:
     tmp "^0.0.33"
     uuid "^3.2.1"
 
-mongodb@3.1.13:
-  version "3.1.13"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.1.13.tgz#f8cdcbb36ad7a08b570bd1271c8525753f75f9f4"
-  integrity sha512-sz2dhvBZQWf3LRNDhbd30KHVzdjZx9IKC0L+kSZ/gzYquCF5zPOgGqRz6sSCqYZtKP2ekB4nfLxhGtzGHnIKxA==
+mongodb@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.2.tgz#49b592be3cd50097f78e0964488d18c2e189de20"
+  integrity sha512-xQ6apOOV+w7VFApdaJpWhYhzartpjIDFQjG0AwgJkLh7dBs7PTsq4A3Bia2QWpDohmAzTBIdQVLMqqLy0mwt3Q==
   dependencies:
-    mongodb-core "3.1.11"
+    mongodb-core "3.2.2"
     safe-buffer "^5.1.2"
 
 mongodb@^3.2.1:
@@ -7110,22 +7106,23 @@ mongoose-legacy-pluralize@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
 
-mongoose@^5.4.19:
-  version "5.4.19"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.4.19.tgz#fdca94ee7f71da2cf0e941d02255aa02007c55c0"
-  integrity sha512-paRU3nbCrPIUVw1GAlxo11uIIqrYORctUx1kcLj7i2NhkxPQuy5OK2/FYj8+tglsaixycmONSyop2HQp1IUQSA==
+mongoose@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.0.tgz#e1bf07cf9953840aaaafb25df163bc12ed70365c"
+  integrity sha512-GZdhdbTXTgikInIgtxR7ODcF3+MoJTumTsKYinX3zxJcQgMVr+Y0jBuFoLJ9YtVdF2nq1ukLnhS6RHfta1ptgQ==
   dependencies:
     async "2.6.1"
-    bson "~1.1.0"
+    bson "~1.1.1"
     kareem "2.3.0"
-    mongodb "3.1.13"
-    mongodb-core "3.1.11"
+    mongodb "3.2.2"
+    mongodb-core "3.2.2"
     mongoose-legacy-pluralize "1.0.2"
     mpath "0.5.1"
     mquery "3.2.0"
     ms "2.1.1"
     regexp-clone "0.0.1"
     safe-buffer "5.1.2"
+    sift "7.0.1"
     sliced "1.0.1"
 
 morgan@^1.9.1:
@@ -9263,6 +9260,11 @@ shimmer@~1.2.0:
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
   integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
 
+sift@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/sift/-/sift-7.0.1.tgz#47d62c50b159d316f1372f8b53f9c10cd21a4b08"
+  integrity sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==
+
 signal-exit@3.0.2, 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"

From 8b1a537ebd933e9b3177b4e22f1cc65121c6d76a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 9 Apr 2019 10:45:53 +0300
Subject: [PATCH 155/382] feat(ever-admin): improved code on Setup Merchants
 page EV-1197

---
 .../components/account/account.component.html |   7 +
 .../components/account/account.component.ts   |   7 +-
 .../basic-info/basic-info.component.html      |   7 +
 .../basic-info/basic-info.component.ts        |  14 +-
 .../contact-info/contact-info.component.html  |   7 +
 .../contact-info/contact-info.component.ts    |   7 +-
 .../location/location.component.html          |   7 +
 .../components/location/location.component.ts |   7 +-
 .../manufacturing.component.html              |   7 +
 .../manufacturing/manufacturing.component.ts  |   7 +-
 .../payments/payments.component.html          |   7 +
 .../components/payments/payments.component.ts |   7 +-
 .../product-categories.component.html         |  34 ++
 .../product-categories.component.ts           |   8 +-
 .../add-products/add-products.component.html  |   1 +
 .../add-products/add-products.component.ts    |  13 +
 .../products/products.component.html          |  48 ++-
 .../components/products/products.component.ts |  18 +-
 .../components/products/products.module.ts    |   4 +-
 .../delivery-takeaway.component.html          |  31 ++
 .../delivery-takeaway.component.ts            |   9 +-
 .../settings/orders/orders.component.html     |   7 +
 .../settings/orders/orders.component.ts       |  10 +-
 .../+merchants/merchants.component.html       | 290 ++----------------
 24 files changed, 271 insertions(+), 293 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
index 8dec8824f..75368d1d7 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
@@ -212,3 +212,10 @@
 		</form>
 	</nb-card-body>
 </nb-card>
+
+<button nbButton disabled (click)="previousStep.emit()">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+</button>
+<button nbButton (click)="nextStep.emit()" [disabled]="!formValid">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+</button>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
index aed5b275a..221052ac1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, ViewChild, Output, EventEmitter } from '@angular/core';
 import { NgForm } from '@angular/forms';
 
 @Component({
@@ -10,6 +10,11 @@ export class SetupMerchantAccountComponent {
 	@ViewChild('accountForm')
 	accountForm: NgForm;
 
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
 	accountModel = {
 		email: '',
 		username: '',
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
index f239680b6..84bc977cf 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
@@ -170,3 +170,10 @@
 		</form>
 	</nb-card-body>
 </nb-card>
+
+<button nbButton (click)="previousStep.emit()">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+</button>
+<button nbButton (click)="nextStep.emit()" [disabled]="!formValid">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+</button>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index 24bf58ac9..c541cff89 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -1,4 +1,11 @@
-import { Component, ViewChild, OnInit, OnDestroy } from '@angular/core';
+import {
+	Component,
+	ViewChild,
+	OnInit,
+	OnDestroy,
+	Output,
+	EventEmitter
+} from '@angular/core';
 import { NgForm, NgModel } from '@angular/forms';
 import QRCode from 'qrcode';
 import { TranslateService } from '@ngx-translate/core';
@@ -18,6 +25,11 @@ export class SetupMerchantBasicInfoComponent implements OnInit, OnDestroy {
 	@ViewChild('name')
 	name: NgModel;
 
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
 	private _ngDestroy$ = new Subject<void>();
 
 	// TODO add translate
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
index c1beeb01e..c1509c88c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
@@ -197,3 +197,10 @@
 		</form>
 	</nb-card-body></nb-card
 >
+
+<button nbButton (click)="previousStep.emit()">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+</button>
+<button nbButton (click)="nextStep.emit()" [disabled]="contactInfoForm.invalid">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+</button>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
index b18b6b14c..97e572934 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, ViewChild, Output, EventEmitter } from '@angular/core';
 import { NgForm } from '@angular/forms';
 
 @Component({
@@ -10,6 +10,11 @@ export class SetupMerchantContactInfoComponent {
 	@ViewChild('contactInfoForm')
 	contactInfoForm: NgForm;
 
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
 	forwardingEmail: boolean;
 	forwardingPhone: boolean;
 	contactInfoModel = {
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
index 4bfe0df29..4dfc2dbf7 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
@@ -18,3 +18,10 @@
 		</google-map>
 	</nb-card-body>
 </nb-card>
+
+<button nbButton (click)="previousStep.emit()">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+</button>
+<button nbButton (click)="nextStep.emit()" [disabled]="location.invalid">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+</button>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
index be1390fd4..82e02391a 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, ViewChild } from '@angular/core';
+import { Component, EventEmitter, ViewChild, Output } from '@angular/core';
 import { LocationFormComponent } from 'app/@shared/forms/location';
 import { FormBuilder } from '@angular/forms';
 
@@ -11,6 +11,11 @@ export class SetupMerchantLocationComponent {
 	@ViewChild('locationForm')
 	locationForm: LocationFormComponent;
 
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
 	location = LocationFormComponent.buildForm(this.formBuilder);
 
 	mapCoordEmitter = new EventEmitter<number[]>();
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
index 0d267cf35..6abfb80f3 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
@@ -17,3 +17,10 @@
 		</div>
 	</nb-card-body>
 </nb-card>
+
+<button nbButton (click)="previousStep.emit()">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+</button>
+<button nbButton (click)="nextStep.emit()">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+</button>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.ts
index 978994b07..15c501caa 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Output, EventEmitter } from '@angular/core';
 
 @Component({
 	selector: 'ea-merchants-setup-manufacturing',
@@ -6,5 +6,10 @@ import { Component } from '@angular/core';
 	styleUrls: ['./manufacturing.component.scss']
 })
 export class SetupMerchantManufacturingComponent {
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
 	isManufacturing: boolean;
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
index b5182c5f8..45c0d37a4 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
@@ -15,3 +15,10 @@
 		</div>
 	</nb-card-body>
 </nb-card>
+
+<button nbButton (click)="previousStep.emit()">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+</button>
+<button nbButton (click)="nextStep.emit()">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+</button>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
index 89b332685..95db3be6a 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, EventEmitter, Output } from '@angular/core';
 
 @Component({
 	selector: 'ea-merchants-setup-payments',
@@ -6,5 +6,10 @@ import { Component } from '@angular/core';
 	styleUrls: ['./payments.component.scss']
 })
 export class SetupMerchantPaymentsComponent {
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
 	isPaymentEnabled: boolean;
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
index f26868a37..69e887bcb 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
@@ -41,3 +41,37 @@
 		</div>
 	</nb-card-body>
 </nb-card>
+
+<div *ngIf="!showMutationForm">
+	<button nbButton (click)="previousStep.emit()">
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+	</button>
+
+	<button nbButton (click)="nextStep.emit()">
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+	</button>
+</div>
+
+<div *ngIf="showMutationForm">
+	<button nbButton (click)="showMutationForm = false">
+		Back
+	</button>
+
+	<button
+		*ngIf="mutationType === 'add'"
+		nbButton
+		[disabled]="showMutationForm ? !isValidForm : false"
+		(click)="add()"
+	>
+		Add
+	</button>
+
+	<button
+		*ngIf="mutationType === 'edit'"
+		nbButton
+		[disabled]="showMutationForm ? isInvalidValidForm : false"
+		(click)="edit()"
+	>
+		Save
+	</button>
+</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
index 0c88db715..8c84c07c5 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
@@ -1,5 +1,4 @@
-import { Component, ViewChild } from '@angular/core';
-import { NgForm } from '@angular/forms';
+import { Component, ViewChild, Output, EventEmitter } from '@angular/core';
 import { first } from 'rxjs/operators';
 import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
 import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
@@ -21,6 +20,11 @@ export class SetupMerchantProductCategoriesComponent {
 	@ViewChild('categoriesTable')
 	categoriesTable: CategoriesTableComponent;
 
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
 	currentCategory: ProductsCategory;
 	productCategories: ProductsCategory[] = [];
 	showPerPage = 3;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
new file mode 100644
index 000000000..607554678
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
@@ -0,0 +1 @@
+<h2>fsdfsd</h2>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
new file mode 100644
index 000000000..676b3a7ed
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
@@ -0,0 +1,13 @@
+import { Component, ViewChild } from '@angular/core';
+import { ProductsTableComponent } from 'app/@shared/product/forms/products-table';
+
+@Component({
+	selector: 'ea-merchants-setup-add-products',
+	templateUrl: './add-products.component.html'
+})
+export class SetupMerchantAddProductsComponent {
+	@ViewChild('productsTable')
+	productsTable: ProductsTableComponent;
+
+	perPage = 3;
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
index d3108530a..b0223c69b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -6,8 +6,11 @@
 		<span *ngIf="currentView == componentViews.productsTable">
 			Select from products catalog
 		</span>
-		<span *ngIf="currentView == componentViews.addNewProduct">
-			Create new product
+		<span *ngIf="currentView == componentViews.createProduct">
+			Create product
+		</span>
+		<span *ngIf="currentView == componentViews.addProducts">
+			Add product
 		</span>
 	</nb-card-header>
 	<nb-card-body>
@@ -29,7 +32,7 @@
 						nbButton
 						outline
 						status="success"
-						(click)="currentView = componentViews.addNewProduct"
+						(click)="currentView = componentViews.createProduct"
 					>
 						Create new product
 					</button>
@@ -43,8 +46,41 @@
 			></ea-merchants-setup-products-catalog>
 		</div>
 
-		<div *ngIf="currentView == componentViews.addNewProduct" class="row">
+		<div *ngIf="currentView == componentViews.createProduct" class="row">
 			<h4>Add new product</h4>
 		</div>
-	</nb-card-body></nb-card
->
+
+		<div *ngIf="currentView == componentViews.addProducts" class="row">
+			<ea-merchants-setup-add-products></ea-merchants-setup-add-products>
+		</div> </nb-card-body
+></nb-card>
+
+<div *ngIf="currentView === componentViews.main">
+	<button nbButton (click)="previousStep.emit()">
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+	</button>
+	<button nbButton (click)="nextStep.emit()">
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+	</button>
+</div>
+<div *ngIf="currentView !== componentViews.main">
+	<button nbButton (click)="back()">
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.BACK' | translate }}
+	</button>
+	<button
+		*ngIf="currentView === componentViews.productsTable"
+		[disabled]="!haveProductsForAdd"
+		nbButton
+		(click)="select()"
+	>
+		Select
+	</button>
+
+	<button
+		*ngIf="currentView === componentViews.addProducts"
+		nbButton
+		(click)="add()"
+	>
+		Add
+	</button>
+</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index 1651bc023..3c3a01a24 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -1,4 +1,4 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, ViewChild, Output, EventEmitter } from '@angular/core';
 import { SetupMerchantProductsCatalogComponent } from './products-catalog/products-catalog.component';
 import Product from '@modules/server.common/entities/Product';
 
@@ -11,11 +11,16 @@ export class SetupMerchantProductsComponent {
 	@ViewChild('productsCatalog')
 	productsCatalog: SetupMerchantProductsCatalogComponent;
 
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
 	componentViews = {
 		main: 'main',
 		productsTable: 'productsTable',
-		addNewProduct: 'addNewProduct',
-		addWarehouseProducts: 'addWarehouseProducts'
+		createProduct: 'createProduct',
+		addProducts: 'addProducts'
 	};
 	currentView = this.componentViews.main;
 	productsPerPage = 3;
@@ -33,10 +38,9 @@ export class SetupMerchantProductsComponent {
 		return hasSelectedCarriers;
 	}
 
-	add() {
-		if (this.currentView === this.componentViews.productsTable) {
-			this.productsForAdd = this.productsCatalog.productsTable.selectedProducts;
-		}
+	select() {
+		this.productsForAdd = this.productsCatalog.productsTable.selectedProducts;
+		this.currentView = this.componentViews.addProducts;
 	}
 
 	back() {
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
index b4ba95682..af9ecfbda 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
@@ -6,10 +6,12 @@ import { TranslateModule } from '@ngx-translate/core';
 import { SetupMerchantProductsComponent } from './products.component';
 import { SetupMerchantProductsCatalogComponent } from './products-catalog/products-catalog.component';
 import { ProductFormsModule } from 'app/@shared/product/forms';
+import { SetupMerchantAddProductsComponent } from './add-products/add-products.component';
 
 const COMPONENTS = [
 	SetupMerchantProductsComponent,
-	SetupMerchantProductsCatalogComponent
+	SetupMerchantProductsCatalogComponent,
+	SetupMerchantAddProductsComponent
 ];
 
 @NgModule({
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
index ddba7a0ed..55d2023ff 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
@@ -126,3 +126,34 @@
 		</div>
 	</nb-card-body>
 </nb-card>
+
+<div *ngIf="currentView === componentViews.main">
+	<button nbButton (click)="previousStep.emit()">
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+	</button>
+	<button nbButton (click)="nextStep.emit()">
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+	</button>
+</div>
+<div *ngIf="currentView !== componentViews.main">
+	<button nbButton (click)="back()">
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.BACK' | translate }}
+	</button>
+	<button
+		*ngIf="currentView !== componentViews.editCarrier"
+		[disabled]="!haveCarriersForAdd"
+		nbButton
+		(click)="add()"
+	>
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.ADD' | translate }}
+	</button>
+
+	<button
+		*ngIf="currentView === componentViews.editCarrier"
+		[disabled]="!isBasicInfoValid"
+		nbButton
+		(click)="save()"
+	>
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.SAVE' | translate }}
+	</button>
+</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index 0a23e205b..ccb6636cc 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -3,7 +3,9 @@ import {
 	ViewChild,
 	OnDestroy,
 	AfterViewInit,
-	Input
+	Input,
+	Output,
+	EventEmitter
 } from '@angular/core';
 import { SetupMerchantSharedCarriersComponent } from './shared-carriers/shared-carriers.component';
 import {
@@ -29,6 +31,11 @@ export class SetupMerchantDeliveryAndTakeawayComponent
 	@ViewChild('carriersTable')
 	carriersTable: CarriersSmartTableComponent;
 
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
 	@Input()
 	locationForm: any;
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
index ec02a964b..719e224d4 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
@@ -36,3 +36,10 @@
 		</div>
 	</nb-card-body>
 </nb-card>
+
+<button nbButton (click)="previousStep.emit()">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
+</button>
+<button nbButton (click)="nextStep.emit()" [disabled]="!canCreateMerchant">
+	{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
+</button>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
index bd1c0a823..fdfa07f19 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Output, EventEmitter, Input } from '@angular/core';
 import OrderBarcodeTypes, {
 	orderBarcodeTypesToString
 } from '@modules/server.common/enums/OrderBarcodeTypes';
@@ -10,6 +10,14 @@ import QRCode from 'qrcode';
 	styleUrls: ['./orders.component.scss']
 })
 export class SetupMerchantOrdersSettingsComponent {
+	@Output()
+	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+	@Output()
+	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
+
+	@Input()
+	canCreateMerchant: boolean = false;
+
 	iorderBarcodeType: OrderBarcodeTypes = OrderBarcodeTypes.QR;
 	barcodetData: string;
 	barcodetDataUrl: string;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 78ed56705..cc92a06a4 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -9,322 +9,74 @@
 						<nb-step label="Account">
 							<ea-merchants-setup-account
 								#account
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-account>
-
-							<button nbButton disabled nbStepperNext>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
-								}}
-							</button>
-							<button
-								nbButton
-								nbStepperNext
-								[disabled]="!account.formValid"
-							>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
-								}}
-							</button>
 						</nb-step>
 						<nb-step label="Basic info">
 							<ea-merchants-setup-basic-info
 								#basicInfo
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-basic-info>
-
-							<button nbButton nbStepperPrevious>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
-								}}
-							</button>
-							<button
-								nbButton
-								nbStepperNext
-								[disabled]="!basicInfo.formValid"
-							>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
-								}}
-							</button>
 						</nb-step>
 						<nb-step label="Contact info">
 							<ea-merchants-setup-contact-info
 								#contactInfo
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-contact-info>
-
-							<button nbButton nbStepperPrevious>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
-								}}
-							</button>
-							<button
-								nbButton
-								nbStepperNext
-								[disabled]="contactInfo.contactInfoForm.invalid"
-							>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
-								}}
-							</button>
 						</nb-step>
 						<nb-step label="Location">
 							<ea-merchants-setup-location
 								#location
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-location>
-
-							<button nbButton nbStepperPrevious>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
-								}}
-							</button>
-							<button
-								nbButton
-								nbStepperNext
-								[disabled]="location.location.invalid"
-							>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
-								}}
-							</button>
 						</nb-step>
 						<nb-step label="Payments">
 							<ea-merchants-setup-payments
 								#payments
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-payments>
-
-							<button nbButton nbStepperPrevious>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
-								}}
-							</button>
-							<button nbButton nbStepperNext>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
-								}}
-							</button>
 						</nb-step>
 						<nb-step label="Manufacturing">
 							<ea-merchants-setup-manufacturing
 								#manufacturing
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-manufacturing>
-
-							<button nbButton nbStepperPrevious>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
-								}}
-							</button>
-							<button nbButton nbStepperNext>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
-								}}
-							</button>
 						</nb-step>
 						<nb-step label="Delivery & Takeaway Settings">
 							<ea-merchants-setup-delivery-takeaway
 								[locationForm]="location.locationForm"
 								#deliveryAndTakeaway
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-delivery-takeaway>
-
-							<div
-								*ngIf="
-									deliveryAndTakeaway.currentView ===
-									deliveryAndTakeaway.componentViews.main
-								"
-							>
-								<button nbButton nbStepperPrevious>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.PREV'
-											| translate
-									}}
-								</button>
-								<button nbButton nbStepperNext>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.NEXT'
-											| translate
-									}}
-								</button>
-							</div>
-							<div
-								*ngIf="
-									deliveryAndTakeaway.currentView !==
-									deliveryAndTakeaway.componentViews.main
-								"
-							>
-								<button
-									nbButton
-									(click)="deliveryAndTakeaway.back()"
-								>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.BACK'
-											| translate
-									}}
-								</button>
-								<button
-									*ngIf="
-										deliveryAndTakeaway.currentView !==
-										deliveryAndTakeaway.componentViews
-											.editCarrier
-									"
-									[disabled]="
-										!deliveryAndTakeaway.haveCarriersForAdd
-									"
-									nbButton
-									(click)="deliveryAndTakeaway.add()"
-								>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.ADD'
-											| translate
-									}}
-								</button>
-
-								<button
-									*ngIf="
-										deliveryAndTakeaway.currentView ===
-										deliveryAndTakeaway.componentViews
-											.editCarrier
-									"
-									[disabled]="
-										!deliveryAndTakeaway.isBasicInfoValid
-									"
-									nbButton
-									(click)="deliveryAndTakeaway.save()"
-								>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.SAVE'
-											| translate
-									}}
-								</button>
-							</div>
 						</nb-step>
 						<nb-step label="Orders Settings">
 							<ea-merchants-setup-orders-settings
 								#ordersSettings
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="createMerchant()"
+								[canCreateMerchant]="canCreateMerchant"
 							></ea-merchants-setup-orders-settings>
-
-							<button nbButton nbStepperPrevious>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate
-								}}
-							</button>
-							<button
-								nbButton
-								(click)="createMerchant()"
-								[disabled]="!canCreateMerchant"
-							>
-								{{
-									'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate
-								}}
-							</button>
 						</nb-step>
 						<nb-step label="Product categories">
 							<ea-merchants-setup-product-categories
 								#productCategories
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-product-categories>
-
-							<div *ngIf="!productCategories.showMutationForm">
-								<button nbButton nbStepperPrevious>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.PREV'
-											| translate
-									}}
-								</button>
-
-								<button nbButton nbStepperNext>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.NEXT'
-											| translate
-									}}
-								</button>
-							</div>
-
-							<div *ngIf="productCategories.showMutationForm">
-								<button
-									nbButton
-									(click)="
-										productCategories.showMutationForm = false
-									"
-								>
-									Back
-								</button>
-
-								<button
-									*ngIf="
-										productCategories.mutationType === 'add'
-									"
-									nbButton
-									[disabled]="
-										productCategories.showMutationForm
-											? !productCategories.isValidForm
-											: false
-									"
-									(click)="productCategories.add()"
-								>
-									Add
-								</button>
-
-								<button
-									*ngIf="
-										productCategories.mutationType ===
-										'edit'
-									"
-									nbButton
-									[disabled]="
-										productCategories.showMutationForm
-											? productCategories.isInvalidValidForm
-											: false
-									"
-									(click)="productCategories.edit()"
-								>
-									Save
-								</button>
-							</div>
 						</nb-step>
 						<nb-step label="Products">
 							<ea-merchants-setup-products
 								#products
+								(previousStep)="nbStepper.previous()"
+								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-products>
-
-							<div
-								*ngIf="
-									products.currentView ===
-									products.componentViews.main
-								"
-							>
-								<button nbButton nbStepperPrevious>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.PREV'
-											| translate
-									}}
-								</button>
-								<button nbButton nbStepperNext>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.NEXT'
-											| translate
-									}}
-								</button>
-							</div>
-							<div
-								*ngIf="
-									products.currentView !==
-									products.componentViews.main
-								"
-							>
-								<button nbButton (click)="products.back()">
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.BACK'
-											| translate
-									}}
-								</button>
-								<button
-									[disabled]="!products.haveProductsForAdd"
-									nbButton
-									(click)="products.add()"
-								>
-									{{
-										'FAKE_DATA.SETUP_MERCHANTS.ADD'
-											| translate
-									}}
-								</button>
-							</div>
 						</nb-step>
 					</nb-stepper>
 				</nb-card-body>

From 3f73236b29aeb3e1d78a66ccc93935167ae7e490 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 9 Apr 2019 11:11:28 +0300
Subject: [PATCH 156/382] feat(ever-admin): extended step "Products" in Setup
 Merchants EV-1197

---
 .../products-table.component.html              | 17 +++++++++++++----
 .../products-table.component.scss              |  4 ++++
 .../products-table/products-table.component.ts |  3 +++
 .../add-products/add-products.component.html   |  2 +-
 .../products-catalog.component.html            |  1 +
 .../components/products/products.component.ts  | 18 +++++++++++++++++-
 6 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.html b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.html
index 3eb698bae..683c06348 100644
--- a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.html
+++ b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.html
@@ -1,5 +1,14 @@
-<nb-card [nbSpinner]="loading">
-	<ng2-smart-table class="products-table" [settings]="settingsSmartTable" [source]="sourceSmartTable" (userRowSelect)="selectProductTmp($event)"
-	 (edit)="edit($event)" (delete)="deleteProduct($event)">
+<nb-card
+	[ngClass]="boxShadow === 'none' ? 'no-box-shadow' : ''"
+	[nbSpinner]="loading"
+>
+	<ng2-smart-table
+		class="products-table"
+		[settings]="settingsSmartTable"
+		[source]="sourceSmartTable"
+		(userRowSelect)="selectProductTmp($event)"
+		(edit)="edit($event)"
+		(delete)="deleteProduct($event)"
+	>
 	</ng2-smart-table>
-</nb-card>
\ No newline at end of file
+</nb-card>
diff --git a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.scss b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.scss
index b29be2cf6..53095cd1d 100644
--- a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.scss
+++ b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.scss
@@ -1,3 +1,7 @@
 nb-card {
 	margin-bottom: 0;
 }
+
+.no-box-shadow {
+	box-shadow: none;
+}
diff --git a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts
index e92837187..4741fe6b0 100644
--- a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts
+++ b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts
@@ -51,6 +51,9 @@ export class ProductsTableComponent implements OnInit, OnDestroy {
 	@Input()
 	hiddenTableActions: boolean;
 
+	@Input()
+	boxShadow: string;
+
 	private static noInfoSign = '';
 	private _selectedProducts: ProductViewModel[] = [];
 	private products: Product[];
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
index 607554678..eb6aea89c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
@@ -1 +1 @@
-<h2>fsdfsd</h2>
+<h2>Add products table</h2>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.html
index e4a81ab7a..c399dc1f1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.html
@@ -1,6 +1,7 @@
 <ea-products-table
 	[perPage]="perPage"
 	[hiddenTableActions]="true"
+	[boxShadow]="'none'"
 	#productsTable
 >
 </ea-products-table>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index 3c3a01a24..a99932367 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -22,11 +22,13 @@ export class SetupMerchantProductsComponent {
 		createProduct: 'createProduct',
 		addProducts: 'addProducts'
 	};
-	currentView = this.componentViews.main;
 	productsPerPage = 3;
 
 	productsForAdd = [];
 
+	private _currentView = this.componentViews.main;
+	private _prevView = this.componentViews.main;
+
 	get haveProductsForAdd() {
 		let hasSelectedCarriers = false;
 
@@ -38,12 +40,26 @@ export class SetupMerchantProductsComponent {
 		return hasSelectedCarriers;
 	}
 
+	get currentView() {
+		return this._currentView;
+	}
+
+	set currentView(view: string) {
+		this._prevView = this.currentView;
+		this._currentView = view;
+	}
+
 	select() {
 		this.productsForAdd = this.productsCatalog.productsTable.selectedProducts;
 		this.currentView = this.componentViews.addProducts;
 	}
 
 	back() {
+		if (this.currentView === this.componentViews.addProducts) {
+			this.currentView = this._prevView;
+			return;
+		}
+
 		this.currentView = this.componentViews.main;
 	}
 }

From 5ef2d1e160fe74d9a5447f3728e4342d813e338d Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 9 Apr 2019 12:21:48 +0300
Subject: [PATCH 157/382] feat(ever-api): optional certificates for server
 EV-980

---
 backend/api/src/services/services.app.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/backend/api/src/services/services.app.ts b/backend/api/src/services/services.app.ts
index 4d5e21b6c..e0c1a6a96 100644
--- a/backend/api/src/services/services.app.ts
+++ b/backend/api/src/services/services.app.ts
@@ -297,20 +297,25 @@ export class ServicesApp {
 		this.expressApp.set('view cache', false);
 
 		// TODO: this is probably a good place to check if Cert files exists and if not generate them for localhost
-		this.httpsServer = https.createServer(
-			{
-				cert: fs.readFileSync(env.HTTPS_CERT_PATH),
-				key: fs.readFileSync(env.HTTPS_KEY_PATH)
-			},
-			this.expressApp
-		);
+		const hasHttpsCert = fs.existsSync(env.HTTPS_CERT_PATH);
+		if (hasHttpsCert) {
+			this.httpsServer = https.createServer(
+				{
+					cert: fs.readFileSync(env.HTTPS_CERT_PATH),
+					key: fs.readFileSync(env.HTTPS_KEY_PATH)
+				},
+				this.expressApp
+			);
+		}
 
 		this.httpServer = http.createServer(this.expressApp);
 
 		// TODO: add to settings file
 		// set connections timeouts to 30 minutes (for long running requests)
 		const timeout = 30 * 60 * 1000;
-		this.httpsServer.setTimeout(timeout);
+		if (this.httpsServer) {
+			this.httpsServer.setTimeout(timeout);
+		}
 		this.httpServer.setTimeout(timeout);
 
 		this.expressApp.set('httpsPort', env.HTTPSPORT);
@@ -406,7 +411,7 @@ export class ServicesApp {
 			'Express server prepare to listen'
 		);
 
-		if (httpsPort && httpsPort > 0) {
+		if (httpsPort && httpsPort > 0 && this.httpsServer) {
 			// app listen on https
 			this.httpsServer.listen(httpsPort, () => {
 				this.log.info(

From 9428b94397d653f2a0bfe73ebdfe475f731bf417 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 9 Apr 2019 12:53:35 +0300
Subject: [PATCH 158/382] feat(ever-api): shows message if no certificates
 EV-980

---
 backend/api/src/services/services.app.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/api/src/services/services.app.ts b/backend/api/src/services/services.app.ts
index e0c1a6a96..da6206851 100644
--- a/backend/api/src/services/services.app.ts
+++ b/backend/api/src/services/services.app.ts
@@ -422,6 +422,10 @@ export class ServicesApp {
 					`Express https server listening on port ${httpsPort}`
 				);
 			});
+		} else {
+			this.log.warn(
+				`No SSL Certificate exists, HTTPS endpoint will be disabled`
+			);
 		}
 
 		if (httpPort && httpPort > 0) {

From 3dae2d160a09f7e1c610b4c97905436a1a541216 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 9 Apr 2019 15:42:15 +0300
Subject: [PATCH 159/382] feat(ever-api): auto generate https certificates
 EV-980

---
 backend/api/.env.template                |  1 +
 backend/api/package.json                 |  7 ++-
 backend/api/src/env.ts                   |  2 +
 backend/api/src/services/services.app.ts | 74 ++++++++++++++++++++++--
 backend/api/yarn.lock                    | 40 ++++++++++++-
 5 files changed, 113 insertions(+), 11 deletions(-)

diff --git a/backend/api/.env.template b/backend/api/.env.template
index bcd1a66f2..cf4d944d8 100644
--- a/backend/api/.env.template
+++ b/backend/api/.env.template
@@ -7,6 +7,7 @@ HTTPSPORT=5501
 GQLPORT=5555
 GQLPORT_SUBSCRIPTIONS=5050
 
+CERTIFICATES_HTTPS_PATH=certificates/https
 HTTPS_CERT_PATH=certificates/https/cert.pem
 HTTPS_KEY_PATH=certificates/https/key.pem
 
diff --git a/backend/api/package.json b/backend/api/package.json
index 05c1ffdb9..72e98257a 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -58,7 +58,6 @@
 		"@nestjs/testing": "^6.0.2",
 		"@nestjs/typeorm": "^6.0.0",
 		"@nestjs/websockets": "^6.0.2",
-		"swagger-ui-express": "^4.0.2",
 		"apollo-server-express": "^2.4.8",
 		"axios": "^0.18.0",
 		"bcrypt": "^3.0.4",
@@ -79,6 +78,7 @@
 		"envalid": "^4.2.2",
 		"errorhandler": "^1.5.0",
 		"etag": "^1.8.1",
+		"event-stream": "3.3.4",
 		"express": "^4.16.4",
 		"express-handlebars": "^3.0.2",
 		"faker": "^4.1.0",
@@ -112,6 +112,7 @@
 		"passport-jwt": "^4.0.0",
 		"passport-local": "^1.0.0",
 		"passport-url": "^1.0.4",
+		"pem": "^1.14.2",
 		"pm2": "^3.4.0",
 		"redis": "^2.8.0",
 		"reflect-metadata": "^0.1.13",
@@ -126,6 +127,7 @@
 		"source-map-support": "^0.5.11",
 		"stripe": "^6.28.0",
 		"subscriptions-transport-ws": "^0.9.16",
+		"swagger-ui-express": "^4.0.2",
 		"symbol": "^0.3.1",
 		"symbol-observable": "^1.2.0",
 		"typeorm": "^0.2.15",
@@ -134,8 +136,7 @@
 		"upath": "^1.1.2",
 		"uuid": "^3.3.2",
 		"validator": "^10.11.0",
-		"ws": "^6.2.0",
-		"event-stream": "3.3.4"
+		"ws": "^6.2.0"
 	},
 	"devDependencies": {
 		"@commitlint/cli": "^7.5.2",
diff --git a/backend/api/src/env.ts b/backend/api/src/env.ts
index cc744e5e5..4f68667bd 100644
--- a/backend/api/src/env.ts
+++ b/backend/api/src/env.ts
@@ -17,6 +17,7 @@ export type Env = Readonly<{
 	GQLPORT: number;
 	GQLPORT_SUBSCRIPTIONS: number;
 
+	CERTIFICATES_HTTPS_PATH: string;
 	HTTPS_CERT_PATH: string;
 	HTTPS_KEY_PATH: string;
 
@@ -82,6 +83,7 @@ export const env: Env = cleanEnv(
 		GQLPORT: port({ default: 5555 }),
 		GQLPORT_SUBSCRIPTIONS: port({ default: 5050 }),
 
+		CERTIFICATES_HTTPS_PATH: str({ default: 'certificates/https' }),
 		HTTPS_CERT_PATH: str({ default: 'certificates/https/cert.pem' }),
 		HTTPS_KEY_PATH: str({ default: 'certificates/https/key.pem' }),
 
diff --git a/backend/api/src/services/services.app.ts b/backend/api/src/services/services.app.ts
index da6206851..66643808a 100644
--- a/backend/api/src/services/services.app.ts
+++ b/backend/api/src/services/services.app.ts
@@ -38,6 +38,7 @@ import ProductsCategory from '@modules/server.common/entities/ProductsCategory';
 import User from '@modules/server.common/entities/User';
 import Warehouse from '@modules/server.common/entities/Warehouse';
 import { ConfigService } from '../config/config.service';
+import * as pem from 'pem';
 
 // local IPs
 const INTERNAL_IPS = ['127.0.0.1', '::1'];
@@ -272,7 +273,7 @@ export class ServicesApp {
 		});
 	}
 
-	private _startExpress() {
+	private async _startExpress() {
 		// that's important to see even if logs disabled, do not remove!
 		console.log('Connected to DB');
 
@@ -297,12 +298,23 @@ export class ServicesApp {
 		this.expressApp.set('view cache', false);
 
 		// TODO: this is probably a good place to check if Cert files exists and if not generate them for localhost
-		const hasHttpsCert = fs.existsSync(env.HTTPS_CERT_PATH);
-		if (hasHttpsCert) {
+		const httpsCertPath = env.HTTPS_CERT_PATH;
+		const httpsKeyPath = env.HTTPS_KEY_PATH;
+
+		const hasHttpsCert = fs.existsSync(httpsCertPath);
+		const hasHttpsKey = fs.existsSync(httpsKeyPath);
+		let hasDefaultHttpsCert = false;
+		if (!hasHttpsCert || !hasHttpsKey) {
+			hasDefaultHttpsCert = await this._getCertificates(
+				httpsCertPath,
+				httpsKeyPath
+			);
+		}
+		if ((hasHttpsCert && hasHttpsKey) || hasDefaultHttpsCert) {
 			this.httpsServer = https.createServer(
 				{
-					cert: fs.readFileSync(env.HTTPS_CERT_PATH),
-					key: fs.readFileSync(env.HTTPS_KEY_PATH)
+					cert: fs.readFileSync(httpsCertPath),
+					key: fs.readFileSync(httpsKeyPath)
 				},
 				this.expressApp
 			);
@@ -442,6 +454,58 @@ export class ServicesApp {
 		}
 	}
 
+	private async _getCertificates(
+		httpsCertPath: string,
+		httpsKeyPath: string
+	) {
+		try {
+			const httpsCertificatesPath = env.CERTIFICATES_HTTPS_PATH;
+			const hasHttpsCertificatesPath = fs.existsSync(
+				httpsCertificatesPath
+			);
+			if (!hasHttpsCertificatesPath) {
+				fs.mkdirSync(httpsCertificatesPath, {
+					recursive: true
+				});
+			}
+
+			return await this._createCertificateAsync(
+				httpsCertPath,
+				httpsKeyPath
+			);
+		} catch (error) {
+			return false;
+		}
+	}
+
+	private _createCertificateAsync(
+		httpsCertPath: string,
+		httpsKeyPath: string
+	): Promise<boolean> {
+		return new Promise((resolve, reject) => {
+			try {
+				pem.createCertificate(
+					{
+						days: 365,
+						selfSigned: true
+					},
+					(err, keys) => {
+						if (err) {
+							reject(false);
+						}
+
+						fs.writeFileSync(httpsCertPath, keys.certificate);
+						fs.writeFileSync(httpsKeyPath, keys.serviceKey);
+
+						resolve(true);
+					}
+				);
+			} catch (error) {
+				reject(false);
+			}
+		});
+	}
+
 	private _startSocketIO() {
 		const ioHttps = socketIO(this.httpsServer);
 		const ioHttp = socketIO(this.httpServer);
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 7502d57e2..742b1c522 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -2583,6 +2583,11 @@ change-case@^3.0.1:
     upper-case "^1.1.1"
     upper-case-first "^1.1.0"
 
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
+
 charm@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
@@ -3346,6 +3351,11 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
+
 cryptiles@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-4.1.3.tgz#2461d3390ea0b82c643a6ba79f0ed491b0934c25"
@@ -3960,6 +3970,11 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
+es6-promisify@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.0.1.tgz#6edaa45f3bd570ffe08febce66f7116be4b1cdb6"
+  integrity sha512-J3ZkwbEnnO+fGAKrjVpeUAnZshAdfZvbhQpqfIH9kSAspReRC4nJnu8ewm55b4y9ElyeuhCTzJD0XiH8Tsbhlw==
+
 es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
@@ -5435,7 +5450,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -6751,6 +6766,15 @@ md5.js@^1.3.4:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+md5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
 meant@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz#66044fea2f23230ec806fb515efea29c44d2115d"
@@ -7766,7 +7790,7 @@ os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -8115,6 +8139,16 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+pem@^1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.2.tgz#ab29350416bc3a532c30beeee0d541af897fb9ac"
+  integrity sha512-TOnPtq3ZFnCniOZ+rka4pk8UIze9xG1qI+wNE7EmkiR/cg+53uVvk5QbkWZ7M6RsuOxzz62FW1hlAobJr/lTOA==
+  dependencies:
+    es6-promisify "^6.0.0"
+    md5 "^2.2.1"
+    os-tmpdir "^1.0.1"
+    which "^1.3.1"
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -10760,7 +10794,7 @@ which-pm-runs@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
   integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
-which@1, which@^1.2.14, which@^1.2.9, which@^1.3.0:
+which@1, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:

From 5e3d93bd6bc7c7f5cb7f350e7cbca885e1b2a6cf Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 9 Apr 2019 16:27:20 +0300
Subject: [PATCH 160/382] feat(ever-api): improved auto generate https
 certificates EV-980

---
 backend/api/.env.template                |  1 -
 backend/api/src/env.ts                   |  2 --
 backend/api/src/services/services.app.ts | 31 +++++++++++++++---------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/backend/api/.env.template b/backend/api/.env.template
index cf4d944d8..bcd1a66f2 100644
--- a/backend/api/.env.template
+++ b/backend/api/.env.template
@@ -7,7 +7,6 @@ HTTPSPORT=5501
 GQLPORT=5555
 GQLPORT_SUBSCRIPTIONS=5050
 
-CERTIFICATES_HTTPS_PATH=certificates/https
 HTTPS_CERT_PATH=certificates/https/cert.pem
 HTTPS_KEY_PATH=certificates/https/key.pem
 
diff --git a/backend/api/src/env.ts b/backend/api/src/env.ts
index 4f68667bd..cc744e5e5 100644
--- a/backend/api/src/env.ts
+++ b/backend/api/src/env.ts
@@ -17,7 +17,6 @@ export type Env = Readonly<{
 	GQLPORT: number;
 	GQLPORT_SUBSCRIPTIONS: number;
 
-	CERTIFICATES_HTTPS_PATH: string;
 	HTTPS_CERT_PATH: string;
 	HTTPS_KEY_PATH: string;
 
@@ -83,7 +82,6 @@ export const env: Env = cleanEnv(
 		GQLPORT: port({ default: 5555 }),
 		GQLPORT_SUBSCRIPTIONS: port({ default: 5050 }),
 
-		CERTIFICATES_HTTPS_PATH: str({ default: 'certificates/https' }),
 		HTTPS_CERT_PATH: str({ default: 'certificates/https/cert.pem' }),
 		HTTPS_KEY_PATH: str({ default: 'certificates/https/key.pem' }),
 
diff --git a/backend/api/src/services/services.app.ts b/backend/api/src/services/services.app.ts
index 66643808a..be761715c 100644
--- a/backend/api/src/services/services.app.ts
+++ b/backend/api/src/services/services.app.ts
@@ -297,19 +297,22 @@ export class ServicesApp {
 
 		this.expressApp.set('view cache', false);
 
-		// TODO: this is probably a good place to check if Cert files exists and if not generate them for localhost
+		// now we check if Cert files exists and if not generate them for localhost
 		const httpsCertPath = env.HTTPS_CERT_PATH;
 		const httpsKeyPath = env.HTTPS_KEY_PATH;
 
 		const hasHttpsCert = fs.existsSync(httpsCertPath);
 		const hasHttpsKey = fs.existsSync(httpsKeyPath);
+
 		let hasDefaultHttpsCert = false;
+
 		if (!hasHttpsCert || !hasHttpsKey) {
 			hasDefaultHttpsCert = await this._getCertificates(
 				httpsCertPath,
 				httpsKeyPath
 			);
 		}
+
 		if ((hasHttpsCert && hasHttpsKey) || hasDefaultHttpsCert) {
 			this.httpsServer = https.createServer(
 				{
@@ -459,16 +462,6 @@ export class ServicesApp {
 		httpsKeyPath: string
 	) {
 		try {
-			const httpsCertificatesPath = env.CERTIFICATES_HTTPS_PATH;
-			const hasHttpsCertificatesPath = fs.existsSync(
-				httpsCertificatesPath
-			);
-			if (!hasHttpsCertificatesPath) {
-				fs.mkdirSync(httpsCertificatesPath, {
-					recursive: true
-				});
-			}
-
 			return await this._createCertificateAsync(
 				httpsCertPath,
 				httpsKeyPath
@@ -492,6 +485,22 @@ export class ServicesApp {
 					(err, keys) => {
 						if (err) {
 							reject(false);
+							return;
+						}
+
+						const httpsCertDirPath = path.dirname(httpsCertPath);
+						const httpsKeyDirPath = path.dirname(httpsKeyPath);
+
+						if (!fs.existsSync(httpsCertDirPath)) {
+							fs.mkdirSync(httpsCertDirPath, {
+								recursive: true
+							});
+						}
+
+						if (!fs.existsSync(httpsKeyDirPath)) {
+							fs.mkdirSync(httpsKeyDirPath, {
+								recursive: true
+							});
 						}
 
 						fs.writeFileSync(httpsCertPath, keys.certificate);

From 27b68df86c2913aa73a01da5f15a34a0cb7705a2 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 9 Apr 2019 18:05:32 +0300
Subject: [PATCH 161/382] feat(ever-api): show messages when generate https
 certificates EV-980

---
 backend/api/src/services/services.app.ts | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/backend/api/src/services/services.app.ts b/backend/api/src/services/services.app.ts
index be761715c..81dc6fafd 100644
--- a/backend/api/src/services/services.app.ts
+++ b/backend/api/src/services/services.app.ts
@@ -462,11 +462,21 @@ export class ServicesApp {
 		httpsKeyPath: string
 	) {
 		try {
-			return await this._createCertificateAsync(
+			this.log.info('Generating SSL Certificates for HTTPS');
+
+			let { success } = await this._createCertificateAsync(
 				httpsCertPath,
 				httpsKeyPath
 			);
+
+			this.log.info('Certificates were generated');
+
+			return success;
 		} catch (error) {
+			this.log.warn(
+				`Certificates were not generated due to error: ${error.message}`
+			);
+
 			return false;
 		}
 	}
@@ -474,7 +484,7 @@ export class ServicesApp {
 	private _createCertificateAsync(
 		httpsCertPath: string,
 		httpsKeyPath: string
-	): Promise<boolean> {
+	): Promise<{ success: boolean }> {
 		return new Promise((resolve, reject) => {
 			try {
 				pem.createCertificate(
@@ -484,7 +494,7 @@ export class ServicesApp {
 					},
 					(err, keys) => {
 						if (err) {
-							reject(false);
+							reject({ success: false, message: err.message });
 							return;
 						}
 
@@ -506,11 +516,11 @@ export class ServicesApp {
 						fs.writeFileSync(httpsCertPath, keys.certificate);
 						fs.writeFileSync(httpsKeyPath, keys.serviceKey);
 
-						resolve(true);
+						resolve({ success: true });
 					}
 				);
-			} catch (error) {
-				reject(false);
+			} catch (err) {
+				reject({ success: false, message: err.message });
 			}
 		});
 	}

From 3f8c9ba5f7d1a95c26995cb8a0f1f73c3169809b Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Tue, 9 Apr 2019 20:33:09 +0300
Subject: [PATCH 162/382] docs: move less important parts of README into Wiki

---
 README.md | 79 +++----------------------------------------------------
 1 file changed, 4 insertions(+), 75 deletions(-)

diff --git a/README.md b/README.md
index 02ab31d20..f4e3fa4c9 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ You can also track feature requests from the community in the [separate repo](ht
 
 ## Documentation
 
-Please refer to https://docs.ever.co for the Platform Documentation (WIP)
+Please refer to our official [Platform Documentation](https://docs.ever.co) and to our [Wiki](https://github.com/ever-co/ever/wiki) (WIP).
 
 For quick overview of each project in the Platform (Server, Admin, Shops, etc), you can search for README.md file in the root of the projects folders. For example, see [./backend/api/README.md](backend/api/README.md) for Server (Backend) related overview.
 
@@ -137,61 +137,11 @@ The command above will install all required packages for every sub-project of th
 
 ### MongoDB
 
-You can download and install free Community version of MongoDB from the [official MongoDB download center](https://www.mongodb.com/download-center/v2/community).
-
-After installation, make sure MongoDB service is running and accepting connections on default `localhost:27017` (change connection parameters in the ./backend/api/.env file if you run on different location/port)
-
-To manage database, you can use free [MongoDB Compass Community Edition available](https://www.mongodb.com/download-center/v2/compass) or some other GUI for MongoDB, e.g. Studio 3T (https://studio3t.com)
-
-For production, we recommend [MongoDB Atlas](https://www.mongodb.com/cloud/atlas).  
-It is also possible to use [AWS DocumentDB](https://aws.amazon.com/documentdb) or [Azure Cosmos DB](https://docs.microsoft.com/en-us/azure/cosmos-db/mongodb-introduction)
-
-_Note: we currently integrating [Mongo Memory Server](https://github.com/nodkz/mongodb-memory-server) which will allow to test Platform without need to install MongoDB locally._
+Ever platform configured to use MongoDB by default and assume you have MongoDB service running and accepting connections on default `localhost:27017`. Please see relevant section in our [documentation](https://github.com/ever-co/ever/wiki/MongoDB).
 
 ### Platform Configuration
 
-#### Default
-
-We created templates & initial configuration files (with reasonable defaults) for each project in the Platform, to save your time and keep things simple.
-
-In the Angular based projects, the "standard" environment configuration files `environment.ts` and `environment.prod.ts` will be auto-generated from .env file (if it's exists) or from default settings on the first app run.
-
-So, the following files will be auto-generated:
-
--   in Admin UI: `./admin/website-angular/src/environments/environment.ts` and `./admin/website-angular/src/environments/environment.prod.ts`.
--   in Mobile Shop: `./shop/mobile-ionic/src/environments/environment.ts` and `./shop/mobile-ionic/src/environments/environment.prod.ts`
--   in Web Shop: `./shop/website-angular/src/environments/environment.ts` and `./shop/website-angular/src/environments/environment.prod.ts`
--   in Carrier App: `./carrier/mobile-ionic/src/environments/environment.ts` and `./carrier/mobile-ionic/src/environments/environment.prod.ts`
--   in Merchant App: `./merchant/tablet-ionic/src/environments/environment.ts` and `./merchant/tablet-ionic/src/environments/environment.prod.ts`
-
-Note: you should never edit auto-generated files above and instead you should edit relevant .env files for custom configurations, see more details below.
-
-#### Custom / Manual
-
--   For _Backend (API)_ configuration, the `./backend/api/.env.template` file should be copied into `./backend/api/.env` and relevant changes should be done in the `.env` file.
-    It means you should have `./backend/api/.env` file in place to be able to run the Platform on developer machine if you want to use different settings to our defaults.
-
--   For _Admin_ Angular App configuration, the `./admin/website-angular/.env.template` file should be copied into `./admin/website-angular/.env` and relevant changes should be done in the `.env` file.
-
--   For _Merchant_ Ionic App configuration, the `./merchant/tablet-ionic/.env.template` file should be copied into `./merchant/tablet-ionic/.env` and relevant changes should be done in the `.env` file.
-    If you need to run Merchant App using PM2 (as Web app, not Tablet App), needs copy `./merchant/tablet-ionic/.env.template` to `./merchant/tablet-ionic/.env` and make relevant changes (if required)
-
--   For _Shopping Mobile_ App (Ionic) configuration, the `./shop/mobile-ionic/.env.template` file should be copied into `./shop/mobile-ionic/.env` and relevant changes should be done in the `.env` file.
-
--   For _Shopping Website_ configuration, the `./shop/website-angular/.env.template` file should be copied into `./shop/website-angular/.env` and relevant changes should be done in the `.env` file.
-
--   For _Carrier Mobile_ App (Ionic) configuration, the `./carrier/mobile-ionic/.env.template` file should be copied into `./carrier/mobile-ionic/.env` and relevant changes should be done in the `.env` file.
-
-Notes:
-
--   For initial development no changes required in the `.env` files in the projects, unless some manual changes were done to the Backend (API) configuration. However, to enable some of the Platform features, you may need to change relevant configurations in corresponding `.env` files.
-
--   As a general rule, files `.env` are configurations you should never make public (and of course never commit to Git repo), unless you removed all private/secure parameters from them.
-    In addition, for Angular based projects, you should never put any secure settings (e.g. Secret Keys, API Keys, etc) in `environment.ts` and `environment.prod.ts` files because all of them will be loaded into the browser and made public.
-    Because we are using auto-generated `environment.ts` and `environment.prod.ts` files, it means you should never put any secure settings into `.env` files in our Angular projects.
-    The only safe place to put your secure settings is `.env` file on the backend API/Server project!
-
--   We are using dotenv (.env) in Angular based projects for consistency with configuration between all our Platform projects only.
+See relevant section in our [documentation](https://github.com/ever-co/ever/wiki/Ever-Platform-Configuration).
 
 ### Run Platform Projects
 
@@ -215,28 +165,7 @@ You can use credentials above to login into Platform Admin App, which available
 
 ## Metrics
 
-See below aproximate source code metrics for Ever Platform using [cloc](https://github.com/AlDanial/cloc) project.
-
-```
-github.com/AlDanial/cloc v 1.80  T=5.12 s (385.5 files/s, 27882.0 lines/s)
--------------------------------------------------------------------------------
-Language                     files          blank        comment           code
--------------------------------------------------------------------------------
-TypeScript                    1145          10151           4065          73840
-HTML                           319           1005            135          15917
-Sass                           298           1969            339          12800
-JSON                            39             13              0           8258
-CSS                             95           1196            665           5650
-JavaScript                      50              8             87           3257
-Markdown                         6            554              1           1426
-GraphQL                         21            269             49           1091
-XML                              1              0              0             11
--------------------------------------------------------------------------------
-SUM:                          1974          15165           5341         122250
--------------------------------------------------------------------------------
-```
-
-Note: you can get latest metrics using `yarn count` from the root of mono-repo.
+According to [cloc](https://github.com/AlDanial/cloc) project, Ever Platform today has more than 120K lines of TypeScript, GraphQL, HTML / CSS and other code files. You can get more details at the relevant section of our [documentation](https://github.com/ever-co/ever/wiki/Metrics).
 
 ## Contribute
 

From 4f692a3f86d4b55735f0ba5a7d46e29aabacc2c2 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 10 Apr 2019 10:38:55 +0300
Subject: [PATCH 163/382] fix(ever-api): stopped subscription server listening

---
 .../subscriptions/subscription.providers.ts    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/backend/api/src/graphql/subscriptions/subscription.providers.ts b/backend/api/src/graphql/subscriptions/subscription.providers.ts
index 020826167..b23b69357 100644
--- a/backend/api/src/graphql/subscriptions/subscription.providers.ts
+++ b/backend/api/src/graphql/subscriptions/subscription.providers.ts
@@ -5,8 +5,26 @@ import { SUBSCRIPTION_SERVER } from './subscription.constants';
 export const createSubscriptionProviders = (port: number = 5050) => [
 	{
 		provide: SUBSCRIPTION_SERVER,
+
 		useFactory: () => {
 			const server = createServer();
+
+			const closeServer = () => {
+				try {
+					if (server != null) {
+						server.close(() => {
+							process.exit(0);
+						});
+					}
+				} catch (err) {
+					process.exit(0);
+				}
+			};
+
+			process
+				.on('SIGINT', () => closeServer())
+				.on('SIGTERM', () => closeServer());
+
 			return new Promise((resolve) =>
 				server.listen(port, () => resolve(server))
 			);

From c19364e0667d3e6b21c802e5484447f9d9b66ecc Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 10 Apr 2019 12:29:17 +0300
Subject: [PATCH 164/382] feat(ever-admin): add warehouse prod. form step
 "Products" EV-1197

---
 .../basic-info/basic-info-form.component.scss |  4 --
 .../products-table.component.scss             |  4 --
 .../warehouse-products-table.component.html   |  2 +-
 .../warehouse-products-table.component.ts     | 32 ++++++---
 .../src/app/@theme/styles/styles.scss         |  5 ++
 .../add-products/add-products.component.html  |  5 +-
 .../add-products/add-products.component.ts    | 66 +++++++++++++++++--
 .../products/products.component.html          | 20 +++++-
 .../products/products.component.scss          |  4 ++
 .../components/products/products.component.ts | 40 ++++++++++-
 .../components/products/products.module.ts    |  4 +-
 11 files changed, 156 insertions(+), 30 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss
index 673906c80..6c14a683f 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss
@@ -16,7 +16,3 @@
 		font-size: 1.1em;
 	}
 }
-
-.no-box-shadow {
-	box-shadow: none;
-}
diff --git a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.scss b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.scss
index 53095cd1d..b29be2cf6 100644
--- a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.scss
+++ b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.scss
@@ -1,7 +1,3 @@
 nb-card {
 	margin-bottom: 0;
 }
-
-.no-box-shadow {
-	box-shadow: none;
-}
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html
index 00526e1cd..fed1c950d 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html
@@ -1,4 +1,4 @@
-<nb-card>
+<nb-card [ngClass]="boxShadow === 'none' ? 'no-box-shadow' : ''">
 	<ng2-smart-table
 		[settings]="settingsSmartTable"
 		[source]="sourceSmartTable"
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
index 3d303cf52..eebabf123 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
@@ -1,4 +1,10 @@
-import { Component, OnInit, OnDestroy, EventEmitter } from '@angular/core';
+import {
+	Component,
+	OnInit,
+	OnDestroy,
+	EventEmitter,
+	Input
+} from '@angular/core';
 import { LocalDataSource } from 'ng2-smart-table';
 import Product from '@modules/server.common/entities/Product';
 import { first, takeUntil } from 'rxjs/operators';
@@ -15,24 +21,28 @@ import { CheckboxComponent } from 'app/@shared/render-component/customer-orders-
 	templateUrl: './warehouse-products-table.component.html'
 })
 export class WarehouseProductsComponent implements OnInit, OnDestroy {
-	private ngDestroy$ = new Subject<void>();
+	@Input()
+	boxShadow: string;
+	@Input()
+	perPage = 5;
+
+	settingsSmartTable: object;
+	sourceSmartTable = new LocalDataSource();
 
+	private ngDestroy$ = new Subject<void>();
 	private warehouseProducts: any[];
 	private warehouse: Warehouse;
 
-	public settingsSmartTable: object;
-	public sourceSmartTable = new LocalDataSource();
-
 	constructor(
 		private _translateService: TranslateService,
 		private warehouseRouter: WarehouseRouter
-	) {
+	) {}
+
+	ngOnInit(): void {
 		this._loadSettingsSmartTable();
 	}
 
-	ngOnInit(): void {}
-
-	public get allWarehouseProducts() {
+	get allWarehouseProducts() {
 		return [...this.warehouseProducts];
 	}
 
@@ -203,6 +213,10 @@ export class WarehouseProductsComponent implements OnInit, OnDestroy {
 									});
 							}
 						}
+					},
+					pager: {
+						display: true,
+						perPage: this.perPage
 					}
 				};
 			});
diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index 3a756ed57..c3d3f784e 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -197,3 +197,8 @@ ea-product-create .card-footer {
 		}
 	}
 }
+
+nb-card.no-box-shadow {
+	box-shadow: none;
+	margin-bottom: 0;
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
index eb6aea89c..b83126aa2 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
@@ -1 +1,4 @@
-<h2>Add products table</h2>
+<ea-warehouse-products-table
+	#warehouseProductsTable
+	[boxShadow]="'none'"
+></ea-warehouse-products-table>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
index 676b3a7ed..a3ed82241 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
@@ -1,13 +1,67 @@
-import { Component, ViewChild } from '@angular/core';
-import { ProductsTableComponent } from 'app/@shared/product/forms/products-table';
+import {
+	Component,
+	ViewChild,
+	OnInit,
+	Input,
+	Output,
+	EventEmitter
+} from '@angular/core';
+import { WarehouseProductsComponent } from 'app/@shared/warehouse-product/forms/warehouse-products-table';
+import Product from '@modules/server.common/entities/Product';
+import { WarehousesService } from 'app/@core/data/warehouses.service';
+import { first } from 'rxjs/operators';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
 
 @Component({
 	selector: 'ea-merchants-setup-add-products',
 	templateUrl: './add-products.component.html'
 })
-export class SetupMerchantAddProductsComponent {
-	@ViewChild('productsTable')
-	productsTable: ProductsTableComponent;
+export class SetupMerchantAddProductsComponent implements OnInit {
+	@ViewChild('warehouseProductsTable')
+	warehouseProductsTable: WarehouseProductsComponent;
 
-	perPage = 3;
+	@Input()
+	products: Product[];
+	@Input()
+	storeId: string;
+
+	@Output()
+	successAdd: EventEmitter<boolean> = new EventEmitter<boolean>();
+
+	constructor(
+		private warehousesService: WarehousesService,
+		private notifyService: NotifyService
+	) {}
+
+	ngOnInit(): void {
+		this.warehouseProductsTable.loadDataSmartTable(
+			this.products || [],
+			this.storeId
+		);
+	}
+
+	async add() {
+		try {
+			const productsForAdd = this.warehouseProductsTable
+				.allWarehouseProducts;
+
+			await this.warehousesService
+				.addProducts(this.storeId, productsForAdd)
+				.pipe(first())
+				.toPromise();
+
+			this.successAdd.emit(true);
+
+			const message = `${productsForAdd.length} products was added`;
+			this.notifyService.success(message);
+		} catch (error) {
+			let message = `Something went wrong`;
+
+			if (error.message === 'Validation error') {
+				message = error.message;
+			}
+
+			this.notifyService.error(message);
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
index b0223c69b..5462c7493 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -1,3 +1,4 @@
+<!-- TODO add translate -->
 <nb-card class="setup-merchant-products">
 	<nb-card-header>
 		<span *ngIf="currentView == componentViews.main">
@@ -15,6 +16,7 @@
 	</nb-card-header>
 	<nb-card-body>
 		<div *ngIf="currentView === componentViews.main" class="main-content">
+			<!-- TODO disable if store id don't exist -->
 			<div class="row actions">
 				<div class="form-group offset-md-2 col-md-4">
 					<button
@@ -51,7 +53,12 @@ <h4>Add new product</h4>
 		</div>
 
 		<div *ngIf="currentView == componentViews.addProducts" class="row">
-			<ea-merchants-setup-add-products></ea-merchants-setup-add-products>
+			<ea-merchants-setup-add-products
+				#addProducts
+				[products]="productsForAdd"
+				[storeId]="storeId"
+				(successAdd)="currentView = componentViews.main"
+			></ea-merchants-setup-add-products>
 		</div> </nb-card-body
 ></nb-card>
 
@@ -78,9 +85,18 @@ <h4>Add new product</h4>
 
 	<button
 		*ngIf="currentView === componentViews.addProducts"
+		[disabled]="!addProducts?.warehouseProductsTable.productsIsValid()"
 		nbButton
-		(click)="add()"
+		(click)="addProducts.add()"
 	>
 		Add
 	</button>
+
+	<button
+		*ngIf="currentView === componentViews.createProduct"
+		nbButton
+		(click)="create()"
+	>
+		Create
+	</button>
 </div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.scss b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.scss
index 013430706..7d9537050 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.scss
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.scss
@@ -9,4 +9,8 @@
 			margin: 0;
 		}
 	}
+
+	ea-merchants-setup-add-products {
+		width: 100%;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index a99932367..c977b86c9 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -1,15 +1,29 @@
-import { Component, ViewChild, Output, EventEmitter } from '@angular/core';
+import {
+	Component,
+	ViewChild,
+	Output,
+	EventEmitter,
+	OnInit,
+	OnDestroy
+} from '@angular/core';
 import { SetupMerchantProductsCatalogComponent } from './products-catalog/products-catalog.component';
 import Product from '@modules/server.common/entities/Product';
+import { SetupMerchantAddProductsComponent } from './add-products/add-products.component';
+import WarehouseProduct from '@modules/server.common/entities/WarehouseProduct';
+import { WarehouseProductsRouter } from '@modules/client.common.angular2/routers/warehouse-products-router.service';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
 
 @Component({
 	selector: 'ea-merchants-setup-products',
 	templateUrl: './products.component.html',
 	styleUrls: ['./products.component.scss']
 })
-export class SetupMerchantProductsComponent {
+export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 	@ViewChild('productsCatalog')
 	productsCatalog: SetupMerchantProductsCatalogComponent;
+	@ViewChild('addProducts')
+	addProducts: SetupMerchantAddProductsComponent;
 
 	@Output()
 	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
@@ -23,11 +37,17 @@ export class SetupMerchantProductsComponent {
 		addProducts: 'addProducts'
 	};
 	productsPerPage = 3;
+	// TODO get real warehouse id
+	storeId = '5ca48ff5d32c2d18ac96f562';
 
 	productsForAdd = [];
+	storeProducts: WarehouseProduct[];
 
 	private _currentView = this.componentViews.main;
 	private _prevView = this.componentViews.main;
+	private _ngDestroy$ = new Subject<void>();
+
+	constructor(private warehouseProductsRouter: WarehouseProductsRouter) {}
 
 	get haveProductsForAdd() {
 		let hasSelectedCarriers = false;
@@ -62,4 +82,20 @@ export class SetupMerchantProductsComponent {
 
 		this.currentView = this.componentViews.main;
 	}
+
+	ngOnInit(): void {
+		if (this.storeId) {
+			this.warehouseProductsRouter
+				.get(this.storeId)
+				.pipe(takeUntil(this._ngDestroy$))
+				.subscribe((products) => {
+					this.storeProducts = products;
+				});
+		}
+	}
+
+	ngOnDestroy(): void {
+		this._ngDestroy$.next();
+		this._ngDestroy$.complete();
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
index af9ecfbda..aeaa8759e 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
@@ -7,6 +7,7 @@ import { SetupMerchantProductsComponent } from './products.component';
 import { SetupMerchantProductsCatalogComponent } from './products-catalog/products-catalog.component';
 import { ProductFormsModule } from 'app/@shared/product/forms';
 import { SetupMerchantAddProductsComponent } from './add-products/add-products.component';
+import { WarehouseProductFormsModule } from 'app/@shared/warehouse-product/forms';
 
 const COMPONENTS = [
 	SetupMerchantProductsComponent,
@@ -20,7 +21,8 @@ const COMPONENTS = [
 		ThemeModule,
 		FormsModule,
 		TranslateModule.forChild(),
-		ProductFormsModule
+		ProductFormsModule,
+		WarehouseProductFormsModule
 	],
 	declarations: COMPONENTS,
 	exports: COMPONENTS

From 110bfa4ca4e82e7e93c859c040a9179465f6810b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2019 10:49:42 +0000
Subject: [PATCH 165/382] chore(package): update mini-css-extract-plugin to
 version 0.6.0

---
 shop/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index e02dbc03e..d56867e8a 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -214,7 +214,7 @@
 		"karma-remap-coverage": "^0.1.5",
 		"karma-sourcemap-loader": "^0.3.7",
 		"karma-webpack": "^3.0.5",
-		"mini-css-extract-plugin": "^0.5.0",
+		"mini-css-extract-plugin": "^0.6.0",
 		"ng-router-loader": "^2.1.0",
 		"ngc-webpack": "~4.1.2",
 		"node-sass": "^4.11.0",

From e2d9c58e5729a9e6c4895dee5a4ec698a914125a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 10 Apr 2019 13:51:05 +0300
Subject: [PATCH 166/382] fix(ever-admin): fixed names on add Warehouse
 Products table EV-1197

---
 .../add-warehouse-products-table.component.html}  |  0
 .../add-warehouse-products-table.component.scss}  |  0
 .../add-warehouse-products-table.component.ts}    | 15 ++++-----------
 .../forms/add-warehouse-products-table/index.ts   |  1 +
 .../forms/warehouse-product-forms.module.ts       |  6 +++---
 .../forms/warehouse-products-table/index.ts       |  1 -
 .../warehouse-product-create.component.html       |  6 +++---
 .../warehouse-product-create.component.ts         | 12 ++++++------
 .../add-products/add-products.component.html      |  6 +++---
 .../add-products/add-products.component.ts        | 10 +++++-----
 .../components/products/products.component.html   |  4 +++-
 11 files changed, 28 insertions(+), 33 deletions(-)
 rename admin/website-angular/src/app/@shared/warehouse-product/forms/{warehouse-products-table/warehouse-products-table.component.html => add-warehouse-products-table/add-warehouse-products-table.component.html} (100%)
 rename admin/website-angular/src/app/@shared/warehouse-product/forms/{warehouse-products-table/warehouse-products-table.component.scss => add-warehouse-products-table/add-warehouse-products-table.component.scss} (100%)
 rename admin/website-angular/src/app/@shared/warehouse-product/forms/{warehouse-products-table/warehouse-products-table.component.ts => add-warehouse-products-table/add-warehouse-products-table.component.ts} (94%)
 create mode 100644 admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/index.ts
 delete mode 100644 admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/index.ts

diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html b/admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/add-warehouse-products-table.component.html
similarity index 100%
rename from admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html
rename to admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/add-warehouse-products-table.component.html
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.scss b/admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/add-warehouse-products-table.component.scss
similarity index 100%
rename from admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.scss
rename to admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/add-warehouse-products-table.component.scss
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/add-warehouse-products-table.component.ts
similarity index 94%
rename from admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
rename to admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/add-warehouse-products-table.component.ts
index eebabf123..7578ed02b 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/add-warehouse-products-table.component.ts
@@ -1,26 +1,19 @@
-import {
-	Component,
-	OnInit,
-	OnDestroy,
-	EventEmitter,
-	Input
-} from '@angular/core';
+import { Component, OnInit, OnDestroy, Input } from '@angular/core';
 import { LocalDataSource } from 'ng2-smart-table';
 import Product from '@modules/server.common/entities/Product';
 import { first, takeUntil } from 'rxjs/operators';
 import { Subject, Observable, forkJoin } from 'rxjs';
 import { PriceCountInputComponent } from '../../../render-component/price-countInput/price-countInput.component';
 import { TranslateService } from '@ngx-translate/core';
-import { ProductCheckboxComponent } from 'app/@shared/render-component/product-checkbox/product-checkbox';
 import Warehouse from '@modules/server.common/entities/Warehouse';
 import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
 import { CheckboxComponent } from 'app/@shared/render-component/customer-orders-table/checkbox/checkbox.component';
 
 @Component({
-	selector: 'ea-warehouse-products-table',
-	templateUrl: './warehouse-products-table.component.html'
+	selector: 'ea-add-warehouse-products-table',
+	templateUrl: './add-warehouse-products-table.component.html'
 })
-export class WarehouseProductsComponent implements OnInit, OnDestroy {
+export class AddWarehouseProductsComponent implements OnInit, OnDestroy {
 	@Input()
 	boxShadow: string;
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/index.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/index.ts
new file mode 100644
index 000000000..3c3446a41
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/index.ts
@@ -0,0 +1 @@
+export * from './add-warehouse-products-table.component';
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-product-forms.module.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-product-forms.module.ts
index ed54c414b..b1dbe6a10 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-product-forms.module.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-product-forms.module.ts
@@ -3,7 +3,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { FormWizardModule } from 'angular2-wizard';
 import { ThemeModule } from '../../../@theme';
 import { WarehouseAddChoiceComponent } from './warehouse-add-choice';
-import { WarehouseProductsComponent } from './warehouse-products-table';
+import { AddWarehouseProductsComponent } from './add-warehouse-products-table';
 import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { RenderComponentsModule } from '../../render-component/render-components.module';
 
@@ -15,7 +15,7 @@ import { RenderComponentsModule } from '../../render-component/render-components
 		Ng2SmartTableModule,
 		RenderComponentsModule
 	],
-	exports: [WarehouseAddChoiceComponent, WarehouseProductsComponent],
-	declarations: [WarehouseAddChoiceComponent, WarehouseProductsComponent]
+	exports: [WarehouseAddChoiceComponent, AddWarehouseProductsComponent],
+	declarations: [WarehouseAddChoiceComponent, AddWarehouseProductsComponent]
 })
 export class WarehouseProductFormsModule {}
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/index.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/index.ts
deleted file mode 100644
index 90845a5dc..000000000
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './warehouse-products-table.component';
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.html b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.html
index d70eee145..fe45bd002 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.html
@@ -62,9 +62,9 @@
 			(onPrev)="onStep3Prev()"
 		>
 			<hr />
-			<ea-warehouse-products-table
-				#warehouseProductsTable
-			></ea-warehouse-products-table>
+			<ea-add-warehouse-products-table
+				#addWarehouseProductsTable
+			></ea-add-warehouse-products-table>
 		</wizard-step>
 	</form-wizard>
 </nb-card>
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
index 4e7a4b907..98f799b59 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
@@ -8,7 +8,7 @@ import { ProductsTableComponent } from '../../product/forms/products-table';
 import { ProductsService } from '../../../@core/data/products.service';
 import Product from '@modules/server.common/entities/Product';
 import { IProductCreateObject } from '@modules/server.common/interfaces/IProduct';
-import { WarehouseProductsComponent } from '../forms/warehouse-products-table';
+import { AddWarehouseProductsComponent } from '../forms/add-warehouse-products-table';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { WarehousesService } from '../../../@core/data/warehouses.service';
 import { WizardComponent } from 'angular2-wizard';
@@ -50,8 +50,8 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 	@ViewChild('productsTable')
 	productsTable: ProductsTableComponent;
 
-	@ViewChild('warehouseProductsTable')
-	warehouseProductsTable: WarehouseProductsComponent;
+	@ViewChild('addWarehouseProductsTable')
+	addWarehouseProductsTable: AddWarehouseProductsComponent;
 
 	@ViewChild('wizzardFrom')
 	wizzardFrom: WizardComponent;
@@ -126,7 +126,7 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 	async addProducts() {
 		this.loading = true;
 		try {
-			const productsForAdd = this.warehouseProductsTable
+			const productsForAdd = this.addWarehouseProductsTable
 				.allWarehouseProducts;
 			const res = await this._warehousesService
 				.addProducts(this.warehouseId, productsForAdd)
@@ -235,13 +235,13 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 				title: p.title[0].value
 			};
 		});
-		this.warehouseProductsTable.loadDataSmartTable(
+		this.addWarehouseProductsTable.loadDataSmartTable(
 			[...newCreatedProducts, ...this.selectedProducts],
 			this.warehouseId
 		);
 
 		this.validAllProducts = () =>
-			this.warehouseProductsTable.productsIsValid();
+			this.addWarehouseProductsTable.productsIsValid();
 	}
 
 	onStep2Prev() {
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
index b83126aa2..a9c1d4424 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
@@ -1,4 +1,4 @@
-<ea-warehouse-products-table
-	#warehouseProductsTable
+<ea-add-warehouse-products-table
+	#addWarehouseProductsTable
 	[boxShadow]="'none'"
-></ea-warehouse-products-table>
+></ea-add-warehouse-products-table>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
index a3ed82241..6f9359a21 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
@@ -6,7 +6,7 @@ import {
 	Output,
 	EventEmitter
 } from '@angular/core';
-import { WarehouseProductsComponent } from 'app/@shared/warehouse-product/forms/warehouse-products-table';
+import { AddWarehouseProductsComponent } from 'app/@shared/warehouse-product/forms/add-warehouse-products-table';
 import Product from '@modules/server.common/entities/Product';
 import { WarehousesService } from 'app/@core/data/warehouses.service';
 import { first } from 'rxjs/operators';
@@ -17,8 +17,8 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	templateUrl: './add-products.component.html'
 })
 export class SetupMerchantAddProductsComponent implements OnInit {
-	@ViewChild('warehouseProductsTable')
-	warehouseProductsTable: WarehouseProductsComponent;
+	@ViewChild('addWarehouseProductsTable')
+	addWarehouseProductsTable: AddWarehouseProductsComponent;
 
 	@Input()
 	products: Product[];
@@ -34,7 +34,7 @@ export class SetupMerchantAddProductsComponent implements OnInit {
 	) {}
 
 	ngOnInit(): void {
-		this.warehouseProductsTable.loadDataSmartTable(
+		this.addWarehouseProductsTable.loadDataSmartTable(
 			this.products || [],
 			this.storeId
 		);
@@ -42,7 +42,7 @@ export class SetupMerchantAddProductsComponent implements OnInit {
 
 	async add() {
 		try {
-			const productsForAdd = this.warehouseProductsTable
+			const productsForAdd = this.addWarehouseProductsTable
 				.allWarehouseProducts;
 
 			await this.warehousesService
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
index 5462c7493..f688a21fc 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -39,6 +39,8 @@
 						Create new product
 					</button>
 				</div>
+
+				<div *ngIf="storeProducts && storeProducts.length !== 0"></div>
 			</div>
 		</div>
 
@@ -85,7 +87,7 @@ <h4>Add new product</h4>
 
 	<button
 		*ngIf="currentView === componentViews.addProducts"
-		[disabled]="!addProducts?.warehouseProductsTable.productsIsValid()"
+		[disabled]="!addProducts?.addWarehouseProductsTable.productsIsValid()"
 		nbButton
 		(click)="addProducts.add()"
 	>

From 666b69979634406b056ecb171b3cb46f60f74cb7 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 10 Apr 2019 14:53:30 +0300
Subject: [PATCH 167/382] feat(ever-admin): created shared Warehouse Products
 table EV-1197

---
 .../forms/warehouse-product-forms.module.ts   |  17 +-
 .../forms/warehouse-products-table/index.ts   |   1 +
 .../warehouse-products-table.component.html   |   8 +
 .../warehouse-products-table.component.ts     | 227 ++++++++++++++++++
 .../products-table.component.html             |  15 +-
 .../products-table.component.ts               | 217 ++---------------
 .../products-table/products-table.module.ts   |  13 +-
 7 files changed, 277 insertions(+), 221 deletions(-)
 create mode 100644 admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/index.ts
 create mode 100644 admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html
 create mode 100644 admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts

diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-product-forms.module.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-product-forms.module.ts
index b1dbe6a10..4c78ce07c 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-product-forms.module.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-product-forms.module.ts
@@ -6,6 +6,15 @@ import { WarehouseAddChoiceComponent } from './warehouse-add-choice';
 import { AddWarehouseProductsComponent } from './add-warehouse-products-table';
 import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { RenderComponentsModule } from '../../render-component/render-components.module';
+import { WarehouseProductsComponent } from './warehouse-products-table';
+import { StoreProductsTableModule } from 'app/@shared/render-component/store-products-table/store-products-table.module';
+import { ProductCategoriesModule } from 'app/@shared/render-component/product-categories/product-categories.module';
+
+const COMPONENTS = [
+	WarehouseAddChoiceComponent,
+	AddWarehouseProductsComponent,
+	WarehouseProductsComponent
+];
 
 @NgModule({
 	imports: [
@@ -13,9 +22,11 @@ import { RenderComponentsModule } from '../../render-component/render-components
 		FormWizardModule,
 		TranslateModule.forChild(),
 		Ng2SmartTableModule,
-		RenderComponentsModule
+		RenderComponentsModule,
+		StoreProductsTableModule,
+		ProductCategoriesModule
 	],
-	exports: [WarehouseAddChoiceComponent, AddWarehouseProductsComponent],
-	declarations: [WarehouseAddChoiceComponent, AddWarehouseProductsComponent]
+	exports: COMPONENTS,
+	declarations: COMPONENTS
 })
 export class WarehouseProductFormsModule {}
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/index.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/index.ts
new file mode 100644
index 000000000..90845a5dc
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/index.ts
@@ -0,0 +1 @@
+export * from './warehouse-products-table.component';
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html
new file mode 100644
index 000000000..e42ca24a8
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html
@@ -0,0 +1,8 @@
+<ng2-smart-table
+	[settings]="settingsSmartTable"
+	[source]="sourceSmartTable"
+	(userRowSelect)="selectProductTmp($event)"
+	(edit)="onEdit.emit($event)"
+	(delete)="onDelete.emit($event)"
+>
+</ng2-smart-table>
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
new file mode 100644
index 000000000..633691220
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
@@ -0,0 +1,227 @@
+import {
+	Component,
+	OnDestroy,
+	OnInit,
+	Output,
+	EventEmitter,
+	Input
+} from '@angular/core';
+import { LocalDataSource } from 'ng2-smart-table';
+import { StoreProductPriceComponent } from 'app/@shared/render-component/store-products-table/store-product-price.component';
+import { StoreProductAmountComponent } from 'app/@shared/render-component/store-products-table/store-product-amount/store-product-amount.component';
+import { ProductCategoriesComponent } from 'app/@shared/render-component/product-categories/product-categories';
+import { ProductTitleRedirectComponent } from 'app/@shared/render-component/product-title-redirect/product-title-redirect.component';
+import { Observable, forkJoin, Subject } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
+import { takeUntil } from 'rxjs/operators';
+import WarehouseProduct from '@modules/server.common/entities/WarehouseProduct';
+import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
+import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
+import Product from '@modules/server.common/entities/Product';
+import { StoreProductImageComponent } from 'app/@shared/render-component/store-products-table/store-product-image/store-product-image.component';
+
+export interface WarehouseProductViewModel {
+	id: string;
+	image: string;
+	title: string;
+	description: string;
+	details: string;
+	categories: { ids: string[]; search: string };
+	price: number;
+	qty: number;
+	storeId: string;
+	product: Product;
+	allCategories: any[];
+}
+
+@Component({
+	selector: 'ea-warehouse-products-table',
+	templateUrl: './warehouse-products-table.component.html'
+})
+export class WarehouseProductsComponent implements OnInit, OnDestroy {
+	@Output()
+	onEdit = new EventEmitter();
+	@Output()
+	onDelete = new EventEmitter();
+
+	@Input()
+	perPage: number = 5;
+
+	settingsSmartTable: object;
+	sourceSmartTable = new LocalDataSource();
+	selectedProducts: WarehouseProductViewModel[] = [];
+
+	private ngDestroy$ = new Subject<void>();
+	private categoriesInfo: any = [];
+
+	constructor(
+		private readonly _translateService: TranslateService,
+		private readonly _productLocalesService: ProductLocalesService,
+		private readonly _productsCategoryService: ProductsCategoryService
+	) {}
+
+	get hasSelectedProducts(): boolean {
+		return this.selectedProducts.length > 0;
+	}
+
+	ngOnInit(): void {
+		this._getCategories();
+		this._loadSettingsSmartTable();
+		this._applyTranslationOnSmartTable();
+	}
+
+	ngOnDestroy(): void {
+		this.ngDestroy$.next();
+		this.ngDestroy$.complete();
+	}
+
+	async loadDataSmartTable(products: WarehouseProduct[], storeId: string) {
+		const productsVM = products.map((product: WarehouseProduct) => {
+			return {
+				id: product.productId,
+				image: this._productLocalesService.getTranslate(
+					product.product['images']
+				),
+				title: this._productLocalesService.getTranslate(
+					product.product['title']
+				),
+				description: this._productLocalesService.getTranslate(
+					product.product['description']
+				),
+				details: this._productLocalesService.getTranslate(
+					product.product['details']
+				),
+				categories: {
+					ids: product.product['categories'],
+					search:
+						this.categoriesInfo &&
+						this.categoriesInfo
+							.filter((c) =>
+								product.product['categories'].includes(c.id)
+							)
+							.map((c) =>
+								this._productLocalesService.getTranslate(c.name)
+							)
+							.toString()
+				},
+				price: product.price,
+				qty: product.count,
+				storeId,
+				product: product.product,
+				allCategories: this.categoriesInfo
+			};
+		});
+
+		this.sourceSmartTable.load(productsVM);
+	}
+
+	selectProductTmp(ev) {
+		this.selectedProducts = ev.selected;
+	}
+
+	private _getCategories() {
+		this._productsCategoryService
+			.getCategories()
+			.subscribe((categories) => {
+				this.categoriesInfo = categories;
+			});
+	}
+
+	private _loadSettingsSmartTable() {
+		const columnTitlePrefix = 'WAREHOUSE_VIEW.PRODUCTS_TAB.';
+		const getTranslate = (name: string): Observable<any> =>
+			this._translateService.get(columnTitlePrefix + name);
+
+		forkJoin(
+			this._translateService.get('Id'),
+			getTranslate('IMAGE'),
+			getTranslate('TITLE'),
+			getTranslate('DESCRIPTION'),
+			getTranslate('DETAILS'),
+			getTranslate('CATEGORY'),
+			getTranslate('PRICE'),
+			getTranslate('QUANTITY')
+		)
+			.pipe(takeUntil(this.ngDestroy$))
+			.subscribe(
+				([
+					id,
+					image,
+					titleTr,
+					description,
+					details,
+					category,
+					price,
+					quantity
+				]) => {
+					this.settingsSmartTable = {
+						mode: 'external',
+						actions: {
+							add: false,
+							position: 'left'
+						},
+						edit: {
+							editButtonContent: '<i class="nb-edit"></i>'
+						},
+						delete: {
+							deleteButtonContent: '<i class="nb-trash"></i>',
+							confirmDelete: true
+						},
+						selectMode: 'multi',
+						columns: {
+							image: {
+								title: image,
+								type: 'custom',
+								class: 'text-center',
+								renderComponent: StoreProductImageComponent,
+								filter: false
+							},
+							title: {
+								title: titleTr,
+								type: 'custom',
+								renderComponent: ProductTitleRedirectComponent
+							},
+							description: { title: description },
+							details: { title: details },
+							categories: {
+								title: category,
+								type: 'custom',
+								renderComponent: ProductCategoriesComponent,
+								filterFunction(
+									cell?: any,
+									search?: string
+								): boolean {
+									if (cell.search.includes(search)) {
+										return true;
+									} else {
+										return false;
+									}
+								}
+							},
+							price: {
+								title: price,
+								type: 'custom',
+								renderComponent: StoreProductPriceComponent
+							},
+							qty: {
+								title: quantity,
+								class: 'text-center',
+								type: 'custom',
+								renderComponent: StoreProductAmountComponent
+							}
+						},
+						pager: {
+							display: true,
+							perPage: this.perPage
+						}
+					};
+				}
+			);
+	}
+
+	private _applyTranslationOnSmartTable() {
+		this._translateService.onLangChange.subscribe(() => {
+			this._loadSettingsSmartTable();
+		});
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
index 1fda65081..2d1563fa1 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
@@ -9,7 +9,7 @@
 		</button>
 		<button
 			class="btn btn-sm btn-danger btn-icon d-inline-block"
-			[disabled]="!hasSelectedProducts"
+			[disabled]="!productsTable.hasSelectedProducts"
 			(click)="deleteSelectedRows()"
 		>
 			<i class="ion-md-trash button-icon"></i>
@@ -22,13 +22,10 @@
 	</nb-card-header>
 
 	<nb-card-body>
-		<ng2-smart-table
-			[settings]="settingsSmartTable"
-			[source]="sourceSmartTable"
-			(userRowSelect)="selectProductTmp($event)"
-			(edit)="editProduct($event)"
-			(delete)="removeProduct($event)"
-		>
-		</ng2-smart-table>
+		<ea-warehouse-products-table
+			#productsTable
+			(onEdit)="editProduct($event)"
+			(onDelete)="removeProduct($event)"
+		></ea-warehouse-products-table>
 	</nb-card-body>
 </nb-card>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
index d2a94fae5..26463a80f 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
@@ -3,17 +3,15 @@ import {
 	Component,
 	Output,
 	EventEmitter,
-	Input
+	Input,
+	ViewChild
 } from '@angular/core';
-import { Subject, Observable, forkJoin } from 'rxjs';
-import { LocalDataSource } from 'ng2-smart-table';
-import { TranslateService } from '@ngx-translate/core';
+import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import WarehouseProduct from '@modules/server.common/entities/WarehouseProduct';
 import { WarehouseProductsRouter } from '@modules/client.common.angular2/routers/warehouse-products-router.service';
 import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
 import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
-import Product from '@modules/server.common/entities/Product';
 import Warehouse from '@modules/server.common/entities/Warehouse';
 import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
 import { Subscription } from 'apollo-client/util/Observable';
@@ -21,26 +19,10 @@ import { Router } from '@angular/router';
 import { NotifyService } from '../../../../@core/services/notify/notify.service';
 import { ConfimationModalComponent } from '../../../../@shared/confirmation-modal/confirmation-modal.component';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { StoreProductImageComponent } from '../../../../@shared/render-component/store-products-table/store-product-image/store-product-image.component';
-import { ProductTitleRedirectComponent } from '../../../../@shared/render-component/product-title-redirect/product-title-redirect.component';
-import { ProductCategoriesComponent } from '../../../../@shared/render-component/product-categories/product-categories';
-import { ProductsCategoryService } from '../../../../@core/data/productsCategory.service';
-import { StoreProductPriceComponent } from '../../../../@shared/render-component/store-products-table/store-product-price.component';
-import { StoreProductAmountComponent } from '../../../../@shared/render-component/store-products-table/store-product-amount/store-product-amount.component';
-
-interface WarehouseProductViewModel {
-	id: string;
-	image: string;
-	title: string;
-	description: string;
-	details: string;
-	categories: { ids: string[]; search: string };
-	price: number;
-	qty: number;
-	storeId: string;
-	product: Product;
-	allCategories: any[];
-}
+import {
+	WarehouseProductViewModel,
+	WarehouseProductsComponent
+} from 'app/@shared/warehouse-product/forms/warehouse-products-table';
 
 @Component({
 	selector: 'ea-store-products-table',
@@ -48,40 +30,28 @@ interface WarehouseProductViewModel {
 	styleUrls: ['./products-table.component.scss']
 })
 export class ProductsTableComponent implements OnDestroy {
+	@ViewChild('productsTable')
+	productsTable: WarehouseProductsComponent;
+
 	@Output()
-	public addProducts: EventEmitter<boolean> = new EventEmitter();
+	addProducts: EventEmitter<boolean> = new EventEmitter();
 
 	@Input()
-	public warehouse: Warehouse;
+	warehouse: Warehouse;
 
-	public settingsSmartTable: object;
-	public sourceSmartTable = new LocalDataSource();
-	private categoriesInfo: any = [];
+	loading: boolean;
 
-	private _selectedProducts: WarehouseProductViewModel[] = [];
 	private ngDestroy$ = new Subject<void>();
 	private warehouseProducts$: Subscription;
 
-	public loading: boolean;
-
 	constructor(
-		private readonly _translateService: TranslateService,
 		private readonly _warehouseProductsRouter: WarehouseProductsRouter,
 		private readonly _productLocalesService: ProductLocalesService,
-		private readonly productsCategoryService: ProductsCategoryService,
 		private readonly warehouseRouter: WarehouseRouter,
 		private readonly _router: Router,
 		private readonly _notifyService: NotifyService,
 		private readonly modalService: NgbModal
-	) {
-		this._loadSettingsSmartTable();
-		this.getCategories();
-		this._applyTranslationOnSmartTable();
-	}
-
-	get hasSelectedProducts(): boolean {
-		return this._selectedProducts.length > 0;
-	}
+	) {}
 
 	editProduct(ev) {
 		this._router.navigate(['/products/list/' + ev.data.id + '/edit']);
@@ -104,14 +74,8 @@ export class ProductsTableComponent implements OnDestroy {
 			});
 	}
 
-	getCategories() {
-		this.productsCategoryService.getCategories().subscribe((categories) => {
-			this.categoriesInfo = categories;
-		});
-	}
-
 	deleteSelectedRows() {
-		this.removeProducts(this._selectedProducts);
+		this.removeProducts(this.productsTable.selectedProducts);
 	}
 
 	localeTranslate(member: ILocaleMember[]) {
@@ -119,61 +83,16 @@ export class ProductsTableComponent implements OnDestroy {
 	}
 
 	async loadDataSmartTable(storeId) {
-		let products: WarehouseProduct[] = [];
-
 		if (this.warehouseProducts$) {
 			this.warehouseProducts$.unsubscribe();
-			this._selectedProducts = [];
+			this.productsTable.selectedProducts = [];
 		}
 
-		const loadData = () => {
-			const productsVM = products.map((product: WarehouseProduct) => {
-				return {
-					id: product.productId,
-					image: this._productLocalesService.getTranslate(
-						product.product['images']
-					),
-					title: this._productLocalesService.getTranslate(
-						product.product['title']
-					),
-					description: this._productLocalesService.getTranslate(
-						product.product['description']
-					),
-					details: this._productLocalesService.getTranslate(
-						product.product['details']
-					),
-					categories: {
-						ids: product.product['categories'],
-						search:
-							this.categoriesInfo &&
-							this.categoriesInfo
-								.filter((c) =>
-									product.product['categories'].includes(c.id)
-								)
-								.map((c) =>
-									this._productLocalesService.getTranslate(
-										c.name
-									)
-								)
-								.toString()
-					},
-					price: product.price,
-					qty: product.count,
-					storeId,
-					product: product.product,
-					allCategories: this.categoriesInfo
-				};
-			});
-
-			this.sourceSmartTable.load(productsVM);
-		};
-
 		this.warehouseProducts$ = this._warehouseProductsRouter
 			.get(storeId)
 			.pipe(takeUntil(this.ngDestroy$))
 			.subscribe((p: WarehouseProduct[]) => {
-				products = p;
-				loadData();
+				this.productsTable.loadDataSmartTable(p, storeId);
 			});
 	}
 
@@ -197,108 +116,6 @@ export class ProductsTableComponent implements OnDestroy {
 		}
 	}
 
-	selectProductTmp(ev) {
-		this._selectedProducts = ev.selected;
-	}
-
-	private _applyTranslationOnSmartTable() {
-		this._translateService.onLangChange.subscribe(() => {
-			this._loadSettingsSmartTable();
-		});
-	}
-
-	private _loadSettingsSmartTable() {
-		const columnTitlePrefix = 'WAREHOUSE_VIEW.PRODUCTS_TAB.';
-		const getTranslate = (name: string): Observable<any> =>
-			this._translateService.get(columnTitlePrefix + name);
-
-		forkJoin(
-			this._translateService.get('Id'),
-			getTranslate('IMAGE'),
-			getTranslate('TITLE'),
-			getTranslate('DESCRIPTION'),
-			getTranslate('DETAILS'),
-			getTranslate('CATEGORY'),
-			getTranslate('PRICE'),
-			getTranslate('QUANTITY')
-		)
-			.pipe(takeUntil(this.ngDestroy$))
-			.subscribe(
-				([
-					id,
-					image,
-					titleTr,
-					description,
-					details,
-					category,
-					price,
-					quantity
-				]) => {
-					this.settingsSmartTable = {
-						mode: 'external',
-						actions: {
-							add: false,
-							position: 'left'
-						},
-						edit: {
-							editButtonContent: '<i class="nb-edit"></i>'
-						},
-						delete: {
-							deleteButtonContent: '<i class="nb-trash"></i>',
-							confirmDelete: true
-						},
-						selectMode: 'multi',
-						columns: {
-							image: {
-								title: image,
-								type: 'custom',
-								class: 'text-center',
-								renderComponent: StoreProductImageComponent,
-								filter: false
-							},
-							title: {
-								title: titleTr,
-								type: 'custom',
-								renderComponent: ProductTitleRedirectComponent
-							},
-							description: { title: description },
-							details: { title: details },
-							categories: {
-								title: category,
-								type: 'custom',
-								renderComponent: ProductCategoriesComponent,
-								filterFunction(
-									cell?: any,
-									search?: string
-								): boolean {
-									if (cell.search.includes(search)) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-							},
-							price: {
-								title: price,
-								type: 'custom',
-								renderComponent: StoreProductPriceComponent
-							},
-							qty: {
-								title: quantity,
-								class: 'text-center',
-								type: 'custom',
-								renderComponent: StoreProductAmountComponent
-							}
-						},
-						pager: {
-							display: true,
-							perPage: 5
-						}
-					};
-				}
-			);
-	}
-
 	ngOnDestroy(): void {
 		console.warn('ProductsTableComponent destroyed');
 	}
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts
index ee1121fed..925b430d4 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts
@@ -1,16 +1,13 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ThemeModule, HttpLoaderFactory } from 'app/@theme';
-import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { HttpClient } from '@angular/common/http';
 import { ProductsTableComponent } from './products-table.component';
 import { ToasterModule } from 'angular2-toaster';
-import { StoreProductsTableModule } from 'app/@shared/render-component/store-products-table/store-products-table.module';
-import { RenderComponentsModule } from 'app/@shared/render-component/render-components.module';
-import { ProductCategoriesModule } from 'app/@shared/render-component/product-categories/product-categories.module';
 import { NbSpinnerModule } from '@nebular/theme';
 import { ConfirmationModalModule } from '../../../../@shared/confirmation-modal/confirmation-modal.module';
+import { WarehouseProductFormsModule } from 'app/@shared/warehouse-product/forms';
 
 const COMPONENTS = [ProductsTableComponent];
 
@@ -18,7 +15,6 @@ const COMPONENTS = [ProductsTableComponent];
 	imports: [
 		CommonModule,
 		ThemeModule,
-		Ng2SmartTableModule,
 		ToasterModule.forChild(),
 		TranslateModule.forChild({
 			loader: {
@@ -27,11 +23,10 @@ const COMPONENTS = [ProductsTableComponent];
 				deps: [HttpClient]
 			}
 		}),
-		StoreProductsTableModule,
-		RenderComponentsModule,
-		ProductCategoriesModule,
+
 		NbSpinnerModule,
-		ConfirmationModalModule
+		ConfirmationModalModule,
+		WarehouseProductFormsModule
 	],
 	declarations: [...COMPONENTS],
 	exports: [...COMPONENTS]

From 55399311536ccadee272aca624ad25982f887e2e Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 10 Apr 2019 15:41:15 +0300
Subject: [PATCH 168/382] feat(ever-admin): add table with Warehouse Prod. step
 "Products" EV-1197

---
 .../warehouse-products-table.component.ts     |  4 +++-
 .../products/products.component.html          | 11 ++++++++-
 .../components/products/products.component.ts | 23 ++++++++++++++++++-
 .../+merchants/merchants.component.html       |  4 ++--
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
index 633691220..33f70cbf5 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
@@ -46,6 +46,8 @@ export class WarehouseProductsComponent implements OnInit, OnDestroy {
 
 	@Input()
 	perPage: number = 5;
+	@Input()
+	selectMode = 'multi';
 
 	settingsSmartTable: object;
 	sourceSmartTable = new LocalDataSource();
@@ -167,7 +169,7 @@ export class WarehouseProductsComponent implements OnInit, OnDestroy {
 							deleteButtonContent: '<i class="nb-trash"></i>',
 							confirmDelete: true
 						},
-						selectMode: 'multi',
+						selectMode: this.selectMode,
 						columns: {
 							image: {
 								title: image,
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
index f688a21fc..b065c7979 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -40,12 +40,21 @@
 					</button>
 				</div>
 
-				<div *ngIf="storeProducts && storeProducts.length !== 0"></div>
+				<div [hidden]="!showProductsTable">
+					<ea-warehouse-products-table
+						#productsTable
+						[selectMode]="null"
+						[perPage]="productsPerPage"
+						(onEdit)="editProduct($event)"
+						(onDelete)="removeProduct($event)"
+					></ea-warehouse-products-table>
+				</div>
 			</div>
 		</div>
 
 		<div *ngIf="currentView == componentViews.productsTable" class="row">
 			<ea-merchants-setup-products-catalog
+				[existedProductsIds]="existedProductsIds"
 				#productsCatalog
 			></ea-merchants-setup-products-catalog>
 		</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index c977b86c9..0272d0e72 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -7,12 +7,12 @@ import {
 	OnDestroy
 } from '@angular/core';
 import { SetupMerchantProductsCatalogComponent } from './products-catalog/products-catalog.component';
-import Product from '@modules/server.common/entities/Product';
 import { SetupMerchantAddProductsComponent } from './add-products/add-products.component';
 import WarehouseProduct from '@modules/server.common/entities/WarehouseProduct';
 import { WarehouseProductsRouter } from '@modules/client.common.angular2/routers/warehouse-products-router.service';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
+import { WarehouseProductsComponent } from 'app/@shared/warehouse-product/forms/warehouse-products-table';
 
 @Component({
 	selector: 'ea-merchants-setup-products',
@@ -24,6 +24,8 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 	productsCatalog: SetupMerchantProductsCatalogComponent;
 	@ViewChild('addProducts')
 	addProducts: SetupMerchantAddProductsComponent;
+	@ViewChild('productsTable')
+	productsTable: WarehouseProductsComponent;
 
 	@Output()
 	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
@@ -39,6 +41,7 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 	productsPerPage = 3;
 	// TODO get real warehouse id
 	storeId = '5ca48ff5d32c2d18ac96f562';
+	showProductsTable: boolean = false;
 
 	productsForAdd = [];
 	storeProducts: WarehouseProduct[];
@@ -69,6 +72,15 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 		this._currentView = view;
 	}
 
+	get existedProductsIds() {
+		let ids = [];
+		if (this.storeProducts) {
+			ids = this.storeProducts.map((p) => p.productId);
+		}
+
+		return ids;
+	}
+
 	select() {
 		this.productsForAdd = this.productsCatalog.productsTable.selectedProducts;
 		this.currentView = this.componentViews.addProducts;
@@ -89,6 +101,15 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 				.get(this.storeId)
 				.pipe(takeUntil(this._ngDestroy$))
 				.subscribe((products) => {
+					if (products.length > 0) {
+						this.showProductsTable = true;
+					}
+
+					this.productsTable.loadDataSmartTable(
+						products,
+						this.storeId
+					);
+
 					this.storeProducts = products;
 				});
 		}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index cc92a06a4..643db1b26 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -6,7 +6,7 @@
 			<nb-card>
 				<nb-card-body>
 					<nb-stepper #nbStepper orientation="vertical">
-						<nb-step label="Account">
+						<!-- <nb-step label="Account">
 							<ea-merchants-setup-account
 								#account
 								(previousStep)="nbStepper.previous()"
@@ -70,7 +70,7 @@
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-product-categories>
-						</nb-step>
+						</nb-step> -->
 						<nb-step label="Products">
 							<ea-merchants-setup-products
 								#products

From f094e887e1fddeb55ffd053c68f84f4d15a39d58 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 10 Apr 2019 17:48:37 +0300
Subject: [PATCH 169/382] feat(ever-admin): create new product form step
 "Products" EV-1197

---
 .../basic-info/basic-info-form.component.html | 18 ++--
 .../basic-info/basic-info-form.component.scss | 94 +++++++++++--------
 .../product-mutation.component.html           |  6 ++
 .../product-mutation.component.ts             | 79 ++++++++++++++++
 .../products/products.component.html          | 14 ++-
 .../components/products/products.component.ts | 15 ++-
 .../components/products/products.module.ts    |  4 +-
 .../+merchants/merchants.component.html       |  4 +-
 8 files changed, 179 insertions(+), 55 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts

diff --git a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.html b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.html
index f200761e1..f5be495b5 100644
--- a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.html
@@ -1,4 +1,8 @@
-<div class="col-md-12 col-lg-12 col-sm-12" [formGroup]="form" *ngIf="form">
+<div
+	class="col-md-12 col-lg-12 col-sm-12 product-basic-info "
+	[formGroup]="form"
+	*ngIf="form"
+>
 	<fieldset>
 		<div class="form-group row">
 			<label class="col-sm-2 control-label">{{
@@ -14,7 +18,7 @@
 					formControlName="title"
 				/>
 
-				<div
+				<span
 					*ngIf="title?.invalid && (title.dirty || title.touched)"
 					class="alert alert-danger"
 				>
@@ -31,7 +35,7 @@
 								| translate
 						}}
 					</span>
-				</div>
+				</span>
 			</div>
 		</div>
 		<div class="form-group row">
@@ -46,7 +50,7 @@
 					(uploadedImgObj)="addImageObj($event)"
 				></e-cu-file-uploader>
 
-				<div
+				<span
 					*ngIf="(imagesArr || uploaderChanged) && image.invalid"
 					class="alert alert-danger"
 				>
@@ -54,7 +58,7 @@
 						'PRODUCT_TYPE_VIEW.WIZARD_FORM.VALIDATION_MESSAGES.IMAGE'
 							| translate
 					}}!
-				</div>
+				</span>
 			</div>
 		</div>
 
@@ -110,7 +114,7 @@
 					></textarea>
 				</div>
 
-				<div
+				<span
 					*ngIf="
 						description?.invalid &&
 						(description.dirty || description.touched)
@@ -130,7 +134,7 @@
 								| translate
 						}}
 					</span>
-				</div>
+				</span>
 			</div>
 		</div>
 
diff --git a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss
index 7ca961986..bf88c5135 100644
--- a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss
+++ b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss
@@ -1,50 +1,66 @@
-/deep/ .categoryOptions-dropdown {
-	.ng-star-inserted {
-		margin-top: 0 !important;
-	}
+.product-basic-info {
+	/deep/ .categoryOptions-dropdown {
+		.ng-star-inserted {
+			margin-top: 0 !important;
+		}
 
-	.dropdown,
-	.dropdown-menu {
-		border: 2px solid #dadfe6;
-		border-radius: 0.375rem;
-		background-color: white !important;
-		width: 100%;
-		color: #111111 !important;
-	}
+		.dropdown,
+		.dropdown-menu {
+			border: 2px solid #dadfe6;
+			border-radius: 0.375rem;
+			background-color: white !important;
+			width: 100%;
+			color: #111111 !important;
+		}
 
-	.dropdown-menu.ng-star-inserted {
-		border: 2px solid #dadfe6 !important;
-	}
+		.dropdown-menu.ng-star-inserted {
+			border: 2px solid #dadfe6 !important;
+		}
 
-	button {
-		color: #111111 !important;
-		// background-color: white !important;
-	}
-	div {
-		a {
-			&:hover {
-				background-color: #f0f0f0 !important;
-				color: #111111 !important;
-				font-weight: bold;
-				font-size: 1.05em !important;
+		button {
+			color: #111111 !important;
+			margin: 0 !important;
+			// background-color: white !important;
+		}
+		div {
+			a {
+				&:hover {
+					background-color: #f0f0f0 !important;
+					color: #111111 !important;
+					font-weight: bold;
+					font-size: 1.05em !important;
+				}
 			}
 		}
 	}
-}
 
-.preview-img {
-	padding-left: 14px;
-	padding-right: 16px;
-}
+	.preview-img {
+		padding-left: 14px;
+		padding-right: 16px;
+	}
 
-.img-rounded {
-	max-height: 70px;
-}
+	.ion-md-remove-circle {
+		font-size: 1rem;
+	}
 
-.removeIcon div {
-	cursor: pointer;
-}
+	.img-rounded {
+		max-height: 70px;
+	}
+
+	.removeIcon div {
+		cursor: pointer;
+	}
 
-.images-content {
-	margin-left: 16px !important;
+	.images-content {
+		margin-left: 16px !important;
+	}
+	label.control-label {
+		font-size: 1rem;
+	}
+
+	span {
+		font-size: 1rem;
+		display: block;
+		margin: 0;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.html
new file mode 100644
index 000000000..03c668a7b
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.html
@@ -0,0 +1,6 @@
+<ea-product-basic-info-form
+	*ngIf="areCategoriesLoaded"
+	#basicInfoForm
+	[productCategories]="productsCategories"
+	[form]="basicInfo"
+></ea-product-basic-info-form>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
new file mode 100644
index 000000000..130715824
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
@@ -0,0 +1,79 @@
+import { Component, EventEmitter, Output, ViewChild } from '@angular/core';
+import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
+import { BasicInfoFormComponent } from 'app/@shared/product/forms/basic-info/basic-info-form.component';
+import ProductsCategory from '@modules/server.common/entities/ProductsCategory';
+import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
+import { first } from 'rxjs/operators';
+import { IProductCreateObject } from '@modules/server.common/interfaces/IProduct';
+import { ProductsService } from 'app/@core/data/products.service';
+import { ProductViewModel } from 'app/pages/+simulation/products/products.component';
+import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
+
+@Component({
+	selector: 'ea-merchants-setup-product-mutation',
+	templateUrl: './product-mutation.component.html'
+})
+export class SetupMerchantProductMutationComponent {
+	@ViewChild('basicInfoForm')
+	basicInfoForm: BasicInfoFormComponent;
+
+	@Output()
+	onCreate: EventEmitter<ProductViewModel> = new EventEmitter();
+
+	productsCategories: ProductsCategory[];
+	areCategoriesLoaded: boolean = false;
+
+	readonly form: FormGroup = this._formBuilder.group({
+		basicInfo: BasicInfoFormComponent.buildForm(this._formBuilder)
+	});
+
+	readonly basicInfo = this.form.get('basicInfo') as FormControl;
+
+	constructor(
+		private readonly _formBuilder: FormBuilder,
+		private readonly _productsService: ProductsService,
+		private readonly _productLocalesService: ProductLocalesService,
+		private readonly _productsCategoryService: ProductsCategoryService
+	) {
+		this.loadProductCategories();
+	}
+
+	async loadProductCategories() {
+		try {
+			this.productsCategories = await this._productsCategoryService
+				.getCategories()
+				.pipe(first())
+				.toPromise();
+		} catch (error) {
+			console.warn(
+				`Error during load product categories. message: ${
+					error.message
+				}`
+			);
+		}
+
+		this.areCategoriesLoaded = true;
+	}
+
+	async create() {
+		const productCreateObject: IProductCreateObject = await this.basicInfoForm.setupProductCreateObject();
+		try {
+			const product = await this._productsService
+				.create(productCreateObject)
+				.pipe(first())
+				.toPromise();
+
+			this.onCreate.emit({
+				id: product.id,
+				title: this._productLocalesService.getMemberValue(
+					product.title
+				),
+				image: this._productLocalesService.getMemberValue(
+					product.images
+				)
+			});
+		} catch (error) {
+			console.error(error.message);
+		}
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
index b065c7979..72d9e7536 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -29,7 +29,7 @@
 					</button>
 				</div>
 
-				<div class="form-group  col-md-4">
+				<div class="form-group col-md-4">
 					<button
 						nbButton
 						outline
@@ -60,7 +60,12 @@
 		</div>
 
 		<div *ngIf="currentView == componentViews.createProduct" class="row">
-			<h4>Add new product</h4>
+			<div class="form-group offset-md-2 col-md-8">
+				<ea-merchants-setup-product-mutation
+					(onCreate)="select([$event])"
+					#productMutation
+				></ea-merchants-setup-product-mutation>
+			</div>
 		</div>
 
 		<div *ngIf="currentView == componentViews.addProducts" class="row">
@@ -89,7 +94,7 @@ <h4>Add new product</h4>
 		*ngIf="currentView === componentViews.productsTable"
 		[disabled]="!haveProductsForAdd"
 		nbButton
-		(click)="select()"
+		(click)="select(productsCatalog?.productsTable.selectedProducts)"
 	>
 		Select
 	</button>
@@ -106,7 +111,8 @@ <h4>Add new product</h4>
 	<button
 		*ngIf="currentView === componentViews.createProduct"
 		nbButton
-		(click)="create()"
+		[disabled]="!productMutation?.basicInfo.valid || false"
+		(click)="productMutation.create()"
 	>
 		Create
 	</button>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index 0272d0e72..da2cdb5a7 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -13,6 +13,7 @@ import { WarehouseProductsRouter } from '@modules/client.common.angular2/routers
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { WarehouseProductsComponent } from 'app/@shared/warehouse-product/forms/warehouse-products-table';
+import { SetupMerchantProductMutationComponent } from './product-mutation/product-mutation.component';
 
 @Component({
 	selector: 'ea-merchants-setup-products',
@@ -26,6 +27,8 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 	addProducts: SetupMerchantAddProductsComponent;
 	@ViewChild('productsTable')
 	productsTable: WarehouseProductsComponent;
+	@ViewChild('productMutation')
+	productMutation: SetupMerchantProductMutationComponent;
 
 	@Output()
 	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
@@ -81,8 +84,8 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 		return ids;
 	}
 
-	select() {
-		this.productsForAdd = this.productsCatalog.productsTable.selectedProducts;
+	select(products) {
+		this.productsForAdd = products;
 		this.currentView = this.componentViews.addProducts;
 	}
 
@@ -95,6 +98,14 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 		this.currentView = this.componentViews.main;
 	}
 
+	editProduct() {
+		console.warn('TODO edit product');
+	}
+
+	removeProduct() {
+		console.warn('TODO remove product');
+	}
+
 	ngOnInit(): void {
 		if (this.storeId) {
 			this.warehouseProductsRouter
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
index aeaa8759e..15bf7370d 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
@@ -8,11 +8,13 @@ import { SetupMerchantProductsCatalogComponent } from './products-catalog/produc
 import { ProductFormsModule } from 'app/@shared/product/forms';
 import { SetupMerchantAddProductsComponent } from './add-products/add-products.component';
 import { WarehouseProductFormsModule } from 'app/@shared/warehouse-product/forms';
+import { SetupMerchantProductMutationComponent } from './product-mutation/product-mutation.component';
 
 const COMPONENTS = [
 	SetupMerchantProductsComponent,
 	SetupMerchantProductsCatalogComponent,
-	SetupMerchantAddProductsComponent
+	SetupMerchantAddProductsComponent,
+	SetupMerchantProductMutationComponent
 ];
 
 @NgModule({
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 643db1b26..cc92a06a4 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -6,7 +6,7 @@
 			<nb-card>
 				<nb-card-body>
 					<nb-stepper #nbStepper orientation="vertical">
-						<!-- <nb-step label="Account">
+						<nb-step label="Account">
 							<ea-merchants-setup-account
 								#account
 								(previousStep)="nbStepper.previous()"
@@ -70,7 +70,7 @@
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-product-categories>
-						</nb-step> -->
+						</nb-step>
 						<nb-step label="Products">
 							<ea-merchants-setup-products
 								#products

From 81928f2ad59392bd1c0619038dd4ed2f16912060 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2019 19:16:51 +0000
Subject: [PATCH 170/382] fix(package): update mongodb-memory-server to version
 5.0.1

---
 backend/api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index 72e98257a..bb5813d06 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -99,7 +99,7 @@
 		"module-alias": "^2.2.0",
 		"moment": "^2.24.0",
 		"mongodb": "^3.2.1",
-		"mongodb-memory-server": "^4.2.1",
+		"mongodb-memory-server": "^5.0.1",
 		"mongoose": "^5.4.19",
 		"morgan": "^1.9.1",
 		"ms": "^2.1.1",

From 9927752a76acec7342b0db1af8541dd00372736b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2019 19:16:55 +0000
Subject: [PATCH 171/382] chore(package): update lockfile backend/api/yarn.lock

---
 backend/api/yarn.lock | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 742b1c522..26c108a3a 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -7096,10 +7096,21 @@ mongodb-core@3.2.1:
   optionalDependencies:
     saslprep "^1.0.0"
 
-mongodb-memory-server@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-4.2.1.tgz#214b1313804cb34a091cec83f38b4089f2f267d4"
-  integrity sha512-dEKTV07X1xs34CFJYLe6aqzhOCRnArn+tSlfKPNVp1RqJpX9cashFb9Dm+CMaPFmMEZCaEJ9Kz3uC0OmZu2Hrg==
+mongodb-core@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.3.tgz#eb9bcb876f169f5843fd135f7f7686dbac0e9e34"
+  integrity sha512-UyI0rmvPPkjOJV8XGWa9VCTq7R4hBVipimhnAXeSXnuAPjuTqbyfA5Ec9RcYJ1Hhu+ISnc8bJ1KfGZd4ZkYARQ==
+  dependencies:
+    bson "^1.1.1"
+    require_optional "^1.0.1"
+    safe-buffer "^5.1.2"
+  optionalDependencies:
+    saslprep "^1.0.0"
+
+mongodb-memory-server-core@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/mongodb-memory-server-core/-/mongodb-memory-server-core-5.0.1.tgz#36a406afcee3a512950407cd56f416f207cddd18"
+  integrity sha512-EVKXFmozAP58Mqcib/piNPM4LJhgMToM9zpqh8lx6aYKGtrulv6rVXRnENGazhZx2nkFp2CDtKiW5aSV8xNfng==
   dependencies:
     debug "^4.1.1"
     decompress "^4.2.0"
@@ -7113,6 +7124,15 @@ mongodb-memory-server@^4.2.1:
     mkdirp "^0.5.1"
     tmp "^0.0.33"
     uuid "^3.2.1"
+  optionalDependencies:
+    mongodb ">=3.0.0"
+
+mongodb-memory-server@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-5.0.1.tgz#0dd1aac902a808f59ed829766a0d0e638d79990e"
+  integrity sha512-R1+umOyO20bb2edWP+wBH/Locrblk/DYoTg4T817BSkA5XU9ziHsaDHO8JxDkVuOSFr1ZThzWjYgeMQjnY7qGQ==
+  dependencies:
+    mongodb-memory-server-core "5.0.1"
 
 mongodb@3.1.13:
   version "3.1.13"
@@ -7122,6 +7142,14 @@ mongodb@3.1.13:
     mongodb-core "3.1.11"
     safe-buffer "^5.1.2"
 
+mongodb@>=3.0.0:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.3.tgz#4610ee33d300caa74329c2dd03e137210723cd91"
+  integrity sha512-jw8UyPsq4QleZ9z+t/pIVy3L++51vKdaJ2Q/XXeYxk/3cnKioAH8H6f5tkkDivrQL4PUgUOHe9uZzkpRFH1XtQ==
+  dependencies:
+    mongodb-core "^3.2.3"
+    safe-buffer "^5.1.2"
+
 mongodb@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.1.tgz#a8af8f15a30ef0fd217405d3c77a25290ce81e0b"

From da92feeeabd0e54edc866f2872055005297a46ea Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Wed, 10 Apr 2019 23:02:25 +0300
Subject: [PATCH 172/382] docs: improve README

---
 README.md | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index f4e3fa4c9..4056f0319 100644
--- a/README.md
+++ b/README.md
@@ -6,24 +6,18 @@
 
 [Ever](https://ever.co)® is an Open-Source, Real-Time, Reactive, **On-Demand** Commerce Platform build with [TypeScript](http://www.typescriptlang.org).
 
-Out-of-the-box Ever® Platform™ provides everything required to quickly build, manage and expand Multi-Store (Multi-Vendor / Peer-to-Peer Marketplace) or Single-Store **On-Demand** Commerce Solutions with customized e-commerce Websites (Shops), Mobile ordering Apps (Hybrid and PWA), Carrier (Driver) Mobile Apps, Merchant Apps and Admin interface Website.
-
-![overview](https://docs.ever.co/docs/assets/overview.jpg)
-
-### Disclaimer
-
-_A word of caution_: We are in α (alpha), i.e. Ever® Platform™ is very much under development (work in progress, WIP).  
-Expect _lots_ of changes and some :bug: and please be nice! :stuck_out_tongue_winking_eye:
+![overview](https://docs.ever.co/docs/assets/overview_small.png)
 
 ## Features
 
--   Open Platform (every part is Open-Source)
+-   Modern & Open Platform for **On-Demand Economy**
+-   Supports Single-Store and Multi-Store / Multi-Vendor / Peer-to-Peer Marketplaces
 -   Everything Reactive, Real-Time and Blazing Fast!
 -   Headless Commerce framework, which allows different implementations of store-fronts, Admin UIs and client apps. Exposes rich GraphQL, REST and WS APIs.
--   Shopping Mobile App for customers to make On-Demand orders (iOS and Android using Ionic / Ionic Native)
--   Carrier Mobile App for carriers, drivers or delivery service providers (iOS and Android using Ionic / Ionic Native)
--   Shopping e-commerce Website for customers to make in-browser On-Demand purchases of food, goods or services
--   Merchant Tablet App used by Stores/Merchants/Warehouses to manage & track orders, organize deliveries, etc.
+-   Mobile ordering App for customers to make On-Demand orders (Hybrid / PWA, iOS and Android using Ionic / Ionic Native)
+-   Carrier (Driver) Mobile App for deliveries by carriers, drivers or service providers (iOS and Android using Ionic / Ionic Native)
+-   Customizing Shopping e-commerce Website for customers to make in-browser On-Demand purchases of food, goods or services
+-   Merchant Tablet App for Stores/Merchants/Warehouses to manage & track orders, organize deliveries, etc.
 -   Admin Website used to manage all platform features and settings in the single Web-based interface
 -   Multi-language and culture settings accross Platform (i18N)
 -   Products Catalogs (global and per Merchant) with Multiple Product Images
@@ -43,6 +37,11 @@ Expect _lots_ of changes and some :bug: and please be nice! :stuck_out_tongue_wi
 
 You can also track feature requests from the community in the [separate repo](https://github.com/ever-co/feature-requests/issues).
 
+### Disclaimer
+
+_A word of caution_: We are in α (alpha), i.e. Ever® Platform™ is very much under development (work in progress, WIP).  
+Expect _lots_ of changes and some :bug: and please be nice! :stuck_out_tongue_winking_eye:
+
 ## Technology Stack and Requirements
 
 -   [TypeScript](https://www.typescriptlang.org) language (version >=2.9)

From 05056c077d6c0b3bff382089ad6f7f60cff1b9d9 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Wed, 10 Apr 2019 23:16:45 +0300
Subject: [PATCH 173/382] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4056f0319..af6a04649 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# Ever - Open-Source On-Demand Commerce Platform
-
 [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/ever)
 [![Gitter](https://badges.gitter.im/JoinChat.svg)](https://gitter.im/ever-co/ever?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Get help on Codementor](https://cdn.codementor.io/badges/get_help_github.svg)](https://www.codementor.io/evereq?utm_source=github&utm_medium=button&utm_term=evereq&utm_campaign=github)
 
+# Open-Source On-Demand Commerce Platform
+
 [Ever](https://ever.co)® is an Open-Source, Real-Time, Reactive, **On-Demand** Commerce Platform build with [TypeScript](http://www.typescriptlang.org).
 
 ![overview](https://docs.ever.co/docs/assets/overview_small.png)

From 09e1e686a053a363fe97c1871586c5dcf6d1d134 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 11 Apr 2019 09:13:52 +0300
Subject: [PATCH 174/382] feat(ever-admin): remove Warehouse prod. form step
 "Products" EV-1197

---
 .../products/products.component.html          |  5 ++-
 .../components/products/products.component.ts | 32 ++++++++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
index 72d9e7536..4e41d1663 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -15,7 +15,10 @@
 		</span>
 	</nb-card-header>
 	<nb-card-body>
-		<div *ngIf="currentView === componentViews.main" class="main-content">
+		<div
+			[hidden]="currentView !== componentViews.main"
+			class="main-content"
+		>
 			<!-- TODO disable if store id don't exist -->
 			<div class="row actions">
 				<div class="form-group offset-md-2 col-md-4">
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index da2cdb5a7..5040b32df 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -11,9 +11,11 @@ import { SetupMerchantAddProductsComponent } from './add-products/add-products.c
 import WarehouseProduct from '@modules/server.common/entities/WarehouseProduct';
 import { WarehouseProductsRouter } from '@modules/client.common.angular2/routers/warehouse-products-router.service';
 import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { takeUntil, first } from 'rxjs/operators';
 import { WarehouseProductsComponent } from 'app/@shared/warehouse-product/forms/warehouse-products-table';
 import { SetupMerchantProductMutationComponent } from './product-mutation/product-mutation.component';
+import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
 
 @Component({
 	selector: 'ea-merchants-setup-products',
@@ -53,7 +55,11 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 	private _prevView = this.componentViews.main;
 	private _ngDestroy$ = new Subject<void>();
 
-	constructor(private warehouseProductsRouter: WarehouseProductsRouter) {}
+	constructor(
+		private warehouseProductsRouter: WarehouseProductsRouter,
+		private warehouseRouter: WarehouseRouter,
+		private notifyService: NotifyService
+	) {}
 
 	get haveProductsForAdd() {
 		let hasSelectedCarriers = false;
@@ -102,8 +108,26 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 		console.warn('TODO edit product');
 	}
 
-	removeProduct() {
-		console.warn('TODO remove product');
+	async removeProduct({ data }) {
+		try {
+			if (this.storeId) {
+				const store = await this.warehouseRouter
+					.get(this.storeId, true)
+					.pipe(first())
+					.toPromise();
+
+				store.products = store.products.filter(
+					(p: WarehouseProduct) => p.productId !== data.id
+				);
+
+				await this.warehouseRouter.save(store);
+			} else {
+				throw new Error("Store id don't exist");
+			}
+		} catch (error) {
+			const message = `Can't remove products error: ${error.message}`;
+			this.notifyService.error(message);
+		}
 	}
 
 	ngOnInit(): void {

From cadf6a5a6dfe05316a7c5fe1c17eb35123e0c4df Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 11 Apr 2019 10:06:56 +0300
Subject: [PATCH 175/382] feat(ever-admin): update product form step "Products"
 EV-1197

---
 .../basic-info/basic-info-form.component.ts   | 10 ++++++
 .../product-mutation.component.html           |  1 +
 .../product-mutation.component.ts             | 31 ++++++++++++++++-
 .../products/products.component.html          | 22 +++++++++++-
 .../components/products/products.component.ts | 34 ++++++++++++++-----
 5 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
index 6ed306b02..e377f6a87 100644
--- a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
@@ -44,6 +44,8 @@ export class BasicInfoFormComponent implements OnDestroy, OnInit {
 	readonly form: FormGroup;
 	@Input()
 	productCategories: any;
+	@Input()
+	currentProduct: Product;
 
 	uploaderPlaceholder: string;
 	product: any;
@@ -164,6 +166,8 @@ export class BasicInfoFormComponent implements OnDestroy, OnInit {
 					this.setValue(this.product);
 				}
 			});
+
+		this.laodData();
 	}
 
 	ngOnDestroy() {
@@ -403,4 +407,10 @@ export class BasicInfoFormComponent implements OnDestroy, OnInit {
 			height: data.height
 		};
 	}
+
+	private laodData() {
+		if (this.currentProduct) {
+			this.setValue(this.currentProduct);
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.html
index 03c668a7b..f763482d0 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.html
@@ -3,4 +3,5 @@
 	#basicInfoForm
 	[productCategories]="productsCategories"
 	[form]="basicInfo"
+	[currentProduct]="product"
 ></ea-product-basic-info-form>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
index 130715824..57ce8ccb0 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
@@ -1,4 +1,10 @@
-import { Component, EventEmitter, Output, ViewChild } from '@angular/core';
+import {
+	Component,
+	EventEmitter,
+	Output,
+	ViewChild,
+	Input
+} from '@angular/core';
 import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
 import { BasicInfoFormComponent } from 'app/@shared/product/forms/basic-info/basic-info-form.component';
 import ProductsCategory from '@modules/server.common/entities/ProductsCategory';
@@ -8,6 +14,7 @@ import { IProductCreateObject } from '@modules/server.common/interfaces/IProduct
 import { ProductsService } from 'app/@core/data/products.service';
 import { ProductViewModel } from 'app/pages/+simulation/products/products.component';
 import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
+import Product from '@modules/server.common/entities/Product';
 
 @Component({
 	selector: 'ea-merchants-setup-product-mutation',
@@ -19,6 +26,11 @@ export class SetupMerchantProductMutationComponent {
 
 	@Output()
 	onCreate: EventEmitter<ProductViewModel> = new EventEmitter();
+	@Output()
+	onEdit: EventEmitter<boolean> = new EventEmitter();
+
+	@Input()
+	product: Product;
 
 	productsCategories: ProductsCategory[];
 	areCategoriesLoaded: boolean = false;
@@ -76,4 +88,21 @@ export class SetupMerchantProductMutationComponent {
 			console.error(error.message);
 		}
 	}
+
+	async save() {
+		try {
+			const res = await this.basicInfoForm.setupProductCreateObject();
+			await this._productsService
+				.save({
+					_id: this.product._id,
+					...res
+				} as Product)
+				.pipe(first())
+				.toPromise();
+
+			this.onEdit.emit(true);
+		} catch (error) {
+			console.error(error.message);
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
index 4e41d1663..923252bae 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -10,6 +10,9 @@
 		<span *ngIf="currentView == componentViews.createProduct">
 			Create product
 		</span>
+		<span *ngIf="currentView == componentViews.editProduct">
+			Edit product
+		</span>
 		<span *ngIf="currentView == componentViews.addProducts">
 			Add product
 		</span>
@@ -62,10 +65,18 @@
 			></ea-merchants-setup-products-catalog>
 		</div>
 
-		<div *ngIf="currentView == componentViews.createProduct" class="row">
+		<div
+			*ngIf="
+				currentView == componentViews.createProduct ||
+				currentView == componentViews.editProduct
+			"
+			class="row"
+		>
 			<div class="form-group offset-md-2 col-md-8">
 				<ea-merchants-setup-product-mutation
 					(onCreate)="select([$event])"
+					(onEdit)="updateMain()"
+					[product]="currentProduct"
 					#productMutation
 				></ea-merchants-setup-product-mutation>
 			</div>
@@ -119,4 +130,13 @@
 	>
 		Create
 	</button>
+
+	<button
+		*ngIf="currentView === componentViews.editProduct"
+		nbButton
+		[disabled]="!productMutation?.basicInfo.valid || false"
+		(click)="productMutation.save()"
+	>
+		Save
+	</button>
 </div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index 5040b32df..8bf943c82 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -10,12 +10,13 @@ import { SetupMerchantProductsCatalogComponent } from './products-catalog/produc
 import { SetupMerchantAddProductsComponent } from './add-products/add-products.component';
 import WarehouseProduct from '@modules/server.common/entities/WarehouseProduct';
 import { WarehouseProductsRouter } from '@modules/client.common.angular2/routers/warehouse-products-router.service';
-import { Subject } from 'rxjs';
+import { Subject, Subscription } from 'rxjs';
 import { takeUntil, first } from 'rxjs/operators';
 import { WarehouseProductsComponent } from 'app/@shared/warehouse-product/forms/warehouse-products-table';
 import { SetupMerchantProductMutationComponent } from './product-mutation/product-mutation.component';
 import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
+import Product from '@modules/server.common/entities/Product';
 
 @Component({
 	selector: 'ea-merchants-setup-products',
@@ -41,12 +42,14 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 		main: 'main',
 		productsTable: 'productsTable',
 		createProduct: 'createProduct',
+		editProduct: 'editProduct',
 		addProducts: 'addProducts'
 	};
 	productsPerPage = 3;
 	// TODO get real warehouse id
 	storeId = '5ca48ff5d32c2d18ac96f562';
 	showProductsTable: boolean = false;
+	currentProduct: Product;
 
 	productsForAdd = [];
 	storeProducts: WarehouseProduct[];
@@ -54,6 +57,7 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 	private _currentView = this.componentViews.main;
 	private _prevView = this.componentViews.main;
 	private _ngDestroy$ = new Subject<void>();
+	private products$: Subscription;
 
 	constructor(
 		private warehouseProductsRouter: WarehouseProductsRouter,
@@ -101,11 +105,13 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 			return;
 		}
 
+		this.currentProduct = null;
 		this.currentView = this.componentViews.main;
 	}
 
-	editProduct() {
-		console.warn('TODO edit product');
+	editProduct({ data }) {
+		this.currentProduct = data.product;
+		this.currentView = this.componentViews.editProduct;
 	}
 
 	async removeProduct({ data }) {
@@ -130,15 +136,17 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 		}
 	}
 
-	ngOnInit(): void {
+	async loadProducts() {
 		if (this.storeId) {
-			this.warehouseProductsRouter
+			if (this.products$) {
+				await this.products$.unsubscribe();
+			}
+
+			this.products$ = this.warehouseProductsRouter
 				.get(this.storeId)
 				.pipe(takeUntil(this._ngDestroy$))
 				.subscribe((products) => {
-					if (products.length > 0) {
-						this.showProductsTable = true;
-					}
+					this.showProductsTable = products.length > 0;
 
 					this.productsTable.loadDataSmartTable(
 						products,
@@ -150,6 +158,16 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 		}
 	}
 
+	updateMain() {
+		this.currentProduct = null;
+		this.currentView = this.componentViews.main;
+		this.loadProducts();
+	}
+
+	ngOnInit(): void {
+		this.loadProducts();
+	}
+
 	ngOnDestroy(): void {
 		this._ngDestroy$.next();
 		this._ngDestroy$.complete();

From c6931a3dcf7933958f7b1caf3f4a28ae0040fc71 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 11 Apr 2019 10:25:27 +0300
Subject: [PATCH 176/382] feat(ever-admin): finished step "Products" EV-1197

---
 .../products/products.component.html          |  5 ++--
 .../components/products/products.component.ts | 23 +++++++++++++------
 .../+merchants/merchants.component.html       |  1 +
 .../+setup/+merchants/merchants.component.ts  |  7 ++++--
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
index 923252bae..ed6568e92 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -22,13 +22,13 @@
 			[hidden]="currentView !== componentViews.main"
 			class="main-content"
 		>
-			<!-- TODO disable if store id don't exist -->
 			<div class="row actions">
 				<div class="form-group offset-md-2 col-md-4">
 					<button
 						nbButton
 						outline
 						status="success"
+						[disabled]="!storeId"
 						(click)="currentView = componentViews.productsTable"
 					>
 						Select from products catalog
@@ -40,6 +40,7 @@
 						nbButton
 						outline
 						status="success"
+						[disabled]="!storeId"
 						(click)="currentView = componentViews.createProduct"
 					>
 						Create new product
@@ -96,7 +97,7 @@
 	<button nbButton (click)="previousStep.emit()">
 		{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
 	</button>
-	<button nbButton (click)="nextStep.emit()">
+	<button nbButton (click)="finish()">
 		{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
 	</button>
 </div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index 8bf943c82..0711c3457 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -3,8 +3,9 @@ import {
 	ViewChild,
 	Output,
 	EventEmitter,
-	OnInit,
-	OnDestroy
+	OnDestroy,
+	Input,
+	OnChanges
 } from '@angular/core';
 import { SetupMerchantProductsCatalogComponent } from './products-catalog/products-catalog.component';
 import { SetupMerchantAddProductsComponent } from './add-products/add-products.component';
@@ -17,13 +18,14 @@ import { SetupMerchantProductMutationComponent } from './product-mutation/produc
 import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
 import Product from '@modules/server.common/entities/Product';
+import { Router } from '@angular/router';
 
 @Component({
 	selector: 'ea-merchants-setup-products',
 	templateUrl: './products.component.html',
 	styleUrls: ['./products.component.scss']
 })
-export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
+export class SetupMerchantProductsComponent implements OnChanges, OnDestroy {
 	@ViewChild('productsCatalog')
 	productsCatalog: SetupMerchantProductsCatalogComponent;
 	@ViewChild('addProducts')
@@ -38,6 +40,9 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 	@Output()
 	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
 
+	@Input()
+	storeId: string;
+
 	componentViews = {
 		main: 'main',
 		productsTable: 'productsTable',
@@ -46,8 +51,6 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 		addProducts: 'addProducts'
 	};
 	productsPerPage = 3;
-	// TODO get real warehouse id
-	storeId = '5ca48ff5d32c2d18ac96f562';
 	showProductsTable: boolean = false;
 	currentProduct: Product;
 
@@ -62,7 +65,8 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 	constructor(
 		private warehouseProductsRouter: WarehouseProductsRouter,
 		private warehouseRouter: WarehouseRouter,
-		private notifyService: NotifyService
+		private notifyService: NotifyService,
+		private router: Router
 	) {}
 
 	get haveProductsForAdd() {
@@ -164,7 +168,12 @@ export class SetupMerchantProductsComponent implements OnInit, OnDestroy {
 		this.loadProducts();
 	}
 
-	ngOnInit(): void {
+	finish() {
+		this.nextStep.emit();
+		this.router.navigateByUrl('/setup');
+	}
+
+	ngOnChanges(): void {
 		this.loadProducts();
 	}
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index cc92a06a4..44236e6da 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -73,6 +73,7 @@
 						</nb-step>
 						<nb-step label="Products">
 							<ea-merchants-setup-products
+								[storeId]="currentStore?.id"
 								#products
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
index 55e4edb95..5235549da 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
@@ -12,6 +12,7 @@ import GeoLocation from '@modules/server.common/entities/GeoLocation';
 import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
 import { ToasterService } from 'angular2-toaster';
 import { NbStepperComponent } from '@nebular/theme';
+import Warehouse from '@modules/server.common/entities/Warehouse';
 
 @Component({
 	styleUrls: ['./merchants.component.scss'],
@@ -38,6 +39,8 @@ export class SetupMerchantsComponent {
 	@ViewChild('ordersSettings')
 	stepOrdersSettings: SetupMerchantOrdersSettingsComponent;
 
+	currentStore: Warehouse;
+
 	get canCreateMerchant() {
 		return (
 			this.stepAccount.formValid &&
@@ -54,13 +57,13 @@ export class SetupMerchantsComponent {
 
 	async createMerchant() {
 		try {
-			const merchant = await this.warehouseRouter.register(
+			this.currentStore = await this.warehouseRouter.register(
 				this.getMerchantCreateObj()
 			);
 
 			this.toasterService.pop(
 				'success',
-				`Warehouse ${merchant.name} was created!`
+				`Warehouse ${this.currentStore.name} was created!`
 			);
 
 			this.nbStepper.next();

From 79c03e32f6eafb1942173aa4abe0ada2ed2ec4ea Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 11 Apr 2019 10:41:19 +0300
Subject: [PATCH 177/382] feat(ever-admin): added TODO's in Instruction, Setup
 Merchants page EV-1197

---
 .../components/instructions/instructions.component.html     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index 0858a7e1f..f67bea7e1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -27,5 +27,11 @@ <h5>How to setup {{ stepper.selected.label }}?</h5>
 		<div *ngIf="stepper.index === 7">
 			TODO add instructions for Orders Settings
 		</div>
+		<div *ngIf="stepper.index === 8">
+			TODO add instructions for Product categories
+		</div>
+		<div *ngIf="stepper.index === 9">
+			TODO add instructions for Products
+		</div>
 	</nb-card-body>
 </nb-card>

From ea49beca910ae65512cd8dfb88787684e990c51a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 11 Apr 2019 11:51:33 +0300
Subject: [PATCH 178/382] feat(ever-merchant): loaded initial Geolocation data
 when create carrier Carriers page EV-1212

---
 .../location/location-form.component.ts       | 51 ++++++++++++++-----
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
index 982697432..20fbeb9a9 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
@@ -26,6 +26,9 @@ import {
 } from '@modules/server.common/entities/GeoLocation';
 
 import { isEmpty } from 'lodash';
+import { Store } from 'services/store.service';
+import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
+import { first } from 'rxjs/operators';
 
 @Component({
 	selector: 'carrier-location-form',
@@ -69,15 +72,31 @@ export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
 
 	constructor(
 		private formBuilder: FormBuilder,
-		private translate: TranslateService
+		private translate: TranslateService,
+		private store: Store,
+		private warehouseRouter: WarehouseRouter
 	) {}
 
+	get buttonOK() {
+		return this._translate(this.PREFIX + this.OK);
+	}
+
+	get buttonCancel() {
+		return this._translate(this.PREFIX + this.CANCEL);
+	}
+
+	get countries(): Array<{ id: Country; name: CountryName }> {
+		return countriesIdsToNamesArray;
+	}
+
 	ngOnInit() {
 		this._initGoogleAutocompleteApi();
 		// this._tryFindNewCoordinates();
 
 		this.buildForm(this.formBuilder);
 		this.bindFormControls();
+
+		this._loadInitialData();
 	}
 
 	ngOnChanges(): void {
@@ -85,12 +104,9 @@ export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
 		this._ngDestroy$.complete();
 	}
 
-	get buttonOK() {
-		return this._translate(this.PREFIX + this.OK);
-	}
-
-	get buttonCancel() {
-		return this._translate(this.PREFIX + this.CANCEL);
+	ngOnDestroy(): void {
+		this._ngDestroy$.next();
+		this._ngDestroy$.complete();
 	}
 
 	buildForm(formBuilder: FormBuilder) {
@@ -117,10 +133,6 @@ export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
 		this.postcode = this.form.get('postcode');
 	}
 
-	get countries(): Array<{ id: Country; name: CountryName }> {
-		return countriesIdsToNamesArray;
-	}
-
 	toggleCoordinates() {
 		this.showCoordinates = !this.showCoordinates;
 		console.log('Toggle Cordinates');
@@ -369,5 +381,20 @@ export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
 		}
 	}
 
-	ngOnDestroy(): void {}
+	private async _loadInitialData() {
+		const { geoLocation } = await this.warehouseRouter
+			.get(this.store.warehouseId, false)
+			.pipe(first())
+			.toPromise();
+
+		this.city.setValue(geoLocation.city);
+		this.street.setValue(geoLocation.streetAddress);
+		this.house.setValue(geoLocation.house);
+		this.country.setValue(geoLocation.countryId.toString());
+		this.lng.setValue(geoLocation.coordinates.lng);
+		this.lat.setValue(geoLocation.coordinates.lat);
+		this.postcode.setValue(geoLocation.postcode);
+
+		this._tryFindNewCoordinates();
+	}
 }

From 8c20de793468b3c3fe91d73dd088d1cf46cfa4e7 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2019 09:45:49 +0000
Subject: [PATCH 179/382] fix(package): update mongodb-memory-server to version
 5.0.2

Closes #426
---
 backend/api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index ab937a8c1..c3834d9ad 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -99,7 +99,7 @@
 		"module-alias": "^2.2.0",
 		"moment": "^2.24.0",
 		"mongodb": "^3.2.1",
-		"mongodb-memory-server": "^4.2.1",
+		"mongodb-memory-server": "^5.0.2",
 		"mongoose": "^5.5.0",
 		"morgan": "^1.9.1",
 		"ms": "^2.1.1",

From 48a6c48ec0e0a46f6c04b17496d94f1c8a29732b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2019 09:45:53 +0000
Subject: [PATCH 180/382] chore(package): update lockfile backend/api/yarn.lock

---
 backend/api/yarn.lock | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 90a309178..305f77bc3 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -7092,10 +7092,21 @@ mongodb-core@3.2.2:
   optionalDependencies:
     saslprep "^1.0.0"
 
-mongodb-memory-server@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-4.2.1.tgz#214b1313804cb34a091cec83f38b4089f2f267d4"
-  integrity sha512-dEKTV07X1xs34CFJYLe6aqzhOCRnArn+tSlfKPNVp1RqJpX9cashFb9Dm+CMaPFmMEZCaEJ9Kz3uC0OmZu2Hrg==
+mongodb-core@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.3.tgz#eb9bcb876f169f5843fd135f7f7686dbac0e9e34"
+  integrity sha512-UyI0rmvPPkjOJV8XGWa9VCTq7R4hBVipimhnAXeSXnuAPjuTqbyfA5Ec9RcYJ1Hhu+ISnc8bJ1KfGZd4ZkYARQ==
+  dependencies:
+    bson "^1.1.1"
+    require_optional "^1.0.1"
+    safe-buffer "^5.1.2"
+  optionalDependencies:
+    saslprep "^1.0.0"
+
+mongodb-memory-server-core@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/mongodb-memory-server-core/-/mongodb-memory-server-core-5.0.2.tgz#e4d21b5d6a746271fab67f1c7ff8d459a98e7c8f"
+  integrity sha512-LBzX8AKq82n35WAH67pOsp86OvtHxpKMnrcM9+dcezsSgoEHokZCkfeZJ6Z/On481jN65SJ1QMn2AQ+3EzW5UQ==
   dependencies:
     debug "^4.1.1"
     decompress "^4.2.0"
@@ -7109,6 +7120,15 @@ mongodb-memory-server@^4.2.1:
     mkdirp "^0.5.1"
     tmp "^0.0.33"
     uuid "^3.2.1"
+  optionalDependencies:
+    mongodb ">=3.0.0"
+
+mongodb-memory-server@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-5.0.2.tgz#520812b6cc50829d7a05b808989f6f2549b95677"
+  integrity sha512-SQLqpvEzpke/meyMD938yDbif7ImypjSflbQA9TgXIW5rHtbdI+HbSFMV+QNy0DEYbtDK7IF4ACANhHKgkJaVg==
+  dependencies:
+    mongodb-memory-server-core "5.0.2"
 
 mongodb@3.2.2:
   version "3.2.2"
@@ -7118,6 +7138,14 @@ mongodb@3.2.2:
     mongodb-core "3.2.2"
     safe-buffer "^5.1.2"
 
+mongodb@>=3.0.0:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.3.tgz#4610ee33d300caa74329c2dd03e137210723cd91"
+  integrity sha512-jw8UyPsq4QleZ9z+t/pIVy3L++51vKdaJ2Q/XXeYxk/3cnKioAH8H6f5tkkDivrQL4PUgUOHe9uZzkpRFH1XtQ==
+  dependencies:
+    mongodb-core "^3.2.3"
+    safe-buffer "^5.1.2"
+
 mongodb@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.1.tgz#a8af8f15a30ef0fd217405d3c77a25290ce81e0b"

From 6140b0a2b6cbbb932732c30a26e0a554ff4fdb30 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 12 Apr 2019 02:54:52 +0300
Subject: [PATCH 181/382] docs: more details in README about git repo clone

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index af6a04649..f807a68f9 100644
--- a/README.md
+++ b/README.md
@@ -73,10 +73,13 @@ We follow [Gitflow Workflow](https://nvie.com/posts/a-successful-git-branching-m
 Clone the Ever Platform Git repo:
 
 ```
-git clone -c core.symlinks=true --recursive git@github.com:ever-co/ever.git
+git clone -c core.symlinks=true --recursive https://github.com/ever-co/ever.git
 ```
 
-Note: it's important to enable Git symlinks because they are used for shared modules (every project have symlinks to common shared modules in the /shared folder)
+Notes: 
+
+-   if you want to use development branch (unstable, but latest development) clone using `--branch develop`
+-   it's important to enable Git symlinks because they are used for shared modules (every project have symlinks to common shared modules in the /shared folder)
 
 If you use Git >= v2.14, it probably make sense to setup following globally:
 

From e9bd2b5c3ca385836eabf620fa537ff8c6c1bd90 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 12 Apr 2019 14:24:30 +0300
Subject: [PATCH 182/382] feat(ever-admin): add translate to orders settings
 EV-1198

---
 .../settings/orders/orders.component.html          | 14 ++++++++++++--
 admin/website-angular/src/assets/i18n/bg.json      |  4 ++++
 admin/website-angular/src/assets/i18n/en.json      |  4 ++++
 admin/website-angular/src/assets/i18n/he.json      |  4 ++++
 admin/website-angular/src/assets/i18n/ru.json      |  4 ++++
 5 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
index 719e224d4..735542eef 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
@@ -1,9 +1,19 @@
 <nb-card class="setup-merchant-orders-settings">
-	<nb-card-header>Orders Settings</nb-card-header>
+	<nb-card-header>
+		{{
+			'FAKE_DATA.SETUP_MERCHANTS.ORDERS_SETTINGS.ORDERS_SETTINGS'
+				| translate
+		}}
+	</nb-card-header>
 	<nb-card-body>
 		<div class="form-group offset-md-2 col-md-8 row">
 			<div class="col">
-				<label>Order Barcode/QR code types</label>
+				<label>
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.ORDERS_SETTINGS.ORDER_BARCODE_QR_CODE_TYPES'
+							| translate
+					}}
+				</label>
 				<nb-radio-group
 					(valueChange)="typeChange($event)"
 					[(ngModel)]="iorderBarcodeType"
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 37771da11..ef793c3f6 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -276,6 +276,10 @@
 				"PRODUCTS_TAKEAWAY_BY_DEFAULT": "Продукти за вкъщи (по подразбиране)",
 				"USE_SELECTED_SHARED_CARRIERS": "Използвайте избрани споделени оператори",
 				"ADD_YOUR_CARRIERS": "Добавете операторите си"
+			},
+			"ORDERS_SETTINGS": {
+				"ORDERS_SETTINGS": "Настройки за поръчки",
+				"ORDER_BARCODE_QR_CODE_TYPES": "Заяви типът баркод/qr код"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 1eb2a037e..b89c3ea67 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -275,6 +275,10 @@
 				"PRODUCTS_TAKEAWAY_BY_DEFAULT": "Products Takeaway (by default)",
 				"USE_SELECTED_SHARED_CARRIERS": "Use selected shared carriers",
 				"ADD_YOUR_CARRIERS": "Add your carriers"
+			},
+			"ORDERS_SETTINGS": {
+				"ORDERS_SETTINGS": "Orders Settings",
+				"ORDER_BARCODE_QR_CODE_TYPES": "Order Barcode/QR code types"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index cf1df12e4..d456b3d6a 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -275,6 +275,10 @@
 				"PRODUCTS_TAKEAWAY_BY_DEFAULT": "מוצרים Takeaway (כברירת מחדל)",
 				"USE_SELECTED_SHARED_CARRIERS": "השתמש במפעילים משותפים נבחרים",
 				"ADD_YOUR_CARRIERS": "הוסף את הספקים שלך"
+			},
+			"ORDERS_SETTINGS": {
+				"ORDERS_SETTINGS": "הגדרות הזמנות",
+				"ORDER_BARCODE_QR_CODE_TYPES": "ציין את סוג קוד הברקוד / qr"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 31155dcc5..fb3879c55 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -275,6 +275,10 @@
 				"PRODUCTS_TAKEAWAY_BY_DEFAULT": "Продукты на вынос (по умолчанию)",
 				"USE_SELECTED_SHARED_CARRIERS": "Использовать выбранные общие носители",
 				"ADD_YOUR_CARRIERS": "Добавьте своих перевозчиков"
+			},
+			"ORDERS_SETTINGS": {
+				"ORDERS_SETTINGS": "Настройки заказов",
+				"ORDER_BARCODE_QR_CODE_TYPES": "Укажите тип штрих-кода / QR-код"
 			}
 		}
 	},

From 39f6bd6d5eb5e62a7458f58d73e781c6df73086b Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 12 Apr 2019 14:44:58 +0300
Subject: [PATCH 183/382] feat(ever-admin): add translate to products
 categories EV-1198

---
 .../product-categories.component.html            | 16 +++++++++++-----
 admin/website-angular/src/assets/i18n/bg.json    |  4 ++++
 admin/website-angular/src/assets/i18n/en.json    |  4 ++++
 admin/website-angular/src/assets/i18n/he.json    |  4 ++++
 admin/website-angular/src/assets/i18n/ru.json    |  4 ++++
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
index 69e887bcb..6c55e6def 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
@@ -1,6 +1,9 @@
 <nb-card class="setup-merchant-product-categories">
 	<nb-card-header>
-		Product categories
+		{{
+			'FAKE_DATA.SETUP_MERCHANTS.PRODUCT_CATEGORIES.PRODUCT_CATEGORIES'
+				| translate
+		}}
 	</nb-card-header>
 	<nb-card-body>
 		<div class="row actions">
@@ -14,7 +17,10 @@
 					status="success"
 					(click)="showMutationForm = true"
 				>
-					Add own product category
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PRODUCT_CATEGORIES.ADD_OWN_PRODUCT_CATEGORY'
+							| translate
+					}}
 				</button>
 			</div>
 
@@ -54,7 +60,7 @@
 
 <div *ngIf="showMutationForm">
 	<button nbButton (click)="showMutationForm = false">
-		Back
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.BACK' | translate }}
 	</button>
 
 	<button
@@ -63,7 +69,7 @@
 		[disabled]="showMutationForm ? !isValidForm : false"
 		(click)="add()"
 	>
-		Add
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.ADD' | translate }}
 	</button>
 
 	<button
@@ -72,6 +78,6 @@
 		[disabled]="showMutationForm ? isInvalidValidForm : false"
 		(click)="edit()"
 	>
-		Save
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.SAVE' | translate }}
 	</button>
 </div>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index ef793c3f6..06a9ae807 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -280,6 +280,10 @@
 			"ORDERS_SETTINGS": {
 				"ORDERS_SETTINGS": "Настройки за поръчки",
 				"ORDER_BARCODE_QR_CODE_TYPES": "Заяви типът баркод/qr код"
+			},
+			"PRODUCT_CATEGORIES": {
+				"PRODUCT_CATEGORIES": "Продуктови категории",
+				"ADD_OWN_PRODUCT_CATEGORY": "Добавете собствена категория продукти"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index b89c3ea67..acdfe7634 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -279,6 +279,10 @@
 			"ORDERS_SETTINGS": {
 				"ORDERS_SETTINGS": "Orders Settings",
 				"ORDER_BARCODE_QR_CODE_TYPES": "Order Barcode/QR code types"
+			},
+			"PRODUCT_CATEGORIES": {
+				"PRODUCT_CATEGORIES": "Product categories",
+				"ADD_OWN_PRODUCT_CATEGORY": "Add own product category"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index d456b3d6a..ef311ce63 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -279,6 +279,10 @@
 			"ORDERS_SETTINGS": {
 				"ORDERS_SETTINGS": "הגדרות הזמנות",
 				"ORDER_BARCODE_QR_CODE_TYPES": "ציין את סוג קוד הברקוד / qr"
+			},
+			"PRODUCT_CATEGORIES": {
+				"PRODUCT_CATEGORIES": "קטגוריות מוצרים",
+				"ADD_OWN_PRODUCT_CATEGORY": "הוסף את הקטגוריה של המוצר עצמו"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index fb3879c55..8581487c6 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -279,6 +279,10 @@
 			"ORDERS_SETTINGS": {
 				"ORDERS_SETTINGS": "Настройки заказов",
 				"ORDER_BARCODE_QR_CODE_TYPES": "Укажите тип штрих-кода / QR-код"
+			},
+			"PRODUCT_CATEGORIES": {
+				"PRODUCT_CATEGORIES": "Категории продукта",
+				"ADD_OWN_PRODUCT_CATEGORY": "Добавить собственную категорию продукта"
 			}
 		}
 	},

From 11b82e0333e59f7bd294ef44e3a579e4efb24992 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 12 Apr 2019 15:40:43 +0300
Subject: [PATCH 184/382] feat(ever-admin): add translate to products EV-1198

---
 .../products/products.component.html          | 34 ++++++++++++-------
 admin/website-angular/src/assets/i18n/bg.json | 10 ++++++
 admin/website-angular/src/assets/i18n/en.json | 10 ++++++
 admin/website-angular/src/assets/i18n/he.json | 10 ++++++
 admin/website-angular/src/assets/i18n/ru.json | 10 ++++++
 5 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
index ed6568e92..abaf26548 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
@@ -1,20 +1,24 @@
-<!-- TODO add translate -->
 <nb-card class="setup-merchant-products">
 	<nb-card-header>
 		<span *ngIf="currentView == componentViews.main">
-			Products
+			{{ 'FAKE_DATA.SETUP_MERCHANTS.PRODUCTS.PRODUCTS' | translate }}
 		</span>
 		<span *ngIf="currentView == componentViews.productsTable">
-			Select from products catalog
+			{{
+				'FAKE_DATA.SETUP_MERCHANTS.PRODUCTS.SELECT_FROM_PRODUCTS_CATALOG'
+					| translate
+			}}
 		</span>
 		<span *ngIf="currentView == componentViews.createProduct">
-			Create product
+			{{
+				'FAKE_DATA.SETUP_MERCHANTS.PRODUCTS.CREATE_PRODUCT' | translate
+			}}
 		</span>
 		<span *ngIf="currentView == componentViews.editProduct">
-			Edit product
+			{{ 'FAKE_DATA.SETUP_MERCHANTS.PRODUCTS.EDIT_PRODUCT' | translate }}
 		</span>
 		<span *ngIf="currentView == componentViews.addProducts">
-			Add product
+			{{ 'FAKE_DATA.SETUP_MERCHANTS.PRODUCTS.ADD_PRODUCT' | translate }}
 		</span>
 	</nb-card-header>
 	<nb-card-body>
@@ -31,7 +35,10 @@
 						[disabled]="!storeId"
 						(click)="currentView = componentViews.productsTable"
 					>
-						Select from products catalog
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.PRODUCTS.SELECT_FROM_PRODUCTS_CATALOG'
+								| translate
+						}}
 					</button>
 				</div>
 
@@ -43,7 +50,10 @@
 						[disabled]="!storeId"
 						(click)="currentView = componentViews.createProduct"
 					>
-						Create new product
+						{{
+							'FAKE_DATA.SETUP_MERCHANTS.PRODUCTS.CREATE_NEW_PRODUCT'
+								| translate
+						}}
 					</button>
 				</div>
 
@@ -111,7 +121,7 @@
 		nbButton
 		(click)="select(productsCatalog?.productsTable.selectedProducts)"
 	>
-		Select
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.SELECT' | translate }}
 	</button>
 
 	<button
@@ -120,7 +130,7 @@
 		nbButton
 		(click)="addProducts.add()"
 	>
-		Add
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.ADD' | translate }}
 	</button>
 
 	<button
@@ -129,7 +139,7 @@
 		[disabled]="!productMutation?.basicInfo.valid || false"
 		(click)="productMutation.create()"
 	>
-		Create
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.CREATE' | translate }}
 	</button>
 
 	<button
@@ -138,6 +148,6 @@
 		[disabled]="!productMutation?.basicInfo.valid || false"
 		(click)="productMutation.save()"
 	>
-		Save
+		{{ 'FAKE_DATA.SETUP_MERCHANTS.SAVE' | translate }}
 	</button>
 </div>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 06a9ae807..f9251d3e9 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -215,6 +215,8 @@
 			"ADD": "Добави",
 			"BACK": "Обратно",
 			"SAVE": "Запази",
+			"SELECT": "Select",
+			"CREATE": "Create",
 			"ACCOUNT": {
 				"ACCOUNT": "Сметка",
 				"EMAIL_ADDRESS": "Имейл адрес",
@@ -284,6 +286,14 @@
 			"PRODUCT_CATEGORIES": {
 				"PRODUCT_CATEGORIES": "Продуктови категории",
 				"ADD_OWN_PRODUCT_CATEGORY": "Добавете собствена категория продукти"
+			},
+			"PRODUCTS": {
+				"PRODUCTS": "Продукти",
+				"SELECT_FROM_PRODUCTS_CATALOG": "Изберете от каталога с продукти",
+				"CREATE_PRODUCT": "Създайте продукт",
+				"EDIT_PRODUCT": "Редактиране на продукт",
+				"ADD_PRODUCT": "Добавете продукт",
+				"CREATE_NEW_PRODUCT": "Създайте нов продукт"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index acdfe7634..fe8c90474 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -214,6 +214,8 @@
 			"ADD": "Add",
 			"BACK": "Back",
 			"SAVE": "Save",
+			"SELECT": "Select",
+			"CREATE": "Create",
 			"ACCOUNT": {
 				"ACCOUNT": "Account",
 				"EMAIL_ADDRESS": "Email address",
@@ -283,6 +285,14 @@
 			"PRODUCT_CATEGORIES": {
 				"PRODUCT_CATEGORIES": "Product categories",
 				"ADD_OWN_PRODUCT_CATEGORY": "Add own product category"
+			},
+			"PRODUCTS": {
+				"PRODUCTS": "Products",
+				"SELECT_FROM_PRODUCTS_CATALOG": "Select from products catalog",
+				"CREATE_PRODUCT": "Create product",
+				"EDIT_PRODUCT": "Edit product",
+				"ADD_PRODUCT": "Add product",
+				"CREATE_NEW_PRODUCT": "Create new product"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index ef311ce63..dfc260bc2 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -214,6 +214,8 @@
 			"ADD": "הוסף",
 			"BACK": "חזור",
 			"SAVE": "להציל",
+			"SELECT": "בחר",
+			"CREATE": "צור",
 			"ACCOUNT": {
 				"ACCOUNT": "חשבון",
 				"EMAIL_ADDRESS": "כתובת דוא'ל",
@@ -283,6 +285,14 @@
 			"PRODUCT_CATEGORIES": {
 				"PRODUCT_CATEGORIES": "קטגוריות מוצרים",
 				"ADD_OWN_PRODUCT_CATEGORY": "הוסף את הקטגוריה של המוצר עצמו"
+			},
+			"PRODUCTS": {
+				"PRODUCTS": "מוצרים",
+				"SELECT_FROM_PRODUCTS_CATALOG": "בחר מתוך קטלוג מוצרים",
+				"CREATE_PRODUCT": "צור מוצר",
+				"EDIT_PRODUCT": "ערוך מוצר",
+				"ADD_PRODUCT": "הוסף מוצר",
+				"CREATE_NEW_PRODUCT": "צור מוצר חדש"
 			}
 		}
 	},
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 8581487c6..5c095b5b1 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -214,6 +214,8 @@
 			"ADD": "Добавлять",
 			"BACK": "Назад",
 			"SAVE": "Сохранить",
+			"SELECT": "Выбрать",
+			"CREATE": "Создайте",
 			"ACCOUNT": {
 				"ACCOUNT": "Учетная запись",
 				"EMAIL_ADDRESS": "Адрес электронной почты",
@@ -283,6 +285,14 @@
 			"PRODUCT_CATEGORIES": {
 				"PRODUCT_CATEGORIES": "Категории продукта",
 				"ADD_OWN_PRODUCT_CATEGORY": "Добавить собственную категорию продукта"
+			},
+			"PRODUCTS": {
+				"PRODUCTS": "Товары",
+				"SELECT_FROM_PRODUCTS_CATALOG": "Выберите из каталога продукции",
+				"CREATE_PRODUCT": "Создать продукт",
+				"EDIT_PRODUCT": "Изменить продукт",
+				"ADD_PRODUCT": "Добавить товар",
+				"CREATE_NEW_PRODUCT": "Создать новый продукт"
 			}
 		}
 	},

From 472e2c9bb692fe218c7fcdbc18c6f71c64153e19 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 12 Apr 2019 16:48:11 +0300
Subject: [PATCH 185/382] feat(ever-admin): add translate to the stepper
 EV-1198

---
 .../+merchants/merchants.component.html       | 70 ++++++++++++++++---
 admin/website-angular/src/assets/i18n/bg.json | 12 ++++
 admin/website-angular/src/assets/i18n/en.json | 12 ++++
 admin/website-angular/src/assets/i18n/he.json | 12 ++++
 admin/website-angular/src/assets/i18n/ru.json | 12 ++++
 5 files changed, 108 insertions(+), 10 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index 44236e6da..e6a2ffb8e 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -6,49 +6,84 @@
 			<nb-card>
 				<nb-card-body>
 					<nb-stepper #nbStepper orientation="vertical">
-						<nb-step label="Account">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.ACCOUNT'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-account
 								#account
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-account>
 						</nb-step>
-						<nb-step label="Basic info">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.BASIC_INFO'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-basic-info
 								#basicInfo
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-basic-info>
 						</nb-step>
-						<nb-step label="Contact info">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.CONTACT_INFO'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-contact-info
 								#contactInfo
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-contact-info>
 						</nb-step>
-						<nb-step label="Location">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.LOCATION'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-location
 								#location
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-location>
 						</nb-step>
-						<nb-step label="Payments">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.PAYMENTS'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-payments
 								#payments
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-payments>
 						</nb-step>
-						<nb-step label="Manufacturing">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.MANUFACTURING'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-manufacturing
 								#manufacturing
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-manufacturing>
 						</nb-step>
-						<nb-step label="Delivery & Takeaway Settings">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.DELIVERY_AND_TAKEAWAY_SETTINGS'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-delivery-takeaway
 								[locationForm]="location.locationForm"
 								#deliveryAndTakeaway
@@ -56,7 +91,12 @@
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-delivery-takeaway>
 						</nb-step>
-						<nb-step label="Orders Settings">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.ORDERS_SETTINGS'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-orders-settings
 								#ordersSettings
 								(previousStep)="nbStepper.previous()"
@@ -64,14 +104,24 @@
 								[canCreateMerchant]="canCreateMerchant"
 							></ea-merchants-setup-orders-settings>
 						</nb-step>
-						<nb-step label="Product categories">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.PRODUCT_CATEGORIES'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-product-categories
 								#productCategories
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-product-categories>
 						</nb-step>
-						<nb-step label="Products">
+						<nb-step
+							label="{{
+								'FAKE_DATA.SETUP_MERCHANTS.STEPPER.PRODUCTS'
+									| translate
+							}}"
+						>
 							<ea-merchants-setup-products
 								[storeId]="currentStore?.id"
 								#products
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index f9251d3e9..81b17b14c 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -217,6 +217,18 @@
 			"SAVE": "Запази",
 			"SELECT": "Select",
 			"CREATE": "Create",
+			"STEPPER": {
+				"ACCOUNT": "Акаунт",
+				"BASIC_INFO": "Основна информация",
+				"CONTACT_INFO": "Информация за контакт",
+				"LOCATION": "Местоположение",
+				"PAYMENTS": "Плащания",
+				"MANUFACTURING": "Производство",
+				"DELIVERY_AND_TAKEAWAY_SETTINGS": "Настройки за доставка и за вкъщи",
+				"ORDERS_SETTINGS": "Настройки за поръчки",
+				"PRODUCT_CATEGORIES": "Продуктови категории",
+				"PRODUCTS": "Продукти"
+			},
 			"ACCOUNT": {
 				"ACCOUNT": "Сметка",
 				"EMAIL_ADDRESS": "Имейл адрес",
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index fe8c90474..21349cdd1 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -216,6 +216,18 @@
 			"SAVE": "Save",
 			"SELECT": "Select",
 			"CREATE": "Create",
+			"STEPPER": {
+				"ACCOUNT": "Account",
+				"BASIC_INFO": "Basic info",
+				"CONTACT_INFO": "Contact info",
+				"LOCATION": "Location",
+				"PAYMENTS": "Payments",
+				"MANUFACTURING": "Manufacturing",
+				"DELIVERY_AND_TAKEAWAY_SETTINGS": "Delivery & Takeaway Settings",
+				"ORDERS_SETTINGS": "Orders Settings",
+				"PRODUCT_CATEGORIES": "Product categories",
+				"PRODUCTS": "Products"
+			},
 			"ACCOUNT": {
 				"ACCOUNT": "Account",
 				"EMAIL_ADDRESS": "Email address",
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index dfc260bc2..277042d64 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -216,6 +216,18 @@
 			"SAVE": "להציל",
 			"SELECT": "בחר",
 			"CREATE": "צור",
+			"STEPPER": {
+				"ACCOUNT": "חשבון",
+				"BASIC_INFO": "מידע בסיסי",
+				"CONTACT_INFO": "פרטים ליצירת קשר",
+				"LOCATION": "מקום",
+				"PAYMENTS": "תשלומים",
+				"MANUFACTURING": "ייצור",
+				"DELIVERY_AND_TAKEAWAY_SETTINGS": "הגדרות משלוח & Takeaway",
+				"ORDERS_SETTINGS": "הגדרות הזמנות",
+				"PRODUCT_CATEGORIES": "קטגוריות מוצרים",
+				"PRODUCTS": "מוצרים"
+			},
 			"ACCOUNT": {
 				"ACCOUNT": "חשבון",
 				"EMAIL_ADDRESS": "כתובת דוא'ל",
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 5c095b5b1..a26ff5375 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -216,6 +216,18 @@
 			"SAVE": "Сохранить",
 			"SELECT": "Выбрать",
 			"CREATE": "Создайте",
+			"STEPPER": {
+				"ACCOUNT": "Счет",
+				"BASIC_INFO": "Базовая информация",
+				"CONTACT_INFO": "Контактная информация",
+				"LOCATION": "Место нахождения",
+				"PAYMENTS": "Платежи",
+				"MANUFACTURING": "Производство",
+				"DELIVERY_AND_TAKEAWAY_SETTINGS": "Настройки доставки и выноса",
+				"ORDERS_SETTINGS": "Настройки заказов",
+				"PRODUCT_CATEGORIES": "Категории продукта",
+				"PRODUCTS": "Товары"
+			},
 			"ACCOUNT": {
 				"ACCOUNT": "Учетная запись",
 				"EMAIL_ADDRESS": "Адрес электронной почты",

From 0502534981bd2ec62a16441b75c7826aabfae1a5 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Fri, 12 Apr 2019 17:00:22 +0300
Subject: [PATCH 186/382] feat(ever-admin): add translate to how to set up
 container EV-1198

---
 .../components/instructions/instructions.component.html   | 8 +++++++-
 admin/website-angular/src/assets/i18n/bg.json             | 3 +++
 admin/website-angular/src/assets/i18n/en.json             | 3 +++
 admin/website-angular/src/assets/i18n/he.json             | 3 +++
 admin/website-angular/src/assets/i18n/ru.json             | 3 +++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
index f67bea7e1..91b9b26a1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
@@ -1,6 +1,12 @@
 <nb-card>
 	<nb-card-header>
-		<h5>How to setup {{ stepper.selected.label }}?</h5>
+		<h5>
+			{{
+				'FAKE_DATA.SETUP_MERCHANTS.HOW_TO_SET_UP.HOW_TO_SET_UP'
+					| translate
+			}}
+			{{ stepper.selected.label }}?
+		</h5>
 	</nb-card-header>
 	<nb-card-body>
 		<div *ngIf="stepper.index === 0">
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 81b17b14c..74bd74146 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -217,6 +217,9 @@
 			"SAVE": "Запази",
 			"SELECT": "Select",
 			"CREATE": "Create",
+			"HOW_TO_SET_UP": {
+				"HOW_TO_SET_UP": "Как да настроите"
+			},
 			"STEPPER": {
 				"ACCOUNT": "Акаунт",
 				"BASIC_INFO": "Основна информация",
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 21349cdd1..fda6fd5ef 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -216,6 +216,9 @@
 			"SAVE": "Save",
 			"SELECT": "Select",
 			"CREATE": "Create",
+			"HOW_TO_SET_UP": {
+				"HOW_TO_SET_UP": "How to setup"
+			},
 			"STEPPER": {
 				"ACCOUNT": "Account",
 				"BASIC_INFO": "Basic info",
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 277042d64..61472a7d4 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -216,6 +216,9 @@
 			"SAVE": "להציל",
 			"SELECT": "בחר",
 			"CREATE": "צור",
+			"HOW_TO_SET_UP": {
+				"HOW_TO_SET_UP": "איך להציב"
+			},
 			"STEPPER": {
 				"ACCOUNT": "חשבון",
 				"BASIC_INFO": "מידע בסיסי",
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index a26ff5375..822b5d6af 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -216,6 +216,9 @@
 			"SAVE": "Сохранить",
 			"SELECT": "Выбрать",
 			"CREATE": "Создайте",
+			"HOW_TO_SET_UP": {
+				"HOW_TO_SET_UP": "Как настроить"
+			},
 			"STEPPER": {
 				"ACCOUNT": "Счет",
 				"BASIC_INFO": "Базовая информация",

From ad0be7d8948c108be891389b2fc132d9c6968b41 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 12 Apr 2019 20:06:59 +0300
Subject: [PATCH 187/382] chore: packages updates (fixes issues with nodejs
 11.x)

---
 admin/website-angular/package.json |   13 +-
 admin/website-angular/yarn.lock    | 4140 +++++++++++++++-------------
 carrier/mobile-ionic/package.json  |   25 +-
 carrier/mobile-ionic/yarn.lock     | 3414 ++++++++++-------------
 merchant/tablet-ionic/package.json |   24 +-
 merchant/tablet-ionic/yarn.lock    | 3550 +++++++++++-------------
 shop/mobile-ionic/package.json     |   26 +-
 shop/mobile-ionic/yarn.lock        | 1486 +++++-----
 shop/website-angular/yarn.lock     | 3535 ++++++++++++++----------
 9 files changed, 8121 insertions(+), 8092 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 661938b6c..908c52def 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -148,12 +148,12 @@
 	},
 	"devDependencies": {
 		"conventional-changelog-cli": "^2.0.12",
-		"@angular-devkit/build-angular": "^0.13.7",
-		"@angular-devkit/build-webpack": "^0.13.7",
-		"@angular-devkit/architect": "^0.13.7",
-		"@angular-devkit/core": "^7.3.7",
-		"@angular-devkit/schematics": "^7.3.7",
-		"@angular/cli": "^7.3.7",
+		"@angular-devkit/build-angular": "^0.13.8",
+		"@angular-devkit/build-webpack": "^0.13.8",
+		"@angular-devkit/architect": "^0.13.8",
+		"@angular-devkit/core": "^7.3.8",
+		"@angular-devkit/schematics": "^7.3.8",
+		"@angular/cli": "^7.3.8",
 		"@angular/compiler-cli": "^7.2.11",
 		"@angular/language-service": "^7.2.11",
 		"@babel/core": "^7.4.0",
@@ -177,7 +177,6 @@
 		"@types/yargs": "^13.0.0",
 		"babel-loader": "^8.0.5",
 		"codelyzer": "^4.5.0",
-		"conventional-changelog-cli": "^2.0.11",
 		"cross-env": "^5.2.0",
 		"dotenv": "^6.2.0",
 		"envalid": "^4.2.2",
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index cde7d7cde..4d0f54074 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -7,24 +7,24 @@
   resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.5.tgz#6dbceb666b2dbc4a868b97e1340a3faceb5f2113"
   integrity sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ==
 
-"@angular-devkit/architect@0.13.7", "@angular-devkit/architect@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
-  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
+"@angular-devkit/architect@0.13.8", "@angular-devkit/architect@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
+  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
-  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
+"@angular-devkit/build-angular@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
+  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/build-optimizer" "0.13.7"
-    "@angular-devkit/build-webpack" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@ngtools/webpack" "7.3.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/build-optimizer" "0.13.8"
+    "@angular-devkit/build-webpack" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@ngtools/webpack" "7.3.8"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -40,7 +40,7 @@
     loader-utils "1.2.3"
     mini-css-extract-plugin "0.5.0"
     minimatch "3.0.4"
-    opn "5.4.0"
+    open "6.0.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
@@ -67,29 +67,29 @@
   optionalDependencies:
     node-sass "4.11.0"
 
-"@angular-devkit/build-optimizer@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
-  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
+"@angular-devkit/build-optimizer@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
+  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.7", "@angular-devkit/build-webpack@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
-  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
+"@angular-devkit/build-webpack@0.13.8", "@angular-devkit/build-webpack@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
+  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-devkit/core@7.3.7", "@angular-devkit/core@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
-  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+"@angular-devkit/core@7.3.8", "@angular-devkit/core@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
+  integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
   dependencies:
     ajv "6.9.1"
     chokidar "2.0.4"
@@ -97,60 +97,60 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.7", "@angular-devkit/schematics@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
-  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
+"@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
+  integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
 "@angular/animations@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
-  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
+  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/cdk@^7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.6.tgz#4c330cacd11df4adade6c1cd3ed587745f9912fd"
-  integrity sha512-ZuOz8nQk0bdo8YyNFcwnmSl4MPaQDAFTbLK29w4Vd/LfPnhBI3pAr0wVuPFb0fl3eSvvUrfTb/+kPbQcE07A0A==
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.7.tgz#ce1ad53ba04beb9c8e950acc5691ea0143753764"
+  integrity sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
-  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
-  dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
-    "@schematics/update" "0.13.7"
+"@angular/cli@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
+  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
+  dependencies:
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
+    "@schematics/angular" "7.3.8"
+    "@schematics/update" "0.13.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
     npm-package-arg "6.1.0"
-    opn "5.4.0"
+    open "6.0.0"
     pacote "9.4.0"
     semver "5.6.0"
     symbol-observable "1.2.0"
 
 "@angular/common@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
-  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
+  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz#0835a17dd9cea4bb03c5073d943a5074fed539ff"
-  integrity sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
+  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -165,56 +165,56 @@
     yargs "9.0.1"
 
 "@angular/compiler@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.11.tgz#d547bf781e5c8b28da9af2460a6dfb5683d325ae"
-  integrity sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
+  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
-  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
+  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/forms@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
-  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
+  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/http@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.11.tgz#c52a491374d937cd05789a5c13d70a1c5fdddf4d"
-  integrity sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.12.tgz#0ec28f6dc7814c85761833b1fd4b53b397b5e882"
+  integrity sha512-cceU+SWIQFOL3gRKqm5SYHQM3VoKbXne2XQRSY2Fdoc3XsipOzTEvJQPLm5ZcTEXdmRFlfianDoDaWEIvGbXkw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/language-service@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.11.tgz#1967ebcef5fc03e462941aa70dc41562d5dce06e"
-  integrity sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
+  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
 
 "@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
-  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
+  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
-  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
+  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/router@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
-  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
+  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
   dependencies:
     tslib "^1.9.0"
 
@@ -230,37 +230,17 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@>=7.1.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687"
-  integrity sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.2.2"
-    "@babel/helpers" "^7.2.0"
-    "@babel/parser" "^7.2.2"
-    "@babel/template" "^7.2.2"
-    "@babel/traverse" "^7.2.2"
-    "@babel/types" "^7.2.2"
-    convert-source-map "^1.1.0"
-    debug "^4.1.0"
-    json5 "^2.1.0"
-    lodash "^4.17.10"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.0.tgz#248fd6874b7d755010bfe61f557461d4f446d9e9"
-  integrity sha512-Dzl7U0/T69DFOTwqz/FJdnOSWS57NpjNfCwMKHABr589Lg8uX1RrlBIJ7L5Dubt/xkLsx0xH5EBFzlBVes1ayA==
+"@babel/core@>=7.1.0", "@babel/core@^7.4.0":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.3.tgz#198d6d3af4567be3989550d97e068de94503074f"
+  integrity sha512-oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.4.0"
-    "@babel/helpers" "^7.4.0"
-    "@babel/parser" "^7.4.0"
+    "@babel/helpers" "^7.4.3"
+    "@babel/parser" "^7.4.3"
     "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
     "@babel/types" "^7.4.0"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
@@ -270,18 +250,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.2.2":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.2.tgz#fff31a7b2f2f3dad23ef8e01be45b0d5c2fc0132"
-  integrity sha512-f3QCuPppXxtZOEm5GWPra/uYUjmNQlu9pbAD8D/9jze4pTY83rTtB1igTBSwvkeNlC5gR24zFFkz+2WHLFQhqQ==
-  dependencies:
-    "@babel/types" "^7.3.2"
-    jsesc "^2.5.1"
-    lodash "^4.17.10"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/generator@^7.4.0":
+"@babel/generator@^7.0.0", "@babel/generator@^7.4.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.0.tgz#c230e79589ae7a729fd4631b9ded4dc220418196"
   integrity sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==
@@ -307,34 +276,35 @@
     "@babel/helper-explode-assignable-expression" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-call-delegate@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
-  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
+"@babel/helper-call-delegate@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.0.tgz#f308eabe0d44f451217853aedf4dea5f6fe3294f"
+  integrity sha512-SdqDfbVdNQCBp3WhK2mNdDvHd3BD6qbmIc43CAyjnsfCmgHMeqgDcM3BzY2lchi7HBJGJ2CVdynLWbezaE4mmQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.4.0"
+    "@babel/traverse" "^7.4.0"
+    "@babel/types" "^7.4.0"
 
-"@babel/helper-create-class-features-plugin@^7.3.0":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.2.tgz#ba1685603eb1c9f2f51c9106d5180135c163fe73"
-  integrity sha512-tdW8+V8ceh2US4GsYdNVNoohq5uVwOf9k6krjwW4E1lINcHgttnWcNqgdoessn12dAy8QkbezlbQh2nXISNY+A==
+"@babel/helper-create-class-features-plugin@^7.4.0":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.3.tgz#5bbd279c6c3ac6a60266b89bbfe7f8021080a1ef"
+  integrity sha512-UMl3TSpX11PuODYdWGrUeW6zFkdYhDn7wRLrOuNVM6f9L+S9CzmDXYyrp3MTHcwWjnzur1f/Op8A7iYZWya2Yg==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.2.3"
+    "@babel/helper-replace-supers" "^7.4.0"
+    "@babel/helper-split-export-declaration" "^7.4.0"
 
-"@babel/helper-define-map@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
-  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
+"@babel/helper-define-map@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.0.tgz#cbfd8c1b2f12708e262c26f600cd16ed6a3bc6c9"
+  integrity sha512-wAhQ9HdnLIywERVcSvX40CEJwKdAa1ID4neI9NXQPDOHwwA+57DqwLiPEVy2AIyWzAk0CQ8qx4awO0VUURwLtA==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
+    "@babel/types" "^7.4.0"
+    lodash "^4.17.11"
 
 "@babel/helper-explode-assignable-expression@^7.1.0":
   version "7.1.0"
@@ -360,12 +330,12 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-hoist-variables@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
-  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
+"@babel/helper-hoist-variables@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.0.tgz#25b621399ae229869329730a62015bbeb0a6fbd6"
+  integrity sha512-/NErCuoe/et17IlAQFKWM24qtyYYie7sFIrW/tIQXpck6vAu2hhtYYsKLBWQV+BQZMbcIYPU/QMYuTufrY4aQw==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.0"
 
 "@babel/helper-member-expression-to-functions@^7.0.0":
   version "7.0.0"
@@ -381,17 +351,17 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-module-transforms@^7.1.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz#ab2f8e8d231409f8370c883d20c335190284b963"
-  integrity sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==
+"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.3.tgz#b1e357a1c49e58a47211a6853abb8e2aaefeb064"
+  integrity sha512-H88T9IySZW25anu5uqyaC1DaQre7ofM+joZtAaO2F8NBdFfupH0SZ4gKjgSFVcvtx/aAirqA9L9Clio2heYbZA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.0.0"
     "@babel/template" "^7.2.2"
     "@babel/types" "^7.2.2"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
@@ -405,12 +375,12 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
   integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
-"@babel/helper-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
-  integrity sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==
+"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.3.tgz#9d6e5428bfd638ab53b37ae4ec8caf0477495147"
+  integrity sha512-hnoq5u96pLCfgjXuj8ZLX3QQ+6nAulS+zSgi6HulUwFbEruRAKwbGLU5OvXkE14L8XW6XsQEKsIDfgthKLRAyA==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
 "@babel/helper-remap-async-to-generator@^7.1.0":
   version "7.1.0"
@@ -423,15 +393,15 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.2.3":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz#19970020cf22677d62b3a689561dbd9644d8c5e5"
-  integrity sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==
+"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.0.tgz#4f56adb6aedcd449d2da9399c2dcf0545463b64c"
+  integrity sha512-PVwCVnWWAgnal+kJ+ZSAphzyl58XrFeSKSAJRiqg5QToTsjL+Xu1f9+RJ+d+Q0aPhPfBGaYfkox66k86thxNSg==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.2.3"
-    "@babel/types" "^7.0.0"
+    "@babel/traverse" "^7.4.0"
+    "@babel/types" "^7.4.0"
 
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
@@ -441,14 +411,7 @@
     "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-split-export-declaration@^7.4.0":
+"@babel/helper-split-export-declaration@^7.0.0", "@babel/helper-split-export-declaration@^7.4.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz#571bfd52701f492920d63b7f735030e9a3e10b55"
   integrity sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==
@@ -465,22 +428,13 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
-"@babel/helpers@^7.2.0":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
-  integrity sha512-Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA==
-  dependencies:
-    "@babel/template" "^7.1.2"
-    "@babel/traverse" "^7.1.5"
-    "@babel/types" "^7.3.0"
-
-"@babel/helpers@^7.4.0":
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.2.tgz#3bdfa46a552ca77ef5a0f8551be5f0845ae989be"
-  integrity sha512-gQR1eQeroDzFBikhrCccm5Gs2xBjZ57DNjGbqTaHo911IpmSxflOQWMAHPw/TXk8L3isv7s9lYzUkexOeTQUYg==
+"@babel/helpers@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.3.tgz#7b1d354363494b31cb9a2417ae86af32b7853a3b"
+  integrity sha512-BMh7X0oZqb36CfyhvtbSmcWc3GXocfxv3yNsAEuM0l+fAqSO22rQrUpijr3oE/10jCTrB6/0b9kzmG4VetCj8Q==
   dependencies:
     "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
     "@babel/types" "^7.4.0"
 
 "@babel/highlight@^7.0.0":
@@ -492,15 +446,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.2.tgz#95cdeddfc3992a6ca2a1315191c1679ca32c55cd"
-  integrity sha512-QzNUC2RO1gadg+fs21fi0Uu0OuGNzRKEmgCxoLNzbCdoprLwjfmZwzUrpUNfJPaVRwBpDY47A17yYEGWyRelnQ==
-
-"@babel/parser@^7.4.0":
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.2.tgz#b4521a400cb5a871eab3890787b4bc1326d38d91"
-  integrity sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==
+"@babel/parser@^7.0.0", "@babel/parser@^7.4.0", "@babel/parser@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.3.tgz#eb3ac80f64aa101c907d4ce5406360fe75b7895b"
+  integrity sha512-gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ==
 
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
@@ -511,12 +460,12 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@^7.2.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd"
-  integrity sha512-wNHxLkEKTQ2ay0tnsam2z7fGZUi+05ziDJflEt3AZTP3oXLKHJp9HqhfroB/vdMvt3sda9fAbq7FsG8QPDrZBg==
+"@babel/plugin-proposal-class-properties@^7.3.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.0.tgz#d70db61a2f1fd79de927eea91f6411c964e084b8"
+  integrity sha512-t2ECPNOXsIeK1JxJNKmgbzQtoG27KIlVE61vTqX0DKR9E9sZlVVxWUtEW9D5FlZ8b8j7SBNCHY47GgPKCKlpPg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.3.0"
+    "@babel/helper-create-class-features-plugin" "^7.4.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-proposal-json-strings@^7.2.0":
@@ -527,10 +476,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.3.1":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz#6d1859882d4d778578e41f82cc5d7bf3d5daf6c1"
-  integrity sha512-DjeMS+J2+lpANkYLLO+m6GjoTMygYglKmRe6cDTbFv3L9i6mmiE8fe6B8MtCSLZpVXscD5kn7s6SgtHrDoBWoA==
+"@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.3.tgz#be27cd416eceeba84141305b93c282f5de23bbb4"
+  integrity sha512-xC//6DNSSHVjq8O2ge0dyYlhshsH4T7XdCVoxbi5HzLYWfsC5ooFlJjrXk8RcAT+hjHAK9UjBXdylzSoDK3t4g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -543,14 +492,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
-  integrity sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==
+"@babel/plugin-proposal-unicode-property-regex@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.0.tgz#202d91ee977d760ef83f4f416b280d568be84623"
+  integrity sha512-h/KjEZ3nK9wv1P1FSNb9G079jXrNYR0Ko+7XkOx85+gM24iZbPn0rh4vCftk+5QKY7y1uByFataBTmX7irEF1w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.2.0"
+    regexpu-core "^4.5.4"
 
 "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
@@ -559,6 +508,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-dynamic-import@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
+  integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
@@ -587,10 +543,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz#68b8a438663e88519e65b776f8938f3445b1a2ff"
-  integrity sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==
+"@babel/plugin-transform-async-to-generator@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.0.tgz#234fe3e458dce95865c0d152d256119b237834b0"
+  integrity sha512-EeaFdCeUULM+GPFEsf7pFcNSxM7hYjoj5fiYbyuiXobW4JhFnjAv9OWzNwHyHcKoPNpAfeRDuW6VyaXEDUBa7g==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -603,26 +559,26 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz#f17c49d91eedbcdf5dd50597d16f5f2f770132d4"
-  integrity sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==
+"@babel/plugin-transform-block-scoping@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.0.tgz#164df3bb41e3deb954c4ca32ffa9fcaa56d30bcb"
+  integrity sha512-AWyt3k+fBXQqt2qb9r97tn3iBwFpiv9xdAiG+Gr2HpAZpuayvbL55yWrsV3MyHvXk/4vmSiedhDRl1YI2Iy5nQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/plugin-transform-classes@^7.2.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz#6c90542f210ee975aa2aa8c8b5af7fa73a126953"
-  integrity sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==
+"@babel/plugin-transform-classes@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.3.tgz#adc7a1137ab4287a555d429cc56ecde8f40c062c"
+  integrity sha512-PUaIKyFUDtG6jF5DUJOfkBdwAS/kFFV3XFk7Nn0a6vR7ZT8jYw5cGtIlat77wcnd0C6ViGqo/wyNf4ZHytF/nQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.1.0"
+    "@babel/helper-define-map" "^7.4.0"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.4.0"
+    "@babel/helper-split-export-declaration" "^7.4.0"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.2.0":
@@ -632,21 +588,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.2.0":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz#f2f5520be055ba1c38c41c0e094d8a461dd78f2d"
-  integrity sha512-Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw==
+"@babel/plugin-transform-destructuring@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.3.tgz#1a95f5ca2bf2f91ef0648d5de38a8d472da4350f"
+  integrity sha512-rVTLLZpydDFDyN4qnXdzwoVpk1oaXHIvPEOkOLyr88o7oHxVc/LyrnDx+amuBWGOwUb7D1s/uLsKBNTx08htZg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz#f0aabb93d120a8ac61e925ea0ba440812dbe0e49"
-  integrity sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==
+"@babel/plugin-transform-dotall-regex@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.3.tgz#fceff1c16d00c53d32d980448606f812cd6d02bf"
+  integrity sha512-9Arc2I0AGynzXRR/oPdSALv3k0rM38IMFyto7kOCwb5F9sLUt2Ykdo3V9yUPR+Bgr4kb6bVEyLkPEiBhzcTeoA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+    "@babel/helper-regex" "^7.4.3"
+    regexpu-core "^4.5.4"
 
 "@babel/plugin-transform-duplicate-keys@^7.2.0":
   version "7.2.0"
@@ -663,17 +619,17 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-for-of@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz#ab7468befa80f764bb03d3cb5eef8cc998e1cad9"
-  integrity sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==
+"@babel/plugin-transform-for-of@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.3.tgz#c36ff40d893f2b8352202a2558824f70cd75e9fe"
+  integrity sha512-UselcZPwVWNSURnqcfpnxtMehrb8wjXYOimlYQPBnup/Zld426YzIhNEvuRsEWVHfESIECGrxoI6L5QqzuLH5Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz#f7930362829ff99a3174c39f0afcc024ef59731a"
-  integrity sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==
+"@babel/plugin-transform-function-name@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.3.tgz#130c27ec7fb4f0cba30e958989449e5ec8d22bbd"
+  integrity sha512-uT5J/3qI/8vACBR9I1GlAuU/JqBtWdfCrynuOkrWG6nCDieZd5przB1vfP59FRHBZQ9DC2IUfqr/xKqzOD5x0A==
   dependencies:
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -685,6 +641,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-member-expression-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
+  integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-modules-amd@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
@@ -693,21 +656,21 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz#c4f1933f5991d5145e9cfad1dfd848ea1727f404"
-  integrity sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==
+"@babel/plugin-transform-modules-commonjs@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.3.tgz#3917f260463ac08f8896aa5bd54403f6e1fed165"
+  integrity sha512-sMP4JqOTbMJMimqsSZwYWsMjppD+KRyDIUVW91pd7td0dZKAvPmhCaxhOzkzLParKwgQc7bdL9UNv+rpJB0HfA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-module-transforms" "^7.4.3"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz#912bfe9e5ff982924c81d0937c92d24994bb9068"
-  integrity sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==
+"@babel/plugin-transform-modules-systemjs@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.0.tgz#c2495e55528135797bc816f5d50f851698c586a1"
+  integrity sha512-gjPdHmqiNhVoBqus5qK60mWPp1CmYWp/tkh11mvb0rrys01HycEGD7NvvSoKXlWEfSM9TcL36CpsK8ElsADptQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.4.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-modules-umd@^7.2.0":
@@ -718,17 +681,17 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz#140b52985b2d6ef0cb092ef3b29502b990f9cd50"
-  integrity sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.4.2":
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.2.tgz#800391136d6cbcc80728dbdba3c1c6e46f86c12e"
+  integrity sha512-NsAuliSwkL3WO2dzWTOL1oZJHm0TM8ZY8ZSxk2ANyKkt5SQlToGA4pzctmq1BEjoacurdwZ3xp2dCQWJkME0gQ==
   dependencies:
     regexp-tree "^0.1.0"
 
-"@babel/plugin-transform-new-target@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
-  integrity sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==
+"@babel/plugin-transform-new-target@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.0.tgz#67658a1d944edb53c8d4fa3004473a0dd7838150"
+  integrity sha512-6ZKNgMQmQmrEX/ncuCwnnw1yVGoaOW5KpxNhoWI7pCQdA0uZ0HqHGqenCUIENAnxRjy2WwNQ30gfGdIgqJXXqw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -740,21 +703,43 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.1.0"
 
-"@babel/plugin-transform-parameters@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz#0d5ad15dc805e2ea866df4dd6682bfe76d1408c2"
-  integrity sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==
+"@babel/plugin-transform-parameters@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.3.tgz#e5ff62929fdf4cf93e58badb5e2430303003800d"
+  integrity sha512-ULJYC2Vnw96/zdotCZkMGr2QVfKpIT/4/K+xWWY0MbOJyMZuk660BGkr3bEKWQrrciwz6xpmft39nA4BF7hJuA==
   dependencies:
-    "@babel/helper-call-delegate" "^7.1.0"
+    "@babel/helper-call-delegate" "^7.4.0"
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-regenerator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
-  integrity sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==
+"@babel/plugin-transform-property-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
+  integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-react-constant-elements@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.2.0.tgz#ed602dc2d8bff2f0cb1a5ce29263dbdec40779f7"
+  integrity sha512-YYQFg6giRFMsZPKUM9v+VcHOdfSQdz9jHCx3akAi3UYgyjndmdYGSXylQ/V+HswQt4fL8IklchD9HTsaOCrWQQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-regenerator@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.3.tgz#2a697af96887e2bbf5d303ab0221d139de5e739c"
+  integrity sha512-kEzotPuOpv6/iSlHroCDydPkKYw7tiJGKlmYp6iJn4a6C/+b2FdttlJsLKYxolYHgotTJ5G5UY5h0qey5ka3+A==
+  dependencies:
+    regenerator-transform "^0.13.4"
+
+"@babel/plugin-transform-reserved-words@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
+  integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
   dependencies:
-    regenerator-transform "^0.13.3"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.2.0":
   version "7.2.0"
@@ -793,88 +778,77 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-unicode-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz#4eb8db16f972f8abb5062c161b8b115546ade08b"
-  integrity sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==
+"@babel/plugin-transform-unicode-regex@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.3.tgz#3868703fc0e8f443dda65654b298df576f7b863b"
+  integrity sha512-lnSNgkVjL8EMtnE8eSS7t2ku8qvKH3eqNf/IwIfnSPUqzgqYmRwzdsQWv4mNQAN9Nuo6Gz1Y0a4CSmdpu1Pp6g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+    "@babel/helper-regex" "^7.4.3"
+    regexpu-core "^4.5.4"
 
-"@babel/preset-env@^7.2.0":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.1.tgz#389e8ca6b17ae67aaf9a2111665030be923515db"
-  integrity sha512-FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ==
+"@babel/preset-env@^7.4.1":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.3.tgz#e71e16e123dc0fbf65a52cbcbcefd072fbd02880"
+  integrity sha512-FYbZdV12yHdJU5Z70cEg0f6lvtpZ8jFSDakTm7WXeJbLXh4R0ztGEu/SW7G1nJ2ZvKwDhz8YrbA84eYyprmGqw==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.3.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.4.3"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.2.0"
+    "@babel/plugin-transform-async-to-generator" "^7.4.0"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.2.0"
-    "@babel/plugin-transform-classes" "^7.2.0"
+    "@babel/plugin-transform-block-scoping" "^7.4.0"
+    "@babel/plugin-transform-classes" "^7.4.3"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.2.0"
-    "@babel/plugin-transform-dotall-regex" "^7.2.0"
+    "@babel/plugin-transform-destructuring" "^7.4.3"
+    "@babel/plugin-transform-dotall-regex" "^7.4.3"
     "@babel/plugin-transform-duplicate-keys" "^7.2.0"
     "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.2.0"
-    "@babel/plugin-transform-function-name" "^7.2.0"
+    "@babel/plugin-transform-for-of" "^7.4.3"
+    "@babel/plugin-transform-function-name" "^7.4.3"
     "@babel/plugin-transform-literals" "^7.2.0"
+    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
     "@babel/plugin-transform-modules-amd" "^7.2.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.2.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.4.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.4.0"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.3.0"
-    "@babel/plugin-transform-new-target" "^7.0.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.2"
+    "@babel/plugin-transform-new-target" "^7.4.0"
     "@babel/plugin-transform-object-super" "^7.2.0"
-    "@babel/plugin-transform-parameters" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.0.0"
+    "@babel/plugin-transform-parameters" "^7.4.3"
+    "@babel/plugin-transform-property-literals" "^7.2.0"
+    "@babel/plugin-transform-regenerator" "^7.4.3"
+    "@babel/plugin-transform-reserved-words" "^7.2.0"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
     "@babel/plugin-transform-spread" "^7.2.0"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
     "@babel/plugin-transform-template-literals" "^7.2.0"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.2.0"
-    browserslist "^4.3.4"
+    "@babel/plugin-transform-unicode-regex" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    browserslist "^4.5.2"
+    core-js-compat "^3.0.0"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
-    semver "^5.3.0"
-
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
-  integrity sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==
-  dependencies:
-    regenerator-runtime "^0.12.0"
+    semver "^5.5.0"
 
-"@babel/runtime@^7.3.1":
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.2.tgz#f5ab6897320f16decd855eed70b705908a313fe8"
-  integrity sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
+  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
-  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.2.2"
-    "@babel/types" "^7.2.2"
-
-"@babel/template@^7.4.0":
+"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.2.2", "@babel/template@^7.4.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.0.tgz#12474e9c077bae585c5d835a95c0b0b790c25c8b"
   integrity sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==
@@ -883,46 +857,22 @@
     "@babel/parser" "^7.4.0"
     "@babel/types" "^7.4.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2", "@babel/traverse@^7.2.3":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
-  integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.2.2"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.2.3"
-    "@babel/types" "^7.2.2"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.10"
-
-"@babel/traverse@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.0.tgz#14006967dd1d2b3494cdd650c686db9daf0ddada"
-  integrity sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.0", "@babel/traverse@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.3.tgz#1a01f078fc575d589ff30c0f71bf3c3d9ccbad84"
+  integrity sha512-HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.4.0"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.4.0"
-    "@babel/parser" "^7.4.0"
+    "@babel/parser" "^7.4.3"
     "@babel/types" "^7.4.0"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.11"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0", "@babel/types@^7.3.2":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.2.tgz#424f5be4be633fff33fb83ab8d67e4a8290f5a2f"
-  integrity sha512-3Y6H8xlUlpbGR+XvawiH0UXehqydTmNmEpozWcXymqwcrwYAl5KMvKtQ+TF6f6E08V6Jur7v/ykdDSF+WDEIXQ==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.10"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.4.0":
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.4.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.0.tgz#670724f77d24cce6cc7d8cf64599d511d164894c"
   integrity sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==
@@ -992,114 +942,111 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
-"@emotion/cache@^0.8.8":
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-0.8.8.tgz#2c3bd1aa5fdb88f1cc2325176a3f3201739e726c"
-  integrity sha512-yaQQjNAVkKclMX6D8jTU3rhQKjCnXU1KS+Ok0lgZcarGHI2yydU/kKHyF3PZnQhbTpIFBK5W4+HmLCtCie7ESw==
-  dependencies:
-    "@emotion/sheet" "^0.8.1"
-    "@emotion/stylis" "^0.7.1"
-    "@emotion/utils" "^0.8.2"
-
-"@emotion/core@^0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-0.13.1.tgz#4fa4983e18dbf089fa16584486c8033ca50013ea"
-  integrity sha512-5qzKP6bTe2Ah7Wvh1sgtzgy6ycdpxwgMAjQ/K/VxvqBxveG9PCpq+Z0GdVg7Houb1AwYjTfNtXstjSk4sqi/7g==
-  dependencies:
-    "@emotion/cache" "^0.8.8"
-    "@emotion/css" "^0.9.8"
-    "@emotion/serialize" "^0.9.1"
-    "@emotion/sheet" "^0.8.1"
-    "@emotion/utils" "^0.8.2"
-
-"@emotion/css@^0.9.8":
-  version "0.9.8"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-0.9.8.tgz#43fd45c576656d4ed9cc3b8b427c66a2ed6af30a"
-  integrity sha512-Stov3+9+KWZAte/ED9Hts3r4DVBADd5erDrhrywokM31ctQsRPD3qk8W4d1ca48ry57g/nc0qUHNis/xd1SoFg==
-  dependencies:
-    "@emotion/serialize" "^0.9.1"
-    "@emotion/utils" "^0.8.2"
-
-"@emotion/hash@^0.6.6":
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44"
-  integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ==
-
-"@emotion/is-prop-valid@^0.6.8":
-  version "0.6.8"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz#68ad02831da41213a2089d2cab4e8ac8b30cbd85"
-  integrity sha512-IMSL7ekYhmFlILXcouA6ket3vV7u9BqStlXzbKOF9HBtpUPMMlHU+bBxrLOa2NvleVwNIxeq/zL8LafLbeUXcA==
-  dependencies:
-    "@emotion/memoize" "^0.6.6"
-
-"@emotion/memoize@^0.6.6":
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b"
-  integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ==
-
-"@emotion/provider@^0.11.2":
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/@emotion/provider/-/provider-0.11.2.tgz#7099f1df5641969ee4d6ff5cf1561295914030aa"
-  integrity sha512-y/BRd6cJ9tyxsy4EK8WheD2X1/RfmudMYILpa8sgI3dKCjVWeEZuQM17wXRVEyhrisaRaIp1qT4h0eWUaaqNLg==
-  dependencies:
-    "@emotion/cache" "^0.8.8"
-    "@emotion/weak-memoize" "^0.1.3"
+"@emotion/cache@^10.0.9":
+  version "10.0.9"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.9.tgz#e0c7b7a289f7530edcfad4dcf3858bd2e5700a6f"
+  integrity sha512-f7MblpE2xoimC4fCMZ9pivmsIn7hyWRIvY75owMDi8pdOSeh+w5tH3r4hBJv/LLrwiMM7cTQURqTPcYoL5pWnw==
+  dependencies:
+    "@emotion/sheet" "0.9.2"
+    "@emotion/stylis" "0.8.3"
+    "@emotion/utils" "0.11.1"
+    "@emotion/weak-memoize" "0.2.2"
+
+"@emotion/core@^10.0.7":
+  version "10.0.10"
+  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.10.tgz#8d3114e5a2f8b178a7067c603a2937516f180b08"
+  integrity sha512-U1aE2cOWUscjc8ZJ3Cx32udOzLeRoJwGxBH93xQD850oQFpwPKZARzdUtdc9SByUOwzSFYxhDhrpXnV34FJmWg==
+  dependencies:
+    "@emotion/cache" "^10.0.9"
+    "@emotion/css" "^10.0.9"
+    "@emotion/serialize" "^0.11.6"
+    "@emotion/sheet" "0.9.2"
+    "@emotion/utils" "0.11.1"
+
+"@emotion/css@^10.0.9":
+  version "10.0.9"
+  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.9.tgz#ea0df431965a308f6cb1d61386df8ad61e5befb5"
+  integrity sha512-jtHhUSWw+L7yxYgNtC+KJ3Ory90/jiAtpG1qT+gTQQ/RR5AMiigs9/lDHu/vnwljaq2S48FoKb/FZZMlJcC4bw==
+  dependencies:
+    "@emotion/serialize" "^0.11.6"
+    "@emotion/utils" "0.11.1"
+    babel-plugin-emotion "^10.0.9"
+
+"@emotion/hash@0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.1.tgz#9833722341379fb7d67f06a4b00ab3c37913da53"
+  integrity sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA==
 
-"@emotion/serialize@^0.9.1":
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145"
-  integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==
+"@emotion/is-prop-valid@0.7.3":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.7.3.tgz#a6bf4fa5387cbba59d44e698a4680f481a8da6cc"
+  integrity sha512-uxJqm/sqwXw3YPA5GXX365OBcJGFtxUVkB6WyezqFHlNe9jqUWH5ur2O2M8dGBz61kn1g3ZBlzUunFQXQIClhA==
   dependencies:
-    "@emotion/hash" "^0.6.6"
-    "@emotion/memoize" "^0.6.6"
-    "@emotion/unitless" "^0.6.7"
-    "@emotion/utils" "^0.8.2"
+    "@emotion/memoize" "0.7.1"
 
-"@emotion/sheet@^0.8.1":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.8.1.tgz#6eed686c927a1c39f5045ec45ecfa36de896819d"
-  integrity sha512-p82hFBHbNkPLZ410HOeaRJZMrN1uh9rI7JAaRXIp62PP5evspPXyi3xYtxZc1+sCSlwjnQPuOIa6N88iJNtPXw==
-
-"@emotion/styled-base@^0.10.6":
-  version "0.10.6"
-  resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-0.10.6.tgz#c95631b6b4f19da97e7b44ee4e3ee1931afde264"
-  integrity sha512-7RfdJm2oEXiy3isFRY63mHRmWWjScFXFoZTFkCJPaL8NhX+H724WwIoQOt3WA1Jd+bb97xkJg31JbYYsSqnEaQ==
-  dependencies:
-    "@emotion/is-prop-valid" "^0.6.8"
-    "@emotion/serialize" "^0.9.1"
-    "@emotion/utils" "^0.8.2"
+"@emotion/memoize@0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.1.tgz#e93c13942592cf5ef01aa8297444dc192beee52f"
+  integrity sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg==
+
+"@emotion/serialize@^0.11.6":
+  version "0.11.6"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.6.tgz#78be8b9ee9ff49e0196233ba6ec1c1768ba1e1fc"
+  integrity sha512-n4zVv2qGLmspF99jaEUwnMV0fnEGsyUMsC/8KZKUSUTZMYljHE+j+B6rSD8PIFtaUIhHaxCG2JawN6L+OgLN0Q==
+  dependencies:
+    "@emotion/hash" "0.7.1"
+    "@emotion/memoize" "0.7.1"
+    "@emotion/unitless" "0.7.3"
+    "@emotion/utils" "0.11.1"
+    csstype "^2.5.7"
+
+"@emotion/sheet@0.9.2":
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.2.tgz#74e5c6b5e489a1ba30ab246ab5eedd96916487c4"
+  integrity sha512-pVBLzIbC/QCHDKJF2E82V2H/W/B004mDFQZiyo/MSR+VC4pV5JLG0TF/zgQDFvP3fZL/5RTPGEmXlYJBMUuJ+A==
+
+"@emotion/styled-base@^10.0.10":
+  version "10.0.10"
+  resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.10.tgz#ffb811295c9dcd9b3c12bf93301d7d8bcb02e6f4"
+  integrity sha512-uZwKrBfcH7jCRAQi5ZxsEGIZ+1Zr9/lof4TMsIolC0LSwpnWkQ+JRJLy+p4ZyATee9SdmyCV0sG/VTngVSnrpA==
+  dependencies:
+    "@emotion/is-prop-valid" "0.7.3"
+    "@emotion/serialize" "^0.11.6"
+    "@emotion/utils" "0.11.1"
+    object-assign "^4.1.1"
 
-"@emotion/styled@^0.10.6":
-  version "0.10.6"
-  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-0.10.6.tgz#1f6af1d3d4bf9fdeb05a4d220046ce11ad21a7ca"
-  integrity sha512-DFNW8jlMjy1aYCj/PKsvBoJVZAQXzjmSCwtKXLs31qZzNPaUEPbTYSIKnMUtIiAOYsu0pUTGXM+l0a+MYNm4lA==
+"@emotion/styled@^10.0.7":
+  version "10.0.10"
+  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.10.tgz#ec241a9389a585b2c2638b709c262c28469ed92e"
+  integrity sha512-k4p5WxwYJUVYKBlwOmfpqxeSwdPHqUycLHJY9ftleEvMfphYLB8lt9oPEkEty5XH4URh/wyUfZ2wW2ojrHODWA==
   dependencies:
-    "@emotion/styled-base" "^0.10.6"
+    "@emotion/styled-base" "^10.0.10"
+    babel-plugin-emotion "^10.0.9"
 
-"@emotion/stylis@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5"
-  integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ==
+"@emotion/stylis@0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.3.tgz#3ca7e9bcb31b3cb4afbaeb66156d86ee85e23246"
+  integrity sha512-M3nMfJ6ndJMYloSIbYEBq6G3eqoYD41BpDOxreE8j0cb4fzz/5qvmqU9Mb2hzsXcCnIlGlWhS03PCzVGvTAe0Q==
 
-"@emotion/unitless@^0.6.7":
-  version "0.6.7"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397"
-  integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg==
+"@emotion/unitless@0.7.3":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.3.tgz#6310a047f12d21a1036fb031317219892440416f"
+  integrity sha512-4zAPlpDEh2VwXswwr/t8xGNDGg8RQiPxtxZ3qQEXyQsBV39ptTdESCjuBvGze1nLMVrxmTIKmnO/nAV8Tqjjzg==
 
-"@emotion/utils@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc"
-  integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw==
+"@emotion/utils@0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.1.tgz#8529b7412a6eb4b48bdf6e720cc1b8e6e1e17628"
+  integrity sha512-8M3VN0hetwhsJ8dH8VkVy7xo5/1VoBsDOk/T4SJOeXwTO1c4uIqVNx2qyecLFnnUWD5vvUqHQ1gASSeUN6zcTg==
 
-"@emotion/weak-memoize@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.1.3.tgz#b700d97385fa91affed60c71dfd51c67e9dad762"
-  integrity sha512-QsYGKdhhuDFNq7bjm2r44y0mp5xW3uO3csuTPDWZc0OIiMQv+AIY5Cqwd4mJiC5N8estVl7qlvOx1hbtOuUWbw==
+"@emotion/weak-memoize@0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e"
+  integrity sha512-n/VQ4mbfr81aqkx/XmVicOLjviMuy02eenSdJY33SVA7S2J42EU0P1H0mOogfYedb3wXA0d/LVtBrgTSm04WEA==
 
 "@fortawesome/fontawesome-free@^5.7.2":
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.7.2.tgz#1498c3eb78ee7c78c5488418707de90aaf58d5d7"
-  integrity sha512-Ha4HshKdCVKgu4TVCtG8XyPPYdzTzNW4/fvPnn+LT7AosRABryhlRv4cc4+o84dgpvVJN9reN7jo/c+nYujFug==
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz#cbafbfe8894c4e3e3c3a9da6774e249ac1f2da8b"
+  integrity sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA==
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -1110,47 +1057,47 @@
     glob-to-regexp "^0.3.0"
 
 "@nebular/auth@^3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@nebular/auth/-/auth-3.2.1.tgz#7e799781739f8b9bf91ea051d98e3e361146a440"
-  integrity sha512-jRkPKFHlDghQnbPdaAc8sqFp2kcs+5NnIt1TP0vDeRVKoan3uPWJqLqJ10TUYYS09eedpSXU6ZSkxOgtxcFeAw==
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@nebular/auth/-/auth-3.4.2.tgz#35cf828202a9b1ca5d386d97772985386ec77551"
+  integrity sha512-GiU4Su0LWNQsOggHAMYKdkAbXNJVW+jlQre1hGjUeMRqKTXqvn8BkVqrt4q3dz4onBv8z1uxxw4Fegpw93po6w==
 
 "@nebular/bootstrap@^3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@nebular/bootstrap/-/bootstrap-3.2.1.tgz#cf39cb4eccb102d501e52d1f29965841603cf888"
-  integrity sha512-jTTM0cPUKvHaFJgmR9UXR9KueseFy1unPDJSy5ySQ4T0iyqBoNQg/ZRvJcYzeAogDfBQqw0m6C7mrPRRPnXhTQ==
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@nebular/bootstrap/-/bootstrap-3.4.2.tgz#ebd4bed91ae21b390493e39319c2aa58296f9ee1"
+  integrity sha512-W/U9XPPk4dIdyg8ohZP114JGh8Fxjh9HwlgpsCkp8PLvUhaZS4u2Zs9bjbFo/Z38+NX/5U5eqmWgC/VigLA5XA==
 
 "@nebular/security@^3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@nebular/security/-/security-3.2.1.tgz#5808bd60aebb582a530db0c5db7efcf6a0fb7f6e"
-  integrity sha512-Hl1P/YYfCJGjeu4NvRvODT+dYm0E4vDAZnZu2o4KlgY2L/MWlUsMlqBB7KumQxGKnvxYb02NDUbr8ktOtVIrfQ==
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@nebular/security/-/security-3.4.2.tgz#bf6baacbb85d261fc9783f2e3b4313208a2d1e11"
+  integrity sha512-xsR/4X3IQBL1atU6ABAg2nUnPdid1OvaFsTop/stoLxqV3hbwfdV/wxKSkL5DIBljY3c8L9vz5cw+IXcpXDMuQ==
 
 "@nebular/theme@^3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@nebular/theme/-/theme-3.2.1.tgz#d0030baabf195f094586ee1e3faccc1ff1391f4b"
-  integrity sha512-TEWvs1/fveTNGMLPZkzwbVoPyM59tRDQuJrNIt/EhWDb1pJPwzm+sEc5t0pQly6Xf34ps+MngdWM7L8GcaggLQ==
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@nebular/theme/-/theme-3.4.2.tgz#070bbccad92878d1cce49d172548d2fd38b35973"
+  integrity sha512-PB17tkTdITYMvRrch0M0o8nQiKa2ULEsk0CaV1FVysyiSANwR4VIYGlDb4JkZPTyK4SlPZ1mwVMImWAK7jlzLw==
   dependencies:
     intersection-observer "0.5.0"
 
 "@ng-bootstrap/ng-bootstrap@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.0.3.tgz#b50a178936db28a1e6c21d1b2d2b9a26cfe2c9dd"
-  integrity sha512-6lTwR9iaNvZLtMDnk9gerV96K8Nk8i2Gu2FeHw/aUK8VPsl6LakXBAn9eBwcWCtpPLQ7m6Amnsa57RufP4ZzSg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.1.1.tgz#5e9c477ed9cc19114b56a0abc87e9c8483fb6bbf"
+  integrity sha512-OgbmPVhbDdNpIwogEXsycUJG0caNtb2+wCABfLUClgi9YcfNXhZ9Phu2GQq7Pk/LO66okth6s77RBQnbTJuysg==
   dependencies:
     tslib "^1.9.0"
 
 "@ng-select/ng-select@^2.15.3":
-  version "2.15.3"
-  resolved "https://registry.yarnpkg.com/@ng-select/ng-select/-/ng-select-2.15.3.tgz#4ceb91cb34f03c8c4ec79ff7ebf0b880273617d1"
-  integrity sha512-q0yA2iY4NHToi92Dw8115gxMhvXjsMgyNUwhE3cXFYMM0T6kX/q1puSHdQXlwd3ap0xTi+CmBZuvJpA/4WbEmw==
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/@ng-select/ng-select/-/ng-select-2.17.0.tgz#e39efbcdcaae53d649e25e8ea5b5139a2f7e28d0"
+  integrity sha512-hCZIcg4tACYp8tKRLZnD9CEZJcVJbKWkVrS++8dh0cJv580SCiKTQ10CJ1qzWWvmC4tIbCRyLzrUuKQRdkRWpA==
   dependencies:
     tslib "^1.9.0"
 
-"@ngtools/webpack@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
-  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
+"@ngtools/webpack@7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
+  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -1175,22 +1122,33 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@schematics/angular@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
-  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
+"@reach/router@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.2.1.tgz#34ae3541a5ac44fa7796e5506a5d7274a162be4e"
+  integrity sha512-kTaX08X4g27tzIFQGRukaHmNbtMYDS3LEWIS8+l6OayGIw6Oyo1HIF/JzeuR2FoF9z6oV+x/wJSVSq4v8tcUGQ==
+  dependencies:
+    create-react-context "^0.2.1"
+    invariant "^2.2.3"
+    prop-types "^15.6.1"
+    react-lifecycles-compat "^3.0.4"
+    warning "^3.0.0"
+
+"@schematics/angular@7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
+  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     typescript "3.2.4"
 
-"@schematics/update@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
-  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
+"@schematics/update@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
+  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -1198,152 +1156,199 @@
     semver "5.6.0"
     semver-intersect "1.4.0"
 
-"@storybook/addon-actions@^4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-4.1.11.tgz#8946ea78f050ae2d06a2f2231ec56d1831942e15"
-  integrity sha512-iVsxEPmOCuPMAaJhHbpxQhzEPzKnZad4GELNfKrwmmvv3mY+3UN/z208HguW4NHjhMJZVYSS3H/qic8CQS+pHw==
-  dependencies:
-    "@emotion/core" "^0.13.1"
-    "@emotion/provider" "^0.11.2"
-    "@emotion/styled" "^0.10.6"
-    "@storybook/addons" "4.1.11"
-    "@storybook/components" "4.1.11"
-    "@storybook/core-events" "4.1.11"
-    core-js "^2.5.7"
-    deep-equal "^1.0.1"
+"@storybook/addon-actions@^5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.0.6.tgz#78cf9c05b8b6cde1d5d46961ffb95d92be16bf46"
+  integrity sha512-Qbenp6Dv8uphDKsIemtW8bSu3PNYIDSB5av7bW9GieYex8QL6ntv7dja0DaD6NmIfjOZdO0Q0U3Nc9CAgHGOBQ==
+  dependencies:
+    "@storybook/addons" "5.0.6"
+    "@storybook/components" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/theming" "5.0.6"
+    core-js "^2.6.5"
+    fast-deep-equal "^2.0.1"
     global "^4.3.2"
     lodash "^4.17.11"
     make-error "^1.3.5"
+    polished "^2.3.3"
     prop-types "^15.6.2"
+    react "^16.8.1"
     react-inspector "^2.3.0"
     uuid "^3.3.2"
 
-"@storybook/addons@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-4.1.11.tgz#a0d537bd10d123ecee6cb1f5f149b148ce250e57"
-  integrity sha512-n9oDs7GgJbiN5NYPkR3B3e5W0Tr6bIZvFfcJzgyP4dn50AUvS1IE1CEthezfn1L/nc2suw/8Oe30bOXOyTl/SQ==
+"@storybook/addons@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.0.6.tgz#3ecb7fd8421e6557b1abc71ebede905e8decfebc"
+  integrity sha512-VZFYnckWRErkOTZG3a3y7jvnPUjOsTCbWSxvJVMM5SfPzlZbcUz16wJDCJ/pQWI0VzhHFEAVfae9DcuiF031Ow==
   dependencies:
-    "@storybook/channels" "4.1.11"
-    "@storybook/components" "4.1.11"
+    "@storybook/channels" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    core-js "^2.6.5"
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/angular@^4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/angular/-/angular-4.1.11.tgz#231e523dd53b9353c6d531bfae1a0e20349770e7"
-  integrity sha512-16sjBItZOWURK90czHZGEuolh0qKREkBQMuRTIpjb4voIPM7lkChD8T7emixIezG0Sw/DWvtlTLsUBB7PZjV7g==
+"@storybook/angular@^5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/angular/-/angular-5.0.6.tgz#b177cb5e0409a1d86ca434e3d5c20125dea7fc09"
+  integrity sha512-fY1mZ5rQSua8LTjMpU+heSE5h3ygzUcDj9fkIclfBk8V2/E9p+FilPXM3TfaZtAEtsw6VMzRLGZXnA+yc535/w==
   dependencies:
-    "@storybook/core" "4.1.11"
-    "@storybook/node-logger" "4.1.11"
+    "@storybook/core" "5.0.6"
+    "@storybook/node-logger" "5.0.6"
     angular2-template-loader "^0.6.2"
-    core-js "^2.5.7"
-    fork-ts-checker-webpack-plugin "^0.4.14"
+    core-js "^2.6.5"
+    fork-ts-checker-webpack-plugin "^0.5.2"
     global "^4.3.2"
-    react "^16.6.0"
-    react-dom "^16.6.0"
+    react "^16.8.1"
+    react-dom "^16.8.1"
     regenerator-runtime "^0.12.1"
     sass-loader "^7.1.0"
-    ts-loader "^5.2.2"
+    ts-loader "^5.3.2"
     tsconfig-paths-webpack-plugin "^3.2.0"
-    webpack "^4.23.1"
+    webpack "^4.29.0"
 
-"@storybook/channel-postmessage@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-4.1.11.tgz#3320a5f3e05652466eff1c53843205c262a92dfb"
-  integrity sha512-/9p4I5CZWVl6mszY5AR5XPRdQ88LUaAt4iyhdxMIaqNRiVo3Rq4ptMXiw35eCr+sLQuG2KO2SiPIwaA4/FgQuw==
+"@storybook/channel-postmessage@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.0.6.tgz#a774cd548d9f229456a56915754db7fd9da7429a"
+  integrity sha512-62gAChPQSnmmdcsCgeU+g/tSqOHLX/nNzmKEsP20v57NqhFwTNfKLMTbQxrl8ttigTafxQZZjQA4EecN0eu16g==
   dependencies:
-    "@storybook/channels" "4.1.11"
+    "@storybook/channels" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    core-js "^2.6.5"
     global "^4.3.2"
-    json-stringify-safe "^5.0.1"
+    telejson "^2.1.0"
 
-"@storybook/channels@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-4.1.11.tgz#d161497fa3cd848cc9d518aa1c37052857e22e3c"
-  integrity sha512-zYusY8cno4keMozn2lDpBgyNSOueFh+hrPETioSB5Z8Kd3F5OjM7681vJC8QA67yOBEie2hHk0CVxRpuxziMwA==
+"@storybook/channels@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.0.6.tgz#bf056194d633cae873875d6e238c1abadb301dbe"
+  integrity sha512-3Q3uKP5R8q8Q0w6us0f/rlS864ySwl/dN1MZsRg1EaFU+YCy09Mx+3IQDF3FlxseXaQ6UtHcBnMcST4j6FO0ew==
+  dependencies:
+    core-js "^2.6.5"
 
-"@storybook/client-logger@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-4.1.11.tgz#2b1e34e892045199592fdb01656e5dcdcd1999d7"
-  integrity sha512-Xxy6sY7Zd405o28wUAhlpqY2FbSZsTrsN3g/uo4Mqo4XD2f0Z4wIv1GOuM5DI2KlHpHGI+36YPO2VFx5Bq+yiQ==
+"@storybook/client-api@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.0.6.tgz#a1622c46abaf1417fcfbbfab4fa8f032b564cd00"
+  integrity sha512-GtqHP5JrWmPOs9VcUdcLi40WLFKw8PdOnM+zMajm+vucyAr/wkc81VtnPjRAOVlZ4TdzGmsSWgFUOewniXlw6g==
+  dependencies:
+    "@storybook/addons" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/router" "5.0.6"
+    common-tags "^1.8.0"
+    core-js "^2.6.5"
+    eventemitter3 "^3.1.0"
+    global "^4.3.2"
+    is-plain-object "^2.0.4"
+    lodash.debounce "^4.0.8"
+    lodash.isequal "^4.5.0"
+    lodash.mergewith "^4.6.1"
+    memoizerific "^1.11.3"
+    qs "^6.5.2"
+
+"@storybook/client-logger@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.0.6.tgz#d183534ccc8c864039113dcc33407e7f1f5d7594"
+  integrity sha512-WYF3E2A5UzAPcCVs3A2xqbdrDfGi/g6zByDZYnmgW46U7NkvmGRPLGMt/lTXBQNwB3LVNlg7SRQO/AJwgqIJ0Q==
+  dependencies:
+    core-js "^2.6.5"
 
-"@storybook/components@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-4.1.11.tgz#25458a4a4f2edd836b1e4b944cfcfcb4a3567036"
-  integrity sha512-KJA8Nr8MbXiibDLcndx1GRVmVDyBBL2Tbb1kfQfr58vDwz6qhYxempejY6W+voaEqohnFxrOtnnbqlCyf8peUQ==
+"@storybook/components@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.0.6.tgz#de77af3443f771d94a692edb719bc0d8c0149daf"
+  integrity sha512-C++A39n9O09PU2e4Y8x/zbZ+Tf0t/mfPw83Mkh8d8OHS4rHdVKEhq6QC8oDuqT9YBNhJOohtg5d9n+7s8sqZyQ==
   dependencies:
-    "@emotion/core" "^0.13.1"
-    "@emotion/provider" "^0.11.2"
-    "@emotion/styled" "^0.10.6"
+    "@storybook/addons" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/router" "5.0.6"
+    "@storybook/theming" "5.0.6"
+    core-js "^2.6.5"
     global "^4.3.2"
-    lodash "^4.17.11"
+    immer "^1.12.0"
+    js-beautify "^1.8.9"
+    lodash.pick "^4.4.0"
+    lodash.throttle "^4.1.1"
+    memoizerific "^1.11.3"
+    polished "^2.3.3"
     prop-types "^15.6.2"
+    react "^16.8.1"
+    react-dom "^16.8.1"
+    react-focus-lock "^1.17.7"
+    react-helmet-async "^0.2.0"
     react-inspector "^2.3.0"
-    react-split-pane "^0.1.84"
+    react-popper-tooltip "^2.8.0"
+    react-syntax-highlighter "^8.0.1"
     react-textarea-autosize "^7.0.4"
+    reactjs-popup "^1.3.2"
+    recompose "^0.30.0"
     render-fragment "^0.1.1"
 
-"@storybook/core-events@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-4.1.11.tgz#78cfb2b4014ca27909421cdebfa9c96533929a5a"
-  integrity sha512-rVb76xFLJkTFcBHL1oTdJW8O2N7q+Cc6Mo7v9u3TnM4WuRk08/GyzzO7sRvEg3Mvo59AOLu1uqYovRMo4tZEnQ==
-
-"@storybook/core@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-4.1.11.tgz#f91cf77d4750edeb92717f6b2a2a4258b0a06c64"
-  integrity sha512-iUrtFCav7xJicCLhp4zdqbhaOXRWXrx4wMPSs0keBD2G7NQtSg/TQMUdx2VYFBl5thIFT1jt5dAm66y0Q2OCTQ==
-  dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.2.0"
-    "@babel/preset-env" "^7.2.0"
-    "@emotion/core" "^0.13.1"
-    "@emotion/provider" "^0.11.2"
-    "@emotion/styled" "^0.10.6"
-    "@storybook/addons" "4.1.11"
-    "@storybook/channel-postmessage" "4.1.11"
-    "@storybook/client-logger" "4.1.11"
-    "@storybook/core-events" "4.1.11"
-    "@storybook/node-logger" "4.1.11"
-    "@storybook/ui" "4.1.11"
+"@storybook/core-events@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.0.6.tgz#ead92a1e463d53fa57151b62192e74f8e3f45b3b"
+  integrity sha512-OpNHSAxgaok1JYbF5AOML23rIyIyTxir7Ou/s4McN2k0Z2huLaIBA3aeu7vSMygOvN+q6VGMc4uC7f6WQ6kwUg==
+  dependencies:
+    core-js "^2.6.5"
+
+"@storybook/core@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.0.6.tgz#142b4d98888dce6e4e6d1b235d09777954cee2de"
+  integrity sha512-Uzl0CzM2Th24T47TLImis0sFiCzDy2tExDt24p/ojMy2HYA/aT+kTGUN5OMXBZTKDbRFQgv0P2vzHCWyS//Zmw==
+  dependencies:
+    "@babel/plugin-proposal-class-properties" "^7.3.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.3.2"
+    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+    "@babel/plugin-transform-react-constant-elements" "^7.2.0"
+    "@babel/preset-env" "^7.4.1"
+    "@storybook/addons" "5.0.6"
+    "@storybook/channel-postmessage" "5.0.6"
+    "@storybook/client-api" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/node-logger" "5.0.6"
+    "@storybook/router" "5.0.6"
+    "@storybook/theming" "5.0.6"
+    "@storybook/ui" "5.0.6"
     airbnb-js-shims "^1 || ^2"
-    autoprefixer "^9.3.1"
-    babel-plugin-macros "^2.4.2"
+    autoprefixer "^9.4.7"
+    babel-plugin-add-react-displayname "^0.0.5"
+    babel-plugin-emotion "^10.0.7"
+    babel-plugin-macros "^2.4.5"
     babel-preset-minify "^0.5.0 || 0.6.0-alpha.5"
-    boxen "^2.0.0"
-    case-sensitive-paths-webpack-plugin "^2.1.2"
-    chalk "^2.4.1"
+    boxen "^2.1.0"
+    case-sensitive-paths-webpack-plugin "^2.2.0"
+    chalk "^2.4.2"
     child-process-promise "^2.2.1"
     cli-table3 "0.5.1"
     commander "^2.19.0"
     common-tags "^1.8.0"
-    core-js "^2.5.7"
-    css-loader "^1.0.1"
+    core-js "^2.6.5"
+    css-loader "^2.1.0"
     detect-port "^1.2.3"
-    dotenv-webpack "^1.5.7"
+    dotenv-webpack "^1.7.0"
     ejs "^2.6.1"
-    eventemitter3 "^3.1.0"
     express "^4.16.3"
-    file-loader "^2.0.0"
+    file-loader "^3.0.1"
     file-system-cache "^1.0.5"
     find-cache-dir "^2.0.0"
     fs-extra "^7.0.1"
     global "^4.3.2"
     html-webpack-plugin "^4.0.0-beta.2"
     inquirer "^6.2.0"
-    interpret "^1.1.0"
+    interpret "^1.2.0"
     ip "^1.1.5"
     json5 "^2.1.0"
     lazy-universal-dotenv "^2.0.0"
     node-fetch "^2.2.0"
+    object.omit "^3.0.0"
     opn "^5.4.0"
     postcss-flexbugs-fixes "^4.1.0"
     postcss-loader "^3.0.0"
     pretty-hrtime "^1.0.3"
     prop-types "^15.6.2"
-    qs "^6.5.2"
-    raw-loader "^0.5.1"
-    react-dev-utils "^6.1.0"
-    redux "^4.0.1"
+    raw-loader "^1.0.0"
+    react-dev-utils "^7.0.0"
     regenerator-runtime "^0.12.1"
-    resolve "^1.8.1"
+    resolve "^1.10.0"
     resolve-from "^4.0.0"
     semver "^5.6.0"
     serve-favicon "^2.5.0"
@@ -1351,100 +1356,101 @@
     spawn-promise "^0.1.8"
     style-loader "^0.23.1"
     svg-url-loader "^2.3.2"
-    terser-webpack-plugin "^1.1.0"
+    terser-webpack-plugin "^1.2.1"
     url-loader "^1.1.2"
-    webpack "^4.23.1"
-    webpack-dev-middleware "^3.4.0"
+    util-deprecate "^1.0.2"
+    webpack "^4.29.0"
+    webpack-dev-middleware "^3.5.1"
     webpack-hot-middleware "^2.24.3"
 
-"@storybook/mantra-core@^1.7.2":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@storybook/mantra-core/-/mantra-core-1.7.2.tgz#e10c7faca29769e97131e0e0308ef7cfb655b70c"
-  integrity sha512-GD4OYJ8GsayVhIg306sfgcKDk9j8YfuSKIAWvdB/g7IDlw0pDgueONALVEEE2XWJtCwcsUyDtCYzXFgCBWLEjA==
-  dependencies:
-    "@storybook/react-komposer" "^2.0.1"
-    "@storybook/react-simple-di" "^1.2.1"
-    babel-runtime "6.x.x"
-
-"@storybook/node-logger@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-4.1.11.tgz#8ea9779eb6260a02bf06c02eafbff5925b883f9f"
-  integrity sha512-rCXk1PUcakkV72oyTR+nOVDUGnkk1On8/sm9u3NtBEUuwsCtm4p+jh42Pp4jsTtWpG36AVABDtiN65VgCfS+9w==
+"@storybook/node-logger@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.0.6.tgz#80044c2b9d278c9c191ee5bc9e15e93247146b3a"
+  integrity sha512-8KKhhsftxjpew1VOXHZDudylzF7y3SUHxvChykK3V4yjZlbtR5a5U8EGE5Bx5HW0aoInFk08uYTMqsHDRvccfw==
   dependencies:
-    chalk "^2.4.1"
-    core-js "^2.5.7"
+    chalk "^2.4.2"
+    core-js "^2.6.5"
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
     regenerator-runtime "^0.12.1"
 
-"@storybook/podda@^1.2.3":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/podda/-/podda-1.2.3.tgz#53c4a1a3f8c7bbd5755dff5c34576fd1af9d38ba"
-  integrity sha512-g7dsdsn50AhlGZ8iIDKdF8bi7Am++iFOq+QN+hNKz3FvgLuf8Dz+mpC/BFl90eE9bEYxXqXKeMf87399Ec5Qhw==
+"@storybook/router@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.0.6.tgz#1856aaa2771145a7ace804d893fa92bc73418039"
+  integrity sha512-mK+chRfpoINrDEWXQ7P2Gff179hl3q0bPfDo4DwbGO0wf0yOKDGXf+S/vlIF29+5weyhrMe4Si9PALq4ibsl6Q==
   dependencies:
-    babel-runtime "^6.11.6"
-    immutable "^3.8.1"
-
-"@storybook/react-komposer@^2.0.1", "@storybook/react-komposer@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.5.tgz#0c23163f28b2e1bd2aeeb4421fed382bb512de0e"
-  integrity sha512-zX5UITgAh37tmD0MWnUFR29S5YM8URMHc/9iwczX/P1f3tM4nPn8VAzxG/UWQecg1xZVphmqkZoux+SDrtTZOQ==
-  dependencies:
-    "@storybook/react-stubber" "^1.0.0"
-    babel-runtime "^6.11.6"
-    hoist-non-react-statics "^1.2.0"
-    lodash "^4.17.11"
-    shallowequal "^1.1.0"
+    "@reach/router" "^1.2.1"
+    "@storybook/theming" "5.0.6"
+    core-js "^2.6.5"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    qs "^6.5.2"
 
-"@storybook/react-simple-di@^1.2.1":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@storybook/react-simple-di/-/react-simple-di-1.3.0.tgz#13116d89a2f42898716a7f8c4095b47415526371"
-  integrity sha512-RH6gPQaYMs/VzQX2dgbZU8DQMKFXVOv1ruohHjjNPys4q+YdqMFMDe5jOP1AUE3j9g01x0eW7bVjRawSpl++Ew==
+"@storybook/theming@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.0.6.tgz#5827d780eb45a031ad27cd19bd87cd70a818546f"
+  integrity sha512-Kz0/ujHknhan7DHApLIdSzfLAMbpo7AEKmi+R060ZV0ImGmAP9O7Ytqws7u1O25fgA4AgCDyeDpT4N9i83la+w==
   dependencies:
-    babel-runtime "6.x.x"
-    create-react-class "^15.6.2"
-    hoist-non-react-statics "1.x.x"
-    prop-types "^15.6.0"
-
-"@storybook/react-stubber@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@storybook/react-stubber/-/react-stubber-1.0.1.tgz#8c312c2658b9eeafce470e1c39e4193f0b5bf9b1"
-  integrity sha512-k+CHH+vA8bQfCmzBTtJsPkITFgD+C/w19KuByZ9WeEvNUFtnDaCqfP+Vp3/OR+3IAfAXYYOWolqPLxNPcEqEjw==
-  dependencies:
-    babel-runtime "^6.5.0"
-
-"@storybook/ui@4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-4.1.11.tgz#0c6fc34a8096028ef236a5196e7b91831702f2fb"
-  integrity sha512-bgIagh2Z4flGA7jv4JN++ThLwGq8CI8Wq+1/vhCiTxjTE3H1j9VNPdJfhNgxrQypcLRVHl5AKhf0mlSMyz0S1A==
-  dependencies:
-    "@emotion/core" "^0.13.1"
-    "@emotion/provider" "^0.11.2"
-    "@emotion/styled" "^0.10.6"
-    "@storybook/components" "4.1.11"
-    "@storybook/core-events" "4.1.11"
-    "@storybook/mantra-core" "^1.7.2"
-    "@storybook/podda" "^1.2.3"
-    "@storybook/react-komposer" "^2.0.5"
-    deep-equal "^1.0.1"
-    eventemitter3 "^3.1.0"
-    fuse.js "^3.3.0"
+    "@emotion/core" "^10.0.7"
+    "@emotion/styled" "^10.0.7"
+    "@storybook/client-logger" "5.0.6"
+    common-tags "^1.8.0"
+    core-js "^2.6.5"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.7"
+    global "^4.3.2"
+    lodash.isequal "^4.5.0"
+    lodash.mergewith "^4.6.1"
+    memoizerific "^1.11.3"
+    polished "^2.3.3"
+    prop-types "^15.6.2"
+    react-inspector "^2.3.1"
+
+"@storybook/ui@5.0.6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.0.6.tgz#954b1284d0a21e8c0154e56c2f76e58e66fe09fe"
+  integrity sha512-XmyJokPE7gWKmZXAVXnlRZgU3vQKyUMt6KJrg8Q6GqbvyaPN6p5OlLVDZMgPA/5DpCGfMUEp3BMbJpl9SI97tA==
+  dependencies:
+    "@storybook/addons" "5.0.6"
+    "@storybook/client-logger" "5.0.6"
+    "@storybook/components" "5.0.6"
+    "@storybook/core-events" "5.0.6"
+    "@storybook/router" "5.0.6"
+    "@storybook/theming" "5.0.6"
+    core-js "^2.6.5"
+    fast-deep-equal "^2.0.1"
+    fuzzy-search "^3.0.1"
     global "^4.3.2"
+    history "^4.7.2"
     keycode "^2.2.0"
-    lodash "^4.17.11"
+    lodash.debounce "^4.0.8"
+    lodash.isequal "^4.5.0"
+    lodash.mergewith "^4.6.1"
+    lodash.pick "^4.4.0"
+    lodash.sortby "^4.7.0"
+    lodash.throttle "^4.1.1"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^2.3.3"
     prop-types "^15.6.2"
     qs "^6.5.2"
-    react "^16.7.0"
-    react-dom "^16.7.0"
-    react-fuzzy "^0.5.2"
+    react "^16.8.1"
+    react-dom "^16.8.1"
+    react-draggable "^3.1.1"
+    react-helmet-async "^0.2.0"
+    react-hotkeys "2.0.0-pre4"
     react-lifecycles-compat "^3.0.4"
-    react-modal "^3.6.1"
-    react-treebeard "^3.1.0"
+    react-modal "^3.8.1"
+    react-resize-detector "^3.2.1"
+    recompose "^0.30.0"
+    semver "^5.6.0"
+    telejson "^2.1.1"
+    util-deprecate "^1.0.2"
 
 "@swimlane/ngx-charts@^10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/@swimlane/ngx-charts/-/ngx-charts-10.0.0.tgz#8b5555d8244f5dd2cc91fb423a57e8a4d31c7ed5"
-  integrity sha512-66GY+VJ1eLq5WZkRwuSzQymBoyyqPxFY1Vf2LCfAAb+QKq7lh1b+TJK1ThDWvbB0lJ5IPbbYHZ3+zILGSCcTZg==
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/@swimlane/ngx-charts/-/ngx-charts-10.1.0.tgz#be139b770b85eda609961cc08dba815c4a0d0b32"
+  integrity sha512-0nZ3ub5o/qQfFMz+av89u/VKqsqiVhPFBDDOOPq2qimP83i+pcb0i3MEao7PSxIbKAEkL/pwRcEJw4KDZ8B67w==
   dependencies:
     d3 "^4.10.2"
     d3-array "^1.2.1"
@@ -1476,20 +1482,34 @@
   resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.2.2.tgz#80cf7cfff7401587b8f89307ba36fe4a576bc7cf"
   integrity sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==
 
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
 "@types/faker@^4.1.5":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/faker/-/faker-4.1.5.tgz#8f620f9c9a67150aa0a32b4e8a407da43fca61d4"
   integrity sha512-YSDqoBEWYGdNk53xSkkb6REaUaVSlIjxIAGjj/nbLzlZOit7kUU+nA2zC2qQkIVO4MQ+3zl4Sz7aw+kbpHHHUQ==
 
 "@types/geojson@*":
-  version "7946.0.6"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.6.tgz#416f388a06b227784a2d91a88a53f14de05cd54b"
-  integrity sha512-f6qai3iR62QuMPPdgyH+LyiXTL2n9Rf62UniJjV7KHrbiwzLTZUKsdq0mFSTxAHbO7JvwxwC4tH0m1UnweuLrA==
+  version "7946.0.7"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
+  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
+
+"@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
 
 "@types/googlemaps@^3.30.16":
-  version "3.30.16"
-  resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.16.tgz#3264d5ef7c3a92fab2a9f00e09e3247866ff3532"
-  integrity sha512-6OZ64ahLzYfzuSr71y4jAHZXiwxjvvEM2bfF2tzjIc9KUZVbO30SkYa8WewTsR8aM5BFz/uBiNlZ14eRLXYS0g==
+  version "3.30.19"
+  resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.19.tgz#359c025e244490b0775826fb216bed093fd66b16"
+  integrity sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==
 
 "@types/highlight.js@^9.12.3":
   version "9.12.3"
@@ -1497,9 +1517,9 @@
   integrity sha512-pGF/zvYOACZ/gLGWdQH8zSwteQS1epp68yRcVLJMgUck/MjEn/FBYmPub9pXT8C1e4a8YZfHo1CKyV8q1vKUnQ==
 
 "@types/jasmine@*", "@types/jasmine@^3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.9.tgz#ee886a9113db567e722a8a0c37f0e6283f2cefa3"
-  integrity sha512-vw3VyFPa9mlba6NZPBZC3q2Zrnkgy5xuCVI43/tTLX6umdYrYvcFtQUKi2zH3PjFZQ9XCxNM/NMrM9uk8TPOzg==
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.12.tgz#bf282cb540e9ad7a0a04b742082c073b655eab39"
+  integrity sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==
 
 "@types/jasminewd2@^2.0.6":
   version "2.0.6"
@@ -1514,37 +1534,37 @@
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
 "@types/leaflet@^1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.4.2.tgz#28a95f45e71d8f3e44b1d95f64deb5f05e739e04"
-  integrity sha512-iRyUFh6m5OSbhekHxlZb5SkdfUVpaXhk+e8fgQviZL6iZ1chV3Q030/+M6jO2A6VM235A1hYuUmBMVsrLAvKEA==
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.4.3.tgz#62638cb73770eeaed40222042afbcc7b495f0cc4"
+  integrity sha512-jFRBSsPHi1EwQSwrN0cOJLdPhwOZsRl4IMxvm/2ShLh0YM5GfCtQXCzsrv8RE7DWL+AykXdYSAd9bFLWbZT4CQ==
   dependencies:
     "@types/geojson" "*"
 
-"@types/lodash@^4.14.62":
-  version "4.14.121"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.121.tgz#9327e20d49b95fc2bf983fc2f045b2c6effc80b9"
-  integrity sha512-ORj7IBWj13iYufXt/VXrCNMbUuCTJfhzme5kx9U/UtcIPdJYuvPDUAlHlbNhz/8lKCLy9XGIZnGrqXOtQbPGoQ==
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/mongodb@*", "@types/mongodb@^3.1.19":
-  version "3.1.19"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.19.tgz#40c4310986888975771857810aa47fd3ea8e1acf"
-  integrity sha512-H54hQEovAhyLrIZOhPNfGyCCDoTqKsjb8GQBy8nptJqfxrYCp5WVcPJf9v0kfTPR72xOhaz9+WcYxOXWwEg1Vg==
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.23.tgz#9aaa105f448427036cb6cd3aa042ab77b2ab8a7a"
+  integrity sha512-TNwS1HPh1nnaYorcQoWi+bH5kJ1Q/WqCjiD9XkU3oBeCZFYXXPafVUuFmoYFbzQ061ojhtsndRLzwNklRhU+4w==
   dependencies:
     "@types/bson" "*"
     "@types/node" "*"
 
 "@types/mongoose@^5.3.16":
-  version "5.3.16"
-  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.16.tgz#82daf7f2d5dde2e03561c75eb70740455a22d6b6"
-  integrity sha512-L/1BFYDbJ8EjQ1ApCIRAJH5j4t2Dre9mCyKsi16029iy3Rfyvb1ooPTNJOmGQ5sfDcFM1XoyAjCI2mLYv5PvKg==
+  version "5.3.26"
+  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.26.tgz#a979014c7fc9395e484695d4cc5647e7686251db"
+  integrity sha512-7NPdpUGU/1ZztTICcP3GxwWBAHTDyOLW0XJxrxlTl5i7R7XbT2Ucq33JussSLkWHKjbxpAmJnDwlYKcjwG7agg==
   dependencies:
     "@types/mongodb" "*"
     "@types/node" "*"
 
 "@types/node@*", "@types/node@^11.9.3":
-  version "11.9.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.9.3.tgz#14adbb5ab8cd563f549fbae8dbe92e0b7d6e76cc"
-  integrity sha512-DMiqG51GwES/c4ScBY0u5bDlH44+oY8AeYHjY1SGCWidD7h08o1dfHue/TGK7REmif2KiJzaUskO+Q0eaeZ2fQ==
+  version "11.13.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
+  integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
 "@types/q@^0.0.32":
   version "0.0.32"
@@ -1552,9 +1572,9 @@
   integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
 "@types/selenium-webdriver@^3.0.0":
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.15.tgz#024c24051c3798e9a0cf5cceb1c893140df1bc31"
-  integrity sha512-5nh8/K2u9p4bk95GGCJB7KBvewaB0TUziZ9DTr+mR2I6RoO4OJVqx7rxK83hs2J1tomwtCGkhiW+Dy8EUnfB+Q==
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz#50a4755f8e33edacd9c406729e9b930d2451902a"
+  integrity sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==
 
 "@types/socket.io-client@^1.4.32":
   version "1.4.32"
@@ -1567,16 +1587,16 @@
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/stripe@^6.25.7":
-  version "6.25.7"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
-  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
+  version "6.25.10"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
+  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
   dependencies:
     "@types/node" "*"
 
 "@types/unist@*", "@types/unist@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.2.tgz#5dc0a7f76809b7518c0df58689cd16a19bd751c6"
-  integrity sha512-iHI60IbyfQilNubmxsq4zqSjdynlmc2Q/QvH9kjzg9+CCYVVzq1O6tc7VBzSygIwnmOt07w80IG6HDQvjv3Liw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
+  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
 "@types/uuid@^3.4.4":
   version "3.4.4"
@@ -1637,21 +1657,45 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
     "@webassemblyjs/wast-parser" "1.7.11"
 
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
 "@webassemblyjs/floating-point-hex-parser@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
   integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
 
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
 "@webassemblyjs/helper-api-error@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
   integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
 
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
 "@webassemblyjs/helper-buffer@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
   integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
 
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
 "@webassemblyjs/helper-code-frame@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
@@ -1659,21 +1703,46 @@
   dependencies:
     "@webassemblyjs/wast-printer" "1.7.11"
 
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
 "@webassemblyjs/helper-fsm@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
   integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
 
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
 "@webassemblyjs/helper-module-context@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
   integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
 
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
 "@webassemblyjs/helper-wasm-bytecode@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
   integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
 
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
 "@webassemblyjs/helper-wasm-section@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
@@ -1684,6 +1753,16 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
     "@webassemblyjs/wasm-gen" "1.7.11"
 
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
 "@webassemblyjs/ieee754@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
@@ -1691,6 +1770,13 @@
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
 "@webassemblyjs/leb128@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
@@ -1698,11 +1784,23 @@
   dependencies:
     "@xtuc/long" "4.2.1"
 
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
 "@webassemblyjs/utf8@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
   integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
 
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
 "@webassemblyjs/wasm-edit@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
@@ -1717,6 +1815,20 @@
     "@webassemblyjs/wasm-parser" "1.7.11"
     "@webassemblyjs/wast-printer" "1.7.11"
 
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
 "@webassemblyjs/wasm-gen@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
@@ -1728,6 +1840,17 @@
     "@webassemblyjs/leb128" "1.7.11"
     "@webassemblyjs/utf8" "1.7.11"
 
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
 "@webassemblyjs/wasm-opt@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
@@ -1738,6 +1861,16 @@
     "@webassemblyjs/wasm-gen" "1.7.11"
     "@webassemblyjs/wasm-parser" "1.7.11"
 
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
 "@webassemblyjs/wasm-parser@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
@@ -1750,6 +1883,18 @@
     "@webassemblyjs/leb128" "1.7.11"
     "@webassemblyjs/utf8" "1.7.11"
 
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
 "@webassemblyjs/wast-parser@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
@@ -1762,6 +1907,18 @@
     "@webassemblyjs/helper-fsm" "1.7.11"
     "@xtuc/long" "4.2.1"
 
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
 "@webassemblyjs/wast-printer@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
@@ -1771,6 +1928,15 @@
     "@webassemblyjs/wast-parser" "1.7.11"
     "@xtuc/long" "4.2.1"
 
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -1781,6 +1947,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
   integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
 
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -1818,9 +1989,9 @@ acorn@^5.0.0:
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 acorn@^6.0.5:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818"
-  integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
 
 add-stream@^1.0.0:
   version "1.0.0"
@@ -1842,7 +2013,7 @@ after@0.8.2:
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
   integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
@@ -1887,7 +2058,7 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
-ajv@6.9.1, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
+ajv@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
   integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
@@ -1907,6 +2078,16 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -1920,11 +2101,10 @@ angular-2-dropdown-multiselect@^1.9.0:
     tslib "^1.9.0"
 
 angular-tree-component@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/angular-tree-component/-/angular-tree-component-8.2.0.tgz#171d4a74334cd9ca6c9999a050756aeca8141334"
-  integrity sha512-vVT7XUSnz56qi+C5hSdciBOMfTXavznskdzmP11SIV3fFoH1gObE9v5Imz1avP6t6+OCieX6Wk42q9Ng9fisnQ==
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/angular-tree-component/-/angular-tree-component-8.3.0.tgz#e74975e66fd366470f13733737cf6b585776eafd"
+  integrity sha512-nxi0RE34o+akjkBQeVpUYwgmZ84eFvIsYcz2YfB8E7bMw+7miUk4sQEZxAKFAfl7qewInQyVyyN0EreF5LmaHg==
   dependencies:
-    "@types/lodash" "^4.14.62"
     lodash "^4.17.5"
     mobx "^3.6.2"
     mobx-angular "2.1.1"
@@ -1979,9 +2159,9 @@ ansi-colors@^1.0.1:
     ansi-wrap "^0.1.0"
 
 ansi-colors@^3.0.0:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
 ansi-escapes@^1.1.0:
   version "1.4.0"
@@ -2015,10 +2195,10 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+ansi-regex@^4.0.0, ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -2057,19 +2237,20 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.0.tgz#67043da828fa474c0e7f98c52eed5cdf7d0aad30"
-  integrity sha512-N/+0BYAbHS16YFghQTaTrbsunKRCB8bjip11NmS9waWNGODbAJHn0oW813MoWpLV8TynaWz1VZRTu5RHkzDlAg==
+apollo-angular-link-http-common@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
+  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
   dependencies:
     tslib "^1.9.0"
 
 apollo-angular-link-http@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz#55411ed97f1f8356ebed5c0ae96f08dbaf3e064c"
-  integrity sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
+  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
   dependencies:
-    apollo-angular-link-http-common "~1.5.0"
+    apollo-angular-link-http-common "~1.6.0"
+    extract-files "5.0.1"
     tslib "^1.9.0"
 
 apollo-angular@^1.5.0:
@@ -2081,71 +2262,81 @@ apollo-angular@^1.5.0:
     tslib "^1.9.0"
 
 apollo-cache-inmemory@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.3.tgz#aded4fb8b3de9e2fb2573a6c03591b07ef98ed36"
-  integrity sha512-p9KGtEZ9Mlb+FS0UEaxR8WvKOijYV0c+TXlhC/XZ3/ltYvP1zL3b1ozSOLGR9SawN2895Fc7QDV5nzPpihV0rA==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz#265d1ee67b0bf0aca9c37629d410bfae44e62953"
+  integrity sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==
   dependencies:
-    apollo-cache "^1.1.26"
-    apollo-utilities "^1.1.3"
+    apollo-cache "^1.2.1"
+    apollo-utilities "^1.2.1"
     optimism "^0.6.9"
+    ts-invariant "^0.2.1"
     tslib "^1.9.3"
 
-apollo-cache@1.1.26, apollo-cache@^1.1.26:
-  version "1.1.26"
-  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.26.tgz#5afe023270effbc2063d90f51d8e56bce274ab37"
-  integrity sha512-JKFHijwkhXpcQ3jOat+ctwiXyjDhQgy0p6GSaj7zG+or+ZSalPqUnPzFRgRwFLVbYxBKJgHCkWX+2VkxWTZzQQ==
+apollo-cache@1.2.1, apollo-cache@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz#aae71eb4a11f1f7322adc343f84b1a39b0693644"
+  integrity sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==
   dependencies:
-    apollo-utilities "^1.1.3"
+    apollo-utilities "^1.2.1"
     tslib "^1.9.3"
 
 apollo-client@^2.4.13:
-  version "2.4.13"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.13.tgz#09829fcbd68e069de9840d0a10764d7c6a3d0787"
-  integrity sha512-7mBdW/CW1qHB8Mj4EFAG3MTtbRc6S8aUUntUdrKfRWV1rZdWa0NovxsgVD/R4HZWZjRQ2UOM4ENsHdM5g1uXOQ==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz#36126ed1d32edd79c3713c6684546a3bea80e6d1"
+  integrity sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==
   dependencies:
     "@types/zen-observable" "^0.8.0"
-    apollo-cache "1.1.26"
+    apollo-cache "1.2.1"
     apollo-link "^1.0.0"
     apollo-link-dedup "^1.0.0"
-    apollo-utilities "1.1.3"
+    apollo-utilities "1.2.1"
     symbol-observable "^1.0.2"
+    ts-invariant "^0.2.1"
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
 apollo-link-context@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.14.tgz#6265eef49bedadddbbcff4026d04cd351094cd6c"
-  integrity sha512-l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ==
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.17.tgz#439272cfb43ec1891506dd175ed907845b7de36c"
+  integrity sha512-W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q==
   dependencies:
-    apollo-link "^1.2.8"
+    apollo-link "^1.2.11"
+    tslib "^1.9.3"
 
 apollo-link-dedup@^1.0.0:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz#028148f1028e806a9ab2f4abf3bde9dc292565e9"
-  integrity sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
+  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
   dependencies:
-    apollo-link "^1.2.8"
+    apollo-link "^1.2.11"
+    tslib "^1.9.3"
 
 apollo-link-http-common@^0.2.8:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.10.tgz#b5bbf502ff40a81cc00281ba3b8543b7ad866dfe"
-  integrity sha512-KY9nhpAurw3z48OIYV0sCZFXrzWp/wjECsveK+Q9GUhhSe1kEbbUjFfmi+qigg+iELgdp5V8ioRJhinl1vPojw==
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz#c688f6baaffdc7b269b2db7ae89dae7c58b5b350"
+  integrity sha512-Uyg1ECQpTTA691Fwx5e6Rc/6CPSu4TB4pQRTGIpwZ4l5JDOQ+812Wvi/e3IInmzOZpwx5YrrOfXrtN8BrsDXoA==
   dependencies:
-    apollo-link "^1.2.8"
+    apollo-link "^1.2.11"
+    ts-invariant "^0.3.2"
+    tslib "^1.9.3"
 
 apollo-link-ws@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz#588f898b7f953930a27e283941614d89907adf13"
-  integrity sha512-KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A==
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz#a7ec3f90d2651b77d6be9bb6e63deff2efac56d4"
+  integrity sha512-0PKgahM2BOcUiI3QSJMYXOoUylWKzar5NTZLgMLEW4K/CczOTzC4CTXvKMjh/cx57Jto/U2xzKRy9BEoNfnK5Q==
   dependencies:
-    apollo-link "^1.2.8"
+    apollo-link "^1.2.11"
+    tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.6, apollo-link@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.8.tgz#0f252adefd5047ac1a9f35ba9439d216587dcd84"
-  integrity sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==
+apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.6, apollo-link@^1.2.8:
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
+  integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
   dependencies:
-    zen-observable-ts "^0.8.15"
+    apollo-utilities "^1.2.1"
+    ts-invariant "^0.3.2"
+    tslib "^1.9.3"
+    zen-observable-ts "^0.8.18"
 
 apollo-upload-client@^10.0.0:
   version "10.0.0"
@@ -2156,12 +2347,13 @@ apollo-upload-client@^10.0.0:
     apollo-link-http-common "^0.2.8"
     extract-files "^5.0.0"
 
-apollo-utilities@1.1.3, apollo-utilities@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.1.3.tgz#a8883c0392f6b46eac0d366204ebf34be9307c87"
-  integrity sha512-pF9abhiClX5gfj/WFWZh8DiI33nOLGxRhXH9ZMquaM1V8bhq1WLFPt2QjShWH3kGQVeIGUK+FQefnhe+ZaaAYg==
+apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
+  integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
   dependencies:
     fast-json-stable-stringify "^2.0.0"
+    ts-invariant "^0.2.1"
     tslib "^1.9.3"
 
 app-root-dir@^1.0.2:
@@ -2170,9 +2362,9 @@ app-root-dir@^1.0.2:
   integrity sha1-OBh+wt6nV3//Az/8sSFyaS/24Rg=
 
 app-root-path@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
-  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
+  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
 
 append-transform@^1.0.0:
   version "1.0.0"
@@ -2269,11 +2461,6 @@ array-reduce@~0.0.0:
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
   integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
 
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
-
 array-union@^1.0.1, array-union@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -2286,11 +2473,6 @@ array-uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -2382,9 +2564,9 @@ astral-regex@^1.0.0:
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-each@^1.0.0, async-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
+  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
 async-foreach@^0.1.3:
   version "0.1.3"
@@ -2430,13 +2612,13 @@ autoprefixer@9.4.6:
     postcss "^7.0.13"
     postcss-value-parser "^3.3.1"
 
-autoprefixer@^9.0.0, autoprefixer@^9.3.1:
-  version "9.4.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.7.tgz#f997994f9a810eae47b38fa6d8a119772051c4ff"
-  integrity sha512-qS5wW6aXHkm53Y4z73tFGsUhmZu4aMPV9iHXYlF0c/wxjknXNHuj/1cIQb+6YH692DbJGGWcckAXX+VxKvahMA==
+autoprefixer@^9.0.0, autoprefixer@^9.4.7:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
   dependencies:
-    browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000932"
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
     postcss "^7.0.14"
@@ -2527,13 +2709,35 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-macros@^2.4.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.5.0.tgz#01f4d3b50ed567a67b80a30b9da066e94f4097b6"
-  integrity sha512-BWw0lD0kVZAXRD3Od1kMrdmfudqzDzYv2qrN3l2ISR1HVp1EgLKfbOrYV9xmY5k3qx3RIu5uPAUZZZHpo0o5Iw==
+babel-plugin-add-react-displayname@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5"
+  integrity sha1-M51M3be2X9YtHfnbn+BN4TQSK9U=
+
+babel-plugin-emotion@^10.0.7, babel-plugin-emotion@^10.0.9:
+  version "10.0.9"
+  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.9.tgz#04a0404d5a4084d5296357a393d344c0f8303ae4"
+  integrity sha512-IfWP12e9/wHtWHxVTzD692Nbcmrmcz2tip7acp6YUqtrP7slAyr5B+69hyZ8jd55GsyNSZwryNnmuDEVe0j+7w==
   dependencies:
-    cosmiconfig "^5.0.5"
-    resolve "^1.8.1"
+    "@babel/helper-module-imports" "^7.0.0"
+    "@emotion/hash" "0.7.1"
+    "@emotion/memoize" "0.7.1"
+    "@emotion/serialize" "^0.11.6"
+    babel-plugin-macros "^2.0.0"
+    babel-plugin-syntax-jsx "^6.18.0"
+    convert-source-map "^1.5.0"
+    escape-string-regexp "^1.0.5"
+    find-root "^1.1.0"
+    source-map "^0.5.7"
+
+babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.4.5:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.5.1.tgz#4a119ac2c2e19b458c259b9accd7ee34fd57ec6f"
+  integrity sha512-xN3KhAxPzsJ6OQTktCanNpIFnnMsCV+t8OloKxIL72D6+SUZYFn9qfklPgef5HyyDtzYZqqb+fs1S12+gQY82Q==
+  dependencies:
+    "@babel/runtime" "^7.4.2"
+    cosmiconfig "^5.2.0"
+    resolve "^1.10.0"
 
 babel-plugin-minify-builtins@^0.5.0:
   version "0.5.0"
@@ -2609,6 +2813,11 @@ babel-plugin-minify-type-constructors@^0.4.3:
   dependencies:
     babel-helper-is-void-0 "^0.4.3"
 
+babel-plugin-syntax-jsx@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+  integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
+
 babel-plugin-transform-inline-consecutive-adds@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz#323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"
@@ -2706,7 +2915,7 @@ babel-polyfill@6.23.0:
     babel-plugin-transform-undefined-to-void "^6.9.4"
     lodash.isplainobject "^4.0.6"
 
-babel-runtime@6.x.x, babel-runtime@^6.11.6, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0:
+babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, 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=
@@ -2845,9 +3054,9 @@ big.js@^5.2.2:
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1"
-  integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 blob@0.0.5:
   version "0.0.5"
@@ -2869,9 +3078,9 @@ blocking-proxy@^1.0.0:
     minimist "^1.2.0"
 
 bluebird@^3.3.0, bluebird@^3.3.5, bluebird@^3.5.1, bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
+  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -2923,7 +3132,7 @@ bootstrap@^4.0.0-alpha.6, bootstrap@^4.3.1:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
   integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
 
-boxen@^2.0.0:
+boxen@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-2.1.0.tgz#8d576156e33fc26a34d6be8635fd16b1d745f0b2"
   integrity sha512-luq3RQOt2U5sUX+fiu+qnT+wWnHDcATLpEe63jvge6GUZO99AKbVRfp97d2jgLvq1iQa0ORzaAm4lGVG52ZSlw==
@@ -2944,13 +3153,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^0.1.2:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  integrity sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=
-  dependencies:
-    expand-range "^0.1.0"
-
 braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -3060,20 +3262,11 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
-  dependencies:
-    pako "~1.0.5"
-
-browserslist@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
-  integrity sha512-VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
-    caniuse-lite "^1.0.30000884"
-    electron-to-chromium "^1.3.62"
-    node-releases "^1.0.0-alpha.11"
+    pako "~1.0.5"
 
-browserslist@^4.3.4, browserslist@^4.4.1:
+browserslist@4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
   integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
@@ -3082,6 +3275,15 @@ browserslist@^4.3.4, browserslist@^4.4.1:
     electron-to-chromium "^1.3.103"
     node-releases "^1.1.3"
 
+browserslist@^4.4.1, browserslist@^4.5.2, browserslist@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
+  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
+  dependencies:
+    caniuse-lite "^1.0.30000955"
+    electron-to-chromium "^1.3.122"
+    node-releases "^1.1.13"
+
 browserstack@^1.5.1:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.2.tgz#17d8bb76127a1cc0ea416424df80d218f803673f"
@@ -3294,10 +3496,10 @@ camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+camelcase@^5.0.0, camelcase@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 can-promise@0.0.1:
   version "0.0.1"
@@ -3306,17 +3508,17 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
-caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000932:
-  version "1.0.30000936"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000936.tgz#5d33b118763988bf721b9b8ad436d0400e4a116b"
-  integrity sha512-orX4IdpbFhdNO7bTBhSbahp1EBpqzBc+qrvTRVUFfZgA4zta7TdM6PN5ZxkEUgDnz36m+PfWGcdX7AVfFWItJw==
+caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.30000957:
+  version "1.0.30000957"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
+  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
   integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
 
-case-sensitive-paths-webpack-plugin@^2.1.2:
+case-sensitive-paths-webpack-plugin@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"
   integrity sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g==
@@ -3342,16 +3544,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.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"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3360,6 +3553,11 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+change-emitter@^0.1.2:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
+  integrity sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=
+
 character-entities-html4@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.2.tgz#c44fdde3ce66b52e8d321d6c1bf46101f0150610"
@@ -3391,35 +3589,35 @@ chardet@^0.7.0:
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 chart.js@^2.3.0, chart.js@^2.7.3:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.3.tgz#cdb61618830bf216dc887e2f7b1b3c228b73c57e"
-  integrity sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.8.0.tgz#b703b10d0f4ec5079eaefdcd6ca32dc8f826e0e9"
+  integrity sha512-Di3wUL4BFvqI5FB5K26aQ+hvWh8wnP9A3DWGvXHVkO13D3DSnaSsdZx29cXlEsYKVkn1E2az+ZYFS4t0zi8x0w==
   dependencies:
     chartjs-color "^2.1.0"
     moment "^2.10.2"
 
-chartjs-color-string@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz#8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"
-  integrity sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==
+chartjs-color-string@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
+  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
   dependencies:
     color-name "^1.0.0"
 
 chartjs-color@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
-  integrity sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.3.0.tgz#0e7e1e8dba37eae8415fd3db38bf572007dd958f"
+  integrity sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==
   dependencies:
-    chartjs-color-string "^0.5.0"
+    chartjs-color-string "^0.6.0"
     color-convert "^0.5.3"
 
 cheerio@^1.0.0-rc.2:
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
-  integrity sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
   dependencies:
     css-select "~1.2.0"
-    dom-serializer "~0.1.0"
+    dom-serializer "~0.1.1"
     entities "~1.1.1"
     htmlparser2 "^3.9.1"
     lodash "^4.15.0"
@@ -3454,26 +3652,7 @@ chokidar@2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.1.tgz#adc39ad55a2adf26548bd2afa048f611091f9184"
-  integrity sha512-gfw3p2oQV2wEt+8VuMlNsPjCxDxvvgnm/kz+uATu805mWVF8IJN7uz9DN7iBz+RMJISmiVbCOBFs9qBGMjtPfQ==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.0"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-chokidar@^2.1.1, chokidar@^2.1.2:
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2, chokidar@^2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
   integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
@@ -3522,15 +3701,10 @@ circular-dependency-plugin@5.0.2:
   resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
   integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
 
-circular-json@^0.5.5:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
-  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
-
 ckeditor@^4.11.2:
-  version "4.11.2"
-  resolved "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.11.2.tgz#90c1439de18afa0b7ee1993a3a463a2e84aa481e"
-  integrity sha512-/qNERAeYsUAnfzEJZAOOI0sVpHk++W6BchCDmJ8+MbDPHq1Tr3jI/1PA9Qw3qSRXazud2T1yHXURfRUI+GT0FA==
+  version "4.11.4"
+  resolved "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.11.4.tgz#5edbc235808f9e0f562e8e642eeb04fa1b01b633"
+  integrity sha512-h1EymdwFDdQuDO1vEisUagZ/WYiDnvvvtftYmbmqbbUf9vk21ovXb7mXnQimvTYJfRQBgJCoqfjFDfcQIfw9ig==
 
 class-utils@^0.3.5:
   version "0.3.6"
@@ -3571,7 +3745,7 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-table3@0.5.1, cli-table3@^0.5.0:
+cli-table3@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
   integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
@@ -3586,6 +3760,15 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
+clipboard@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d"
+  integrity sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
+
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
@@ -3638,9 +3821,9 @@ co@^4.6.0:
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-block-writer@^7.2.0:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.2.2.tgz#14ec0120de9a65d2cc5d214561d51d1660dddbb1"
-  integrity sha512-8SyXM1bWsMDCzvCoTdnDBhnnUbHntxcba4ApBIO3S3QX0M2Iq0xZCzs6SYdBOGaSUi4drysvrAK15JoXhlpsvQ==
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.3.0.tgz#9a70ca48865d3a733347da31c74104eed734929f"
+  integrity sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==
 
 code-point-at@^1.0.0:
   version "1.1.0"
@@ -3709,13 +3892,6 @@ colors@^1.1.0, colors@^1.1.2, colors@^1.3.3, colors@latest:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
   integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
 
-combine-lists@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  integrity sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=
-  dependencies:
-    lodash "^4.5.0"
-
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
@@ -3723,16 +3899,28 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@^2.12.1, commander@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+comma-separated-tokens@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.5.tgz#b13793131d9ea2d2431cf5b507ddec258f0ce0db"
+  integrity sha512-Cg90/fcK93n0ecgYTAz1jaA3zvnQ0ExlmKY1rdbyHqAx6BHxwoJc+J7HDu0iuQ7ixEs1qaa+WyQ6oeuBpYP1iA==
+  dependencies:
+    trim "0.0.1"
 
-commander@2.17.x, commander@~2.17.1:
+commander@2, commander@^2.12.1, commander@^2.19.0, commander@~2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+
+commander@2.17.x:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
+commander@~2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -3771,23 +3959,23 @@ component-inherit@0.0.3:
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
   integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
-compressible@~2.0.14:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
-  integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
+compressible@~2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
+  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
   dependencies:
-    mime-db ">= 1.36.0 < 2"
+    mime-db ">= 1.38.0 < 2"
 
-compression@^1.5.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
+compression@^1.5.2, compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.14"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
@@ -3806,7 +3994,15 @@ concat-stream@^1.5.0, concat-stream@~1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-connect-history-api-fallback@^1.3.0:
+config-chain@^1.1.12:
+  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"
+
+connect-history-api-fallback@^1.3.0, connect-history-api-fallback@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
@@ -3881,13 +4077,21 @@ conventional-changelog-codemirror@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-core@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.6.tgz#ac1731a461c50d150d29c1ad4f33143293bcd32f"
-  integrity sha512-5teTAZOtJ4HLR6384h50nPAaKdDr+IaU0rnD2Gg2C3MS7hKsEPH8pZxrDNqam9eOSPQg9tET6uZY79zzgSz+ig==
+conventional-changelog-conventionalcommits@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-1.1.1.tgz#322351f6a0422876d89ec54491365695b073a709"
+  integrity sha512-21BcbiSfvYIon7sF80Rwn6vnfhaiuZUyHHFYr9Zz8H2B+O/3grud5TbEYpU1/SFXD5aD48IdSme/KkJl9wCsCw==
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-core@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0"
+  integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==
   dependencies:
-    conventional-changelog-writer "^4.0.3"
-    conventional-commits-parser "^3.0.1"
+    conventional-changelog-writer "^4.0.5"
+    conventional-commits-parser "^3.0.2"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
     git-raw-commits "2.0.0"
@@ -3898,7 +4102,7 @@ conventional-changelog-core@^3.1.6:
     q "^1.5.1"
     read-pkg "^3.0.0"
     read-pkg-up "^3.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
 conventional-changelog-ember@^2.0.2:
   version "2.0.2"
@@ -3907,10 +4111,10 @@ conventional-changelog-ember@^2.0.2:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-eslint@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.1.tgz#f65e0e7f63dc09c044244b8785313a602e628002"
-  integrity sha512-yH3+bYrtvgKxSFChUBQnKNh9/U9kN2JElYBm253VpYs5wXhPHVc9ENcuVGWijh24nnOkei7wEJmnmUzgZ4ok+A==
+conventional-changelog-eslint@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.2.tgz#e9eb088cda6be3e58b2de6a5aac63df0277f3cbe"
+  integrity sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ==
   dependencies:
     q "^1.5.1"
 
@@ -3936,18 +4140,18 @@ conventional-changelog-jshint@^2.0.1:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-preset-loader@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
-  integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ==
+conventional-changelog-preset-loader@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4"
+  integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA==
 
-conventional-changelog-writer@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.3.tgz#916a2b302d0bb5ef18efd236a034c13fb273cde1"
-  integrity sha512-bIlpSiQtQZ1+nDVHEEh798Erj2jhN/wEjyw9sfxY9es6h7pREE5BNJjfv0hXGH/FTrAsEpHUq4xzK99eePpwuA==
+conventional-changelog-writer@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.5.tgz#fb9e384bb294e8e8a9f2568a3f4d1e11953d8641"
+  integrity sha512-g/Myp4MaJ1A+f7Ai+SnVhkcWtaHk6flw0SYN7A+vQ+MTu0+gSovQWs4Pg4NtcNUcIztYQ9YHsoxHP+GGQplI7Q==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.1"
+    conventional-commits-filter "^2.0.2"
     dateformat "^3.0.0"
     handlebars "^4.1.0"
     json-stringify-safe "^5.0.1"
@@ -3955,43 +4159,44 @@ conventional-changelog-writer@^4.0.3:
     meow "^4.0.0"
     semver "^5.5.0"
     split "^1.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
 conventional-changelog@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.0.6.tgz#a0bd3b51a0549ec03eb6ef90af7f9fa8c358b15f"
-  integrity sha512-1b96x3G67lDKakRvMm+VvYGwgRk+C8aapHKL5iZ/TJzzD/RuyGA2diHNEsR+uPHmQ7/A4Ts7j6N+VNqUoOfksg==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.3.tgz#decb10d89c46c838e74eb5160bcf4987992f7534"
+  integrity sha512-JBfdDSdSGasTNaBRZbOeFn8CJTIpP/sB/kiawmWAiLapLZ+wCDVDZR6Q+Hh9rjh3dxNAFR03bWTeqjKajXvPYA==
   dependencies:
     conventional-changelog-angular "^5.0.3"
     conventional-changelog-atom "^2.0.1"
     conventional-changelog-codemirror "^2.0.1"
-    conventional-changelog-core "^3.1.6"
+    conventional-changelog-conventionalcommits "^1.1.1"
+    conventional-changelog-core "^3.2.2"
     conventional-changelog-ember "^2.0.2"
-    conventional-changelog-eslint "^3.0.1"
+    conventional-changelog-eslint "^3.0.2"
     conventional-changelog-express "^2.0.1"
     conventional-changelog-jquery "^3.0.4"
     conventional-changelog-jshint "^2.0.1"
-    conventional-changelog-preset-loader "^2.0.2"
+    conventional-changelog-preset-loader "^2.1.1"
 
-conventional-commits-filter@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3"
-  integrity sha512-92OU8pz/977udhBjgPEbg3sbYzIxMDFTlQT97w7KdhR9igNqdJvy8smmedAAgn4tPiqseFloKkrVfbXCVd+E7A==
+conventional-commits-filter@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
+  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
   dependencies:
-    is-subset "^0.1.1"
+    lodash.ismatch "^4.4.0"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
-  integrity sha512-P6U5UOvDeidUJ8ebHVDIoXzI7gMlQ1OF/id6oUvp8cnZvOXMt1n8nYl74Ey9YMn0uVQtxmCtjPQawpsssBWtGg==
+conventional-commits-parser@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.2.tgz#1295590dd195f64f53d6f8eb7c41114bb9a60742"
+  integrity sha512-y5eqgaKR0F6xsBNVSQ/5cI5qIF3MojddSUi1vKIggRkqUTbkqFKH9P5YX/AT1BVZp9DtSzBTIkvjyVLotLsVog==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
     lodash "^4.2.1"
     meow "^4.0.0"
     split2 "^2.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
 
 convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
@@ -4042,20 +4247,35 @@ copy-webpack-plugin@4.6.0:
     p-limit "^1.0.0"
     serialize-javascript "^1.4.0"
 
+core-js-compat@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.0.1.tgz#bff73ba31ca8687431b9c88f78d3362646fb76f0"
+  integrity sha512-2pC3e+Ht/1/gD7Sim/sqzvRplMiRnFQVlPpDVaHtY9l7zZP7knamr3VRD6NyGfHd84MrDC0tAM9ulNxYMW0T3g==
+  dependencies:
+    browserslist "^4.5.4"
+    core-js "3.0.1"
+    core-js-pure "3.0.1"
+    semver "^6.0.0"
+
+core-js-pure@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.0.1.tgz#37358fb0d024e6b86d443d794f4e37e949098cbe"
+  integrity sha512-mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g==
+
+core-js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.4:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d"
-  integrity sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A==
-
-core-js@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
-  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.4, core-js@^2.6.5:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
+  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -4080,17 +4300,7 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.0, cosmiconfig@^5.0.5, cosmiconfig@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
-  integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-
-cosmiconfig@^5.1.0:
+cosmiconfig@^5.0.0, cosmiconfig@^5.0.7, cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
   integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
@@ -4131,14 +4341,21 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-class@^15.6.2:
-  version "15.6.3"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
-  integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==
+create-react-context@<=0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.2.tgz#9836542f9aaa22868cd7d4a6f82667df38019dca"
+  integrity sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==
+  dependencies:
+    fbjs "^0.8.0"
+    gud "^1.0.0"
+
+create-react-context@^0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3"
+  integrity sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==
   dependencies:
-    fbjs "^0.8.9"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
+    fbjs "^0.8.0"
+    gud "^1.0.0"
 
 cross-env@^5.2.0:
   version "5.2.0"
@@ -4213,23 +4430,22 @@ crypto-js@^3.1.9-1:
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
   integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=
 
-css-loader@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
-  integrity sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==
+css-loader@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea"
+  integrity sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==
   dependencies:
-    babel-code-frame "^6.26.0"
-    css-selector-tokenizer "^0.7.0"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash "^4.17.11"
-    postcss "^6.0.23"
-    postcss-modules-extract-imports "^1.2.0"
-    postcss-modules-local-by-default "^1.2.0"
-    postcss-modules-scope "^1.1.0"
-    postcss-modules-values "^1.3.0"
+    camelcase "^5.2.0"
+    icss-utils "^4.1.0"
+    loader-utils "^1.2.3"
+    normalize-path "^3.0.0"
+    postcss "^7.0.14"
+    postcss-modules-extract-imports "^2.0.0"
+    postcss-modules-local-by-default "^2.0.6"
+    postcss-modules-scope "^2.1.0"
+    postcss-modules-values "^2.0.0"
     postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
+    schema-utils "^1.0.0"
 
 css-parse@1.7.x:
   version "1.7.0"
@@ -4256,9 +4472,9 @@ css-selector-tokenizer@^0.7.0:
     regexpu-core "^1.0.0"
 
 css-what@2.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d"
-  integrity sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
 cssauron@^1.4.0:
   version "1.4.0"
@@ -4272,6 +4488,16 @@ cssesc@^0.1.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
   integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+csstype@^2.5.7:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.3.tgz#b701e5968245bf9b08d54ac83d00b624e622a9fa"
+  integrity sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg==
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -4419,9 +4645,9 @@ d3-force@1.1.0:
     d3-timer "1"
 
 d3-force@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.0.tgz#60713f7efe8764f53e685d69433c06914dc4ea4c"
-  integrity sha512-PFLcDnRVANHMudbQlIB87gcfQorEsDIAvRpZ2bNddfM/WxdsEkyrEaOIPoydhH1I1V4HPjNLGOMLXCA0AuGQ9w==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"
+  integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==
   dependencies:
     d3-collection "1"
     d3-dispatch "1"
@@ -4545,9 +4771,9 @@ d3-shape@1.2.0:
     d3-path "1"
 
 d3-shape@^1.2.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.4.tgz#358e76014645321eecc7c364e188f8ae3d2a07d4"
-  integrity sha512-izaz4fOpOnY3CD17hkZWNxbaN70sIGagLR/5jb6RS96Y+6VqX+q1BQf1av6QSBRdfULi3Gb8Js4CzG4+KAPjMg==
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.5.tgz#e81aea5940f59f0a79cfccac012232a8987c6033"
+  integrity sha512-VKazVR3phgD+MUCldapHD7P9kcrvPcexeX/PkMJmkUov4JM8IxsSg1DvbYoYich9AtdTsa5nNk2++ImPiDiSxg==
   dependencies:
     d3-path "1"
 
@@ -4675,10 +4901,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-format@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
-  integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
+date-format@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.0.0.tgz#7cf7b172f1ec564f0003b39ea302c5498fb98c8f"
+  integrity sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==
 
 date-now@^0.1.4:
   version "0.1.4"
@@ -4697,7 +4923,7 @@ debug@*, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4758,6 +4984,11 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+deep-object-diff@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
+  integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
+
 deepmerge@^2.0.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
@@ -4771,7 +5002,7 @@ default-gateway@^2.6.0:
     execa "^0.10.0"
     ip-regex "^2.1.0"
 
-default-gateway@^4.0.1:
+default-gateway@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
   integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
@@ -4840,11 +5071,28 @@ del@^3.0.0:
     pify "^3.0.0"
     rimraf "^2.2.8"
 
+del@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.0.tgz#049543b8290e1a9293e2bd150ab3a06f637322b8"
+  integrity sha512-C4kvKNlYrwXhKxz97BuohF8YoGgQ23Xm9lvoHmgT7JaPGprSEjk3+XFled74Yt/x0ZABUHg2D67covzAPUKx5Q==
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+delegate@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
+  integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
+
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -4945,7 +5193,7 @@ dir-glob@2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
-dir-glob@^2.0.0, dir-glob@^2.2.1:
+dir-glob@^2.0.0, dir-glob@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
   integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
@@ -4972,20 +5220,13 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
-dom-converter@~0.2:
+dom-converter@^0.2:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
   integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
   dependencies:
     utila "~0.4"
 
-dom-helpers@^3.3.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
-  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -4996,13 +5237,13 @@ dom-serialize@^2.2.0:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@0, dom-serializer@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
-  integrity sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=
+dom-serializer@0, dom-serializer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
   dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
 
 dom-walk@^0.1.0:
   version "0.1.1"
@@ -5014,23 +5255,11 @@ domain-browser@^1.1.1:
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1, domelementtype@^1.3.0:
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-  integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=
-
-domhandler@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
-  integrity sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=
-  dependencies:
-    domelementtype "1"
-
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
@@ -5038,13 +5267,6 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domutils@1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
-  integrity sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=
-  dependencies:
-    domelementtype "1"
-
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
@@ -5092,7 +5314,7 @@ dotenv-expand@^4.2.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275"
   integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=
 
-dotenv-webpack@^1.5.7:
+dotenv-webpack@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz#4384d8c57ee6f405c296278c14a9f9167856d3a1"
   integrity sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==
@@ -5135,11 +5357,21 @@ ecc-jsbn@~0.1.1:
     safer-buffer "^2.1.0"
 
 echarts@^4.2.1-rc.1:
-  version "4.2.1-rc.1"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.2.1-rc.1.tgz#0fdf7e3c5a3f81825c2b3f635ab87966d48c0655"
-  integrity sha512-BpGPaBOiJLdg594t+V6J+oyROEsDIVUAtBpbm+byqKtPCvDmNlGP4q+16hzo9LtcyUzvHqZdbL0AuDbvE7D+4Q==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.2.1.tgz#9a8ea3b03354f86f824d97625c334cf16965ef03"
+  integrity sha512-pw4xScRPsLegD/cqEcoXRKeA2SD4+s+Kyo0Na166NamOWhzNl2yI5RZ2rE97tBlAopNmhyMeBVpAeD5qb+ee1A==
+  dependencies:
+    zrender "4.0.7"
+
+editorconfig@^0.15.2:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
+  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
   dependencies:
-    zrender "4.0.6"
+    commander "^2.19.0"
+    lru-cache "^4.1.5"
+    semver "^5.6.0"
+    sigmund "^1.0.1"
 
 ee-first@1.1.1:
   version "1.1.1"
@@ -5151,10 +5383,10 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.62:
-  version "1.3.113"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
-  integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
+electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.122:
+  version "1.3.124"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
+  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -5179,6 +5411,15 @@ emojis-list@^2.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
   integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
+emotion-theming@^10.0.7:
+  version "10.0.10"
+  resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.10.tgz#efe8751119751bdc70fdc1795fe4cde0fb0cf14c"
+  integrity sha512-E4SQ3Y91avxxydDgubi/po/GaC5MM1XHm8kcClKg1PA/TeOye0PiLBzAzlgt9dBzDRV9+qHDunsayPvzVYIYng==
+  dependencies:
+    "@emotion/weak-memoize" "0.2.2"
+    hoist-non-react-statics "^3.3.0"
+    object-assign "^4.1.1"
+
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -5325,19 +5566,14 @@ es-to-primitive@^1.2.0:
     is-symbol "^1.0.2"
 
 es5-shim@^4.5.10:
-  version "4.5.12"
-  resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.12.tgz#508c13dda1c87dd3df1b50e69e7b96b82149b649"
-  integrity sha512-MjoCAHE6P2Dirme70Cxd9i2Ng8rhXiaVSsxDWdSwimfLERJL/ypR2ed2rTYkeeYrMk8gq281dzKLiGcdrmc8qg==
+  version "4.5.13"
+  resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.13.tgz#5d88062de049f8969f83783f4a4884395f21d28b"
+  integrity sha512-xi6hh6gsvDE0MaW4Vp1lgNEBpVcCXRWfPXj5egDvtgLz4L9MEvNwYEMdJH+JJinWkwa8c3c3o5HduV7dB/e1Hw==
 
 es6-promise@^4.0.3:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
-  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
-
-es6-promise@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
-  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
+  integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
@@ -5347,9 +5583,9 @@ es6-promisify@^5.0.0:
     es6-promise "^4.0.3"
 
 es6-shim@^0.35.3:
-  version "0.35.4"
-  resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.4.tgz#8d5a4109756383d3f0323421089c423acf8378f1"
-  integrity sha512-oJidbXjN/VWXZJs41E9JEqWzcFbjt43JupimIoVX82Thzt5qy1CiYezdhRmWkj3KOuwJ106IG/ZZrcFC6fgIUQ==
+  version "0.35.5"
+  resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.5.tgz#46f59dc0a84a1c5029e8ff1166ca0a902077a9ab"
+  integrity sha512-E9kK/bjtCQRpN1K28Xh4BlmP8egvZBGJJ+9GtnzOwt7mdqtrjHFuVGr7QJfdjBIKqrlU5duPf3pCBoDrkjVYFg==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -5397,9 +5633,9 @@ escodegen@~1.9.0:
     source-map "~0.6.1"
 
 eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -5479,13 +5715,6 @@ events@^3.0.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
   integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
 
-eventsource@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
-  integrity sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=
-  dependencies:
-    original ">=0.0.5"
-
 eventsource@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
@@ -5557,15 +5786,6 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-braces@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  integrity sha1-SIsdHSRRyz06axks/AMPRMWFX+o=
-  dependencies:
-    array-slice "^0.2.3"
-    array-unique "^0.2.1"
-    braces "^0.1.2"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -5579,22 +5799,7 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  integrity sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=
-  dependencies:
-    is-number "^0.1.1"
-    repeat-string "^0.2.2"
-
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-express@^4.16.2, express@^4.16.3:
+express@^4.16.2, express@^4.16.3, express@^4.16.4:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -5682,7 +5887,7 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-files@^5.0.0:
+extract-files@5.0.1, extract-files@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz#c9492a8410be643e260a376f0151361993d5f659"
   integrity sha512-qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w==
@@ -5759,7 +5964,14 @@ fastparse@^1.1.1:
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
   integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
-faye-websocket@0.11.x, faye-websocket@~0.11.0, faye-websocket@~0.11.1:
+fault@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz#c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa"
+  integrity sha512-o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw==
+  dependencies:
+    format "^0.2.2"
+
+faye-websocket@0.11.x, faye-websocket@~0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
   integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
@@ -5773,7 +5985,7 @@ faye-websocket@^0.10.0:
   dependencies:
     websocket-driver ">=0.5.1"
 
-fbjs@^0.8.9:
+fbjs@^0.8.0, fbjs@^0.8.1:
   version "0.8.17"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
   integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
@@ -5813,7 +6025,7 @@ file-loader@1.1.11:
     loader-utils "^1.0.2"
     schema-utils "^0.4.5"
 
-file-loader@3.0.1:
+file-loader@3.0.1, file-loader@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
   integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
@@ -5821,14 +6033,6 @@ file-loader@3.0.1:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
-file-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
-  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
-  dependencies:
-    loader-utils "^1.0.2"
-    schema-utils "^1.0.0"
-
 file-system-cache@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-1.0.5.tgz#84259b36a2bbb8d3d6eb1021d3132ffe64cfff4f"
@@ -5897,14 +6101,19 @@ find-cache-dir@^1.0.0:
     pkg-dir "^2.0.0"
 
 find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
     commondir "^1.0.1"
-    make-dir "^1.0.0"
+    make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
+find-root@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
+
 find-up@3.0.0, find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -5959,6 +6168,11 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
+focus-lock@^0.6.0:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.6.2.tgz#d8ac9dbc46250779789c3e6f43d978c7dfa59dcd"
+  integrity sha512-Wuq6TSOgsGQmzbpvinl1TcEw4BAUhD9T06myl5HvaBlO0geAz9ABtqBIqPkkNyO3AgPzEDazetL5hSRgj+2iqQ==
+
 follow-redirects@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
@@ -6010,18 +6224,16 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@^0.4.14:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.4.15.tgz#7cd9f94f3dd58cd1fe8f953f876e72090eda3f6d"
-  integrity sha512-qNYuygh2GxXehBvQZ5rI5YlQFn+7ZV6kmkyD9Sgs33dWl73NZdUOB5aCp8v0EXJn176AhPrZP8YCMT3h01fs+g==
+fork-ts-checker-webpack-plugin@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.5.2.tgz#a73b3630bd0a69409a6e4824e54c03a62fe82d8f"
+  integrity sha512-a5IG+xXyKnpruI0CP/anyRLAoxWtp3lzdG6flxicANnoSzz64b12dJ7ASAVRrI2OaWwZR2JyBaMHFQqInhWhIw==
   dependencies:
     babel-code-frame "^6.22.0"
     chalk "^2.4.1"
     chokidar "^2.0.4"
-    lodash "^4.17.11"
     micromatch "^3.1.10"
     minimatch "^3.0.4"
-    resolve "^1.5.0"
     tapable "^1.0.0"
 
 form-data@~2.3.2:
@@ -6033,6 +6245,11 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
+format@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
+  integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
+
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -6099,7 +6316,7 @@ fs-extra@^6.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^7.0.1:
+fs-extra@^7.0.0, fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -6162,10 +6379,10 @@ function.prototype.name@^1.1.0:
     function-bind "^1.1.1"
     is-callable "^1.1.3"
 
-fuse.js@^3.0.1, fuse.js@^3.3.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.4.2.tgz#d7a638c436ecd7b9c4c0051478c09594eb956212"
-  integrity sha512-WVbrm+cAxPtyMqdtL7cYhR7aZJPhtOfjNClPya8GKMVukKDYs7pEnPINeRVX1C9WmWgU8MdYGYbUPAP2AJXdoQ==
+fuzzy-search@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fuzzy-search/-/fuzzy-search-3.0.1.tgz#14a4964508a9607d6e9a88818e7ff634108260b6"
+  integrity sha512-rjUvzdsMlOyarm0oD5k6zVQwgvt4Tb5Xe3YdIGU+Vogw54+ueAGPUTMU2B9jfPQEie5cD11i/S9J9d+MNBSQ3Q==
 
 gauge@~2.7.3:
   version "2.7.4"
@@ -6199,9 +6416,9 @@ get-caller-file@^1.0.1:
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-caller-file@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.1.tgz#25835260d3a2b9665fcdbb08cb039a7bbf7011c0"
-  integrity sha512-SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
@@ -6319,33 +6536,13 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glo
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-modules@1.0.0, global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-modules@^2.0.0:
+global-modules@2.0.0, global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
   integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
   dependencies:
     global-prefix "^3.0.0"
 
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
 global-prefix@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
@@ -6373,13 +6570,13 @@ globals@^9.18.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
-globby@8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
-  integrity sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==
+globby@8.0.2, globby@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
+  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
   dependencies:
     array-union "^1.0.1"
-    dir-glob "^2.0.0"
+    dir-glob "2.0.0"
     fast-glob "^2.0.2"
     glob "^7.1.2"
     ignore "^3.3.5"
@@ -6421,26 +6618,14 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globby@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
-  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
 globby@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.0.0.tgz#3800df736dc711266df39b4ce33fe0d481f94c23"
-  integrity sha512-q0qiO/p1w/yJ0hk8V9x1UXlgsXUxlGd0AHUOXZVXBO6aznDtpx7M8D1kBrCAItoPm+4l8r6ATXV1JpjY2SBQOw==
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
+  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
   dependencies:
+    "@types/glob" "^7.1.1"
     array-union "^1.0.2"
-    dir-glob "^2.2.1"
+    dir-glob "^2.2.2"
     fast-glob "^2.2.6"
     glob "^7.1.3"
     ignore "^4.0.3"
@@ -6462,12 +6647,19 @@ globule@^1.0.0:
     minimatch "~3.0.2"
 
 gonzales-pe@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz#41091703625433285e0aee3aa47829fc1fbeb6f2"
-  integrity sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.4.tgz#356ae36a312c46fe0f1026dd6cb539039f8500d2"
+  integrity sha512-v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ==
   dependencies:
     minimist "1.1.x"
 
+good-listener@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
+  integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
+  dependencies:
+    delegate "^3.1.2"
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
@@ -6479,12 +6671,17 @@ graphql-tag@^2.10.1:
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
 
 graphql@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0"
-  integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.1.tgz#779529bf9a01e7207b977a54c20670b48ca6e95c"
+  integrity sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==
   dependencies:
     iterall "^1.2.2"
 
+gud@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
+  integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==
+
 gzip-size@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"
@@ -6498,17 +6695,6 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@^4.0.11:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
-  integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
-  dependencies:
-    async "^2.5.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 handlebars@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
@@ -6621,15 +6807,47 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hast-util-parse-selector@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.1.tgz#4ddbae1ae12c124e3eb91b581d2556441766f0ab"
+  integrity sha512-Xyh0v+nHmQvrOqop2Jqd8gOdyQtE8sIP9IQf7mlVDqp924W4w/8Liuguk2L2qei9hARnQSG2m+wAOCxM7npJVw==
+
+hastscript@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-5.0.0.tgz#fee10382c1bc4ba3f1be311521d368c047d2c43a"
+  integrity sha512-xJtuJ8D42Xtq5yJrnDg/KAIxl2cXBXKoiIJwmWX9XMf8113qHTGl/Bf7jEsxmENJ4w6q4Tfl8s/Y6mEZo8x8qw==
+  dependencies:
+    comma-separated-tokens "^1.0.0"
+    hast-util-parse-selector "^2.2.0"
+    property-information "^5.0.1"
+    space-separated-tokens "^1.0.0"
+
 he@1.2.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
 highlight.js@^9.14.2:
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.14.2.tgz#efbfb22dc701406e4da406056ef8c2b70ebe5b26"
-  integrity sha512-Nc6YNECYpxyJABGYJAyw7dBAYbXEuIzwzkqoJnwbc1nIpCiN+3ioYf0XrBnLiyyG0JLuJhpPtt2iTSbXiKLoyA==
+  version "9.15.6"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.6.tgz#72d4d8d779ec066af9a17cb14360c3def0aa57c4"
+  integrity sha512-zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ==
+
+highlight.js@~9.12.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
+  integrity sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=
+
+history@^4.7.2:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz#84587c2068039ead8af769e9d6a6860a14fa1bca"
+  integrity sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    loose-envify "^1.2.0"
+    resolve-pathname "^2.2.0"
+    tiny-invariant "^1.0.2"
+    tiny-warning "^1.0.0"
+    value-equal "^0.4.0"
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -6641,21 +6859,21 @@ hmac-drbg@^1.0.0:
     minimalistic-crypto-utils "^1.0.1"
 
 hoek@6.x.x:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
-  integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
+  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
 
-hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
-  integrity sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=
+hoist-non-react-statics@^2.3.1:
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
+  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-homedir-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
+hoist-non-react-statics@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
+  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
   dependencies:
-    parse-passwd "^1.0.0"
+    react-is "^16.7.0"
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
@@ -6707,27 +6925,17 @@ html-webpack-plugin@^4.0.0-beta.2:
     tapable "^1.1.0"
     util.promisify "1.0.0"
 
-htmlparser2@^3.10.0, htmlparser2@^3.9.1:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz#5f5e422dcf6119c0d983ed36260ce9ded0bee464"
-  integrity sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==
+htmlparser2@^3.10.0, htmlparser2@^3.3.0, htmlparser2@^3.9.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
   dependencies:
-    domelementtype "^1.3.0"
+    domelementtype "^1.3.1"
     domhandler "^2.3.0"
     domutils "^1.5.1"
     entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.0.6"
-
-htmlparser2@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
-  integrity sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=
-  dependencies:
-    domelementtype "1"
-    domhandler "2.1"
-    domutils "1.1"
-    readable-stream "1.0"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
 
 http-auth@3.1.x:
   version "3.1.3"
@@ -6847,9 +7055,9 @@ husky@^1.3.1:
     slash "^2.0.0"
 
 i18next@^15.0.4:
-  version "15.0.8"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.8.tgz#4a52ba8b422832f334fe2fb464e8ad4785899211"
-  integrity sha512-ayzNwJ9NHtqEeAG0nQ6yKFbIpZULpDeesjVnfWQaPwbH7Anee8QwRAYPNWHtFCmDZV9FZaKiEbfo1scH8+KSDg==
+  version "15.0.9"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.9.tgz#42536407a921bb5a8535a4c090a26f16827a1884"
+  integrity sha512-IdVj7DqErUuMbGuj2dFT431T7zKlmDci63eae6pNA/bMwgBZKT74/KnwHXE0WH7ivo2EV/LNme4pP4Yw6vB79w==
   dependencies:
     "@babel/runtime" "^7.3.1"
 
@@ -6872,17 +7080,17 @@ icss-replace-symbols@^1.1.0:
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
   integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
 
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
+icss-utils@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.0.tgz#339dbbffb9f8729a243b701e1c29d4cc58c52f0e"
+  integrity sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.14"
 
 ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -6907,9 +7115,9 @@ ignore@^4.0.3:
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.0.4:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.5.tgz#c663c548d6ce186fb33616a8ccb5d46e56bdbbf9"
-  integrity sha512-kOC8IUb8HSDMVcYrDVezCxpJkzSQWTAzf3olpKM6o9rM5zpojx23O0Fl8Wr4+qJ6ZbPEHqf1fdwev/DS7v7pmA==
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.6.tgz#562dacc7ec27d672dde433aa683c543b24c17694"
+  integrity sha512-/+hp3kUf/Csa32ktIaj0OlRqQxrgs30n62M90UBpNd9k+ENEch5S+hmbW3DtcJGz3sYFTh4F3A6fQ0q7KWsp4w==
 
 image-size@~0.5.0:
   version "0.5.5"
@@ -6921,21 +7129,21 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immer@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-1.7.2.tgz#a51e9723c50b27e132f6566facbec1c85fc69547"
-  integrity sha512-4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA==
+immer@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d"
+  integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==
+
+immer@^1.12.0:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-1.12.1.tgz#40c6e5b292c00560836c2993bda3a24379d466f5"
+  integrity sha512-3fmKM6ovaqDt0CdC9daXpNi5x/YCYS3i4cwLdTVkhJdk5jrDXoPs7lCm3IqM3yhfSnz4tjjxbRG2CziQ7m8ztg==
 
 immutable-tuple@^0.4.9:
   version "0.4.10"
   resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.10.tgz#e0b1625384f514084a7a84b749a3bb26e9179929"
   integrity sha512-45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q==
 
-immutable@^3.8.1:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
-
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -7045,25 +7253,6 @@ inquirer@3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
-  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.0"
-    figures "^2.0.0"
-    lodash "^4.17.10"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.1.0"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 inquirer@6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
@@ -7116,14 +7305,14 @@ internal-ip@^3.0.1:
     ipaddr.js "^1.5.2"
 
 internal-ip@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
-  integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    default-gateway "^4.0.1"
+    default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
-interpret@^1.0.0, interpret@^1.1.0:
+interpret@^1.0.0, interpret@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
@@ -7138,7 +7327,7 @@ intl@1.2.5:
   resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
   integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
 
-invariant@^2.2.2:
+invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -7156,9 +7345,9 @@ invert-kv@^2.0.0:
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
 ionicons@^4.5.5:
-  version "4.5.5"
-  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.5.tgz#b059958a54dd45cfa127acc0baf11503b8671e51"
-  integrity sha512-dIGI73XG6Fg2Ps77ry5Ywe36Pq7wUGkDkl0pBhC4uhsiyoW+oXe+pplmarXEnKEcB5fmlkRrBOxYYzZaoRiUGw==
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.6.tgz#f3b5d2446e7e1b30e67ddcd1fc563271acc60f3c"
+  integrity sha512-/F3U/rxdLPGl8eUW5dMouhBBoJuUPrlFO6rkoz4VNuw1lxP6l+bFtsDA8MaVM1dHABp+gIHxtpt+IhwmB3oIfA==
 
 ip-regex@^2.1.0:
   version "2.1.0"
@@ -7311,7 +7500,7 @@ is-extendable@^0.1.0, is-extendable@^0.1.1:
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
   integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
-is-extendable@^1.0.1:
+is-extendable@^1.0.0, is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
   integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
@@ -7342,6 +7531,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-function@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
+  integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -7350,9 +7544,9 @@ is-glob@^3.1.0:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -7366,11 +7560,6 @@ is-negated-glob@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
   integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
 
-is-number@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-  integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -7388,6 +7577,11 @@ is-path-cwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
   integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
+is-path-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.0.0.tgz#d4777a8e227a00096a31f030db3770f84b116c02"
+  integrity sha512-m5dHHzpOXEiv18JEORttBO64UgTEypx99vCxQLjbBvGhOJxnTNglYoFXxwo6AbsQb79sqqycQEHv2hWkHZAijA==
+
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
@@ -7395,6 +7589,13 @@ is-path-in-cwd@^1.0.0:
   dependencies:
     is-path-inside "^1.0.0"
 
+is-path-in-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.0.0.tgz#68e452a6eec260500cec21e029c0a44cc0dcd2ea"
+  integrity sha512-6Vz5Gc9s/sDA3JBVu0FzWufm8xaBsqy1zn8Q6gmvGP6nSDMw78aS4poBNeatWjaRpTpxxLn1WOndAiOlk+qY8A==
+  dependencies:
+    is-path-inside "^1.0.0"
+
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
@@ -7448,11 +7649,6 @@ is-stream@^1.0.1, is-stream@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
-
 is-supported-regexp-flag@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz#21ee16518d2c1dd3edd3e9a0d57e50207ac364ca"
@@ -7571,10 +7767,10 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-api@^2.0.5:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.0.tgz#37ab0c2c3e83065462f5254b94749d6157846c4e"
-  integrity sha512-+Ygg4t1StoiNlBGc6x0f8q/Bv26FbZqP/+jegzfNpU7Q8o+4ZRoJxJPhBkgE/UonpAjtxnE4zCZIyJX+MwLRMQ==
+istanbul-api@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.1.tgz#194b773f6d9cbc99a9258446848b0f988951c4d0"
+  integrity sha512-kVmYrehiwyeBAk/wE71tW6emzLiHGjYIiDrc8sfyty4F8M02/lrgXSm+R1kXysmF20zArvmZXjlE/mg24TVPJw==
   dependencies:
     async "^2.6.1"
     compare-versions "^3.2.1"
@@ -7584,7 +7780,7 @@ istanbul-api@^2.0.5:
     istanbul-lib-instrument "^3.1.0"
     istanbul-lib-report "^2.0.4"
     istanbul-lib-source-maps "^3.0.2"
-    istanbul-reports "^2.1.0"
+    istanbul-reports "^2.1.1"
     js-yaml "^3.12.0"
     make-dir "^1.3.0"
     minimatch "^3.0.4"
@@ -7663,12 +7859,12 @@ istanbul-lib-source-maps@^3.0.2:
     rimraf "^2.6.2"
     source-map "^0.6.1"
 
-istanbul-reports@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.1.0.tgz#87b8b55cd1901ba1748964c98ddd8900ce306d59"
-  integrity sha512-azQdSX+dtTtkQEfqq20ICxWi6eOHXyHIgMFw1VOOVi8iIPWeCWRgCyFh/CsBKIhcgskMI8ExXmU7rjXTRCIJ+A==
+istanbul-reports@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.1.1.tgz#72ef16b4ecb9a4a7bd0e2001e00f95d1eec8afa9"
+  integrity sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==
   dependencies:
-    handlebars "^4.0.11"
+    handlebars "^4.1.0"
 
 iterall@^1.2.1, iterall@^1.2.2:
   version "1.2.2"
@@ -7676,9 +7872,9 @@ iterall@^1.2.1, iterall@^1.2.2:
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
 jasmine-core@^3.3, jasmine-core@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
-  integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
@@ -7707,15 +7903,26 @@ jasminewd2@^2.1.0:
   integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
 jquery@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
-  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"
+  integrity sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ==
 
 js-base64@^2.1.8:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
   integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
 
+js-beautify@^1.8.9:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.9.1.tgz#6f9ef915f5d8d92b9f907606fce63795884c8040"
+  integrity sha512-oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ==
+  dependencies:
+    config-chain "^1.1.12"
+    editorconfig "^0.15.2"
+    glob "^7.1.3"
+    mkdirp "~0.5.0"
+    nopt "~4.0.1"
+
 js-levenshtein@^1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@@ -7731,18 +7938,10 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
-  integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.13.0:
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
-  integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==
+js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.9.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -7851,15 +8050,14 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jszip@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
-  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.1.tgz#c5d32df7274042282b157efb16e522b43435e01a"
+  integrity sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw==
   dependencies:
-    core-js "~2.3.0"
-    es6-promise "~3.0.2"
-    lie "~3.1.0"
+    lie "~3.3.0"
     pako "~1.0.2"
-    readable-stream "~2.0.6"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
 
 karma-chrome-launcher@^2.2.0:
   version "2.2.0"
@@ -7877,11 +8075,11 @@ karma-cli@^2.0.0:
     resolve "^1.3.3"
 
 karma-coverage-istanbul-reporter@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz#402ae4ed6eadb9d9dafbd408ffda17897c0d003a"
-  integrity sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz#ca5899d4905e44a5984dd4f963adfc1a74dce767"
+  integrity sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==
   dependencies:
-    istanbul-api "^2.0.5"
+    istanbul-api "^2.1.1"
     minimatch "^3.0.4"
 
 karma-jasmine-html-reporter@^1.4.0:
@@ -7904,27 +8102,26 @@ karma-source-map-support@1.3.0:
     source-map-support "^0.5.5"
 
 karma@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.0.tgz#f28e38a2b66243fde3f98e12a8dcaa2c6ff8ca9c"
-  integrity sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
+  integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
+    braces "^2.3.2"
     chokidar "^2.0.3"
     colors "^1.1.0"
-    combine-lists "^1.0.0"
     connect "^3.6.0"
     core-js "^2.2.0"
     di "^0.0.1"
     dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
     flatted "^2.0.0"
     glob "^7.1.1"
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^4.17.5"
-    log4js "^3.0.0"
+    lodash "^4.17.11"
+    log4js "^4.0.0"
     mime "^2.3.1"
     minimatch "^3.0.2"
     optimist "^0.6.1"
@@ -7942,7 +8139,7 @@ keycode@^2.2.0:
   resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
   integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
 
-killable@^1.0.0:
+killable@^1.0.0, killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -8059,10 +8256,10 @@ license-webpack-plugin@2.1.0:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
 
-lie@~3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
   dependencies:
     immediate "~3.0.5"
 
@@ -8139,7 +8336,7 @@ loader-utils@1.1.0:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, 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==
@@ -8174,6 +8371,11 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+lodash-es@^4.17.11:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
+  integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -8194,21 +8396,46 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
+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.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
+lodash.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
+
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
   integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
-lodash.mergewith@^4.6.0:
+lodash.mergewith@^4.6.0, lodash.mergewith@^4.6.1:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
   integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
+lodash.pick@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+  integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
+
 lodash.some@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
   integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
 
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -8229,7 +8456,12 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.10:
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
+
+lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -8241,18 +8473,18 @@ log-symbols@^2.0.0, log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
-log4js@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
-  integrity sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==
+log4js@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.1.0.tgz#57983c6a443546a8c8607e9cb045d2a117c27644"
+  integrity sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==
   dependencies:
-    circular-json "^0.5.5"
-    date-format "^1.2.0"
-    debug "^3.1.0"
+    date-format "^2.0.0"
+    debug "^4.1.1"
+    flatted "^2.0.0"
     rfdc "^1.1.2"
-    streamroller "0.7.0"
+    streamroller "^1.0.4"
 
-loglevel@^1.4.1:
+loglevel@^1.4.1, loglevel@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
   integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
@@ -8262,7 +8494,7 @@ longest-streak@^2.0.1:
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e"
   integrity sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -8282,7 +8514,15 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lowlight@~1.9.1:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.9.2.tgz#0b9127e3cec2c3021b7795dd81005c709a42fdd1"
+  integrity sha512-Ek18ElVCf/wF/jEm1b92gTnigh94CtBNWiZ2ad+vTgW7cTmQxUY3I98BjHK68gZAJEWmybGBZgx9qv3QxLQB/Q==
+  dependencies:
+    fault "^1.0.2"
+    highlight.js "~9.12.0"
+
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -8302,10 +8542,10 @@ lunr@^2.3.6:
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.6.tgz#f278beee7ffd56ad86e6e478ce02ab2b98c78dd5"
   integrity sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==
 
-macos-release@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
-  integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==
+macos-release@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
+  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
 magic-string@^0.22.4:
   version "0.22.5"
@@ -8328,6 +8568,14 @@ make-dir@^1.0.0, make-dir@^1.3.0:
   dependencies:
     pify "^3.0.0"
 
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-error@^1.1.1, make-error@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
@@ -8350,6 +8598,11 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
 map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -8372,6 +8625,11 @@ map-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
   integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
+map-or-similar@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08"
+  integrity sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=
+
 map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
@@ -8394,10 +8652,18 @@ markdown-table@^1.1.0:
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz#c78db948fa879903a41bce522e3b96f801c63786"
   integrity sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==
 
+markdown-to-jsx@^6.9.1:
+  version "6.9.3"
+  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.9.3.tgz#31719e3c54517ba9805db81d53701b89f5d2ed7e"
+  integrity sha512-iXteiv317VZd1vk/PBH5MWMD4r0XWekoWCHRVVadBcnCtxavhtfV1UaEaQgq9KyckTv31L60ASh5ZVVrOh37Qg==
+  dependencies:
+    prop-types "^15.6.2"
+    unquote "^1.1.0"
+
 marked@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.1.tgz#a63addde477bca9613028de4b2bc3629e53a0562"
-  integrity sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
+  integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
 
 mathml-tag-names@^2.0.1:
   version "2.1.0"
@@ -8438,14 +8704,21 @@ mem@^1.1.0:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.1.0.tgz#aeb9be2d21f47e78af29e4ac5978e8afa2ca5b8a"
-  integrity sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
   dependencies:
     map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
+    mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
+memoizerific@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
+  integrity sha1-fIekZGREwy11Q4VwkF8tvRsagFo=
+  dependencies:
+    map-or-similar "^1.5.0"
+
 memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -8554,22 +8827,22 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.36.0 < 2":
+"mime-db@>= 1.38.0 < 2":
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
+  integrity sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==
+
+mime-db@~1.38.0:
   version "1.38.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
   integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
 
-mime-db@~1.37.0:
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
-  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
-
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
-  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
+  version "2.1.22"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
   dependencies:
-    mime-db "~1.37.0"
+    mime-db "~1.38.0"
 
 mime@1.4.1:
   version "1.4.1"
@@ -8582,15 +8855,20 @@ mime@^1.4.1:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.0.3, mime@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
+  integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
+mimic-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
 min-document@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
@@ -8811,9 +9089,9 @@ mute-stream@0.0.7:
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 nan@^2.10.0, nan@^2.9.2:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
-  integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -8838,11 +9116,11 @@ nebular-icons@1.1.0:
   integrity sha512-4TkJgDrjXw8qsOsc2NN6OBlRJYAJJpvqtjV+gpv+NV6amPgMPQNNuEvbenYXAMFmjs3uShgKOvmpnCX8Ua1oWQ==
 
 needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.0.tgz#ce3fea21197267bacb310705a7bbe24f2a3a3492"
+  integrity sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==
   dependencies:
-    debug "^2.1.2"
+    debug "^4.1.0"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
@@ -8857,9 +9135,9 @@ neo-async@^2.5.0, neo-async@^2.6.0:
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
 ng-simple-slideshow@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/ng-simple-slideshow/-/ng-simple-slideshow-1.2.8.tgz#a574456d0775d99711cd48d270113e084c49e48a"
-  integrity sha512-ZMM2ZEoAQY0RkceCZljwEWiCVehDc848/erWR2MPf+q0JUWpzQK3cIssKtyAaZnzohynE5YixY/t+zCGxkEwDw==
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/ng-simple-slideshow/-/ng-simple-slideshow-1.2.9.tgz#384706ea76ed859c77927fd3b0585aba20d9a034"
+  integrity sha512-05bLd9pWFAIhlOuScO1FOhCubNm9oZ3HK7fJ0oZgn9m9kl257yxXQv/1fBsVrCu0v/25zQRGRS9EgkX5UXhJdQ==
 
 ng2-ckeditor@^1.2.2:
   version "1.2.2"
@@ -8910,9 +9188,9 @@ ngx-highlightjs@^2.1.4:
     tslib "^1.9.0"
 
 ngx-moment@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/ngx-moment/-/ngx-moment-3.3.0.tgz#54176d8d24cf0f0d90fbbb8a6e6185cbd0d55324"
-  integrity sha512-6fpllpJqLfjRWboOhphgeEYt+rzIA9O29rG5QWCebRt2X0uNk4P93sLEb0S8lbDF0dEp2NOC3UOD+xoCVlJQhA==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ngx-moment/-/ngx-moment-3.4.0.tgz#53bd64557e552c612b0f68b975d1c7ed34f28dfc"
+  integrity sha512-GEqzSsu12VsXXP35aerlQpuZ1ienEYQZxHmp+RH7EuJD7hWamKgLOpmbiDI9Ij3KLW/UApvonYzZvyRSv3ea/w==
   dependencies:
     tslib "^1.9.0"
 
@@ -9026,10 +9304,10 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.0-alpha.11, node-releases@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.7.tgz#b09a10394d0ed8f7778f72bb861dde68b146303b"
-  integrity sha512-bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA==
+node-releases@^1.1.13, node-releases@^1.1.3:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
+  integrity sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==
   dependencies:
     semver "^5.3.0"
 
@@ -9070,7 +9348,7 @@ node-version@^1.0.0:
   dependencies:
     abbrev "1"
 
-nopt@^4.0.1:
+nopt@^4.0.1, nopt@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
   integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
@@ -9131,9 +9409,9 @@ npm-package-arg@6.1.0, npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
     validate-npm-package-name "^3.0.0"
 
 npm-packlist@^1.1.12, npm-packlist@^1.1.6:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.3.0.tgz#7f01e8e44408341379ca98cfd756e7b29bd2626c"
-  integrity sha512-qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
+  integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -9243,9 +9521,9 @@ object-inspect@~1.4.0:
   integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
 object-keys@^1.0.12, object-keys@^1.0.6:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
@@ -9282,6 +9560,13 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
+object.omit@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-3.0.0.tgz#0e3edc2fce2ba54df5577ff529f6d97bd8a522af"
+  integrity sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ==
+  dependencies:
+    is-extendable "^1.0.0"
+
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -9311,10 +9596,10 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
-  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
+on-headers@~1.0.1, on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
@@ -9330,6 +9615,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+open@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
+  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+  dependencies:
+    is-wsl "^1.1.0"
+
 opencollective@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
@@ -9350,13 +9642,27 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@5.4.0, opn@^5.1.0, opn@^5.4.0, opn@latest:
+opn@5.4.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
   integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
   dependencies:
     is-wsl "^1.1.0"
 
+opn@^5.1.0, opn@^5.4.0, opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+  dependencies:
+    is-wsl "^1.1.0"
+
+opn@latest:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-6.0.0.tgz#3c5b0db676d5f97da1233d1ed42d182bc5a27d2d"
+  integrity sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==
+  dependencies:
+    is-wsl "^1.1.0"
+
 optimism@^0.6.9:
   version "0.6.9"
   resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz#19258ff8b3be0cea29ac35f06bff818e026e30bb"
@@ -9384,7 +9690,7 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-original@>=0.0.5, original@^1.0.0:
+original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
   integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
@@ -9427,11 +9733,11 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     mem "^4.0.0"
 
 os-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.0.0.tgz#e1434dbfddb8e74b44c98b56797d951b7648a5d9"
-  integrity sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
   dependencies:
-    macos-release "^2.0.0"
+    macos-release "^2.2.0"
     windows-release "^3.1.0"
 
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
@@ -9458,9 +9764,9 @@ p-finally@^1.0.0:
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-is-promise@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
-  integrity sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
 p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
@@ -9470,9 +9776,9 @@ p-limit@^1.0.0, p-limit@^1.1.0:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
-  integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
   dependencies:
     p-try "^2.0.0"
 
@@ -9495,15 +9801,20 @@ p-map@^1.1.1:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pace-js@1.0.2:
   version "1.0.2"
@@ -9549,9 +9860,9 @@ pako@^0.2.5:
   integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
 pako@~1.0.2, pako@~1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4"
-  integrity sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
@@ -9570,9 +9881,9 @@ param-case@2.1.x:
     no-case "^2.2.0"
 
 parse-asn1@^5.0.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.3.tgz#1600c6cc0727365d68b97f3aa78939e735a75204"
-  integrity sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg==
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
+  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -9581,10 +9892,10 @@ parse-asn1@^5.0.0:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-entities@^1.0.2, parse-entities@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz#9deac087661b2e36814153cb78d7e54a4c5fd6f4"
-  integrity sha512-XXtDdOPLSB0sHecbEapQi6/58U/ODj/KWfIXmmMCJF/eRn8laX6LZbOyioMoETOOJoWRW8/qTSl5VQkUIfKM5g==
+parse-entities@^1.0.2, parse-entities@^1.1.0, parse-entities@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.1.tgz#2c761ced065ba7dc68148580b5a225e4918cdd69"
+  integrity sha512-NBWYLQm1KSoDKk7GAHyioLTvCZ5QjdH/ASBBQTD3iLiAWJXS5bg1jEWI8nIJ+vgVvsceBVBcDGRWSo0KVQBvvg==
   dependencies:
     character-entities "^1.0.0"
     character-entities-legacy "^1.0.0"
@@ -9618,11 +9929,6 @@ parse-node-version@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -9837,17 +10143,29 @@ please-upgrade-node@^3.1.1:
   dependencies:
     semver-compare "^1.0.0"
 
+png-js@>=0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/png-js/-/png-js-0.1.1.tgz#1cc7c212303acabe74263ec3ac78009580242d93"
+  integrity sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=
+
 pngjs@^3.3.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
-popper.js@^1.14.7:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
-  integrity sha512-4q1hNvoUre/8srWsH7hnoSJ5xVmIL4qgz+s4qf2TnJIMyZFUFMGH+9vE7mXynAlHSZ/NdTmmow86muD0myUkVQ==
+polished@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/polished/-/polished-2.3.3.tgz#bdbaba962ba8271b0e11aa287f2befd4c87be99a"
+  integrity sha512-59V4fDbdxtH4I1m9TWxFsoGJbC8nnOpUYo5uFmvMfKp9Qh+6suo4VMUle1TGIIUZIGxfkW+Rs485zPk0wcwR2Q==
+  dependencies:
+    "@babel/runtime" "^7.2.0"
+
+popper.js@^1.14.4, popper.js@^1.14.7:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
+  integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
 
-portfinder@^1.0.9:
+portfinder@^1.0.20, portfinder@^1.0.9:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
   integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
@@ -9893,9 +10211,9 @@ postcss-jsx@^0.36.0:
     "@babel/core" ">=7.1.0"
 
 postcss-less@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.2.tgz#fb67e7ba351dbdf69de3c52eebd1184c52bfaea6"
-  integrity sha512-66ZBVo1JGkQ7r13M97xcHcyarWpgg21RaqIZWZXHE3XOtb5+ywK1uZWeY1DYkYRkIX/l8Hvxnx9iSKB68nFr+w==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
+  integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
   dependencies:
     postcss "^7.0.14"
 
@@ -9930,36 +10248,37 @@ postcss-media-query-parser@^0.2.3:
   resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
   integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
 
-postcss-modules-extract-imports@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
-  integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==
+postcss-modules-extract-imports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.5"
 
-postcss-modules-local-by-default@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
+postcss-modules-local-by-default@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz#dd9953f6dd476b5fd1ef2d8830c8929760b56e63"
+  integrity sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
+    postcss-selector-parser "^6.0.0"
+    postcss-value-parser "^3.3.1"
 
-postcss-modules-scope@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
+postcss-modules-scope@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz#ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"
+  integrity sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
+    postcss-selector-parser "^6.0.0"
 
-postcss-modules-values@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
+postcss-modules-values@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64"
+  integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==
   dependencies:
     icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
 
 postcss-reporter@^6.0.0:
   version "6.0.1"
@@ -10007,6 +10326,15 @@ postcss-selector-parser@^3.1.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
+  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
 postcss-syntax@^0.36.2:
   version "0.36.2"
   resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
@@ -10017,7 +10345,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.7:
+postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -10026,15 +10354,6 @@ postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^6.0.1, postcss@^6.0.23:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -10053,16 +10372,18 @@ pretty-hrtime@^1.0.3:
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
   integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
+prismjs@^1.8.4, prismjs@~1.16.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.16.0.tgz#406eb2c8aacb0f5f0f1167930cb83835d10a4308"
+  integrity sha512-OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA==
+  optionalDependencies:
+    clipboard "^2.0.0"
+
 private@^0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
-
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
@@ -10112,7 +10433,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
+prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -10121,6 +10442,18 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.5.9,
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
+property-information@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.0.1.tgz#c3b09f4f5750b1634c0b24205adbf78f18bdf94f"
+  integrity sha512-nAtBDVeSwFM3Ot/YxT7s4NqZmqXI7lLzf46BThvotEtYf2uk2yH0ACYuWQkJ7gxKs49PPtKVY0UlDGkyN9aJlw==
+  dependencies:
+    xtend "^4.0.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=
+
 protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
@@ -10255,15 +10588,15 @@ qrcode@^1.3.3:
     pngjs "^3.3.0"
     yargs "^12.0.5"
 
-qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
+qs@6.5.2, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@^6.5.2:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
-  integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
+qs@^6.5.2, qs@^6.6.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 querystring-es3@^0.2.0:
   version "0.2.1"
@@ -10276,9 +10609,9 @@ querystring@0.2.0, querystring@^0.2.0:
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
-  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
 quick-lru@^1.0.0:
   version "1.1.0"
@@ -10300,9 +10633,9 @@ ramda@^0.21.0:
   integrity sha1-oAGr7bP/YQd9T/HVd9RN536NCjU=
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
@@ -10329,7 +10662,7 @@ raw-body@2.3.3:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-raw-loader@1.0.0:
+raw-loader@1.0.0, raw-loader@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405"
   integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==
@@ -10337,11 +10670,6 @@ raw-loader@1.0.0:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
 
-raw-loader@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
-
 rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -10352,62 +10680,100 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dev-utils@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-6.1.1.tgz#a07e3e8923c4609d9f27e5af5207e3ca20724895"
-  integrity sha512-ThbJ86coVd6wV/QiTo8klDTvdAJ1WsFCGQN07+UkN+QN9CtCSsl/+YuDJToKGeG8X4j9HMGXNKbk2QhPAZr43w==
+react-clientside-effect@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.0.tgz#db823695f75e9616a5e4dd6d908e5ea627fb2516"
+  integrity sha512-cVIsGG7SNHsQsCP4+fw7KFUB0HiYiU8hbvL640XaLCbZ31aK8/lj0qOKJ2K+xRjuQz/IM4Q4qclI0aEqTtcXtA==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    shallowequal "^1.1.0"
+
+react-dev-utils@^7.0.0:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-7.0.5.tgz#cb95375d01ae71ca27b3c7616006ef7a77d14e8e"
+  integrity sha512-zJnqqb0x6gd63E3xoz5pXAxBPNaW75Hyz7GgQp0qPhMroBCRQtRvG67AoTZZY1z4yCYVJQZAfQJFdnea0Ujbug==
   dependencies:
     "@babel/code-frame" "7.0.0"
     address "1.0.3"
-    browserslist "4.1.1"
-    chalk "2.4.1"
+    browserslist "4.4.1"
+    chalk "2.4.2"
     cross-spawn "6.0.5"
     detect-port-alt "1.1.6"
     escape-string-regexp "1.0.5"
     filesize "3.6.1"
     find-up "3.0.0"
-    global-modules "1.0.0"
-    globby "8.0.1"
+    global-modules "2.0.0"
+    globby "8.0.2"
     gzip-size "5.0.0"
-    immer "1.7.2"
-    inquirer "6.2.0"
+    immer "1.10.0"
+    inquirer "6.2.1"
     is-root "2.0.0"
-    loader-utils "1.1.0"
+    loader-utils "1.2.3"
     opn "5.4.0"
     pkg-up "2.0.0"
-    react-error-overlay "^5.1.0"
+    react-error-overlay "^5.1.4"
     recursive-readdir "2.2.2"
     shell-quote "1.6.1"
-    sockjs-client "1.1.5"
-    strip-ansi "4.0.0"
+    sockjs-client "1.3.0"
+    strip-ansi "5.0.0"
     text-table "0.2.0"
 
-react-dom@^16.6.0, react-dom@^16.6.3, react-dom@^16.7.0:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.1.tgz#ec860f98853d09d39bafd3a6f1e12389d283dbb4"
-  integrity sha512-N74IZUrPt6UiDjXaO7UbDDFXeUXnVhZzeRLy/6iqqN1ipfjrhR60Bp5NuBK+rv3GMdqdIuwIl22u1SYwf330bg==
+react-dom@^16.8.1:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
+  integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.1"
-
-react-error-overlay@^5.1.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.3.tgz#16fcbde75ed4dc6161dc6dc959b48e92c6ffa9ad"
-  integrity sha512-GoqeM3Xadie7XUApXOjkY3Qhs8RkwB/Za4WMedBGrOKH1eTuKGyoAECff7jiVonJchOx6KZ9i8ILO5XIoHB+Tg==
+    scheduler "^0.13.6"
 
-react-fuzzy@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/react-fuzzy/-/react-fuzzy-0.5.2.tgz#fc13bf6f0b785e5fefe908724efebec4935eaefe"
-  integrity sha512-qIZZxaCheb/HhcBi5fABbiCFg85+K5r1TCps1D4uaL0LAMMD/1zm/x1/kNR130Tx7nnY9V7mbFyY0DquPYeLAw==
+react-draggable@^3.1.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-3.2.1.tgz#45d09a9a227988dc85674b23ab3c75b6e820dae5"
+  integrity sha512-r+3Bs9InID2lyIEbR8UIRVtpn4jgu1ArFEZgIy8vibJjijLSdNLX7rH9U68BBVD4RD9v44RXbaK4EHLyKXzNQw==
   dependencies:
-    babel-runtime "^6.23.0"
     classnames "^2.2.5"
-    fuse.js "^3.0.1"
-    prop-types "^15.5.9"
+    prop-types "^15.6.0"
+
+react-error-overlay@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.4.tgz#88dfb88857c18ceb3b9f95076f850d7121776991"
+  integrity sha512-fp+U98OMZcnduQ+NSEiQa4s/XMsbp+5KlydmkbESOw4P69iWZ68ZMFM5a2BuE0FgqPBKApJyRuYHR95jM8lAmg==
+
+react-fast-compare@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
+  integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
+
+react-focus-lock@^1.17.7:
+  version "1.18.3"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-1.18.3.tgz#19d84afeab935c0b5de196922f71db7c481baba4"
+  integrity sha512-4fPAHnsr8oCYPgVmcMZ8NbAE9jm/OshPjXEM5PHseu2lDernzm/b1sHhYzZUO4OoW9D/u1AQsV6n4trRllow7w==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    focus-lock "^0.6.0"
+    prop-types "^15.6.2"
+    react-clientside-effect "^1.2.0"
+
+react-helmet-async@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-0.2.0.tgz#d20d8725c1dcdcc95d54e281a1040af47c3abffa"
+  integrity sha512-xo8oN+SUt0YkgQscKPTqhZZIOn5ni18FMv/H3KuBDt5+yAXTGktPEf3HU2EyufbHAF0TQ8qI+JrA3ILnjVfqNA==
+  dependencies:
+    invariant "^2.2.4"
+    prop-types "^15.6.1"
+    react-fast-compare "^2.0.2"
+    shallowequal "^1.0.2"
+
+react-hotkeys@2.0.0-pre4:
+  version "2.0.0-pre4"
+  resolved "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-2.0.0-pre4.tgz#a1c248a51bdba4282c36bf3204f80d58abc73333"
+  integrity sha512-oa+UncSWyOwMK3GExt+oELXaR7T3ItgcMolsupQFdKvwkEhVAluJd5rYczsRSQpQlVkdNoHG46De2NUeuS+88Q==
+  dependencies:
+    prop-types "^15.6.1"
 
-react-inspector@^2.3.0:
+react-inspector@^2.3.0, react-inspector@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-2.3.1.tgz#f0eb7f520669b545b441af9d38ec6d706e5f649c"
   integrity sha512-tUUK7t3KWgZEIUktOYko5Ic/oYwvjEvQUFAGC1UeMeDaQ5za2yZFtItJa2RTwBJB//NxPr000WQK6sEbqC6y0Q==
@@ -10416,17 +10782,17 @@ react-inspector@^2.3.0:
     is-dom "^1.0.9"
     prop-types "^15.6.1"
 
-react-is@^16.8.1:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb"
-  integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA==
+react-is@^16.7.0, react-is@^16.8.1:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
+  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
-react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
+react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2, 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@^3.6.1:
+react-modal@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.8.1.tgz#7300f94a6f92a2e17994de0be6ccb61734464c9e"
   integrity sha512-aLKeZM9pgXpIKVwopRHMuvqKWiBajkqisDA8UzocdCF6S4fyKVfLWmZR5G1Q0ODBxxxxf2XIwiCP8G/11GJAuw==
@@ -10436,64 +10802,69 @@ react-modal@^3.6.1:
     react-lifecycles-compat "^3.0.0"
     warning "^3.0.0"
 
-react-split-pane@^0.1.84:
-  version "0.1.85"
-  resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.85.tgz#64819946a99b617ffa2d20f6f45a0056b6ee4faa"
-  integrity sha512-3GhaYs6+eVNrewgN4eQKJoNMQ4pcegNMTMhR5bO/NFO91K6/98qdD1sCuWPpsefCjzxNTjkvVYWQC0bMaC45mA==
-  dependencies:
-    prop-types "^15.5.10"
-    react "^16.6.3"
-    react-dom "^16.6.3"
-    react-lifecycles-compat "^3.0.4"
-    react-style-proptype "^3.0.0"
-
-react-style-proptype@^3.0.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/react-style-proptype/-/react-style-proptype-3.2.2.tgz#d8e998e62ce79ec35b087252b90f19f1c33968a0"
-  integrity sha512-ywYLSjNkxKHiZOqNlso9PZByNEY+FTyh3C+7uuziK0xFXu9xzdyfHwg4S9iyiRRoPCR4k2LqaBBsWVmSBwCWYQ==
+react-popper-tooltip@^2.8.0:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-2.8.2.tgz#4803446362a815b1406e39526ddeb299ed2fb414"
+  integrity sha512-k0T5y42Lhru4+7/YqB20YoHtlemlKE/6hT8nWtQzvoyBw/eKCahK6+udW4iZ6KwRYM/vocih14d0OPkMccqhWA==
   dependencies:
-    prop-types "^15.5.4"
+    "@babel/runtime" "^7.4.3"
+    react-popper "^1.3.3"
 
-react-textarea-autosize@^7.0.4:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-7.1.0.tgz#3132cb77e65d94417558d37c0bfe415a5afd3445"
-  integrity sha512-c2FlR/fP0qbxmlrW96SdrbgP/v0XZMTupqB90zybvmDVDutytUgPl7beU35klwcTeMepUIQEpQUn3P3bdshGPg==
+react-popper@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.3.tgz#2c6cef7515a991256b4f0536cd4bdcb58a7b6af6"
+  integrity sha512-ynMZBPkXONPc5K4P5yFWgZx5JGAUIP3pGGLNs58cfAPgK67olx7fmLp+AdpZ0+GoQ+ieFDa/z4cdV6u7sioH6w==
   dependencies:
     "@babel/runtime" "^7.1.2"
-    prop-types "^15.6.0"
+    create-react-context "<=0.2.2"
+    popper.js "^1.14.4"
+    prop-types "^15.6.1"
+    typed-styles "^0.0.7"
+    warning "^4.0.2"
 
-react-transition-group@^2.0.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.3.tgz#26de363cab19e5c88ae5dbae105c706cf953bb92"
-  integrity sha512-2DGFck6h99kLNr8pOFk+z4Soq3iISydwOFeeEVPjTN6+Y01CmvbWmnN02VuTWyFdnRtIDPe+wy2q6Ui8snBPZg==
+react-resize-detector@^3.2.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-3.4.0.tgz#2ccd399958a0efe9b7c52c5db5a13d87e47cd585"
+  integrity sha512-T96I8Iqa1hGWyooeFA2Sl6FdPoMhXWINfEKg2/EJLxhP37+/94VNuyuyz9CRqpmApD83IWRR+lbB3r0ADMoKJg==
   dependencies:
-    dom-helpers "^3.3.1"
-    loose-envify "^1.4.0"
+    lodash "^4.17.11"
+    lodash-es "^4.17.11"
     prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
+    resize-observer-polyfill "^1.5.1"
 
-react-treebeard@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/react-treebeard/-/react-treebeard-3.1.0.tgz#e380b9e75f900e538044280ac365d29092583642"
-  integrity sha512-u4OEzwZk1Xcxp2s55Ny/Ofp8fHRwlabKOAeGbzQ7XUE9YXFbPj8ajl0FInbXEP4Ys9+E1vHCtgqJ6VBsgbCPVg==
+react-syntax-highlighter@^8.0.1:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-8.1.0.tgz#59103ff17a828a27ed7c8f035ae2558f09b6b78c"
+  integrity sha512-G2bkZxmF3VOa4atEdXIDSfwwCqjw6ZQX5znfTaHcErA1WqHIS0o6DaSCDKFPVaOMXQEB9Hf1UySYQvuJmV8CXg==
   dependencies:
-    "@babel/runtime" "^7.0.0"
-    "@emotion/core" "^0.13.1"
-    "@emotion/styled" "^0.10.6"
-    deep-equal "^1.0.1"
-    prop-types "^15.6.2"
-    shallowequal "^1.1.0"
-    velocity-react "^1.4.1"
+    babel-runtime "^6.18.0"
+    highlight.js "~9.12.0"
+    lowlight "~1.9.1"
+    prismjs "^1.8.4"
+    refractor "^2.4.1"
+
+react-textarea-autosize@^7.0.4:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-7.1.0.tgz#3132cb77e65d94417558d37c0bfe415a5afd3445"
+  integrity sha512-c2FlR/fP0qbxmlrW96SdrbgP/v0XZMTupqB90zybvmDVDutytUgPl7beU35klwcTeMepUIQEpQUn3P3bdshGPg==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    prop-types "^15.6.0"
 
-react@^16.6.0, react@^16.6.3, react@^16.7.0:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.1.tgz#ae11831f6cb2a05d58603a976afc8a558e852c4a"
-  integrity sha512-wLw5CFGPdo7p/AgteFz7GblI2JPOos0+biSoxf1FPsGxWQZdN/pj6oToJs1crn61DL3Ln7mN86uZ4j74p31ELQ==
+react@^16.8.1:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
+  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.1"
+    scheduler "^0.13.6"
+
+reactjs-popup@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/reactjs-popup/-/reactjs-popup-1.3.2.tgz#7f7861443fc5edfb0184da1d01838dbd5db690cd"
+  integrity sha512-BwfaOkKpLHNHxSmiMcX/yc61twJvjGbJ/SBE+fYovJudFlaZDYXGPSp+3dTCE0UoNsEqF8oc/pNkYlGgmrnsrw==
 
 read-cache@^1.0.0:
   version "1.0.0"
@@ -10562,7 +10933,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^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.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, 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.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -10575,37 +10946,15 @@ read-pkg@^4.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^3.0.6:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
-  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
+"readable-stream@2 || 3", readable-stream@^3.0.6, readable-stream@^3.1.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
 readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -10622,6 +10971,18 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
+recompose@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.30.0.tgz#82773641b3927e8c7d24a0d87d65aeeba18aabd0"
+  integrity sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    change-emitter "^0.1.2"
+    fbjs "^0.8.1"
+    hoist-non-react-statics "^2.3.1"
+    react-lifecycles-compat "^3.0.2"
+    symbol-observable "^1.0.4"
+
 recursive-readdir@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
@@ -10645,23 +11006,24 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-redux@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
-  integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
-  dependencies:
-    loose-envify "^1.4.0"
-    symbol-observable "^1.2.0"
-
 reflect-metadata@^0.1.13, reflect-metadata@^0.1.2:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
   integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
 
-regenerate-unicode-properties@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
-  integrity sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==
+refractor@^2.4.1:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/refractor/-/refractor-2.8.0.tgz#29d7b2254e823edd2e3e476af286af1c11472bfa"
+  integrity sha512-w+jG49/1MX60GeE9u8lyx1KYMBRdAHjOIfgcDJ0wq2ogOnEmab0MgIj+AtPq6kelw0mr1l9U0i2rFvLlOCkxiw==
+  dependencies:
+    hastscript "^5.0.0"
+    parse-entities "^1.1.2"
+    prismjs "~1.16.0"
+
+regenerate-unicode-properties@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662"
+  integrity sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==
   dependencies:
     regenerate "^1.4.0"
 
@@ -10680,7 +11042,7 @@ 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.12.0, regenerator-runtime@^0.12.1:
+regenerator-runtime@^0.12.1:
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
@@ -10690,10 +11052,10 @@ regenerator-runtime@^0.13.2:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
   integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
 
-regenerator-transform@^0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
-  integrity sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==
+regenerator-transform@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"
+  integrity sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==
   dependencies:
     private "^0.1.6"
 
@@ -10706,13 +11068,9 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     safe-regex "^1.1.0"
 
 regexp-tree@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.1.tgz#27b455f9b138ca2e84c090e9aff1ffe2a04d97fa"
-  integrity sha512-HwRjOquc9QOwKTgbxvZTcddS5mlNlwePMQ3NFL8broajMLD5CXDAqas8Y5yxJH5QtZp5iRor3YCILd5pz71Cgw==
-  dependencies:
-    cli-table3 "^0.5.0"
-    colors "^1.1.2"
-    yargs "^12.0.5"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.5.tgz#7cd71fca17198d04b4176efd79713f2998009397"
+  integrity sha512-nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ==
 
 regexp.prototype.flags@^1.2.0:
   version "1.2.0"
@@ -10730,17 +11088,17 @@ regexpu-core@^1.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^4.1.3, regexpu-core@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.4.0.tgz#8d43e0d1266883969720345e70c275ee0aec0d32"
-  integrity sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==
+regexpu-core@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
+  integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
   dependencies:
     regenerate "^1.4.0"
-    regenerate-unicode-properties "^7.0.0"
+    regenerate-unicode-properties "^8.0.2"
     regjsgen "^0.5.0"
     regjsparser "^0.6.0"
     unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.0.2"
+    unicode-match-property-value-ecmascript "^1.1.0"
 
 regjsgen@^0.2.0:
   version "0.2.0"
@@ -10832,13 +11190,13 @@ render-fragment@^0.1.1:
   integrity sha512-+DnAcalJYR8GE5VRuQGGu78Q0GDe8EXnkuk4DF8gbAhIeS6LRt4j+aaggLLj4PtQVfXNC61McXvXI58WqmRleQ==
 
 renderkid@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.2.tgz#12d310f255360c07ad8fde253f6c9e9de372d2aa"
-  integrity sha512-FsygIxevi1jSiPY9h7vZmBFUbAOcbYm9UwyiLNdVsLRs/5We9Ob5NMPbGYUTWiLq5L+ezlVdE0A8bbME5CWTpg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz#380179c2ff5ae1365c522bf2fcfcff01c5b74149"
+  integrity sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==
   dependencies:
     css-select "^1.1.0"
-    dom-converter "~0.2"
-    htmlparser2 "~3.3.0"
+    dom-converter "^0.2"
+    htmlparser2 "^3.3.0"
     strip-ansi "^3.0.0"
     utila "^0.4.0"
 
@@ -10847,11 +11205,6 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-  integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=
-
 repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
@@ -10920,6 +11273,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.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"
@@ -10927,14 +11285,6 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-dir@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -10945,6 +11295,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-pathname@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
+  integrity sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -10955,7 +11310,7 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0, resolve@^1.8.1:
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
@@ -11080,6 +11435,11 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-eval@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/safe-eval/-/safe-eval-0.4.1.tgz#e54ba5a1bbdec795d488f6c8765e0c2a78b4cdc0"
+  integrity sha512-wmiu4RSYVZ690RP1+cv/LxfPK1dIlEN35aW7iv4SMYdqDrHbkll4+NJcHmKm7PbCuI1df1otOcPwgcc2iFR85g==
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -11136,10 +11496,10 @@ sax@>=0.6.0, sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scheduler@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591"
-  integrity sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A==
+scheduler@^0.13.6:
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
+  integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -11181,6 +11541,11 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
+select@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
+  integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
+
 selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
@@ -11191,7 +11556,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.9.1:
+selfsigned@^1.10.4, selfsigned@^1.9.1:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
@@ -11217,11 +11582,21 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@5.6.0, semver@^5.0.0, semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+
+semver@5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -11290,6 +11665,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
@@ -11342,7 +11722,7 @@ shallow-copy@~0.0.1:
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
   integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
 
-shallowequal@^1.1.0:
+shallowequal@^1.0.2, shallowequal@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
@@ -11378,6 +11758,11 @@ shelljs@^0.8.1, shelljs@^0.8.2:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
+
 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"
@@ -11517,18 +11902,6 @@ socket.io@2.1.1:
     socket.io-client "2.1.1"
     socket.io-parser "~3.2.0"
 
-sockjs-client@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83"
-  integrity sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=
-  dependencies:
-    debug "^2.6.6"
-    eventsource "0.1.6"
-    faye-websocket "~0.11.0"
-    inherits "^2.0.1"
-    json3 "^3.3.2"
-    url-parse "^1.1.8"
-
 sockjs-client@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
@@ -11550,17 +11923,17 @@ sockjs@0.3.19:
     uuid "^3.0.1"
 
 socks-proxy-agent@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
-  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
   dependencies:
-    agent-base "~4.2.0"
-    socks "~2.2.0"
+    agent-base "~4.2.1"
+    socks "~2.3.2"
 
-socks@~2.2.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.3.tgz#7399ce11e19b2a997153c983a9ccb6306721f2dc"
-  integrity sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==
+socks@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
+  integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
   dependencies:
     ip "^1.1.5"
     smart-buffer "4.0.2"
@@ -11594,7 +11967,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.9:
+source-map-support@0.5.10:
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
   integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
@@ -11602,6 +11975,14 @@ source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@^0.5.6,
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@~0.4.0:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
@@ -11653,6 +12034,13 @@ sourcemap-codec@^1.4.4:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
   integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
 
+space-separated-tokens@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.2.tgz#e95ab9d19ae841e200808cd96bc7bd0adbbb3412"
+  integrity sha512-G3jprCEw+xFEs0ORweLmblJ3XLymGGr6hxZYTYZjIlvDti9vOBUjRQa1Rzjt012aRrocKstHwdNi+F7HguPsEA==
+  dependencies:
+    trim "0.0.1"
+
 spawn-promise@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/spawn-promise/-/spawn-promise-0.1.8.tgz#a5bea98814c48f52cbe02720e7fe2d6fc3b5119a"
@@ -11682,9 +12070,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
-  integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
+  integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -11901,15 +12289,16 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
   integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
-streamroller@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
-  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
+streamroller@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.4.tgz#d485c7624796d5e2eb34190c79afcbf006afb5e6"
+  integrity sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==
   dependencies:
-    date-format "^1.2.0"
+    async "^2.6.1"
+    date-format "^2.0.0"
     debug "^3.1.0"
-    mkdirp "^0.5.1"
-    readable-stream "^2.3.0"
+    fs-extra "^7.0.0"
+    lodash "^4.17.10"
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
@@ -11929,13 +12318,13 @@ string-width@^1.0.1, string-width@^1.0.2:
     strip-ansi "^4.0.0"
 
 string-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1"
-  integrity sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
   dependencies:
     emoji-regex "^7.0.1"
     is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
 
 string.prototype.matchall@^3.0.0:
   version "3.0.1"
@@ -11973,11 +12362,6 @@ string_decoder@^1.0.0, string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -11995,12 +12379,12 @@ stringify-entities@^1.0.1:
     is-alphanumerical "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-strip-ansi@4.0.0, strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+strip-ansi@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
+  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
   dependencies:
-    ansi-regex "^3.0.0"
+    ansi-regex "^4.0.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
@@ -12009,12 +12393,19 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
@@ -12051,12 +12442,12 @@ strip-json-comments@~2.0.1:
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 stripe@^6.25.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.25.0.tgz#f98f51c1385b457df03ec7a8fb9013a31e8bb312"
-  integrity sha512-8JiTz72zGmLjQP6+1/aEdm7nyjJSRa3nnyR1iFyJcmzRintpuXvcYPGddo9w0OlEYQ/gljV8vw3/F4gRbhZOFQ==
+  version "6.28.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.28.0.tgz#81f2bf174efe9503b50f24930a7e1d195c60f810"
+  integrity sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==
   dependencies:
     lodash.isplainobject "^4.0.6"
-    qs "~6.5.1"
+    qs "^6.6.0"
     safe-buffer "^5.1.1"
     uuid "^3.3.2"
 
@@ -12148,9 +12539,9 @@ stylus@0.54.5:
     source-map "0.1.x"
 
 subscriptions-transport-ws@^0.9.15:
-  version "0.9.15"
-  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz#68a8b7ba0037d8c489fb2f5a102d1494db297d0d"
-  integrity sha512-f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ==
+  version "0.9.16"
+  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz#90a422f0771d9c32069294c08608af2d47f596ec"
+  integrity sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==
   dependencies:
     backo2 "^1.0.2"
     eventemitter3 "^3.1.0"
@@ -12170,7 +12561,7 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.1.0, supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -12197,7 +12588,7 @@ svg-url-loader@^2.3.2:
     file-loader "1.1.11"
     loader-utils "1.1.0"
 
-symbol-observable@1.2.0, symbol-observable@^1.0.2, symbol-observable@^1.0.4, symbol-observable@^1.2.0:
+symbol-observable@1.2.0, symbol-observable@^1.0.2, symbol-observable@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
@@ -12220,9 +12611,9 @@ table@^5.0.0:
     string-width "^3.0.0"
 
 tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
-  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tar@^2.0.0:
   version "2.2.1"
@@ -12246,6 +12637,20 @@ tar@^4, tar@^4.4.8:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
+telejson@^2.1.0, telejson@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/telejson/-/telejson-2.1.1.tgz#cd8835ce90198c9341078dbe80849e39d1a2b73c"
+  integrity sha512-tc9Jdrhro4zzYgN6y5DNzCXIyIsWT7znGEfK7G4KMPF0X0tC2cVw2SPKnJObao/cxP7/FSnG8bJe0JD390My5g==
+  dependencies:
+    global "^4.3.2"
+    is-function "^1.0.1"
+    is-regex "^1.0.4"
+    is-symbol "^1.0.2"
+    isobject "^3.0.1"
+    lodash.get "^4.4.2"
+    memoizerific "^1.11.3"
+    safe-eval "^0.4.1"
+
 tempfile@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
@@ -12261,7 +12666,7 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.2, terser-webpack-plugin@^1.1.0:
+terser-webpack-plugin@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
   integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
@@ -12275,14 +12680,28 @@ terser-webpack-plugin@1.2.2, terser-webpack-plugin@^1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.1:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
+  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.16.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
 terser@^3.16.1:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
-  integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
   dependencies:
-    commander "~2.17.1"
+    commander "^2.19.0"
     source-map "~0.6.1"
-    source-map-support "~0.5.9"
+    source-map-support "~0.5.10"
 
 text-extensions@^1.0.0:
   version "1.9.0"
@@ -12302,6 +12721,13 @@ through2@^2.0.0, through2@^2.0.2, through2@~2.0.3:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
+through2@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
 through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -12324,15 +12750,30 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-emitter@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
+  integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
+
 tiny-inflate@^1.0.0, tiny-inflate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
   integrity sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=
 
+tiny-invariant@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.4.tgz#346b5415fd93cb696b0c4e8a96697ff590f92463"
+  integrity sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g==
+
+tiny-warning@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28"
+  integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==
+
 tinymce@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.0.0.tgz#03e819e8f3a2ce116fc445541fa493d6b7f5d827"
-  integrity sha512-aWBXuV1S+JaZUoteLgOoDv9Ra7wcohpRFoHhldoRWUg9fdA36zC9XPjWfxNgzaANqKdOICxZ3tguLmi3RLtiLA==
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.0.3.tgz#40fa8658b5bdf58e7f04c816b38e1b06f96f6cfe"
+  integrity sha512-x7D0ttqn176Z4CWQIITMjcEtMGUjiaK0Y2FN2vO8DiyUeIHCdr70jJDSoGhuXtXX70Sw4Bd5UFfqIn/bG3HXcg==
 
 tmp@0.0.30:
   version "0.0.30"
@@ -12453,7 +12894,21 @@ trough@^1.0.0:
   dependencies:
     glob "^7.1.2"
 
-ts-loader@^5.2.2:
+ts-invariant@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz#3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f"
+  integrity sha512-Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg==
+  dependencies:
+    tslib "^1.9.3"
+
+ts-invariant@^0.3.2:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.3.tgz#b5742b1885ecf9e29c31a750307480f045ec0b16"
+  integrity sha512-UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ==
+  dependencies:
+    tslib "^1.9.3"
+
+ts-loader@^5.3.2:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.3.tgz#8b4af042e773132d86b3c99ef0acf3b4d325f473"
   integrity sha512-KwF1SplmOJepnoZ4eRIloH/zXL195F51skt7reEsS6jvDqzgc/YSbz9b8E07GxIUwLXdcD4ssrJu6v8CwaTafA==
@@ -12465,9 +12920,9 @@ ts-loader@^5.2.2:
     semver "^5.0.1"
 
 ts-node@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.2.tgz#9ecdf8d782a0ca4c80d1d641cbb236af4ac1b756"
-  integrity sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.3.tgz#aa60b836a24dafd8bf21b54766841a232fdbc641"
+  integrity sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==
   dependencies:
     arg "^4.1.0"
     diff "^3.1.0"
@@ -12524,9 +12979,9 @@ tslint-language-service@^0.9.9:
     mock-require "^2.0.2"
 
 tslint@^5.12.1, tslint@^5.9.1:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1"
-  integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
+  integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -12534,14 +12989,15 @@ tslint@^5.12.1, tslint@^5.9.1:
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
+    mkdirp "^0.5.1"
     resolve "^1.3.2"
     semver "^5.3.0"
     tslib "^1.8.0"
-    tsutils "^2.27.2"
+    tsutils "^2.29.0"
 
-tsutils@^2.25.0, tsutils@^2.27.2:
+tsutils@^2.25.0, tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
   integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
@@ -12580,6 +13036,11 @@ type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+typed-styles@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
+  integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -12615,12 +13076,20 @@ ua-parser-js@^0.7.18:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
   integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==
 
-uglify-js@3.4.x, uglify-js@^3.1.4:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
+uglify-js@3.4.x:
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
+  dependencies:
+    commander "~2.19.0"
+    source-map "~0.6.1"
+
+uglify-js@^3.1.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.4.tgz#4a64d57f590e20a898ba057f838dcdfb67a939b9"
+  integrity sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.20.0"
     source-map "~0.6.1"
 
 ultron@~1.1.0:
@@ -12654,10 +13123,10 @@ 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.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
-  integrity sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==
+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-properties@^1.0.0:
   version "1.1.0"
@@ -12668,9 +13137,9 @@ unicode-properties@^1.0.0:
     unicode-trie "^0.3.0"
 
 unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
-  integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
+  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==
 
 unicode-trie@^0.3.0:
   version "0.3.1"
@@ -12776,6 +13245,11 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
+unquote@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
+  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -12784,12 +13258,7 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.0.5, upath@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
-
-upath@^1.1.1:
+upath@^1.0.5, upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
@@ -12820,10 +13289,10 @@ url-loader@^1.1.2:
     mime "^2.0.3"
     schema-utils "^1.0.0"
 
-url-parse@^1.1.8, url-parse@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
+url-parse@^1.4.3:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.5.tgz#04cbb6ba2be682a18e4417fa2245aa7e3dfdcc50"
+  integrity sha512-4XDvC5vZRjEpjP0L4znrWeoH8P8F0XGBlfLdABi/6oV4o8xUVbTpyrxWHxkK2bT0pSIpcjdIzSoWUhlUfawCAQ==
   dependencies:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
@@ -12916,26 +13385,16 @@ validator@^10.11.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
   integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==
 
+value-equal@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
+  integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==
+
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-velocity-animate@^1.4.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105"
-  integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==
-
-velocity-react@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/velocity-react/-/velocity-react-1.4.1.tgz#1d0b41859cdf2521c08a8b57f44e93ed2d54b5fc"
-  integrity sha512-ZyXBm+9C/6kNUNyc+aeNKEhtTu/Mn+OfpsNBGuTxU8S2DUcis/KQL0rTN6jWL+7ygdOrun18qhheNZTA7YERmg==
-  dependencies:
-    lodash "^4.17.5"
-    prop-types "^15.5.8"
-    react-transition-group "^2.0.0"
-    velocity-animate "^1.4.0"
-
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -12996,6 +13455,13 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
+warning@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
+  dependencies:
+    loose-envify "^1.0.0"
+
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -13070,20 +13536,10 @@ webpack-dev-middleware@3.5.1:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@^3.4.0:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.2.tgz#d768b6194f3fe8d72d51feded49de359e8d96ffb"
-  integrity sha512-nPmshdt1ckcwWjI0Ubrdp8KroeuprW6xFKYqk0u3MflNMBXvHPnMATsC7/L/enwav2zvLCfj/Usr47qnF3KQyA==
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-middleware@^3.5.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
-  integrity sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==
+webpack-dev-middleware@^3.5.1, webpack-dev-middleware@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
+  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
   dependencies:
     memory-fs "^0.4.1"
     mime "^2.3.1"
@@ -13127,40 +13583,40 @@ webpack-dev-server@3.1.14:
     yargs "12.0.2"
 
 webpack-dev-server@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
-  integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
+  integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
+    chokidar "^2.1.5"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
     debug "^4.1.1"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
+    del "^4.1.0"
+    express "^4.16.4"
+    html-entities "^1.2.1"
     http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
     internal-ip "^4.2.0"
     ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
+    killable "^1.0.1"
+    loglevel "^1.6.1"
+    opn "^5.5.0"
+    portfinder "^1.0.20"
     schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
+    selfsigned "^1.10.4"
+    semver "^6.0.0"
+    serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
     spdy "^4.0.0"
-    strip-ansi "^3.0.0"
+    strip-ansi "^3.0.1"
     supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "^3.5.1"
+    webpack-dev-middleware "^3.6.2"
     webpack-log "^2.0.0"
-    yargs "12.0.2"
+    yargs "12.0.5"
 
 webpack-hot-middleware@^2.24.3:
   version "2.24.3"
@@ -13232,15 +13688,15 @@ webpack@4.29.0:
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
-webpack@^4.23.1:
-  version "4.29.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.3.tgz#e0b406a7b4201ed5e4fb4f84fd7359f9a7db4647"
-  integrity sha512-xPJvFeB+8tUflXFq+OgdpiSnsCD5EANyv56co5q8q8+YtEasn5Sj3kzY44mta+csCIEB0vneSxnuaHkOL2h94A==
+webpack@^4.29.0:
+  version "4.29.6"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
+  integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
@@ -13295,7 +13751,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -13321,17 +13777,12 @@ window-or-global@^1.0.1:
   resolved "https://registry.yarnpkg.com/window-or-global/-/window-or-global-1.0.1.tgz#dbe45ba2a291aabc56d62cf66c45b7fa322946de"
   integrity sha1-2+RboqKRqrxW1iz2bEW3+jIpRt4=
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
-
 windows-release@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e"
-  integrity sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
 
 wordwrap@~0.0.2:
   version "0.0.3"
@@ -13387,9 +13838,9 @@ ws@~3.3.1:
     ultron "~1.1.0"
 
 ws@~6.1.0:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.3.tgz#d2d2e5f0e3c700ef2de89080ebc0ac6e1bf3a72d"
-  integrity sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
   dependencies:
     async-limiter "~1.0.0"
 
@@ -13506,6 +13957,24 @@ yargs@12.0.2:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
+yargs@12.0.5, yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
+
 yargs@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
@@ -13525,28 +13994,10 @@ yargs@9.0.1:
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
 
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
-
 yargs@^13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
-  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
+  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
   dependencies:
     cliui "^4.0.0"
     find-up "^3.0.0"
@@ -13585,28 +14036,29 @@ yeast@0.1.2:
   integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.0.0.tgz#0073c6b56e92aed652fbdfd62431f2d6b9a7a091"
-  integrity sha512-+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.0.tgz#fcbe2db63610361afcc5eb9e0ac91e976d046114"
+  integrity sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg==
 
-zen-observable-ts@^0.8.15:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz#6cf7df6aa619076e4af2f707ccf8a6290d26699b"
-  integrity sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==
+zen-observable-ts@^0.8.18:
+  version "0.8.18"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz#ade44b1060cc4a800627856ec10b9c67f5f639c8"
+  integrity sha512-q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A==
   dependencies:
+    tslib "^1.9.3"
     zen-observable "^0.8.0"
 
 zen-observable@^0.8.0, zen-observable@^0.8.13:
-  version "0.8.13"
-  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.13.tgz#a9f1b9dbdfd2d60a08761ceac6a861427d44ae2e"
-  integrity sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g==
+  version "0.8.14"
+  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
+  integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
 zone.js@^0.8.29:
   version "0.8.29"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.29.tgz#8dce92aa0dd553b50bc5bfbb90af9986ad845a12"
   integrity sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==
 
-zrender@4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.0.6.tgz#cb4f681c09e63692d11053d366b8f89e6537cc69"
-  integrity sha512-uGR+vMdFyhP/qki8TRVOa3UbFlHFDdrA26v/6tX7D2cqSaCbdF4Hlng0ufU62R0j+ZkhLGGnFZ0VmWEVK9XyWA==
+zrender@4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.0.7.tgz#15ae960822f5efed410995d37e5107fe3de10e6d"
+  integrity sha512-TNloHe0ums6zxbHfnaCryM61J4IWDajZwNq6dHk9vfWhhysO/OeFvvR0drBs/nbXha2YxSzfQj2FiCd6RVBe+Q==
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 3ec81bc5b..7ac9ba73c 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -157,21 +157,20 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "^0.13.7",
-		"@angular-devkit/build-angular": "^0.13.7",
-		"@angular-devkit/build-webpack": "^0.13.7",
-		"@angular-devkit/core": "^7.3.7",
-		"@angular-devkit/schematics": "^7.3.7",
-		"@angular/cli": "^7.3.7",
-		"@angular/compiler": "^7.2.11",
-		"@angular/compiler-cli": "^7.2.11",
-		"@angular/language-service": "^7.2.11",
+		"@angular-devkit/architect": "^0.13.8",
+		"@angular-devkit/build-angular": "^0.13.8",
+		"@angular-devkit/build-webpack": "^0.13.8",
+		"@angular-devkit/core": "^7.3.8",
+		"@angular-devkit/schematics": "^7.3.8",
+		"@angular/cli": "^7.3.8",
+		"@angular/compiler": "^7.2.12",
+		"@angular/compiler-cli": "^7.2.12",
+		"@angular/language-service": "^7.2.12",
+		"@schematics/angular": "^7.3.8",
 		"@compodoc/compodoc": "^1.1.9",
-		"@ionic/angular-toolkit": "^1.5.0",
+		"@ionic/angular-toolkit": "^1.5.1",
 		"@ionic/app-scripts": "^3.2.3",
 		"@ionic/lab": "^1.0.24",
-		"@ionic/ng-toolkit": "^1.1.0",
-		"@ionic/schematics-angular": "^1.0.7",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
 		"@types/graphql": "^14.0.7",
@@ -187,7 +186,7 @@
 		"@types/yargs": "^13.0.0",
 		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
-		"codelyzer": "^5.0.0-beta.1",
+		"codelyzer": "^5.0.0",
 		"cross-env": "^5.2.0",
 		"cpr": "^3.0.1",
 		"husky": "^1.3.1",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 1f3e3d4b4..538f836bd 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -14,24 +14,24 @@
   resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
   integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
 
-"@angular-devkit/architect@0.13.7", "@angular-devkit/architect@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
-  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
+"@angular-devkit/architect@0.13.8", "@angular-devkit/architect@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
+  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
-  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
+"@angular-devkit/build-angular@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
+  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/build-optimizer" "0.13.7"
-    "@angular-devkit/build-webpack" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@ngtools/webpack" "7.3.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/build-optimizer" "0.13.8"
+    "@angular-devkit/build-webpack" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@ngtools/webpack" "7.3.8"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -47,7 +47,7 @@
     loader-utils "1.2.3"
     mini-css-extract-plugin "0.5.0"
     minimatch "3.0.4"
-    opn "5.4.0"
+    open "6.0.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
@@ -77,46 +77,36 @@
 "@angular-devkit/build-optimizer@0.0.35":
   version "0.0.35"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz#3aadad1d7e9ffc7dcd106fda8a5670465936562c"
+  integrity sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==
   dependencies:
     loader-utils "^1.1.0"
     source-map "^0.5.6"
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
-  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
+"@angular-devkit/build-optimizer@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
+  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.7", "@angular-devkit/build-webpack@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
-  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
+"@angular-devkit/build-webpack@0.13.8", "@angular-devkit/build-webpack@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
+  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-devkit/core@0.9.0-beta.3":
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.9.0-beta.3.tgz#9263e071bc606995b6d413e463139a87106fb67d"
-  integrity sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==
-  dependencies:
-    ajv "6.5.3"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.2.2"
-    source-map "0.7.3"
-
-"@angular-devkit/core@7.3.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.3.tgz#cd6d5a8eca25ef07b6394bc2b08133d90d08d39f"
-  integrity sha512-fosULDtMoDWrOyUzTmBkJccOy7zodo02kENyKai7vOv9EWfv9jytkVdNc+jl0ys9OE2QadvSYBo49jhnZxFXfQ==
+"@angular-devkit/core@7.3.8", "@angular-devkit/core@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
+  integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
   dependencies:
     ajv "6.9.1"
     chokidar "2.0.4"
@@ -124,78 +114,51 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.7", "@angular-devkit/core@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
-  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
-  dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
-"@angular-devkit/schematics@0.9.0-beta.3":
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
-  integrity sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==
-  dependencies:
-    "@angular-devkit/core" "0.9.0-beta.3"
-    rxjs "6.2.2"
-
-"@angular-devkit/schematics@7.3.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.3.tgz#80e9dc3197a3181f32edfb5c07e7ac016eace7d3"
-  integrity sha512-SdDq9eKwceb6WLwci1fywtZ/kARR5CYyzi5dZIR1lOxrz00682uUBqH/X39mKdqc6eVqR7rtPceqNm6nQpOIMg==
-  dependencies:
-    "@angular-devkit/core" "7.3.3"
-    rxjs "6.3.3"
-
-"@angular-devkit/schematics@7.3.7", "@angular-devkit/schematics@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
-  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
+"@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
+  integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
 "@angular/animations@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
-  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
+  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
-  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
+"@angular/cli@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
+  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
-    "@schematics/update" "0.13.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
+    "@schematics/angular" "7.3.8"
+    "@schematics/update" "0.13.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
     npm-package-arg "6.1.0"
-    opn "5.4.0"
+    open "6.0.0"
     pacote "9.4.0"
     semver "5.6.0"
     symbol-observable "1.2.0"
 
 "@angular/common@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
-  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
+  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz#0835a17dd9cea4bb03c5073d943a5074fed539ff"
-  integrity sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==
+"@angular/compiler-cli@^7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
+  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -209,75 +172,75 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.11.tgz#d547bf781e5c8b28da9af2460a6dfb5683d325ae"
-  integrity sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==
+"@angular/compiler@^7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
+  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
-  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
+  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/forms@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
-  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
+  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/http@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.11.tgz#c52a491374d937cd05789a5c13d70a1c5fdddf4d"
-  integrity sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.12.tgz#0ec28f6dc7814c85761833b1fd4b53b397b5e882"
+  integrity sha512-cceU+SWIQFOL3gRKqm5SYHQM3VoKbXne2XQRSY2Fdoc3XsipOzTEvJQPLm5ZcTEXdmRFlfianDoDaWEIvGbXkw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.11.tgz#1967ebcef5fc03e462941aa70dc41562d5dce06e"
-  integrity sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==
+"@angular/language-service@^7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
+  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
 
 "@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
-  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
+  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
-  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
+  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/pwa@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
-  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.8.tgz#20799d6c5a00c8b15d56874bc5c2344e13683a1a"
+  integrity sha512-Yu9bFh/9Vq2Wi3X4foki2qM3kLRs/GTROaI2Na+OfCpACMn6vNTHgJdqyjzSW9DpFTbW/4Fsb2NMmPf8CgAScw==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
+    "@schematics/angular" "7.3.8"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
 "@angular/router@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
-  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
+  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/service-worker@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.11.tgz#ab61d4b1c75359fde461b4073b90438abff4d9e9"
-  integrity sha512-MalD4T2Iur582TMmHKFDmoqSYMys1EjdTZWt0qME85ri1w7yBriujvTyy9/aZmT2bFBGeJvbqhohoU46CsnqsA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.12.tgz#9d3ca7399a105900a4d706cf5da5954cbe5b66dc"
+  integrity sha512-0hvKy+EXPoGrLujqzXK02gfVUZ187o/aDvmBuH2Io9us93RgGew/Se1iFl2YaawhPYSsuwwbrcjoSVMznoI1GQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -288,12 +251,12 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.2.2":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.3.tgz#185962ade59a52e00ca2bdfcfd1d58e528d4e39e"
-  integrity sha512-aEADYwRRZjJyMnKN7llGIlircxTCofm3dtV5pmY6ob18MSIuipHpA2yZWkPlycwu5HJcx/pADS3zssd8eY7/6A==
+"@babel/generator@^7.0.0", "@babel/generator@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.0.tgz#c230e79589ae7a729fd4631b9ded4dc220418196"
+  integrity sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==
   dependencies:
-    "@babel/types" "^7.3.3"
+    "@babel/types" "^7.4.0"
     jsesc "^2.5.1"
     lodash "^4.17.11"
     source-map "^0.5.0"
@@ -315,12 +278,12 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
+"@babel/helper-split-export-declaration@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz#571bfd52701f492920d63b7f735030e9a3e10b55"
+  integrity sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -331,46 +294,46 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.3.tgz#092d450db02bdb6ccb1ca8ffd47d8774a91aef87"
-  integrity sha512-xsH1CJoln2r74hR+y7cg2B5JCPaTh+Hd+EbBRk9nWGSNspuo6krjhX0Om6RnRQuIvFq8wVXCLKH3kwKDYhanSg==
+"@babel/parser@^7.0.0", "@babel/parser@^7.4.0", "@babel/parser@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.3.tgz#eb3ac80f64aa101c907d4ce5406360fe75b7895b"
+  integrity sha512-gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ==
 
 "@babel/runtime@^7.3.1":
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.2.tgz#f5ab6897320f16decd855eed70b705908a313fe8"
-  integrity sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
+  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
   dependencies:
     regenerator-runtime "^0.13.2"
 
 "@babel/template@^7.0.0", "@babel/template@^7.1.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
-  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.0.tgz#12474e9c077bae585c5d835a95c0b0b790c25c8b"
+  integrity sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.2.2"
-    "@babel/types" "^7.2.2"
+    "@babel/parser" "^7.4.0"
+    "@babel/types" "^7.4.0"
 
 "@babel/traverse@^7.0.0":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
-  integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.3.tgz#1a01f078fc575d589ff30c0f71bf3c3d9ccbad84"
+  integrity sha512-HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.2.2"
+    "@babel/generator" "^7.4.0"
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.2.3"
-    "@babel/types" "^7.2.2"
+    "@babel/helper-split-export-declaration" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/types" "^7.4.0"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.3.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.3.tgz#6c44d1cdac2a7625b624216657d5bc6c107ab436"
-  integrity sha512-2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ==
+"@babel/types@^7.0.0", "@babel/types@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.0.tgz#670724f77d24cce6cc7d8cf64599d511d164894c"
+  integrity sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.11"
@@ -413,6 +376,7 @@
 "@compodoc/ngd-core@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz#e31a6cbbdfa8de648b027aa4169468bc496544c9"
+  integrity sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==
   dependencies:
     ansi-colors "^1.0.1"
     fancy-log "^1.3.2"
@@ -421,6 +385,7 @@
 "@compodoc/ngd-transformer@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz#89e858dd332198cde262f0cf3648bd0969d0da62"
+  integrity sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==
   dependencies:
     "@compodoc/ngd-core" "~2.0.0"
     dot "^1.1.1"
@@ -430,147 +395,148 @@
 "@dsherret/to-absolute-glob@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1f6475dc8bd974cea07a2daf3864b317b1dd332c"
+  integrity sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=
   dependencies:
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
 "@ionic-native/barcode-scanner@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz#e04bb2884f6f0a76b135d34f41c40e8d3a52b72d"
-  integrity sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.4.0.tgz#b38db6a40973ee2780dd993c3521f3962d3f083a"
+  integrity sha512-p7/wBtu3P20jX98eVoAvxoPNw9UhlVPjDTJ/DHimlFlUnj5jRl0jcQJ7ZXo8AYCYfs7vC8a32BDnqTkQlo6Lfw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/call-number@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.3.0.tgz#4a9318fecb4b1dce804786ecb78b51c84f05f06f"
-  integrity sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.4.0.tgz#097ec2f732b8e8eaf12bc6797e4ebf7511c6d4cd"
+  integrity sha512-rG/rLePAqWxNNgh0YlneiT0QdArRXICWF0Zz/YyqD9vuXr2D0as1xPomXSjWhoUu0J6UO5LdLK5Up2PL9+LwGw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/camera@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.3.0.tgz#fbd58cdb9c7a53fd2f65697f6395ea481743b67c"
-  integrity sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.4.0.tgz#d10461b9486ef8b064a7314b77c090b59620208f"
+  integrity sha512-lReblyrDaDA3Nr4uLYozOpixvdrHrpLVaGfPd7I1oR0sIYWyphFPXiCMFQL2r29GDl4hRm0jsxG5ygAvjXVTXw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/core@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/core/-/core-5.3.0.tgz#50934ded237a03489cf45bef3f1d3a7f1a0a71c4"
-  integrity sha512-oIsBvkB/Q63bjKvHGW7zAFMWSXIwnZ/U962UFyuqrF9dKvNSPI5cz8iPOaqKE+jzb2XhlcGKEbp5qAhTI0BcZQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/core/-/core-5.4.0.tgz#4bb126d9f14c337be65542bb5f653bc202ee9dbf"
+  integrity sha512-GSrwIcOqGq9a7axYGVDPvIS0FoBRPNIC6b4RkcC0rcvjbIDebgZG7zsZ2x6mhe4HC7fTUV2y8qBO8timMHv3oA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/device@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.3.0.tgz#6734f6adb5bed0aaa34da1aad84b658583e17d0b"
-  integrity sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.4.0.tgz#1f071460a2559468256a8b7a82127cd7c1ebacff"
+  integrity sha512-C9j2iryuDzWXkFucR0liKgA2DU0vVkEWweOIqgPXcYSlS6NgdguYcbBWh8Bi+JKhT/lqTNq9bKrquZUwkf1IcA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/dialogs@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.3.0.tgz#6b565119d08ffcb7c5dd1f68248b8d0739cf3aeb"
-  integrity sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.4.0.tgz#650357eb0c3ea444eabfaa12cae34fba555d284d"
+  integrity sha512-8JlLXsGjvWmLWjVJJUnfKaR1jFQD5qK5gqKcoylkQRakUBpuzTB/fFAMwOyBcHZcioXWkKDInELq2h2fu5T+WA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/geolocation@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.3.0.tgz#64a3495a6b9bdf4c2d5eb106a1b49012336eaef0"
-  integrity sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.4.0.tgz#332f0650c16b103d48c8a06b4ba0465ac0f88220"
+  integrity sha512-mcnIVhYZwRvoDMX9yRIgrixZBDSRjbtojIXWLjdWUoaO/YcOv/I5VhsICAUpiKM89NFW8Dcip3YLYDGGmCkSVA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/globalization@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/globalization/-/globalization-5.3.0.tgz#f1cd1a81a5a9079078b05a0defe6ba5216d36675"
-  integrity sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/globalization/-/globalization-5.4.0.tgz#9f6c9f430cb8e7d54425ef3b0e649fbe66ab01d6"
+  integrity sha512-ZUBv7t1MaHn/szbQ8jfrBkCuxSIqEVeM/a+sqESRzp3rpEOSRMXqaRv8oFfqzRUxvavSpunkPgx/xzfVeubhpg==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/google-analytics@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz#6e07f8fe67b24a83d04869d5bb2561530feb997a"
-  integrity sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.4.0.tgz#3155c889b98dc2cb5b30a9a8c2c61324eb16c9bb"
+  integrity sha512-Lk96Oqam0nczNWvSulWvUH8yjfyp0KBxmn9m8/0kEEkQnTZD+tIuQIDYB9zZTXnw7rkpbdqJCWb+Q2CLqoEwjA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/google-maps@~5.0.0-beta.26":
-  version "5.0.0-beta.26"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz#c27b84ecd699f13746f207ae41fc2a34e7ca451a"
-  integrity sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==
+  version "5.0.0-beta.27"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.0.0-beta.27.tgz#215116c69ca6b949044a9882ba04d6efa30eff4d"
+  integrity sha512-ifVuI3fPt1D9+Fqu6vYyCYdNEI45/S6BRUM1PB0qhs26MbfEXwQvt2tTdw1CITLoBxqzgQcGgh/PadzdeA1xhg==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/in-app-browser@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz#9e3e3ac12c18a8ebd1052ab35c05f16f090124fb"
-  integrity sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.4.0.tgz#b5a74580a9bf3e0797aabf52f53c3529dee80f0e"
+  integrity sha512-cPRKu7nl9oLKgqJyt/1SeO+aWTABWzu+QzkOQBOLfoAaqP1eXm/AU2C9joULnTl3P+s7oFZqXKiEAKI/jF+x1Q==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/intercom@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.3.0.tgz#e920f1ed774da10944424f9dfa1a89218f8b4546"
-  integrity sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.4.0.tgz#e742e008b14529c09e2825f0d7d936499478adef"
+  integrity sha512-WXEpoRt7auxtd9P4NjMwk+QTCWskEfrcn/XjJHVLDLtyvQid/ek0SLlDbJh8tB0EQuOTpXS4CE4cwfRD28NlBw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/local-notifications@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz#a97ce54f8f8fff198fab79a88a4c65fa64a56a54"
-  integrity sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.4.0.tgz#b8310dafb53bae509af57f5b153095a0ca2063c3"
+  integrity sha512-xKpcljk4mOFhe/6BzsL8AkPPZyB6WloqUcu1jp61ADEKfkeqr4uTzpADfZ/pzlw/aL05waHwvPZRgpQM/uUHlA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/mixpanel@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz#9733569e19ef4268ee3ac5b765569bd1b61f68bd"
-  integrity sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.4.0.tgz#7d022e29c20237208ed7f64db5d7e68251dbe81b"
+  integrity sha512-+f+3des08I3LwJQD8m0JglskOgEjqHivyYoU0DrSHZ0H+sPndOwwL6Q0LNXGwJ00gAv8173YFGxht5TxAP+neQ==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/network@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.3.0.tgz#d7d840e631d1b9374517c521800c8ac8f5d8ebb5"
-  integrity sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.4.0.tgz#4f4c12da0484a1a05fccd520402b402dc1c72af0"
+  integrity sha512-qHDoterYyz65E4nl6W1GdliiNtx7oeIyO/AsA3DFoY4Adlc+SmL7Ks+ZyIBqIPCwTvrK9CQ9VxOU26LsyneLOw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/splash-screen@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz#147b005ee7fcea6b816e2549db5d8cc4b550fd84"
-  integrity sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.4.0.tgz#5e90ceab6ccf7d352197dbcd5502c1a649c881ea"
+  integrity sha512-2RkLfEWO9u+L7wgHCS156UBW18ulE8md2iPvWaz3fzwuPddjhYqFEP2Nz3ZM4pKvdex6pKRMNkLlvhBN93CkFw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/status-bar@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-5.3.0.tgz#a25558f59f2eee2aea509d563b54fcab2dc69861"
-  integrity sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-5.4.0.tgz#aa83a4282ee0062de3bdeddcd6b089863481a3b5"
+  integrity sha512-ePt6NBVtUBKr02HoRcNZ8nlq6bAqqx/rVf6veZdV9UK2OEApFKEs++tdq+2fmpjdTBfB3jMGiyN3Kr+7c1dOmA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/unique-device-id@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz#ac63aece625ddf23861427f4e2e4f101107b19e3"
-  integrity sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.4.0.tgz#3a1c2036f518a410c9003a9b9968ffa7b04f50ae"
+  integrity sha512-ManX3ML07ZOgiyJ55+cRE7NmFgKLHb/wx+52UX+K+aTVBhHF1xe/EP9Grj6mTisQyQ9VkwlFEhm6hFa6/TGJsw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/vibration@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.3.0.tgz#0c8a47ece05900e97af0843fa4e888f25b75b12e"
-  integrity sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.4.0.tgz#27d77ea805eb5c9e2e4c5587a6c4ca5629613879"
+  integrity sha512-eKxpz4QpefHfEw9P2N3+QjmlSgKbEbZcCjButpnpM3FhUddrNzQ9ISaWHe3m/IZ8R4aj8x6N7FrZ7V32XVmidQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic/angular-toolkit@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@ionic/angular-toolkit/-/angular-toolkit-1.5.0.tgz#8c0e48ea4c1ad7aeb9e87854bdb86a87e50f1fe2"
-  integrity sha512-KHUu7MHi+s1LKox+EBOSN6HO6Sk79qOmBIMGHQMboPbqHGzb5aqCbTmtwa/BJZ1kytZ+yQ8kEejv8YwvrJIZEQ==
+"@ionic/angular-toolkit@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic/angular-toolkit/-/angular-toolkit-1.5.1.tgz#1bcd6c32fb745e63281a58161c66ee378c0bf0b8"
+  integrity sha512-B5LHuzEv/lgFP7yxfOA3/wggDM/X1mDkWFX8rZtaBRZBbC0vtZwdwDu73RnkfFZ0jTFyIgtoBW8qTrrCyd5MLA==
   dependencies:
     "@schematics/angular" "^7.0.3"
     tslib "^1.9.0"
@@ -578,11 +544,11 @@
     ws "^6.1.4"
 
 "@ionic/angular@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.1.2.tgz#c14c072c5bbaa7cfc533cb6408d02e769f820776"
-  integrity sha512-GVdtpPekPjAYo/3IiRg/EoVRw1/9RwW07ITW6TRorcX1XOPJlrRXVcQyWFTbHRD9TOikgE1XmMQd/+1Lk0TQFw==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.2.0.tgz#f90ad2b8b5f515a9cfc1025c8b40ec77fddb2c1c"
+  integrity sha512-ALZNxEZjkBJDyLH0mqcZQsgi9yUWB8uW2u6kg6ZjjSGf6atQL1IhOt+tTvdE98GWoNwFghNmdg9IFCFjUhANjw==
   dependencies:
-    "@ionic/core" "4.1.2"
+    "@ionic/core" "4.2.0"
     tslib "^1.9.3"
 
 "@ionic/app-scripts@^3.2.3":
@@ -618,28 +584,6 @@
     ws "3.3.2"
     xml2js "^0.4.19"
 
-"@ionic/cli-framework@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-1.1.0.tgz#aab5ed11d37784761a9bf947d5527ec57b27e720"
-  integrity sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==
-  dependencies:
-    "@ionic/utils-fs" "0.0.2"
-    chalk "^2.3.0"
-    debug "^4.0.0"
-    inquirer "^6.0.0"
-    lodash "^4.17.5"
-    minimist "^1.2.0"
-    rimraf "^2.6.2"
-    slice-ansi "^1.0.0"
-    stream-combiner2 "^1.1.1"
-    string-width "^2.1.1"
-    strip-ansi "^5.0.0"
-    tree-kill "1.2.0"
-    tslib "^1.9.0"
-    untildify "^3.0.2"
-    wrap-ansi "^4.0.0"
-    write-file-atomic "^2.3.0"
-
 "@ionic/cli-framework@1.7.0":
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-1.7.0.tgz#6cb516ad6a95b10c7e3197e9510eb64c1d580587"
@@ -667,10 +611,10 @@
     wrap-ansi "^4.0.0"
     write-file-atomic "^2.3.0"
 
-"@ionic/core@4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.1.2.tgz#cbabd9ae65936f56b1dc6de021cf79778dc991da"
-  integrity sha512-QVJYpDAycmXgQL3mWdvjlIgrLEG0wVl9+NGZQATEBCTEsuDHrOw7BO28FKPlFCdfTjVA6HDJnSj1HwOUi3Yp4w==
+"@ionic/core@4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.2.0.tgz#9b71c4b22a6b58cfe1bd3b1e24142b462ed9b480"
+  integrity sha512-JGnx8NV9z3Bgg/Ds/uEe4PPwp/UWnxqU35koByWZcyDpdb1WTwF8b4iJA8QGoj2DWEyFx7qt3c/bw3Zk/F7JPw==
   dependencies:
     ionicons "4.5.5"
 
@@ -695,32 +639,11 @@
     express "^4.16.2"
     tslib "^1.9.0"
 
-"@ionic/ng-toolkit@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz#b7453b2e8024648ab95fa0afefce73a4c3873b4d"
-  integrity sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==
-  dependencies:
-    "@ionic/cli-framework" "1.1.0"
-    chalk "^2.3.0"
-    debug "^4.0.0"
-    rxjs "~6.2.0"
-    tslib "^1.9.0"
-
 "@ionic/pro@^2.0.4":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@ionic/pro/-/pro-2.0.4.tgz#d9531ddaaf11098b75dde5aad5fea47b23632322"
   integrity sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw==
 
-"@ionic/schematics-angular@^1.0.7":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz#1e5be27346efdc430d75f2eaa86ee0c729e0877a"
-  integrity sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==
-  dependencies:
-    "@schematics/angular" "0.9.0-beta.3"
-    lodash "^4.17.5"
-    tslib "^1.9.0"
-    typescript "3.0.1"
-
 "@ionic/storage@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/storage/-/storage-2.2.0.tgz#ac181991d3bfc8352a5400efb5e9faa5e76b5d4b"
@@ -738,16 +661,6 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-fs@0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-0.0.2.tgz#5d93c4193ef4dde48fa468bce52b179d5d85e5ca"
-  integrity sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==
-  dependencies:
-    debug "^4.0.0"
-    ncp "^2.0.0"
-    through2 "^2.0.3"
-    tslib "^1.9.0"
-
 "@ionic/utils-fs@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-1.2.0.tgz#bc4492c5d57f910dedac2d3a33026d71ff3a51d5"
@@ -819,16 +732,17 @@
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
   dependencies:
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
-  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
+"@ngtools/webpack@7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
+  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -855,44 +769,27 @@
   dependencies:
     tslib "^1.9.0"
 
-"@nodelib/fs.stat@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz#54c5a964462be3d4d78af631363c18d6fa91ac26"
-
-"@schematics/angular@0.9.0-beta.3":
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.9.0-beta.3.tgz#dbfbadc52faf63a331a72b57945e807ab115eb6b"
-  integrity sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==
-  dependencies:
-    "@angular-devkit/core" "0.9.0-beta.3"
-    "@angular-devkit/schematics" "0.9.0-beta.3"
-    typescript "3.0.1"
-
-"@schematics/angular@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
-  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    typescript "3.2.4"
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@schematics/angular@^7.0.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.3.tgz#aaa63331365bf67b1b908cc18cfc5d7097ec8377"
-  integrity sha512-HbH8vajYPka0xGcFAN5IUBx8n8SFMQLFb9di2dJCOBaEakbKVkk8qtOpil54oFQbx7DFCvutq/p0u42JfEbuMQ==
+"@schematics/angular@7.3.8", "@schematics/angular@^7.0.3", "@schematics/angular@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
+  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
   dependencies:
-    "@angular-devkit/core" "7.3.3"
-    "@angular-devkit/schematics" "7.3.3"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     typescript "3.2.4"
 
-"@schematics/update@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
-  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
+"@schematics/update@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
+  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -901,8 +798,9 @@
     semver-intersect "1.4.0"
 
 "@types/bson@*":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@types/bson/-/bson-1.0.11.tgz#c95ad69bb0b3f5c33b4bb6cc86d86cafb273335c"
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.0.0.tgz#9073772679d749116eb1dfca56f8eaac6d59cc7a"
+  integrity sha512-pq/rqJwJWkbS10crsG5bgnrisL8pML79KlMKQMoQwLUjlPAkrUHMvHJ3oGwE7WHR61Lv/nadMwXVAD2b+fpD8Q==
   dependencies:
     "@types/node" "*"
 
@@ -916,13 +814,10 @@
   resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.2.2.tgz#80cf7cfff7401587b8f89307ba36fe4a576bc7cf"
   integrity sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==
 
-"@types/events@*":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
-
 "@types/geojson@*":
-  version "7946.0.4"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.4.tgz#4e049756383c3f055dd8f3d24e63fb543e98eb07"
+  version "7946.0.7"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
+  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
 "@types/googlemaps@^3.30.19":
   version "3.30.19"
@@ -930,15 +825,11 @@
   integrity sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==
 
 "@types/graphql@^14.0.7":
-  version "14.0.7"
-  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-14.0.7.tgz#daa09397220a68ce1cbb3f76a315ff3cd92312f6"
-  integrity sha512-BoLDjdvLQsXPZLJux3lEZANwGr3Xag56Ngy0U3y8uoRSDdeLcn43H3oBcgZlnd++iOQElBpaRVDHPzEDekyvXQ==
-
-"@types/jasmine@*":
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-14.2.0.tgz#74e1da5f2a4a744ac6eb3ed57b48242ea9367202"
+  integrity sha512-lELg5m6eBOmATWyCZl8qULEOvnPIUG6B443yXKj930glXIgwQirIBPp5rthP2amJW0YSzUg2s5sfgba4mRRCNw==
 
-"@types/jasmine@^3.3.12":
+"@types/jasmine@*", "@types/jasmine@^3.3.12":
   version "3.3.12"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.12.tgz#bf282cb540e9ad7a0a04b742082c073b655eab39"
   integrity sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==
@@ -957,38 +848,26 @@
   dependencies:
     "@types/geojson" "*"
 
-"@types/mongodb@*":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.4.tgz#f0f6dc8d509500c4a8213238066b68f0c8cb25a9"
-  dependencies:
-    "@types/bson" "*"
-    "@types/events" "*"
-    "@types/node" "*"
-
-"@types/mongodb@^3.1.22":
-  version "3.1.22"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.22.tgz#66f96c7acbf7135ce6295a8d6c26f1d97388a84b"
-  integrity sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==
+"@types/mongodb@*", "@types/mongodb@^3.1.22":
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.23.tgz#9aaa105f448427036cb6cd3aa042ab77b2ab8a7a"
+  integrity sha512-TNwS1HPh1nnaYorcQoWi+bH5kJ1Q/WqCjiD9XkU3oBeCZFYXXPafVUuFmoYFbzQ061ojhtsndRLzwNklRhU+4w==
   dependencies:
     "@types/bson" "*"
     "@types/node" "*"
 
 "@types/mongoose@^5.3.23":
-  version "5.3.23"
-  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.23.tgz#5a37bb73313f4892af9e2e6b9641a6f7b164200c"
-  integrity sha512-UZJOkFe/ShSt3iYFBiadwwCu2Y8qm/RZyAoCQI2uf88wr3NfDBpbqqoIyrchBy1y2XtvAAyktEPzvvR7up6/TQ==
+  version "5.3.26"
+  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.26.tgz#a979014c7fc9395e484695d4cc5647e7686251db"
+  integrity sha512-7NPdpUGU/1ZztTICcP3GxwWBAHTDyOLW0XJxrxlTl5i7R7XbT2Ucq33JussSLkWHKjbxpAmJnDwlYKcjwG7agg==
   dependencies:
     "@types/mongodb" "*"
     "@types/node" "*"
 
-"@types/node@*":
-  version "10.9.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
-
-"@types/node@^11.9.3":
-  version "11.9.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.9.4.tgz#ceb0048a546db453f6248f2d1d95e937a6f00a14"
-  integrity sha512-Zl8dGvAcEmadgs1tmSPcvwzO1YRsz38bVJQvH1RvRqSR9/5n61Q1ktcDL0ht3FXWR+ZpVmXVwN1LuH4Ax23NsA==
+"@types/node@*", "@types/node@^11.9.3":
+  version "11.13.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
+  integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
 "@types/node@^8.0.7":
   version "8.10.45"
@@ -1008,9 +887,9 @@
     reflect-metadata "*"
 
 "@types/selenium-webdriver@^3.0.0":
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.15.tgz#024c24051c3798e9a0cf5cceb1c893140df1bc31"
-  integrity sha512-5nh8/K2u9p4bk95GGCJB7KBvewaB0TUziZ9DTr+mR2I6RoO4OJVqx7rxK83hs2J1tomwtCGkhiW+Dy8EUnfB+Q==
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz#50a4755f8e33edacd9c406729e9b930d2451902a"
+  integrity sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==
 
 "@types/socket.io-client@^1.4.32":
   version "1.4.32"
@@ -1023,9 +902,9 @@
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/stripe@^6.25.7":
-  version "6.25.7"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
-  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
+  version "6.25.10"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
+  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
   dependencies:
     "@types/node" "*"
 
@@ -1233,13 +1112,15 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@1:
+abbrev@*, abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
@@ -1247,6 +1128,7 @@ accepts@~1.3.4, accepts@~1.3.5:
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  integrity sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=
   dependencies:
     acorn "^4.0.3"
 
@@ -1255,42 +1137,22 @@ acorn-dynamic-import@^4.0.0:
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
-  dependencies:
-    acorn "^3.0.4"
-
 acorn-walk@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
   integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
-
 acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+  integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
 
 acorn@^5.0.0, acorn@^5.2.1:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.2.tgz#91fa871883485d06708800318404e72bfb26dcc5"
-
-acorn@^5.5.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.5:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818"
-  integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==
-
-acorn@^6.0.7:
+acorn@^6.0.5, acorn@^6.0.7:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
@@ -1303,8 +1165,9 @@ adm-zip@^0.4.9:
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.0, agent-base@~4.2.1:
+agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
@@ -1323,26 +1186,12 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-
 ajv-keywords@^3.1.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
-ajv@6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
-  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@6.9.1, ajv@^6.1.0:
+ajv@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
   integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
@@ -1352,18 +1201,30 @@ ajv@6.9.1, ajv@^6.1.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.0.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
   dependencies:
     kind-of "^3.0.2"
     longest "^1.0.1"
@@ -1372,6 +1233,7 @@ align-text@^0.1.1, align-text@^0.1.3:
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 android-versions@1.4.0:
   version "1.4.0"
@@ -1394,14 +1256,15 @@ ansi-align@^2.0.0:
 
 ansi-colors@^1.0.1:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
   dependencies:
     ansi-wrap "^0.1.0"
 
 ansi-colors@^3.0.0:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
 ansi-escapes@^1.1.0:
   version "1.4.0"
@@ -1416,6 +1279,7 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.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"
 
@@ -1427,37 +1291,44 @@ ansi-html@0.0.7:
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-wrap@0.1.0, 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=
 
-ansi@^0.3.1:
+ansi@*, ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
+  integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
 
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -1474,19 +1345,20 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.0.tgz#67043da828fa474c0e7f98c52eed5cdf7d0aad30"
-  integrity sha512-N/+0BYAbHS16YFghQTaTrbsunKRCB8bjip11NmS9waWNGODbAJHn0oW813MoWpLV8TynaWz1VZRTu5RHkzDlAg==
+apollo-angular-link-http-common@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
+  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
   dependencies:
     tslib "^1.9.0"
 
 apollo-angular-link-http@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz#55411ed97f1f8356ebed5c0ae96f08dbaf3e064c"
-  integrity sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
+  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
   dependencies:
-    apollo-angular-link-http-common "~1.5.0"
+    apollo-angular-link-http-common "~1.6.0"
+    extract-files "5.0.1"
     tslib "^1.9.0"
 
 apollo-angular@^1.5.0:
@@ -1540,11 +1412,12 @@ apollo-link-context@^1.0.17:
     tslib "^1.9.3"
 
 apollo-link-dedup@^1.0.0:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz#028148f1028e806a9ab2f4abf3bde9dc292565e9"
-  integrity sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
+  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
   dependencies:
-    apollo-link "^1.2.8"
+    apollo-link "^1.2.11"
+    tslib "^1.9.3"
 
 apollo-link-ws@^1.0.17:
   version "1.0.17"
@@ -1554,14 +1427,7 @@ apollo-link-ws@^1.0.17:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.8.tgz#0f252adefd5047ac1a9f35ba9439d216587dcd84"
-  integrity sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==
-  dependencies:
-    zen-observable-ts "^0.8.15"
-
-apollo-link@^1.2.11:
+apollo-link@^1.0.0, apollo-link@^1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
   integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
@@ -1581,9 +1447,9 @@ apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
     tslib "^1.9.3"
 
 app-root-path@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
-  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
+  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
 
 append-transform@^1.0.0:
   version "1.0.0"
@@ -1595,10 +1461,12 @@ append-transform@^1.0.0:
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -1611,6 +1479,7 @@ arg@^4.1.0:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
@@ -1622,74 +1491,67 @@ aria-query@^3.0.0:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
 
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-flatten@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@~2.0.3:
   version "2.0.6"
@@ -1699,6 +1561,7 @@ asap@~2.0.3:
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -1707,22 +1570,26 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
     util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 ast-transform@0.0.0:
   version "0.0.0"
@@ -1739,9 +1606,9 @@ ast-types-flow@0.0.7:
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
 ast-types@0.x.x:
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.12.2.tgz#341656049ee328ac03fc805c156b49ebab1e4462"
-  integrity sha512-8c83xDLJM/dLDyXNLiR6afRRm4dPKN6KAnKqytRK3DBJul9lA+atxdQkNDkSVPdTqea5HiRq3lnnOIZ0MBpvdg==
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.12.3.tgz#2299c6201d34b2a749a2dd9f2de7ef5f0e84f423"
+  integrity sha512-wJUcAfrdW+IgDoMGNz5MmcvahKgB7BwIbLupdKVVHxHNYt+HVR2k35swdYNv9aZpF8nvlkjbnkp2rrNwxGckZA==
 
 ast-types@^0.7.0:
   version "0.7.8"
@@ -1754,20 +1621,24 @@ astral-regex@^1.0.0:
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-each@^1.0.0, async-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
+  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@2.6.1, async@^2.1.2, async@^2.4.1:
+async@2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
@@ -1776,7 +1647,7 @@ async@^1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.5.0, async@^2.6.1:
+async@^2.1.2, async@^2.4.1, async@^2.5.0, async@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
   integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
@@ -1786,10 +1657,12 @@ async@^2.5.0, async@^2.6.1:
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@9.4.6:
   version "9.4.6"
@@ -1806,6 +1679,7 @@ autoprefixer@9.4.6:
 autoprefixer@^7.2.6:
   version "7.2.6"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
+  integrity sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==
   dependencies:
     browserslist "^2.11.3"
     caniuse-lite "^1.0.30000805"
@@ -1817,10 +1691,12 @@ autoprefixer@^7.2.6:
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 axobject-query@^2.0.2:
   version "2.0.2"
@@ -1832,6 +1708,7 @@ axobject-query@^2.0.2:
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -1919,14 +1796,17 @@ babylon@^6.18.0:
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
-balanced-match@^1.0.0:
+balanced-match@*, balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@0.0.8:
   version "0.0.8"
@@ -1936,10 +1816,12 @@ base64-js@0.0.8:
 base64-js@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+  integrity sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=
 
 base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.2.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
@@ -1949,6 +1831,7 @@ base64id@1.0.0:
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1961,16 +1844,19 @@ base@^0.11.1:
 basic-auth@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
   dependencies:
     safe-buffer "5.1.2"
 
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
@@ -1982,6 +1868,7 @@ bcryptjs@^2.3.0:
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
@@ -2001,12 +1888,9 @@ big-integer@1.6.32:
   integrity sha512-ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw==
 
 big-integer@^1.6.7:
-  version "1.6.35"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.35.tgz#e093c3a50f63fb6bda0b5511c9425f1befcba74d"
-
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  version "1.6.43"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.43.tgz#8ac15bf13e93e509500859061233e19d8d0d99d1"
+  integrity sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -2014,12 +1898,9 @@ big.js@^5.2.2:
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
-
-blob@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 blob@0.0.5:
   version "0.0.5"
@@ -2029,6 +1910,7 @@ blob@0.0.5:
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
@@ -2042,30 +1924,17 @@ blocking-proxy@^1.0.0:
 bluebird@3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+  integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
 
 bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
+  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-
-body-parser@1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
-    on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
 body-parser@1.18.3, body-parser@^1.16.1:
   version "1.18.3"
@@ -2086,6 +1955,7 @@ body-parser@1.18.3, body-parser@^1.16.1:
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
+  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
   dependencies:
     continuable-cache "^0.3.1"
     error "^7.0.0"
@@ -2107,6 +1977,7 @@ bonjour@^3.5.0:
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 boom@7.x.x:
   version "7.3.0"
@@ -2128,30 +1999,25 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@^0.1.0:
+bplist-parser@*, bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
+  integrity sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@^1.1.7:
+brace-expansion@*, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -2177,6 +2043,7 @@ brfs@^1.3.0, brfs@^1.4.0:
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 brotli@^1.2.0:
   version "1.3.2"
@@ -2195,6 +2062,7 @@ browser-resolve@^1.11.0, browser-resolve@^1.8.1:
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -2206,6 +2074,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -2214,6 +2083,7 @@ browserify-cipher@^1.0.0:
 browserify-des@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -2232,6 +2102,7 @@ browserify-optional@^1.0.0:
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -2239,6 +2110,7 @@ browserify-rsa@^4.0.0:
 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=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -2251,24 +2123,26 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
 browserslist@^2.11.3:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
+  integrity sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==
   dependencies:
     caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
 browserslist@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
-  integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
+  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
   dependencies:
-    caniuse-lite "^1.0.30000929"
-    electron-to-chromium "^1.3.103"
-    node-releases "^1.1.3"
+    caniuse-lite "^1.0.30000955"
+    electron-to-chromium "^1.3.122"
+    node-releases "^1.1.13"
 
 browserstack@^1.5.1:
   version "1.5.2"
@@ -2318,22 +2192,26 @@ buffer-indexof@^1.0.0:
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
   version "4.9.1"
-  resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
+builtin-modules@^1.1.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 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"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
@@ -2343,10 +2221,12 @@ builtins@^1.0.3:
 bytes@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
+  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
 cacache@^10.0.4:
   version "10.0.4"
@@ -2390,6 +2270,7 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.2:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -2404,6 +2285,7 @@ cache-base@^1.0.1:
 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"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
 
 call-number@^1.0.1:
   version "1.0.1"
@@ -2417,13 +2299,6 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
-  dependencies:
-    callsites "^0.2.0"
-
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
@@ -2434,11 +2309,7 @@ caller-path@^2.0.0:
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 callsites@^2.0.0:
   version "2.0.0"
@@ -2448,6 +2319,7 @@ callsites@^2.0.0:
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -2455,23 +2327,27 @@ camelcase-keys@^2.0.0:
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 can-promise@0.0.1:
   version "0.0.1"
@@ -2480,14 +2356,10 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
-caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
-  version "1.0.30000883"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000883.tgz#597c1eabfb379bd9fbeaa778632762eb574706ac"
-
-caniuse-lite@^1.0.30000929:
-  version "1.0.30000938"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz#b64bf1427438df40183fce910fe24e34feda7a3f"
-  integrity sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==
+caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955:
+  version "1.0.30000957"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
+  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -2502,17 +2374,20 @@ capture-stack-trace@^1.0.0:
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
   dependencies:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
-  resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -2520,7 +2395,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.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"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2529,14 +2404,6 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -2553,17 +2420,18 @@ check-types@^7.3.0:
   integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
 
 cheerio@^1.0.0-rc.2:
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
   dependencies:
     css-select "~1.2.0"
-    dom-serializer "~0.1.0"
+    dom-serializer "~0.1.1"
     entities "~1.1.1"
     htmlparser2 "^3.9.1"
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@2.0.4, chokidar@^2.0.2, chokidar@^2.0.4:
+chokidar@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
   integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
@@ -2583,29 +2451,10 @@ chokidar@2.0.4, chokidar@^2.0.2, chokidar@^2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^2.0.0, chokidar@^2.0.3, chokidar@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
-  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.0"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-chokidar@^2.1.2:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.4.tgz#244a65d68beedf1078c2f193cf2735c2cfdc7da2"
-  integrity sha512-ZVuFiB9IGOHqu+Jh7B7fSTmzsfDmUtC6yqd/V72UPQeXbNHONbMV0chOXtLXjsP3NvdUsHTNMg02NtXPDaSmNQ==
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -2621,11 +2470,7 @@ chokidar@^2.1.2:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-
-chownr@^1.1.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -2650,6 +2495,7 @@ ci-info@^2.0.0:
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -2659,14 +2505,10 @@ circular-dependency-plugin@5.0.2:
   resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
   integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -2700,6 +2542,7 @@ cli-width@^2.0.0:
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
   dependencies:
     center-align "^0.1.1"
     right-align "^0.1.1"
@@ -2708,6 +2551,7 @@ cliui@^2.1.0:
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -2745,19 +2589,22 @@ clone@^2.1.1, clone@^2.1.2:
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-block-writer@^7.2.0:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.2.2.tgz#14ec0120de9a65d2cc5d214561d51d1660dddbb1"
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.3.0.tgz#9a70ca48865d3a733347da31c74104eed734929f"
+  integrity sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^5.0.0-beta.1:
-  version "5.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0-beta.1.tgz#749bc5d7f9cb73f71cc17594bae85227de0434fb"
-  integrity sha512-Pz+AF7F6SdO/aKvRNeDFFHWqSe0vGzbv3F1gu+OrE7+hbIeXm8RFafXZVYsO3edek9cRP8abo/mw28LK/BUSEA==
+codelyzer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0.tgz#e4032efb23a7c5d4bcfe7321fc1789490c679837"
+  integrity sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==
   dependencies:
     app-root-path "^2.1.0"
     aria-query "^3.0.0"
@@ -2772,6 +2619,7 @@ codelyzer@^5.0.0-beta.1:
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -2779,57 +2627,46 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 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-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==
 
 colors@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
   integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
-colors@^1.1.0, colors@^1.3.3:
+colors@^1.1.0, colors@^1.3.3, colors@latest:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
   integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
 
-colors@latest:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
-
-combined-stream@1.0.6, combined-stream@~1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@^1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.11.0, commander@^2.18.0, commander@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-commander@^2.12.1, commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@~2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
 commander@~2.12.1:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+  integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -2844,38 +2681,44 @@ compare-versions@^3.2.1:
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.0, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
-compressible@~2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7"
+compressible@~2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
+  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
   dependencies:
-    mime-db ">= 1.34.0 < 2"
+    mime-db ">= 1.38.0 < 2"
 
 compression@^1.5.2, compression@^1.6.0:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.14"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@0.0.1:
+concat-map@*, concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@~1.6.0:
+concat-stream@^1.5.0, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -2915,33 +2758,34 @@ connect@^3.6.0, connect@^3.6.6:
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 continuable-cache@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
+  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
 
 convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.6.0"
@@ -2953,10 +2797,12 @@ convert-source-map@^1.5.0, convert-source-map@^1.5.1:
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 cookiejar@^2.1.2:
   version "2.1.2"
@@ -2978,6 +2824,7 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-webpack-plugin@4.6.0:
   version "4.6.0"
@@ -2994,10 +2841,11 @@ copy-webpack-plugin@4.6.0:
     serialize-javascript "^1.4.0"
 
 cordova-android-support-gradle-release@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz#1a6a834a713310a7ee6ad1cd3e1db6b63cb993c3"
-  integrity sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.1.0.tgz#2d41db1eb7fc5dea32b6514336a37a5e00dfbc21"
+  integrity sha512-rKqNQ5PCHuZ/qUWYrLz5dKJpdJ/ArkhTCEv4CxbFuny0a0JNg5lwufmZ7qfVIqxoK0Nvs9XsIYKiFSGxaQ8lTg==
   dependencies:
+    q "^1.4.1"
     semver "5.1.0"
     xml2js "~0.4.19"
 
@@ -3035,6 +2883,7 @@ cordova-browser@^6.0.0:
 cordova-common@2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/cordova-common/-/cordova-common-2.2.5.tgz#f93cef2ad494cfcbf56c46e3d612aaa9cb5fcc32"
+  integrity sha1-+TzvKtSUz8v1bEbj1hKqqctfzDI=
   dependencies:
     ansi "^0.3.1"
     bplist-parser "^0.1.0"
@@ -3143,9 +2992,9 @@ cordova-plugin-local-notification@^0.9.0-beta.2:
   integrity sha512-63n77K1pt8dnbWnNR8QWETi9Glezi1bvNHvHWmGNIOv0xCb0phZnm+Ku49BQ+omwe8Z5voMvrA4I03SYPpv38w==
 
 cordova-plugin-mixpanel@^4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/cordova-plugin-mixpanel/-/cordova-plugin-mixpanel-4.5.2.tgz#76a78090c6333715618901e53e2782da9d3ac06c"
-  integrity sha512-+mlT7fw4ug+wU5/KlR5TX8lZQbyF7jsk/Ol8PNcizfxI7xU6URA5Y/qhTNzOZGjf4Iga6XhJx/VPz9fEzep1iA==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/cordova-plugin-mixpanel/-/cordova-plugin-mixpanel-4.6.1.tgz#a22de20db37fb552b08b2d7a286aa6291165eba5"
+  integrity sha512-tQ0kvp5mwKhWgSqvjMdERYfbSiQLBKDu01m6e0/wS/3zJEwPkBY5uhmTD/HTwl66HLOV0SGBXppD9shcmoJiKg==
 
 cordova-plugin-network-information@^2.0.1:
   version "2.0.1"
@@ -3182,9 +3031,10 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
+  integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw=
 
 cordova-serve@^3.0.0:
   version "3.0.0"
@@ -3197,28 +3047,25 @@ cordova-serve@^3.0.0:
     opn "^5.3.0"
     which "^1.3.0"
 
-core-js@^2.2.0:
+core-js@^2.2.0, core-js@^2.4.0:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
-core-js@^2.4.0:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d"
-  integrity sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A==
-
 core-js@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957"
-  integrity sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cors@latest:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.4.tgz#2bd381f2eb201020105cd50ea59da63090694686"
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
   dependencies:
     object-assign "^4"
     vary "^1"
@@ -3233,25 +3080,14 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
-  integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-
-cosmiconfig@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
-  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
+cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
+  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    lodash.get "^4.4.2"
+    js-yaml "^3.13.0"
     parse-json "^4.0.0"
 
 cpr@^3.0.1:
@@ -3267,6 +3103,7 @@ cpr@^3.0.1:
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -3281,6 +3118,7 @@ create-error-class@^3.0.0:
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -3291,6 +3129,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   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==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -3310,6 +3149,7 @@ cross-env@^5.2.0:
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -3317,6 +3157,7 @@ cross-spawn@^3.0.0:
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
@@ -3343,6 +3184,7 @@ cryptiles@^4.1.3:
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -3373,7 +3215,8 @@ css-parse@1.7.x:
 
 css-select@~1.2.0:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
   dependencies:
     boolbase "~1.0.0"
     css-what "2.1"
@@ -3390,8 +3233,9 @@ css-selector-tokenizer@^0.7.1:
     regexpu-core "^1.0.0"
 
 css-what@2.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d"
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
 cssauron@^1.4.0:
   version "1.4.0"
@@ -3408,6 +3252,7 @@ cssesc@^0.1.0:
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
@@ -3424,6 +3269,7 @@ cyclist@~0.2.2:
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
   dependencies:
     es5-ext "^0.10.9"
 
@@ -3435,13 +3281,14 @@ damerau-levenshtein@^1.0.4:
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 data-uri-to-buffer@2:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.0.tgz#0ba23671727349828c32cfafddea411908d13d23"
-  integrity sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz#ca8f56fe38b1fd329473e9d1b4a9afcd8ce1c045"
+  integrity sha512-OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A==
   dependencies:
     "@types/node" "^8.0.7"
 
@@ -3453,11 +3300,7 @@ date-format@^2.0.0:
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-
-debug-log@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
-  integrity sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 debug@*, debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
@@ -3466,19 +3309,21 @@ debug@*, debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@2.6.9, debug@^2.1.0, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.1.0, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@^3.1.0, debug@~3.1.0:
+debug@3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-debug@^3.2.5, debug@^3.2.6:
+debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3488,6 +3333,7 @@ debug@^3.2.5, debug@^3.2.6:
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decamelize@^2.0.0:
   version "2.0.0"
@@ -3499,6 +3345,7 @@ decamelize@^2.0.0:
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 dedent@^0.7.0:
   version "0.7.0"
@@ -3513,6 +3360,7 @@ deep-equal@^1.0.0, deep-equal@^1.0.1, deep-equal@~1.0.1:
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
@@ -3544,18 +3392,21 @@ define-properties@^1.1.2:
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -3574,18 +3425,6 @@ degenerator@^1.0.4:
     escodegen "1.x.x"
     esprima "3.x.x"
 
-deglob@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/deglob/-/deglob-2.1.1.tgz#d268e168727799862e8eac07042e165957c1f3be"
-  integrity sha512-2kjwuGGonL7gWE1XU4Fv79+vVzpoQCl0V+boMwWtOQJV2AGDabCwez++nB1Nli/8BabAfZQ/UuHPlp6AymKdWw==
-  dependencies:
-    find-root "^1.0.0"
-    glob "^7.0.5"
-    ignore "^3.0.9"
-    pkg-config "^1.1.0"
-    run-parallel "^1.1.2"
-    uniq "^1.0.1"
-
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -3614,18 +3453,17 @@ del@^3.0.0:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
-depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 dependency-graph@^0.7.2:
   version "0.7.2"
@@ -3635,6 +3473,7 @@ dependency-graph@^0.7.2:
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -3642,6 +3481,7 @@ des.js@^1.0.0:
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-indent@^4.0.0:
   version "4.0.0"
@@ -3653,6 +3493,7 @@ detect-indent@^4.0.0:
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-node@^2.0.4:
   version "2.0.4"
@@ -3674,6 +3515,7 @@ di@^0.0.1:
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diff@^4.0.1:
   version "4.0.1"
@@ -3683,6 +3525,7 @@ diff@^4.0.1:
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -3693,13 +3536,21 @@ dijkstrajs@^1.0.1:
   resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
   integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs=
 
-dir-glob@^2.0.0:
+dir-glob@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
   dependencies:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
+dir-glob@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+  dependencies:
+    path-type "^3.0.0"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -3720,28 +3571,14 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
 doctrine@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
+  integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=
   dependencies:
     esutils "^1.1.6"
     isarray "0.0.1"
 
-doctrine@^2.0.2, doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -3752,12 +3589,13 @@ dom-serialize@^2.2.0:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@0, dom-serializer@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+dom-serializer@0, dom-serializer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
   dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
 
 dom7@^2.1.3:
   version "2.1.3"
@@ -3769,28 +3607,24 @@ dom7@^2.1.3:
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.2.1.tgz#578558ef23befac043a1abb0db07635509393479"
-
-domelementtype@^1.3.0:
-  version "1.3.0"
-  resolved "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
   dependencies:
     domelementtype "1"
 
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -3798,6 +3632,7 @@ domutils@1.5.1:
 domutils@^1.5.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -3812,16 +3647,21 @@ dot-prop@^4.1.0:
 dot@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/dot/-/dot-1.1.2.tgz#c7377019fc4e550798928b2b9afeb66abfa1f2f9"
+  integrity sha1-xzdwGfxOVQeYkosrmv62ar+h8vk=
 
-dotenv-webpack@^1.5.7:
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.5.7.tgz#c44395ab21d1fd28d79a90942a7b14b1debd145f"
+dotenv-defaults@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-1.0.2.tgz#441cf5f067653fca4bbdce9dd3b803f6f84c585d"
+  integrity sha512-iXFvHtXl/hZPiFj++1hBg4lbKwGM+t/GlvELDnRtOFdjXyWP7mubkVr+eZGWG62kdsbulXAef6v/j6kiWc/xGA==
   dependencies:
-    dotenv "^5.0.1"
+    dotenv "^6.2.0"
 
-dotenv@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
+dotenv-webpack@^1.5.7:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz#4384d8c57ee6f405c296278c14a9f9167856d3a1"
+  integrity sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==
+  dependencies:
+    dotenv-defaults "^1.0.2"
 
 dotenv@^6.2.0:
   version "6.2.0"
@@ -3848,6 +3688,7 @@ duplexer3@^0.1.4:
 duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
@@ -3862,6 +3703,7 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -3869,24 +3711,22 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 ejs@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.103:
-  version "1.3.113"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
-  integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
-
-electron-to-chromium@^1.3.30:
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.62.tgz#2e8e2dc070c800ec8ce23ff9dfcceb585d6f9ed8"
+electron-to-chromium@^1.3.122, electron-to-chromium@^1.3.30:
+  version "1.3.124"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
+  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
 elementtree@0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/elementtree/-/elementtree-0.1.6.tgz#2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"
+  integrity sha1-KsTEbqMFFsjEy9teOsdBjlkt4gw=
   dependencies:
     sax "0.3.5"
 
@@ -3900,6 +3740,7 @@ elementtree@0.1.7, elementtree@^0.1.7:
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -3917,10 +3758,12 @@ emoji-regex@^7.0.1:
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
   version "0.1.12"
@@ -3937,15 +3780,13 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
     once "^1.4.0"
 
 endent@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/endent/-/endent-1.2.0.tgz#1e43a6072d1e8e517495c0bf13c32b0c6e57206d"
-  integrity sha512-o6JTG7ce2GBLDfWjoB0XWcIoBXXtx59TGc8jHhDC8Pi6su4ifFNMpUvCmEr8ec5FPxpGVowGpmC7/JhKLk0iVw==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/endent/-/endent-1.3.0.tgz#ea86b583d7b7caff5cbee5ad2c7c322eb1900c76"
+  integrity sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==
   dependencies:
     dedent "^0.7.0"
     fast-json-parse "^1.0.3"
     objectorarray "^1.0.3"
-    standard "^11.0.1"
-    tape "^4.8.0"
 
 engine.io-client@~3.2.0:
   version "3.2.1"
@@ -3965,9 +3806,9 @@ engine.io-client@~3.2.0:
     yeast "0.1.2"
 
 engine.io-client@~3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.1.tgz#afedb4a07b2ea48b7190c3136bfea98fdd4f0f03"
-  integrity sha512-q66JBFuQcy7CSlfAz9L3jH+v7DTT3i6ZEadYcVj2pOs8/0uJHLxKX3WBkGTvULJMdz0tUCyJag0aKT/dpXL9BQ==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.2.tgz#04e068798d75beda14375a264bb3d742d7bc33aa"
+  integrity sha512-y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -3981,7 +3822,7 @@ engine.io-client@~3.3.1:
     xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
-engine.io-parser@~2.1.0:
+engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
   integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
@@ -3992,16 +3833,6 @@ engine.io-parser@~2.1.0:
     blob "0.0.5"
     has-binary2 "~1.0.2"
 
-engine.io-parser@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.5"
-    blob "0.0.4"
-    has-binary2 "~1.0.2"
-
 engine.io@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
@@ -4026,6 +3857,7 @@ enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
 enhanced-resolve@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
+  integrity sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -4040,6 +3872,7 @@ ent@~2.2.0:
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 envalid@^4.2.2:
   version "4.2.2"
@@ -4059,23 +3892,26 @@ err-code@^1.0.0:
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 error@^7.0.0:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02"
+  integrity sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=
   dependencies:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.5.0, es-abstract@^1.7.0:
+es-abstract@^1.5.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
   integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
@@ -4097,16 +3933,18 @@ es-to-primitive@^1.2.0:
     is-symbol "^1.0.2"
 
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.46"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
+  version "0.10.49"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.49.tgz#059a239de862c94494fec28f8150c977028c6c5e"
+  integrity sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
-    next-tick "1"
+    next-tick "^1.0.0"
 
 es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
   dependencies:
     d "1"
     es5-ext "^0.10.35"
@@ -4115,6 +3953,7 @@ es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
 es6-map@^0.1.3:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4143,6 +3982,7 @@ es6-promisify@^5.0.0:
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  integrity sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4153,6 +3993,7 @@ es6-set@~0.1.5:
 es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4160,6 +4001,7 @@ es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
 es6-weak-map@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  integrity sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=
   dependencies:
     d "1"
     es5-ext "^0.10.14"
@@ -4169,10 +4011,12 @@ es6-weak-map@^2.0.1:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@1.x.x, escodegen@^1.8.1:
   version "1.11.1"
@@ -4212,156 +4056,21 @@ escodegen@~1.9.0:
 escope@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  integrity sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=
   dependencies:
     es6-map "^0.1.3"
     es6-weak-map "^2.0.1"
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-standard-jsx@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-5.0.0.tgz#4abfac554f38668e0078c664569e7b2384e5d2aa"
-  integrity sha512-rLToPAEqLMPBfWnYTu6xRhm2OWziS2n40QFqJ8jAM8NSVzeVKTa3nclhsU4DpPJQRY60F34Oo1wi/71PN/eITg==
-
-eslint-config-standard@11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz#87ee0d3c9d95382dc761958cbb23da9eea31e0ba"
-  integrity sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw==
-
-eslint-import-resolver-node@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
-  integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
-  dependencies:
-    debug "^2.6.9"
-    resolve "^1.5.0"
-
-eslint-module-utils@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz#546178dab5e046c8b562bbb50705e2456d7bda49"
-  integrity sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==
-  dependencies:
-    debug "^2.6.8"
-    pkg-dir "^2.0.0"
-
-eslint-plugin-import@~2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.9.0.tgz#26002efbfca5989b7288ac047508bd24f217b169"
-  integrity sha1-JgAu+/ylmJtyiKwEdQi9JPIXsWk=
-  dependencies:
-    builtin-modules "^1.1.1"
-    contains-path "^0.1.0"
-    debug "^2.6.8"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.1"
-    eslint-module-utils "^2.1.1"
-    has "^1.0.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.3"
-    read-pkg-up "^2.0.0"
-
-eslint-plugin-node@~6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz#bf19642298064379315d7a4b2a75937376fa05e4"
-  integrity sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==
-  dependencies:
-    ignore "^3.3.6"
-    minimatch "^3.0.4"
-    resolve "^1.3.3"
-    semver "^5.4.1"
-
-eslint-plugin-promise@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.7.0.tgz#f4bde5c2c77cdd69557a8f69a24d1ad3cfc9e67e"
-  integrity sha512-2WO+ZFh7vxUKRfR0cOIMrWgYKdR6S1AlOezw6pC52B6oYpd5WFghN+QHxvrRdZMtbo8h3dfUZ2o1rWb0UPbKtg==
-
-eslint-plugin-react@~7.7.0:
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160"
-  integrity sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==
-  dependencies:
-    doctrine "^2.0.2"
-    has "^1.0.1"
-    jsx-ast-utils "^2.0.1"
-    prop-types "^15.6.0"
-
-eslint-plugin-standard@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2"
-  integrity sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=
-
-eslint-scope@^3.7.1:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
-  integrity sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-visitor-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
-  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
-
-eslint@~4.18.0:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.2.tgz#0f81267ad1012e7d2051e186a9004cc2267b8d45"
-  integrity sha512-qy4i3wODqKMYfz9LUI8N2qYDkHkoieTbiHpMrYUI/WbjhXJQr7lI4VngixTgaG+yHX+NBCv7nW4hA0ShbvaNKw==
-  dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.2"
-    esquery "^1.0.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
-
-espree@^3.5.2:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
-  integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==
-  dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
-
 esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -4370,45 +4079,49 @@ esprima@3.x.x, esprima@^3.1.3:
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esprima@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
   integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
 
-esquery@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
-  dependencies:
-    estraverse "^4.0.0"
-
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   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.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
 estraverse@~1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"
   integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=
 
-estree-walker@^0.5.0, estree-walker@^0.5.2:
+estree-walker@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
+  integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
+
+estree-walker@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae"
+  integrity sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==
 
 esutils@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
+  integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
 
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 esutils@~1.0.0:
   version "1.0.0"
@@ -4418,10 +4131,12 @@ esutils@~1.0.0:
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 event-emitter@~0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4442,6 +4157,7 @@ event-stream@3.3.4:
 event-stream@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-4.0.1.tgz#4092808ec995d0dd75ea4580c1df6a74db2cde65"
+  integrity sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==
   dependencies:
     duplexer "^0.1.1"
     from "^0.1.7"
@@ -4456,9 +4172,10 @@ eventemitter3@^3.0.0:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
   integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
-events@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+events@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
 
 eventsource@^1.0.7:
   version "1.0.7"
@@ -4470,6 +4187,7 @@ eventsource@^1.0.7:
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -4490,6 +4208,7 @@ execa@^0.10.0:
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -4517,15 +4236,10 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -4535,48 +4249,7 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  dependencies:
-    fill-range "^2.1.0"
-
-express@^4.13.3, express@^4.16.3:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.2"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-express@^4.16.2:
+express@^4.13.3, express@^4.16.2, express@^4.16.3:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -4615,12 +4288,14 @@ express@^4.16.2:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -4628,8 +4303,9 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@^3.0.0, 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==
 
-external-editor@^2.0.1, external-editor@^2.0.4:
+external-editor@^2.0.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
@@ -4647,15 +4323,10 @@ external-editor@^3.0.0, external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  dependencies:
-    is-extglob "^1.0.0"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -4666,13 +4337,20 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-files@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz#c9492a8410be643e260a376f0151361993d5f659"
+  integrity sha512-qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w==
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 falafel@^2.1.0:
   version "2.1.0"
@@ -4684,15 +4362,7 @@ falafel@^2.1.0:
     isarray "0.0.1"
     object-keys "^1.0.6"
 
-fancy-log@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    time-stamp "^1.0.0"
-
-fancy-log@^1.3.3:
+fancy-log@^1.3.2, 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==
@@ -4705,6 +4375,7 @@ fancy-log@^1.3.3:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
@@ -4712,14 +4383,15 @@ fast-deep-equal@^2.0.1:
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-glob@^2.0.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.3.tgz#d09d378e9ef6b0076a0fa1ba7519d9d4d9699c28"
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
+  integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.0.1"
+    "@nodelib/fs.stat" "^1.1.2"
     glob-parent "^3.1.0"
     is-glob "^4.0.0"
-    merge2 "^1.2.1"
+    merge2 "^1.2.3"
     micromatch "^3.1.10"
 
 fast-json-parse@^1.0.3:
@@ -4730,6 +4402,7 @@ fast-json-parse@^1.0.3:
 fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
@@ -4767,14 +4440,6 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
 file-loader@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
@@ -4788,10 +4453,6 @@ file-uri-to-path@1:
   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-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-
 fileset@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
@@ -4805,19 +4466,10 @@ filesize@^3.6.1:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
   integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
 
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -4827,6 +4479,7 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -4839,6 +4492,7 @@ finalhandler@1.1.0:
 finalhandler@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
@@ -4858,22 +4512,18 @@ find-cache-dir@^1.0.0:
     pkg-dir "^2.0.0"
 
 find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
     commondir "^1.0.1"
-    make-dir "^1.0.0"
+    make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-root@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
-  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -4881,6 +4531,7 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
@@ -4894,16 +4545,7 @@ find-up@^3.0.0:
 findit2@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/findit2/-/findit2-2.2.3.tgz#58a466697df8a6205cdfdbf395536b8bd777a5f6"
-
-flat-cache@^1.2.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
-  integrity sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==
-  dependencies:
-    circular-json "^0.3.1"
-    graceful-fs "^4.1.2"
-    rimraf "~2.6.2"
-    write "^0.2.1"
+  integrity sha1-WKRmaX34piBc39vzlVNri9d3pfY=
 
 flatted@^2.0.0:
   version "2.0.0"
@@ -4962,12 +4604,7 @@ for-in@^0.1.3:
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  dependencies:
-    for-in "^1.0.1"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^1.0.0:
   version "1.0.0"
@@ -4984,8 +4621,9 @@ foreach@^2.0.5:
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@^2.3.3:
+form-data@^2.3.3, form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
@@ -4994,14 +4632,6 @@ form-data@^2.3.3:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
 formidable@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
@@ -5010,16 +4640,19 @@ formidable@^1.2.0:
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from2@^2.1.0:
   version "2.3.0"
@@ -5032,6 +4665,7 @@ from2@^2.1.0:
 from@^0.1.7, from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
+  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
 
 fs-access@^1.0.0:
   version "1.0.1"
@@ -5043,6 +4677,7 @@ fs-access@^1.0.0:
 fs-extra@^4.0.1, fs-extra@^4.0.2:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -5051,20 +4686,13 @@ fs-extra@^4.0.1, fs-extra@^4.0.2:
 fs-extra@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^7.0.1:
+fs-extra@^7.0.0, fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -5076,6 +4704,7 @@ fs-extra@^7.0.1:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
@@ -5092,15 +4721,9 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
-fsevents@^1.2.7:
+fsevents@^1.2.2, fsevents@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
   integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
@@ -5111,6 +4734,7 @@ fsevents@^1.2.7:
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -5130,14 +4754,10 @@ function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -5151,6 +4771,7 @@ gauge@~2.7.3:
 gaze@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
@@ -5162,15 +4783,17 @@ genfun@^5.0.0:
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-caller-file@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.1.tgz#25835260d3a2b9665fcdbb08cb039a7bbf7011c0"
-  integrity sha512-SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stdin@^6.0.0:
   version "6.0.0"
@@ -5180,6 +4803,7 @@ get-stdin@^6.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@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
@@ -5203,29 +4827,19 @@ get-uri@^2.0.0:
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -5233,10 +4847,12 @@ glob-parent@^3.1.0:
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 glob@5.0.15, glob@^5.0.13:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -5256,9 +4872,10 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1, glob@~7.1.3:
+glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1, glob@~7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -5274,7 +4891,7 @@ global-dirs@^0.1.0:
   dependencies:
     ini "^1.3.4"
 
-globals@^11.0.1, globals@^11.1.0:
+globals@^11.1.0:
   version "11.11.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
   integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==
@@ -5320,11 +4937,12 @@ globby@^7.1.1:
     slash "^1.0.0"
 
 globby@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
+  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
   dependencies:
     array-union "^1.0.1"
-    dir-glob "^2.0.0"
+    dir-glob "2.0.0"
     fast-glob "^2.0.2"
     glob "^7.1.2"
     ignore "^3.3.5"
@@ -5334,6 +4952,7 @@ globby@^8.0.1:
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
+  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
@@ -5356,24 +4975,20 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.5:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
 graphql-tag@^2.10.1:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02"
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
 
 graphql@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0"
-  integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.1.tgz#779529bf9a01e7207b977a54c20670b48ca6e95c"
+  integrity sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==
   dependencies:
     iterall "^1.2.2"
 
@@ -5391,11 +5006,11 @@ handle-thing@^2.0.0:
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
-  integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
+  integrity sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==
   dependencies:
-    async "^2.5.0"
+    neo-async "^2.6.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
@@ -5404,37 +5019,44 @@ handlebars@^4.1.0:
 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:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
-    ajv "^5.3.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-symbols@^1.0.0:
   version "1.0.0"
@@ -5444,10 +5066,12 @@ has-symbols@^1.0.0:
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -5456,6 +5080,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -5464,10 +5089,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -5482,13 +5109,15 @@ has@^1.0.1, has@^1.0.3, has@~1.0.3:
 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=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
@@ -5496,15 +5125,16 @@ hash.js@^1.0.0, hash.js@^1.0.3:
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
 hoek@6.x.x:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
-  integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
+  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
 
 hooks-fixed@^2.0.2:
   version "2.0.2"
@@ -5519,6 +5149,7 @@ hoopy@^0.1.2:
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -5536,15 +5167,16 @@ html-entities@^1.2.0, html-entities@^1.2.1:
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 htmlparser2@^3.9.1:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz#5f5e422dcf6119c0d983ed36260ce9ded0bee464"
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
   dependencies:
-    domelementtype "^1.3.0"
+    domelementtype "^1.3.1"
     domhandler "^2.3.0"
     domutils "^1.5.1"
     entities "^1.1.1"
     inherits "^2.0.1"
-    readable-stream "^3.0.6"
+    readable-stream "^3.1.1"
 
 http-auth@3.1.x:
   version "3.1.3"
@@ -5566,18 +5198,10 @@ http-deceiver@^1.2.7:
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
   integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
-  dependencies:
-    depd "1.1.1"
-    inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
-
 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -5585,8 +5209,9 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.4.0:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
+  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
@@ -5618,6 +5243,7 @@ http-proxy@^1.13.0, http-proxy@^1.16.2:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -5626,6 +5252,7 @@ http-signature@~1.2.0:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
   version "2.2.1"
@@ -5659,16 +5286,12 @@ husky@^1.3.1:
     slash "^2.0.0"
 
 i18next@^15.0.4:
-  version "15.0.7"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.7.tgz#2f61240c8b2b6656233217a8eee07a09a5707fea"
-  integrity sha512-KCSmTOE0nsku53cI0sSBY21ftXhsAfCjcNQBx54Y0AxcTxSs+v+qGFQ38ab+vi6F4NZEm8JupO36vlWoeF47cA==
+  version "15.0.9"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.9.tgz#42536407a921bb5a8535a4c090a26f16827a1884"
+  integrity sha512-IdVj7DqErUuMbGuj2dFT431T7zKlmDci63eae6pNA/bMwgBZKT74/KnwHXE0WH7ivo2EV/LNme4pP4Yw6vB79w==
   dependencies:
     "@babel/runtime" "^7.3.1"
 
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -5679,12 +5302,14 @@ iconv-lite@0.4.23:
 iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -5694,12 +5319,14 @@ iferr@^0.1.5:
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.0.9, ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6:
+ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
 image-size@~0.5.0:
   version "0.5.5"
@@ -5709,6 +5336,7 @@ image-size@~0.5.0:
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
 immutable-tuple@^0.4.9:
   version "0.4.10"
@@ -5758,35 +5386,42 @@ imurmurhash@^0.1.4:
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
-inflight@^1.0.4:
+inflight@*, inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@1.3.5, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 inquirer@3.0.6:
   version "3.0.6"
@@ -5826,26 +5461,6 @@ inquirer@6.2.1:
     strip-ansi "^5.0.0"
     through "^2.3.6"
 
-inquirer@^3.0.6:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 inquirer@^6.0.0:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
@@ -5868,6 +5483,7 @@ inquirer@^6.0.0:
 inside@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/inside/-/inside-1.0.0.tgz#db45e993573cdb3db70b9832e8285bad46424770"
+  integrity sha1-20Xpk1c82z23C5gy6ChbrUZCR3A=
 
 internal-ip@^3.0.1:
   version "3.0.1"
@@ -5878,8 +5494,9 @@ internal-ip@^3.0.1:
     ipaddr.js "^1.5.2"
 
 interpret@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
+  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
 invariant@^2.2.2:
   version "2.2.4"
@@ -5891,6 +5508,7 @@ invariant@^2.2.2:
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 invert-kv@^2.0.0:
   version "2.0.0"
@@ -5931,11 +5549,16 @@ ionic@^4.12.0:
     update-notifier "^2.3.0"
     uuid "^3.2.1"
 
-ionicons@4.5.5, ionicons@^4.5.5:
+ionicons@4.5.5:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.5.tgz#b059958a54dd45cfa127acc0baf11503b8671e51"
   integrity sha512-dIGI73XG6Fg2Ps77ry5Ywe36Pq7wUGkDkl0pBhC4uhsiyoW+oXe+pplmarXEnKEcB5fmlkRrBOxYYzZaoRiUGw==
 
+ionicons@^4.5.5:
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.6.tgz#f3b5d2446e7e1b30e67ddcd1fc563271acc60f3c"
+  integrity sha512-/F3U/rxdLPGl8eUW5dMouhBBoJuUPrlFO6rkoz4VNuw1lxP6l+bFtsDA8MaVM1dHABp+gIHxtpt+IhwmB3oIfA==
+
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -5949,6 +5572,7 @@ ip@^1.1.0, ip@^1.1.5:
 ipaddr.js@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
 ipaddr.js@^1.5.2:
   version "1.9.0"
@@ -5958,6 +5582,7 @@ ipaddr.js@^1.5.2:
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
     is-windows "^1.0.1"
@@ -5965,34 +5590,33 @@ is-absolute@^1.0.0:
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-callable@^1.1.3, is-callable@^1.1.4:
   version "1.1.4"
@@ -6016,12 +5640,14 @@ is-ci@^2.0.0:
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
@@ -6033,6 +5659,7 @@ is-date-object@^1.0.1:
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -6041,6 +5668,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -6049,66 +5677,55 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  dependencies:
-    is-primitive "^2.0.0"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -6123,32 +5740,25 @@ is-installed-globally@^0.1.0:
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
 is-negated-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
 
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
   integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -6176,17 +5786,10 @@ is-path-inside@^1.0.0:
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -6207,14 +5810,10 @@ is-regex@^1.0.4:
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
 
-is-resolvable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
-
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -6223,6 +5822,7 @@ is-retry-allowed@^1.0.0:
 is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-symbol@^1.0.2:
   version "1.0.2"
@@ -6234,36 +5834,44 @@ is-symbol@^1.0.2:
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-unc-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isarray@^2.0.1:
   version "2.0.4"
@@ -6280,20 +5888,24 @@ isbinaryfile@^3.0.0:
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-api@^2.1.1:
   version "2.1.1"
@@ -6400,9 +6012,9 @@ iterall@^1.2.2:
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
 jasmine-core@^3.3, jasmine-core@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
-  integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
@@ -6431,8 +6043,9 @@ jasminewd2@^2.1.0:
   integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
 js-base64@^2.1.8:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
+  integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -6442,18 +6055,12 @@ js-base64@^2.1.8:
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.12.0, js-yaml@^3.9.1:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
-  integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.7.0, js-yaml@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.9.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -6461,6 +6068,7 @@ js-yaml@^3.7.0, js-yaml@^3.9.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsesc@^1.3.0:
   version "1.3.0"
@@ -6480,14 +6088,17 @@ jsesc@~0.5.0:
 json-loader@^0.5.4, json-loader@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+  integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==
 
 json-parse-better-errors@^1.0.0, 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"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -6497,24 +6108,22 @@ json-schema-traverse@^0.4.1:
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
   integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
-json5@^0.5.0, json5@^0.5.1:
+json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
 json5@^1.0.1:
   version "1.0.1"
@@ -6533,6 +6142,7 @@ json5@^2.1.0:
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -6544,23 +6154,17 @@ jsonparse@^1.2.0:
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsx-ast-utils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
-  integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
-  dependencies:
-    array-includes "^3.0.3"
-
 jszip@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.0.tgz#1c179e8692777490ca4e9b8f3ced08f9b820da2c"
-  integrity sha512-4WjbsaEtBK/DHeDZOPiPw5nzSGLDEDDreFRDEgnoMwmknPjTqa+23XuYFk6NiGbeiAeZCctiQ/X/z0lQBmDVOQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.1.tgz#c5d32df7274042282b157efb16e522b43435e01a"
+  integrity sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
@@ -6648,22 +6252,26 @@ killable@^1.0.0:
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 latest-version@^3.0.0:
   version "3.1.0"
@@ -6675,10 +6283,12 @@ latest-version@^3.0.0:
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
@@ -6723,7 +6333,7 @@ less@3.9.0:
     request "^2.83.0"
     source-map "~0.6.0"
 
-levn@^0.3.0, levn@~0.3.0:
+levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
   integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
@@ -6742,6 +6352,7 @@ license-webpack-plugin@2.1.0:
 lie@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
   dependencies:
     immediate "~3.0.5"
 
@@ -6781,12 +6392,14 @@ live-server@^1.2.1:
     serve-index "^1.9.1"
 
 livereload-js@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
+  integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
 
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -6797,27 +6410,19 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
 loader-runner@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+  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.1, loader-utils@^1.0.2:
+loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -6826,14 +6431,6 @@ loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2:
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
-loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
 localforage-cordovasqlitedriver@1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/localforage-cordovasqlitedriver/-/localforage-cordovasqlitedriver-1.7.0.tgz#8b93957759ee688d3a58d5ba7c0477f6ccb53838"
@@ -6858,6 +6455,7 @@ localforage@>=1.5.0:
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -6919,19 +6517,17 @@ lodash.assign@^3.2.0:
 lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-
-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=
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.isarguments@^3.0.0:
   version "3.1.0"
@@ -6946,6 +6542,7 @@ lodash.isarray@^3.0.0:
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
 lodash.keys@^3.0.0:
   version "3.1.2"
@@ -6959,6 +6556,7 @@ lodash.keys@^3.0.0:
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
@@ -6970,13 +6568,10 @@ lodash.tail@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
   integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.5, lodash@~4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
-lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 log-update@^2.3.0:
   version "2.3.0"
@@ -6988,15 +6583,15 @@ log-update@^2.3.0:
     wrap-ansi "^3.0.1"
 
 log4js@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.0.2.tgz#0c73e623ca4448669653eb0e9f629beacc7fbbe3"
-  integrity sha512-KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.1.0.tgz#57983c6a443546a8c8607e9cb045d2a117c27644"
+  integrity sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==
   dependencies:
     date-format "^2.0.0"
-    debug "^3.1.0"
+    debug "^4.1.1"
     flatted "^2.0.0"
     rfdc "^1.1.2"
-    streamroller "^1.0.1"
+    streamroller "^1.0.4"
 
 loglevel@^1.4.1:
   version "1.6.1"
@@ -7006,6 +6601,7 @@ loglevel@^1.4.1:
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
 
 loose-envify@^1.0.0:
   version "1.4.0"
@@ -7017,6 +6613,7 @@ loose-envify@^1.0.0:
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -7026,7 +6623,7 @@ lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lru-cache@4.1.x, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -7034,13 +6631,6 @@ lru-cache@4.1.x, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-lru-cache@^4.0.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -7056,15 +6646,17 @@ lunr@^2.3.6:
 macos-release@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb"
+  integrity sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==
 
-macos-release@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
-  integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==
+macos-release@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
+  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
   dependencies:
     vlq "^0.2.2"
 
@@ -7082,6 +6674,14 @@ make-dir@^1.0.0, make-dir@^1.3.0:
   dependencies:
     pify "^3.0.0"
 
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
@@ -7114,14 +6714,17 @@ map-age-cleaner@^0.1.1:
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
+  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
 
 map-stream@~0.1.0:
   version "0.1.0"
@@ -7131,24 +6734,23 @@ map-stream@~0.1.0:
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 marked@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.1.tgz#a63addde477bca9613028de4b2bc3629e53a0562"
-  integrity sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==
-
-math-random@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
+  integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
 
 md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
 meant@^1.0.1:
   version "1.0.1"
@@ -7158,32 +6760,41 @@ meant@^1.0.1:
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.1.0.tgz#aeb9be2d21f47e78af29e4ac5978e8afa2ca5b8a"
-  integrity sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
   dependencies:
     map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
+    mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
 memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memory-pager@^1.0.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
+  integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==
+
 meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -7199,6 +6810,7 @@ meow@^3.7.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 merge-source-map@1.0.4:
   version "1.0.4"
@@ -7207,35 +6819,20 @@ merge-source-map@1.0.4:
   dependencies:
     source-map "^0.5.6"
 
-merge2@^1.2.1:
+merge2@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
+  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
 methods@^1.1.1, methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-
-micromatch@^2.3.11:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
 micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7254,23 +6851,32 @@ micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.34.0 < 2", mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+"mime-db@>= 1.38.0 < 2":
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
+  integrity sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==
+
+mime-db@~1.38.0:
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
+  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  version "2.1.22"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
   dependencies:
-    mime-db "~1.36.0"
+    mime-db "~1.38.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 mime@^1.4.1:
   version "1.6.0"
@@ -7278,13 +6884,19 @@ mime@^1.4.1:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.3.1, mime@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
+  integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+mimic-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 mingo@1:
   version "1.3.3"
@@ -7303,37 +6915,36 @@ mini-css-extract-plugin@0.5.0:
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
+minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.3.4, minipass@^2.3.5:
+minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -7341,12 +6952,6 @@ minipass@^2.3.4, minipass@^2.3.5:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  dependencies:
-    minipass "^2.2.1"
-
 minizlib@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
@@ -7389,6 +6994,7 @@ mississippi@^3.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -7403,7 +7009,8 @@ mixin-object@^2.0.1:
 
 mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
-  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
@@ -7429,11 +7036,12 @@ mongodb@3.2.2:
 mongoose-legacy-pluralize@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
+  integrity sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==
 
 mongoose@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.0.tgz#e1bf07cf9953840aaaafb25df163bc12ed70365c"
-  integrity sha512-GZdhdbTXTgikInIgtxR7ODcF3+MoJTumTsKYinX3zxJcQgMVr+Y0jBuFoLJ9YtVdF2nq1ukLnhS6RHfta1ptgQ==
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.1.tgz#a256a08241a1412bb307b85e7ece25629d0b4bbe"
+  integrity sha512-sVDyzADl0RbNvoRWLL/zQDqoFGi1IaSo5+DpOwhvGgFs3pSsvmONPNW3JF1KvZerNkkkGFb8ZMuFBeKEiDqZLw==
   dependencies:
     async "2.6.1"
     bson "~1.1.1"
@@ -7475,10 +7083,12 @@ move-concurrently@^1.0.1:
 mpath@0.5.1, mpath@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.5.1.tgz#17131501f1ff9e6e4fbc8ffa875aa7065b5775ab"
+  integrity sha512-H8OVQ+QEz82sch4wbODFOz+3YQ61FYz/z3eJ5pIdbMEaUzDqA268Wd+Vt4Paw9TJfvDgVKaayC0gBzMIw2jhsg==
 
 mquery@3.2.0, mquery@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/mquery/-/mquery-3.2.0.tgz#e276472abd5109686a15eb2a8e0761db813c81cc"
+  integrity sha512-qPJcdK/yqcbQiKoemAt62Y0BAc0fTEKo1IThodBD+O5meQRJT/2HSe5QpBNwaa4CjskoGrYWsEyjkqgiE0qjhg==
   dependencies:
     bluebird "3.5.1"
     debug "3.1.0"
@@ -7489,6 +7099,7 @@ mquery@3.2.0, mquery@^3.2.0:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@2.1.1, ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
@@ -7511,6 +7122,7 @@ multicast-dns@^6.0.1:
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
   dependencies:
     array-differ "^1.0.0"
     array-union "^1.0.1"
@@ -7528,12 +7140,14 @@ mx.ferreyra.callnumber@0.0.2:
   integrity sha512-J9FJiMrfWG9Q8AQEz/cgYLcXTTD/Z5+vfq29hn8K7yVWjxkSzr7zFi7Dpn8wcv2iKHBHDJY+U0z8yoAzDugXMw==
 
 nan@^2.10.0, nan@^2.9.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7547,40 +7161,34 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-
-ncp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
-  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
-
 needle@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.2.tgz#1120ca4c41f2fcc6976fd28a8968afe239929418"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.0.tgz#ce3fea21197267bacb310705a7bbe24f2a3a3492"
+  integrity sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==
   dependencies:
-    debug "^2.1.2"
+    debug "^4.1.0"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
-neo-async@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
+neo-async@^2.5.0, neo-async@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
 netmask@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
   integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
 
-next-tick@1:
+next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -7612,6 +7220,7 @@ node-forge@0.7.5:
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -7627,8 +7236,9 @@ node-gyp@^3.8.0:
     which "1"
 
 node-libs-browser@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
+  integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -7637,7 +7247,7 @@ node-libs-browser@^2.0.0:
     constants-browserify "^1.0.0"
     crypto-browserify "^3.11.0"
     domain-browser "^1.1.1"
-    events "^1.0.0"
+    events "^3.0.0"
     https-browserify "^1.0.0"
     os-browserify "^0.3.0"
     path-browserify "0.0.0"
@@ -7651,12 +7261,13 @@ node-libs-browser@^2.0.0:
     timers-browserify "^2.0.4"
     tty-browserify "0.0.0"
     url "^0.11.0"
-    util "^0.10.3"
+    util "^0.11.0"
     vm-browserify "0.0.4"
 
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -7669,10 +7280,10 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.3:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.8.tgz#32a63fff63c5e51b7e0f540ac95947d220fc6862"
-  integrity sha512-gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA==
+node-releases@^1.1.13:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
+  integrity sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==
   dependencies:
     semver "^5.3.0"
 
@@ -7704,32 +7315,26 @@ node-sass@4.11.0, node-sass@^4.10.0, node-sass@^4.11.0:
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.1.tgz#bce5c42446a3291f47622a370abbf158fbbacbfd"
+  integrity sha1-vOXEJEajKR9HYio3CrvxWPu6y/0=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-package-data@^2.4.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7739,9 +7344,10 @@ normalize-package-data@^2.4.0:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
@@ -7753,10 +7359,12 @@ normalize-path@^3.0.0:
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
 npm-bundled@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
+  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
 
 npm-package-arg@6.1.0, npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
@@ -7768,7 +7376,7 @@ npm-package-arg@6.1.0, npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.12:
+npm-packlist@^1.1.12, npm-packlist@^1.1.6:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
   integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
@@ -7776,13 +7384,6 @@ npm-packlist@^1.1.12:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-packlist@^1.1.6:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
 npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
@@ -7807,12 +7408,14 @@ npm-registry-fetch@^3.8.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"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -7822,6 +7425,7 @@ npm-run-path@^2.0.0:
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
   dependencies:
     boolbase "~1.0.0"
 
@@ -7833,26 +7437,32 @@ null-check@^1.0.0:
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1, object-assign@latest:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -7869,26 +7479,21 @@ object-inspect@~1.6.0:
   integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
 
 object-keys@^1.0.12, object-keys@^1.0.6:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
@@ -7907,16 +7512,19 @@ obuf@^1.0.0, obuf@^1.1.2:
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+on-headers@~1.0.1, on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
@@ -7927,6 +7535,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+open@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
+  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+  dependencies:
+    is-wsl "^1.1.0"
+
 opencollective@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
@@ -7952,23 +7567,17 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@5.4.0, opn@^5.1.0, opn@latest:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
-  dependencies:
-    is-wsl "^1.1.0"
-
-opn@^5.2.0:
+opn@^5.1.0, opn@^5.2.0, opn@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
   integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
   dependencies:
     is-wsl "^1.1.0"
 
-opn@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+opn@latest:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-6.0.0.tgz#3c5b0db676d5f97da1233d1ed42d182bc5a27d2d"
+  integrity sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7982,11 +7591,12 @@ optimism@^0.6.9:
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optionator@^0.8.1, optionator@^0.8.2:
+optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
   integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
@@ -8008,20 +7618,24 @@ original@^1.0.0:
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
@@ -8039,25 +7653,28 @@ os-locale@^3.0.0, os-locale@^3.1.0:
 os-name@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-2.0.1.tgz#b9a386361c17ae3a21736ef0599405c9a8c5dc5e"
+  integrity sha1-uaOGNhwXrjohc27wWZQFyajF3F4=
   dependencies:
     macos-release "^1.0.0"
     win-release "^1.0.0"
 
 os-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.0.0.tgz#e1434dbfddb8e74b44c98b56797d951b7648a5d9"
-  integrity sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
   dependencies:
-    macos-release "^2.0.0"
+    macos-release "^2.2.0"
     windows-release "^3.1.0"
 
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -8070,28 +7687,31 @@ p-defer@^1.0.0:
 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@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
-  integrity sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
 p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
-  integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
   dependencies:
     p-try "^2.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
@@ -8110,11 +7730,12 @@ p-map@^1.1.1:
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pac-proxy-agent@^3.0.0:
   version "3.0.0"
@@ -8189,14 +7810,10 @@ pako@^0.2.5:
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
   integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
-pako@~1.0.2:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4"
-  integrity sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==
-
-pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+pako@~1.0.2, pako@~1.0.5:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
@@ -8208,33 +7825,28 @@ parallel-transform@^1.1.0:
     readable-stream "^2.1.5"
 
 parse-asn1@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
+  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
     create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
+    safe-buffer "^5.1.1"
 
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -8267,6 +7879,7 @@ parse5@4.0.0:
 parse5@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
   dependencies:
     "@types/node" "*"
 
@@ -8278,46 +7891,55 @@ parse5@^5.1.0:
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -8325,24 +7947,29 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2:
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5, path-parse@^1.0.6:
+path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-to-regexp@^1.0.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
   dependencies:
     isarray "0.0.1"
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -8351,24 +7978,28 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 pause-stream@0.0.11, pause-stream@^0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
+  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
   dependencies:
     through "~2.3"
 
 pbkdf2@^3.0.3:
-  version "3.0.16"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -8399,6 +8030,7 @@ pdfmake@^0.1.53:
 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=
 
 phonegap-plugin-barcodescanner@^8.0.1:
   version "8.0.1"
@@ -8408,37 +8040,29 @@ phonegap-plugin-barcodescanner@^8.0.1:
 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=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-pkg-conf@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.1.0.tgz#2126514ca6f2abfebd168596df18ba57867f0058"
-  integrity sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=
-  dependencies:
-    find-up "^2.0.0"
-    load-json-file "^4.0.0"
-
-pkg-config@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pkg-config/-/pkg-config-1.1.1.tgz#557ef22d73da3c8837107766c52eadabde298fe4"
-  integrity sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=
-  dependencies:
-    debug-log "^1.0.0"
-    find-root "^1.0.0"
-    xtend "^4.0.1"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^2.0.0:
   version "2.0.0"
@@ -8464,6 +8088,7 @@ please-upgrade-node@^3.1.1:
 plist@2.1.0, plist@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025"
+  integrity sha1-V8zbeggh3yGDEhejytVOPhRqECU=
   dependencies:
     base64-js "1.2.0"
     xmlbuilder "8.2.2"
@@ -8478,20 +8103,15 @@ plist@^3.0.1:
     xmlbuilder "^9.0.7"
     xmldom "0.1.x"
 
-pluralize@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
-
 png-js@>=0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/png-js/-/png-js-0.1.1.tgz#1cc7c212303acabe74263ec3ac78009580242d93"
   integrity sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=
 
 pngjs@^3.3.0:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz#85173703bde3edac8998757b96e5821d0966a21b"
-  integrity sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
 portfinder@^1.0.9:
   version "1.0.20"
@@ -8505,6 +8125,7 @@ portfinder@^1.0.9:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-import@12.0.1:
   version "12.0.1"
@@ -8534,11 +8155,7 @@ postcss-loader@3.0.0:
     postcss-load-config "^2.0.0"
     schema-utils "^1.0.0"
 
-postcss-value-parser@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-
-postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   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==
@@ -8555,6 +8172,7 @@ postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13:
 postcss@^6.0.17, postcss@^6.0.21:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
@@ -8570,22 +8188,15 @@ prepend-http@^1.0.1:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 promise-inflight@^1.0.1:
   version "1.0.1"
@@ -8607,17 +8218,10 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.6.0:
-  version "15.7.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.1.tgz#2fa61e0a699d428b40320127733ee2931f05d9d1"
-  integrity sha512-f8Lku2z9kERjOCcnDOPm68EBJAO2K00Q5mSgPAUE/gJuBgsYLbVy6owSrtcHj90zt8PvW+z0qaIIgsIhHOa1Qw==
-  dependencies:
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
 properties-parser@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/properties-parser/-/properties-parser-0.2.3.tgz#f7591255f707abbff227c7b56b637dbb0373a10f"
+  integrity sha1-91kSVfcHq7/yJ8e1a2N9uwNzoQ8=
 
 protoduck@^5.0.1:
   version "5.0.1"
@@ -8647,9 +8251,10 @@ protractor@^5.4.2:
     webdriver-js-extender "2.1.0"
     webdriver-manager "^12.0.6"
 
-proxy-addr@~2.0.3, proxy-addr@~2.0.4:
+proxy-addr@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
   dependencies:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
@@ -8676,28 +8281,34 @@ proxy-from-env@^1.0.0:
 proxy-middleware@^0.15.0, proxy-middleware@latest:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/proxy-middleware/-/proxy-middleware-0.15.0.tgz#a3fdf1befb730f951965872ac2f6074c61477a56"
+  integrity sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=
 
 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=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
 
 public-encrypt@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
     create-hash "^1.1.0"
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
 
 pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
@@ -8727,10 +8338,12 @@ pumpify@^1.3.3:
 punycode@1.3.2:
   version "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:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
@@ -8740,10 +8353,12 @@ punycode@^2.1.0:
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
 
 q@^1.4.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qjobs@^1.1.4:
   version "1.2.0"
@@ -8761,31 +8376,30 @@ qrcode@^1.3.3:
     pngjs "^3.3.0"
     yargs "^12.0.5"
 
-qs@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
-qs@6.5.2, qs@^6.4.0, qs@~6.5.2:
+qs@6.5.2, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
-  integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
+qs@^6.4.0, qs@^6.6.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
-  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
@@ -8796,23 +8410,17 @@ quote-stream@^1.0.1, quote-stream@~1.0.2:
     minimist "^1.1.3"
     through2 "^2.0.0"
 
-randomatic@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -8820,15 +8428,7 @@ randomfill@^1.0.3:
 range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
-    unpipe "1.0.0"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raw-body@2.3.3, raw-body@^2.2.0:
   version "2.3.3"
@@ -8843,6 +8443,7 @@ raw-body@2.3.3, raw-body@^2.2.0:
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
+  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
   dependencies:
     bytes "1"
     string_decoder "0.10"
@@ -8858,17 +8459,13 @@ raw-loader@1.0.0:
 rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-is@^16.8.1:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb"
-  integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA==
-
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -8879,6 +8476,7 @@ read-cache@^1.0.0:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -8886,6 +8484,7 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -8893,6 +8492,7 @@ read-pkg-up@^2.0.0:
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -8901,6 +8501,7 @@ read-pkg@^1.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=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -8918,6 +8519,7 @@ read-pkg@^4.0.1:
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -8937,42 +8539,16 @@ readable-stream@1.1.x:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-"readable-stream@2 || 3":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
-  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@3, readable-stream@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
-  integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.0.6.tgz#351302e4c68b5abd6a2ed55376a7f9a25be3057a"
+"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  dependencies:
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
-
-readdirp@^2.2.1:
+readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
   integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
@@ -8991,15 +8567,12 @@ rechoir@^0.6.2:
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
-reflect-metadata@*, reflect-metadata@^0.1.10, reflect-metadata@^0.1.2:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
-
-reflect-metadata@^0.1.13:
+reflect-metadata@*, reflect-metadata@^0.1.10, reflect-metadata@^0.1.13, reflect-metadata@^0.1.2:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
   integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
@@ -9024,15 +8597,10 @@ regenerator-runtime@^0.13.2:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
   integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
 
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -9040,6 +8608,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexp-clone@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-0.0.1.tgz#a7c2e09891fdbf38fbb10d376fb73003e68ac589"
+  integrity sha1-p8LgmJH9vzj7sQ03b7cwA+aKxYk=
 
 regexpu-core@^1.0.0:
   version "1.0.0"
@@ -9080,24 +8649,29 @@ regjsparser@^0.1.4:
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 request@^2.83.0, 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==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -9123,6 +8697,7 @@ request@^2.83.0, request@^2.87.0, request@^2.88.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-from-string@^2.0.1:
   version "2.0.2"
@@ -9132,23 +8707,17 @@ require-from-string@^2.0.1:
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-require-uncached@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 require_optional@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.1.tgz#4cf35a4247f64ca3df8c2ef208cc494b1ca8fc2e"
+  integrity sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==
   dependencies:
     resolve-from "^2.0.0"
     semver "^5.1.0"
@@ -9165,14 +8734,10 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
 resolve-from@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+  integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=
 
 resolve-from@^3.0.0:
   version "3.0.0"
@@ -9182,31 +8747,20 @@ resolve-from@^3.0.0:
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.5, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.3, resolve@^1.5.0:
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.4.0, resolve@~1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.1.6, resolve@^1.3.2, resolve@^1.4.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  dependencies:
-    path-parse "^1.0.5"
-
-resolve@~1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
-  integrity sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==
-  dependencies:
-    path-parse "^1.0.5"
-
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -9232,6 +8786,7 @@ resumer@~0.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
@@ -9246,16 +8801,11 @@ rfdc@^1.1.2:
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  dependencies:
-    glob "^7.0.5"
-
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimraf@~2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -9265,6 +8815,7 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimra
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -9272,6 +8823,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 rollup-plugin-commonjs@8.2.6:
   version "8.2.6"
   resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz#27e5b9069ff94005bb01e01bb46a1e4873784677"
+  integrity sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==
   dependencies:
     acorn "^5.2.1"
     estree-walker "^0.5.0"
@@ -9282,6 +8834,7 @@ rollup-plugin-commonjs@8.2.6:
 rollup-plugin-node-resolve@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
+  integrity sha1-i4l8TDAw1QASd7BRSyXSygloPuA=
   dependencies:
     browser-resolve "^1.11.0"
     builtin-modules "^1.1.0"
@@ -9289,15 +8842,17 @@ rollup-plugin-node-resolve@3.0.0:
     resolve "^1.1.6"
 
 rollup-pluginutils@^2.0.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.1.tgz#760d185ccc237dedc12d7ae48c6bcd127b4892d0"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz#203706edd43dfafeaebc355d7351119402fc83ad"
+  integrity sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ==
   dependencies:
-    estree-walker "^0.5.2"
-    micromatch "^2.3.11"
+    estree-walker "^0.6.0"
+    micromatch "^3.1.10"
 
 rollup@0.50.0:
   version "0.50.0"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.50.0.tgz#4c158f4e780e6cb33ff0dbfc184a52cc58cd5f3b"
+  integrity sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==
 
 rsvp@^3.0.21:
   version "3.6.2"
@@ -9316,11 +8871,6 @@ run-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
   integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
 
-run-parallel@^1.1.2:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
-  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
-
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -9328,18 +8878,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-  integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
-
 rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
@@ -9360,13 +8898,6 @@ rxjs-tslint@0.1.5:
     tslint "^5.9.1"
     tsutils "^2.25.0"
 
-rxjs@6.2.2, rxjs@~6.2.0:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
-  integrity sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==
-  dependencies:
-    tslib "^1.9.0"
-
 rxjs@6.3.3:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
@@ -9381,35 +8912,44 @@ rxjs@^6.1.0, rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-json-parse@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
+  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-saslprep@1.0.1, saslprep@^1.0.0:
+saslprep@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.1.tgz#b644e0ba25b156b652f3cb90df7542f896049ba6"
+  integrity sha512-ntN6SbE3hRqd45PKKadRPgA+xHPWg5lPSj2JWJdJvjTwXDDfkPVtXWvP8jJojvnm+rAsZ2b299C5NwZqq818EA==
+
+saslprep@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.2.tgz#da5ab936e6ea0bbae911ffec77534be370c9f52d"
+  integrity sha512-4cDsYuAjXssUSjxHKRe4DTZC0agDwsCqcMqtJAQPzC74nJ7LfAJflAtC1Zed5hMzEQKj82d3tuzqdGNRsLJ4Gw==
+  dependencies:
+    sparse-bitfield "^3.0.3"
 
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -9448,6 +8988,7 @@ save@^2.3.3:
 sax@0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.3.5.tgz#88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"
+  integrity sha1-iPz8H3PAyLvVt8d2ttPzUB7tBz0=
 
 sax@0.5.x:
   version "0.5.8"
@@ -9462,6 +9003,7 @@ sax@1.1.4:
 sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schema-utils@^0.3.0:
   version "0.3.0"
@@ -9490,6 +9032,7 @@ schema-utils@^1.0.0:
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -9542,9 +9085,10 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
 semver@5.1.0:
   version "5.1.0"
@@ -9556,17 +9100,20 @@ semver@5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-semver@5.6.0, semver@^5.0.0, semver@^5.0.3, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+semver@5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
 send@0.16.2, send@latest:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -9603,6 +9150,7 @@ serve-index@^1.7.2, serve-index@^1.9.1:
 serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -9612,18 +9160,22 @@ serve-static@1.13.2:
 serviceworker-cache-polyfill@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
+  integrity sha1-3hnuc77yGrPAdAo3sz22JGS6ves=
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@^1.0.1, set-immediate-shim@~1.0.1:
+set-immediate-shim@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -9633,6 +9185,7 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -9642,18 +9195,17 @@ set-value@^2.0.0:
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -9675,16 +9227,19 @@ shallow-copy@~0.0.1:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shelljs@0.5.3, shelljs@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"
+  integrity sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=
 
 shelljs@^0.8.1:
   version "0.8.3"
@@ -9703,23 +9258,18 @@ sift@7.0.1:
 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=
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
-slice-ansi@1.0.0, slice-ansi@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-
 slice-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -9732,6 +9282,7 @@ slice-ansi@^2.0.0:
 sliced@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41"
+  integrity sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=
 
 smart-buffer@4.0.2:
   version "4.0.2"
@@ -9741,6 +9292,7 @@ smart-buffer@4.0.2:
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -9749,12 +9301,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -9860,15 +9414,7 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
-socks-proxy-agent@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
-  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
-  dependencies:
-    agent-base "~4.2.0"
-    socks "~2.2.0"
-
-socks-proxy-agent@^4.0.1:
+socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
   integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
@@ -9876,14 +9422,6 @@ socks-proxy-agent@^4.0.1:
     agent-base "~4.2.1"
     socks "~2.3.2"
 
-socks@~2.2.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.3.tgz#7399ce11e19b2a997153c983a9ccb6306721f2dc"
-  integrity sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==
-  dependencies:
-    ip "^1.1.5"
-    smart-buffer "4.0.2"
-
 socks@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
@@ -9893,8 +9431,9 @@ socks@~2.3.2:
     smart-buffer "4.0.2"
 
 source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-list-map@~0.1.7:
   version "0.1.8"
@@ -9912,6 +9451,7 @@ source-map-loader@0.2.4:
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -9919,7 +9459,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.9:
+source-map-support@0.5.10:
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
   integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
@@ -9927,6 +9467,14 @@ source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@^0.5.6,
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@~0.4.0:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
@@ -9934,17 +9482,10 @@ source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@~0.5.10:
-  version "0.5.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@0.1.x, source-map@~0.1.30:
   version "0.1.43"
@@ -9966,43 +9507,57 @@ source-map@0.7.3:
 source-map@^0.4.2, source-map@~0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 sourcemap-codec@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
   integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
 
+sparse-bitfield@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11"
+  integrity sha1-/0rm5oZWBWuks+eSqzM004JzyhE=
+  dependencies:
+    memory-pager "^1.0.2"
+
 spdx-correct@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
 spdx-expression-parse@^3.0.0:
   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==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
+  integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -10037,6 +9592,7 @@ speed-measure-webpack-plugin@1.3.1:
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
@@ -10057,6 +9613,7 @@ split@0.3:
 split@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
@@ -10068,25 +9625,26 @@ sprintf-js@^1.1.2:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 ssh-config@^1.1.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ssh-config/-/ssh-config-1.1.5.tgz#a2d398c611a65c60d101e5b0f976c01f4739a28e"
-  integrity sha512-j3Yo++WWfc+2eFrSFclQZ79RRyMF2BOkDLboaUxyysYNomrLjIoOWanFbulHH5fLErRuW8YrO31p7MKpI4XrZw==
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/ssh-config/-/ssh-config-1.1.6.tgz#c6ce2d7f85f395178c9e47c448d62b8adf9b2523"
+  integrity sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==
 
 sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
 ssr-window@^1.0.1:
@@ -10108,31 +9666,6 @@ ssri@^6.0.0, ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-standard-engine@~8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-8.0.1.tgz#0b77be8d7ab963675717dbeac1ef1d6675fb62f0"
-  integrity sha512-LA531C3+nljom/XRvdW/hGPXwmilRkaRkENhO3FAGF1Vtq/WtCXzgmnc5S6vUHHsgv534MRy02C1ikMwZXC+tw==
-  dependencies:
-    deglob "^2.1.0"
-    get-stdin "^6.0.0"
-    minimist "^1.1.0"
-    pkg-conf "^2.0.0"
-
-standard@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/standard/-/standard-11.0.1.tgz#49be40c76f1d564964b22bbf7309929ad0335e29"
-  integrity sha512-nu0jAcHiSc8H+gJCXeiziMVZNDYi8MuqrYJKxTgjP4xKXZMKm311boqQIzDrYI/ktosltxt2CbDjYQs9ANC8IA==
-  dependencies:
-    eslint "~4.18.0"
-    eslint-config-standard "11.0.0"
-    eslint-config-standard-jsx "5.0.0"
-    eslint-plugin-import "~2.9.0"
-    eslint-plugin-node "~6.0.0"
-    eslint-plugin-promise "~3.7.0"
-    eslint-plugin-react "~7.7.0"
-    eslint-plugin-standard "~3.0.1"
-    standard-engine "~8.0.0"
-
 static-eval@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
@@ -10143,6 +9676,7 @@ static-eval@^2.0.0:
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -10174,27 +9708,32 @@ stats-webpack-plugin@0.7.0:
   dependencies:
     lodash "^4.17.4"
 
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
 
 statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
   dependencies:
     readable-stream "^2.0.1"
 
 stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -10209,7 +9748,8 @@ stream-combiner2@^1.1.1:
 
 stream-combiner@^0.2.2:
   version "0.2.2"
-  resolved "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
+  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
+  integrity sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=
   dependencies:
     duplexer "~0.1.1"
     through "~2.3.4"
@@ -10232,6 +9772,7 @@ stream-each@^1.1.0:
 stream-http@^2.7.2:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -10244,10 +9785,10 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
   integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
-streamroller@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.3.tgz#cb51e7e382f799a9381a5d7490ce3053b325fba3"
-  integrity sha512-P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg==
+streamroller@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.4.tgz#d485c7624796d5e2eb34190c79afcbf006afb5e6"
+  integrity sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==
   dependencies:
     async "^2.6.1"
     date-format "^2.0.0"
@@ -10258,10 +9799,12 @@ streamroller@^1.0.1:
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
+  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -10270,18 +9813,19 @@ string-width@^1.0.1, string-width@^1.0.2:
 "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
 string-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1"
-  integrity sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
   dependencies:
     emoji-regex "^7.0.1"
     is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
 
 string.prototype.trim@~1.1.2:
   version "1.1.2"
@@ -10295,55 +9839,71 @@ string.prototype.trim@~1.1.2:
 string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  dependencies:
+    safe-buffer "~5.1.0"
 
-string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1:
+string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^4.1.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 stripe@^6.28.0:
   version "6.28.0"
@@ -10410,16 +9970,19 @@ superagent@^4.1.0:
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^4.2.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+  integrity sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=
   dependencies:
     has-flag "^2.0.0"
 
 supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
@@ -10451,31 +10014,20 @@ symbol-observable@1.2.0, symbol-observable@^1.0.2:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-  integrity sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==
-  dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
-
 tapable@^0.2.7:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.9.tgz#af2d8bbc9b04f74ee17af2b4d9048f807acd18a8"
+  integrity sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==
 
 tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
-  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tape@^4.8.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/tape/-/tape-4.10.0.tgz#c915fcd7595e53f089bc4f99d12c10eda9f6e4f6"
-  integrity sha512-3PgdF0vcZ1t7HEYbpTXdo58KXi19QCGcZfj07A53M2DH14P2Fw3cB3f9pF7e/Br2z+PQm7xlvhjzHH3D8ti99g==
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/tape/-/tape-4.10.1.tgz#f73be60888dcb120f08b57f947af65a829506a5f"
+  integrity sha512-G0DywYV1jQeY3axeYnXUOt6ktnxS9OPJh97FGR3nrua8lhWi1zPflLxcAHavZ7Jf3qUfY7cxcVIVFa4mY2IY1w==
   dependencies:
     deep-equal "~1.0.1"
     defined "~1.0.0"
@@ -10486,7 +10038,7 @@ tape@^4.8.0:
     inherits "~2.0.3"
     minimist "~1.2.0"
     object-inspect "~1.6.0"
-    resolve "~1.7.1"
+    resolve "~1.10.0"
     resumer "~0.0.0"
     string.prototype.trim "~1.1.2"
     through "~2.3.8"
@@ -10494,24 +10046,13 @@ tape@^4.8.0:
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  dependencies:
-    chownr "^1.0.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
-tar@^4.3.0, tar@^4.4.8:
+tar@^4, tar@^4.3.0, tar@^4.4.8:
   version "4.4.8"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
   integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
@@ -10531,7 +10072,7 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.2, terser-webpack-plugin@^1.1.0:
+terser-webpack-plugin@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
   integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
@@ -10545,7 +10086,7 @@ terser-webpack-plugin@1.2.2, terser-webpack-plugin@^1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser-webpack-plugin@^1.2.3:
+terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
   integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
@@ -10559,16 +10100,7 @@ terser-webpack-plugin@^1.2.3:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser@^3.16.1:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
-  integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
-    source-map-support "~0.5.9"
-
-terser@^3.17.0:
+terser@^3.16.1, terser@^3.17.0:
   version "3.17.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
   integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
@@ -10577,12 +10109,7 @@ terser@^3.17.0:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
-text-table@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
-through2@^2.0.0, through2@^2.0.3, through2@~2.0.3:
+through2@^2.0.0, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -10591,16 +10118,16 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.3:
     xtend "~4.0.1"
 
 through2@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.0.tgz#468b461df9cd9fcc170f22ebf6852e467e578ff2"
-  integrity sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
   dependencies:
     readable-stream "2 || 3"
-    xtend "~4.0.1"
 
 through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4, 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=
 
 thunkify@^2.1.2:
   version "2.1.2"
@@ -10615,6 +10142,7 @@ thunky@^1.0.2:
 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.0:
   version "4.0.1"
@@ -10624,6 +10152,7 @@ timed-out@^4.0.0:
 timers-browserify@^2.0.4:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
   dependencies:
     setimmediate "^1.0.4"
 
@@ -10635,6 +10164,7 @@ tiny-inflate@^1.0.0, tiny-inflate@^1.0.2:
 tiny-lr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
+  integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
   dependencies:
     body "^5.1.0"
     debug "^3.1.0"
@@ -10660,10 +10190,12 @@ tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
@@ -10678,12 +10210,14 @@ to-fast-properties@^2.0.0:
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -10691,6 +10225,7 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -10700,6 +10235,7 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 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"
@@ -10707,11 +10243,7 @@ tough-cookie@~2.4.3:
 traverse@^0.6.6:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
-
-tree-kill@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
-  integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
+  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
 
 tree-kill@1.2.1:
   version "1.2.1"
@@ -10721,6 +10253,7 @@ tree-kill@1.2.1:
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-right@^1.0.1:
   version "1.0.1"
@@ -10730,6 +10263,7 @@ trim-right@^1.0.1:
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
   dependencies:
     glob "^7.1.2"
 
@@ -10746,9 +10280,9 @@ ts-invariant@^0.2.1:
     tslib "^1.9.3"
 
 ts-invariant@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz#89a2ffeb70879b777258df1df1c59383c35209b0"
-  integrity sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.3.tgz#b5742b1885ecf9e29c31a750307480f045ec0b16"
+  integrity sha512-UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ==
   dependencies:
     tslib "^1.9.3"
 
@@ -10766,6 +10300,7 @@ ts-node@^8.0.3:
 ts-simple-ast@12.4.0:
   version "12.4.0"
   resolved "https://registry.yarnpkg.com/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz#6b53f6d6a59145da637dfe0e8c646d1e66ba278a"
+  integrity sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==
   dependencies:
     "@dsherret/to-absolute-glob" "^2.0.2"
     code-block-writer "^7.2.0"
@@ -10781,19 +10316,21 @@ ts-simple-ast@12.4.0:
 tslib@^1.0.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tslint-eslint-rules@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba"
+  integrity sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=
   dependencies:
     doctrine "^0.7.2"
     tslib "^1.0.0"
     tsutils "^1.4.0"
 
-tslint@^5.14.0:
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e"
-  integrity sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==
+tslint@^5.14.0, tslint@^5.8.0, tslint@^5.9.1:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
+  integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -10801,7 +10338,7 @@ tslint@^5.14.0:
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     resolve "^1.3.2"
@@ -10809,64 +10346,34 @@ tslint@^5.14.0:
     tslib "^1.8.0"
     tsutils "^2.29.0"
 
-tslint@^5.8.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.7.0"
-    minimatch "^3.0.4"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.27.2"
-
-tslint@^5.9.1:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1"
-  integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==
-  dependencies:
-    babel-code-frame "^6.22.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.7.0"
-    minimatch "^3.0.4"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.27.2"
-
 tsutils@^1.4.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
+  integrity sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=
 
-tsutils@^2.25.0, tsutils@^2.27.2, tsutils@^2.29.0:
+tsutils@^2.25.0, tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
@@ -10875,9 +10382,10 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.15, type-is@~1.6.16:
+type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.18"
@@ -10890,11 +10398,7 @@ typedarray@^0.0.6:
 typescript@2.9.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
-
-typescript@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
-  integrity sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==
+  integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
 typescript@3.2.4, typescript@~3.2.4:
   version "3.2.4"
@@ -10904,10 +10408,12 @@ typescript@3.2.4, typescript@~3.2.4:
 typescript@^2.4.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
+  integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
 typescript@~2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
+  integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=
 
 typescript@~3.3.3333:
   version "3.3.4000"
@@ -10917,6 +10423,7 @@ typescript@~3.3.3333:
 uglify-es@3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.2.2.tgz#15c62b7775002c81b7987a1c49ecd3f126cace73"
+  integrity sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==
   dependencies:
     commander "~2.12.1"
     source-map "~0.6.1"
@@ -10924,6 +10431,7 @@ uglify-es@3.2.2:
 uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
   dependencies:
     source-map "~0.5.1"
     yargs "~3.10.0"
@@ -10931,20 +10439,22 @@ uglify-js@^2.8.29:
     uglify-to-browserify "~1.0.0"
 
 uglify-js@^3.1.4:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.4.tgz#4a64d57f590e20a898ba057f838dcdfb67a939b9"
+  integrity sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.20.0"
     source-map "~0.6.1"
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
 uglifyjs-webpack-plugin@^0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+  integrity sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=
   dependencies:
     source-map "^0.5.6"
     uglify-js "^2.8.29"
@@ -10953,14 +10463,17 @@ uglifyjs-webpack-plugin@^0.4.6:
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
-underscore@^1.8.3:
+underscore@*, underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
+  integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
 
 unicode-properties@^1.0.0:
   version "1.1.0"
@@ -10981,17 +10494,13 @@ unicode-trie@^0.3.0:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
 unique-filename@^1.1.0, unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
@@ -11016,22 +10525,27 @@ unique-string@^1.0.0:
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unix-crypt-td-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
+  integrity sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
 
-unorm@^1.3.3:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.4.1.tgz#364200d5f13646ca8bcd44490271335614792300"
+unorm@*, unorm@^1.3.3:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
+  integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -11046,11 +10560,7 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.0.5, upath@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-
-upath@^1.1.1:
+upath@^1.0.5, upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
@@ -11081,6 +10591,7 @@ uri-js@^4.2.2:
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
@@ -11090,9 +10601,9 @@ url-parse-lax@^1.0.0:
     prepend-http "^1.0.1"
 
 url-parse@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.5.tgz#04cbb6ba2be682a18e4417fa2245aa7e3dfdcc50"
+  integrity sha512-4XDvC5vZRjEpjP0L4znrWeoH8P8F0XGBlfLdABi/6oV4o8xUVbTpyrxWHxkK2bT0pSIpcjdIzSoWUhlUfawCAQ==
   dependencies:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
@@ -11100,6 +10611,7 @@ url-parse@^1.4.3:
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -11107,6 +10619,7 @@ url@^0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 useragent@2.3.0:
   version "2.3.0"
@@ -11119,30 +10632,36 @@ useragent@2.3.0:
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
-util@^0.10.3:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
   dependencies:
     inherits "2.0.3"
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.0, uuid@^3.0.1, uuid@^3.2.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -11162,10 +10681,12 @@ validator@^10.11.0:
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -11174,14 +10695,17 @@ verror@1.10.0:
 viz.js@^1.8.0:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a"
+  integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==
 
 vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
 
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
   dependencies:
     indexof "0.0.1"
 
@@ -11237,9 +10761,9 @@ webdriver-manager@^12.0.6:
     xml2js "^0.4.17"
 
 webpack-bundle-analyzer@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz#2f19cbb87bb6d4f3cb4e59cb67c837bd9436e89d"
-  integrity sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz#3da733a900f515914e729fcebcd4c40dde71fc6f"
+  integrity sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==
   dependencies:
     acorn "^6.0.7"
     acorn-walk "^6.1.1"
@@ -11334,7 +10858,7 @@ webpack-merge@4.2.1, webpack-merge@^4.2.1:
   dependencies:
     lodash "^4.17.5"
 
-webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
+webpack-sources@1.3.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
   integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
@@ -11342,13 +10866,6 @@ webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-s
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-sources@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
 webpack-subresource-integrity@1.1.0-rc.6:
   version "1.1.0-rc.6"
   resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
@@ -11417,6 +10934,7 @@ webpack@4.29.0:
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
   dependencies:
     http-parser-js ">=0.4.0"
     websocket-extensions ">=0.1.1"
@@ -11424,6 +10942,7 @@ websocket-driver@>=0.5.1:
 websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
 when@~3.6.x:
   version "3.6.4"
@@ -11433,20 +10952,24 @@ when@~3.6.x:
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@1, which@^1.2.1, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
@@ -11460,6 +10983,7 @@ widest-line@^2.0.0:
 win-release@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/win-release/-/win-release-1.1.1.tgz#5fa55e02be7ca934edfc12665632e849b72e5209"
+  integrity sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=
   dependencies:
     semver "^5.0.1"
 
@@ -11471,21 +10995,24 @@ window-or-global@^1.0.1:
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
 windows-release@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e"
-  integrity sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
 
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 wordwrap@~1.0.0:
   version "1.0.0"
@@ -11501,7 +11028,8 @@ worker-farm@^1.5.2:
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -11523,9 +11051,10 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@1:
+wrappy@*, wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
   version "2.4.2"
@@ -11536,32 +11065,19 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608"
+  integrity sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
-ws@^6.0.0:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
-  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
-  dependencies:
-    async-limiter "~1.0.0"
-
-ws@^6.1.4:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526"
-  integrity sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==
+ws@^6.0.0, ws@^6.1.4:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
@@ -11575,9 +11091,9 @@ ws@~3.3.1:
     ultron "~1.1.0"
 
 ws@~6.1.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
-  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
   dependencies:
     async-limiter "~1.0.0"
 
@@ -11597,18 +11113,22 @@ xml2js@^0.4.17, xml2js@^0.4.19, xml2js@~0.4.19:
 xmlbuilder@8.2.2:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
+  integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=
 
 xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmldom@0.1.x:
+xmldom@*, xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
+  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
 xregexp@2.0.0:
   version "2.0.0"
@@ -11620,13 +11140,15 @@ xregexp@4.0.0:
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
   integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
-xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
@@ -11636,10 +11158,12 @@ y18n@^3.2.1:
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
 yargs-parser@^10.1.0:
   version "10.1.0"
@@ -11667,12 +11191,14 @@ yargs-parser@^13.0.0:
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
   dependencies:
     camelcase "^4.1.0"
 
@@ -11751,6 +11277,7 @@ yargs@^13.2.2:
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -11769,6 +11296,7 @@ yargs@^7.0.0:
 yargs@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A=
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -11787,6 +11315,7 @@ yargs@^8.0.2:
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
   dependencies:
     camelcase "^1.0.2"
     cliui "^2.1.0"
@@ -11796,18 +11325,12 @@ yargs@~3.10.0:
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.0.0.tgz#0073c6b56e92aed652fbdfd62431f2d6b9a7a091"
-  integrity sha512-+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q==
-
-zen-observable-ts@^0.8.15:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz#6cf7df6aa619076e4af2f707ccf8a6290d26699b"
-  integrity sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==
-  dependencies:
-    zen-observable "^0.8.0"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.0.tgz#fcbe2db63610361afcc5eb9e0ac91e976d046114"
+  integrity sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg==
 
 zen-observable-ts@^0.8.18:
   version "0.8.18"
@@ -11818,8 +11341,9 @@ zen-observable-ts@^0.8.18:
     zen-observable "^0.8.0"
 
 zen-observable@^0.8.0:
-  version "0.8.9"
-  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.9.tgz#0475c760ff0eda046bbdfa4dc3f95d392807ac53"
+  version "0.8.14"
+  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
+  integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
 zone.js@^0.9.0:
   version "0.9.0"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index cdcc17313..8edeeb93d 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -62,7 +62,7 @@
 		"@angular/http": "^7.2.11",
 		"@angular/platform-browser": "^7.2.11",
 		"@angular/platform-browser-dynamic": "^7.2.11",
-		"@angular/pwa": "^0.13.7",
+		"@angular/pwa": "^0.13.8",
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
@@ -170,21 +170,19 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "^0.13.6",
-		"@angular-devkit/build-angular": "^0.13.7",
-		"@angular-devkit/build-optimizer": "^0.13.7",
-		"@angular-devkit/core": "^7.3.6",
-		"@angular-devkit/schematics": "^7.3.6",
-		"@angular/cli": "^7.3.7",
-		"@angular/compiler": "^7.2.9",
-		"@angular/compiler-cli": "^7.2.9",
-		"@angular/language-service": "^7.2.9",
+		"@angular-devkit/architect": "^0.13.8",
+		"@angular-devkit/build-angular": "^0.13.8",
+		"@angular-devkit/build-optimizer": "^0.13.8",
+		"@angular-devkit/core": "^7.3.8",
+		"@angular-devkit/schematics": "^7.3.8",
+		"@angular/cli": "^7.3.8",
+		"@angular/compiler": "^7.2.12",
+		"@angular/compiler-cli": "^7.2.12",
+		"@angular/language-service": "^7.2.12",
 		"@compodoc/compodoc": "^1.1.9",
-		"@ionic/angular-toolkit": "^1.4.0",
+		"@ionic/angular-toolkit": "^1.5.1",
 		"@ionic/app-scripts": "^3.2.3",
 		"@ionic/lab": "^1.0.24",
-		"@ionic/ng-toolkit": "^1.1.0",
-		"@ionic/schematics-angular": "^1.0.7",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
 		"@types/graphql": "^14.0.7",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 5c4b3849c..eebd8612c 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -14,32 +14,24 @@
   resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
   integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
 
-"@angular-devkit/architect@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
-  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
+"@angular-devkit/architect@0.13.8", "@angular-devkit/architect@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
+  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-devkit/architect@^0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.6.tgz#7758ab9f288cfd4f64d8b88b0700bac5c4961d06"
-  integrity sha512-Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw==
+"@angular-devkit/build-angular@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
+  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
-    rxjs "6.3.3"
-
-"@angular-devkit/build-angular@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
-  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
-  dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/build-optimizer" "0.13.7"
-    "@angular-devkit/build-webpack" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@ngtools/webpack" "7.3.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/build-optimizer" "0.13.8"
+    "@angular-devkit/build-webpack" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@ngtools/webpack" "7.3.8"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -55,7 +47,7 @@
     loader-utils "1.2.3"
     mini-css-extract-plugin "0.5.0"
     minimatch "3.0.4"
-    opn "5.4.0"
+    open "6.0.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
@@ -85,68 +77,36 @@
 "@angular-devkit/build-optimizer@0.0.35":
   version "0.0.35"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.35.tgz#3aadad1d7e9ffc7dcd106fda8a5670465936562c"
+  integrity sha512-7JxZZAYFSCc0tP6+NrRn3b2Cd1b9d+a3+OfwVNyNsNd2unelqUMko2hm0KLbC8BXcXt/OILg1E/ZgLAXSS47nw==
   dependencies:
     loader-utils "^1.1.0"
     source-map "^0.5.6"
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.7", "@angular-devkit/build-optimizer@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
-  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
+"@angular-devkit/build-optimizer@0.13.8", "@angular-devkit/build-optimizer@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
+  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
-  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
-  dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    rxjs "6.3.3"
-
-"@angular-devkit/core@0.9.0-beta.3":
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.9.0-beta.3.tgz#9263e071bc606995b6d413e463139a87106fb67d"
-  integrity sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==
-  dependencies:
-    ajv "6.5.3"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.2.2"
-    source-map "0.7.3"
-
-"@angular-devkit/core@7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.4.tgz#fae0521652c7430237025f117531ca3262ef8335"
-  integrity sha512-MBfen51iOBKfK4tlg5KwmPxePsF1QoFNUMGLuvUUwPkteonrGcupX1Q7NWTpf+HA+i08mOnZGuepeuQkD12IQw==
-  dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
-"@angular-devkit/core@7.3.6", "@angular-devkit/core@^7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.6.tgz#bc11ca571187f0f0ce9df012332794907e0b8133"
-  integrity sha512-aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g==
+"@angular-devkit/build-webpack@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
+  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
   dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
-    source-map "0.7.3"
 
-"@angular-devkit/core@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
-  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+"@angular-devkit/core@7.3.8", "@angular-devkit/core@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
+  integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
   dependencies:
     ajv "6.9.1"
     chokidar "2.0.4"
@@ -154,75 +114,51 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@0.9.0-beta.3":
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
-  integrity sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==
-  dependencies:
-    "@angular-devkit/core" "0.9.0-beta.3"
-    rxjs "6.2.2"
-
-"@angular-devkit/schematics@7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.4.tgz#918c9349835f3a4c9a7128ebcda0738b623fc89e"
-  integrity sha512-BLI4MDHmpzw+snu/2Dw1nMmfJ0VAARTbU6DrmzXyl2Se45+iE/tdRy4yNx3IfHhyoCrVZ15R0y9CXeEsLftlIg==
-  dependencies:
-    "@angular-devkit/core" "7.3.4"
-    rxjs "6.3.3"
-
-"@angular-devkit/schematics@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
-  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    rxjs "6.3.3"
-
-"@angular-devkit/schematics@^7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.6.tgz#5580b730b1bae5397f5860cfb0d7270fec6e6deb"
-  integrity sha512-YXF7QusmMy3D9H0vNczc1n5BkuEHLwt7cW33euNeGNgTIsD0n6DrUhgClurXicnr2GNPSDYE5+3115lmJkhyrg==
+"@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
+  integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
   dependencies:
-    "@angular-devkit/core" "7.3.6"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
 "@angular/animations@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
-  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
+  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
-  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
+"@angular/cli@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
+  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
-    "@schematics/update" "0.13.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
+    "@schematics/angular" "7.3.8"
+    "@schematics/update" "0.13.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
     npm-package-arg "6.1.0"
-    opn "5.4.0"
+    open "6.0.0"
     pacote "9.4.0"
     semver "5.6.0"
     symbol-observable "1.2.0"
 
 "@angular/common@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
-  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
+  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.9.tgz#2c1c970969a956fe148a96fe402704626568d3bc"
-  integrity sha512-3itdcfszdyXTHYEsO4eBu4WEx10hU8JpOgUcZyw+OYgwLQLyjEXOD9dfYZZpE/+2F0omoMLseCTHTP//uux+Iw==
+"@angular/compiler-cli@^7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
+  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -236,84 +172,84 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.9.tgz#92dd0d9fd26fa7cfdbc8c75d0be0d96bd6432fbb"
-  integrity sha512-jAKV4C5BW2pnke10fiDZNbLCQOs2QK37mUJWe5jnZqCAM4Y3edXlfifOkbi0hvA4WJMDXKmUdydY6Xo/Z+cWbA==
+"@angular/compiler@^7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
+  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
-  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
+  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/forms@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
-  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
+  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/http@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.11.tgz#c52a491374d937cd05789a5c13d70a1c5fdddf4d"
-  integrity sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.12.tgz#0ec28f6dc7814c85761833b1fd4b53b397b5e882"
+  integrity sha512-cceU+SWIQFOL3gRKqm5SYHQM3VoKbXne2XQRSY2Fdoc3XsipOzTEvJQPLm5ZcTEXdmRFlfianDoDaWEIvGbXkw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.9":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.9.tgz#50a74f80a42b069c6a3a0844ee6af3098f8bd48b"
-  integrity sha512-+8P3yGqrCZy8PaoxUUlC6cowxPAIbuW4HwhvHvYV3G99LDQUC/bxUPSPhqbrAvDiFr3VeXqivzXgFCTo69S1WQ==
+"@angular/language-service@^7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
+  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
 
 "@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
-  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
+  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
-  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
+  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
-  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
+"@angular/pwa@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.8.tgz#20799d6c5a00c8b15d56874bc5c2344e13683a1a"
+  integrity sha512-Yu9bFh/9Vq2Wi3X4foki2qM3kLRs/GTROaI2Na+OfCpACMn6vNTHgJdqyjzSW9DpFTbW/4Fsb2NMmPf8CgAScw==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
+    "@schematics/angular" "7.3.8"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
 "@angular/router@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
-  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
+  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/service-worker@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.11.tgz#ab61d4b1c75359fde461b4073b90438abff4d9e9"
-  integrity sha512-MalD4T2Iur582TMmHKFDmoqSYMys1EjdTZWt0qME85ri1w7yBriujvTyy9/aZmT2bFBGeJvbqhohoU46CsnqsA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.12.tgz#9d3ca7399a105900a4d706cf5da5954cbe5b66dc"
+  integrity sha512-0hvKy+EXPoGrLujqzXK02gfVUZ187o/aDvmBuH2Io9us93RgGew/Se1iFl2YaawhPYSsuwwbrcjoSVMznoI1GQ==
   dependencies:
     tslib "^1.9.0"
 
 "@babel/runtime@^7.3.1":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
-  integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
+  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
   dependencies:
-    regenerator-runtime "^0.12.0"
+    regenerator-runtime "^0.13.2"
 
 "@compodoc/compodoc@^1.1.9":
   version "1.1.9"
@@ -352,6 +288,7 @@
 "@compodoc/ngd-core@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz#e31a6cbbdfa8de648b027aa4169468bc496544c9"
+  integrity sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==
   dependencies:
     ansi-colors "^1.0.1"
     fancy-log "^1.3.2"
@@ -360,6 +297,7 @@
 "@compodoc/ngd-transformer@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz#89e858dd332198cde262f0cf3648bd0969d0da62"
+  integrity sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==
   dependencies:
     "@compodoc/ngd-core" "~2.0.0"
     dot "^1.1.1"
@@ -369,84 +307,85 @@
 "@dsherret/to-absolute-glob@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1f6475dc8bd974cea07a2daf3864b317b1dd332c"
+  integrity sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=
   dependencies:
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
 "@ionic-native/barcode-scanner@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz#e04bb2884f6f0a76b135d34f41c40e8d3a52b72d"
-  integrity sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.4.0.tgz#b38db6a40973ee2780dd993c3521f3962d3f083a"
+  integrity sha512-p7/wBtu3P20jX98eVoAvxoPNw9UhlVPjDTJ/DHimlFlUnj5jRl0jcQJ7ZXo8AYCYfs7vC8a32BDnqTkQlo6Lfw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/call-number@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.3.0.tgz#4a9318fecb4b1dce804786ecb78b51c84f05f06f"
-  integrity sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.4.0.tgz#097ec2f732b8e8eaf12bc6797e4ebf7511c6d4cd"
+  integrity sha512-rG/rLePAqWxNNgh0YlneiT0QdArRXICWF0Zz/YyqD9vuXr2D0as1xPomXSjWhoUu0J6UO5LdLK5Up2PL9+LwGw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/camera@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.3.0.tgz#fbd58cdb9c7a53fd2f65697f6395ea481743b67c"
-  integrity sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.4.0.tgz#d10461b9486ef8b064a7314b77c090b59620208f"
+  integrity sha512-lReblyrDaDA3Nr4uLYozOpixvdrHrpLVaGfPd7I1oR0sIYWyphFPXiCMFQL2r29GDl4hRm0jsxG5ygAvjXVTXw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/core@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/core/-/core-5.3.0.tgz#50934ded237a03489cf45bef3f1d3a7f1a0a71c4"
-  integrity sha512-oIsBvkB/Q63bjKvHGW7zAFMWSXIwnZ/U962UFyuqrF9dKvNSPI5cz8iPOaqKE+jzb2XhlcGKEbp5qAhTI0BcZQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/core/-/core-5.4.0.tgz#4bb126d9f14c337be65542bb5f653bc202ee9dbf"
+  integrity sha512-GSrwIcOqGq9a7axYGVDPvIS0FoBRPNIC6b4RkcC0rcvjbIDebgZG7zsZ2x6mhe4HC7fTUV2y8qBO8timMHv3oA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/device@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.3.0.tgz#6734f6adb5bed0aaa34da1aad84b658583e17d0b"
-  integrity sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.4.0.tgz#1f071460a2559468256a8b7a82127cd7c1ebacff"
+  integrity sha512-C9j2iryuDzWXkFucR0liKgA2DU0vVkEWweOIqgPXcYSlS6NgdguYcbBWh8Bi+JKhT/lqTNq9bKrquZUwkf1IcA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/dialogs@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.3.0.tgz#6b565119d08ffcb7c5dd1f68248b8d0739cf3aeb"
-  integrity sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.4.0.tgz#650357eb0c3ea444eabfaa12cae34fba555d284d"
+  integrity sha512-8JlLXsGjvWmLWjVJJUnfKaR1jFQD5qK5gqKcoylkQRakUBpuzTB/fFAMwOyBcHZcioXWkKDInELq2h2fu5T+WA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/email-composer@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/email-composer/-/email-composer-5.3.0.tgz#99328cf73819ed25e4677ccd076281c8e430cac6"
-  integrity sha512-BgxdiLdlxcIIpkAhkhPPHqjvM8EJc1CD/9yi1MB6Ys7g4td5HlSxnQscnCN9aV+eVx0ft7Je40yVCkJ+xepbMA==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/email-composer/-/email-composer-5.4.0.tgz#eef344baf3dd0c2eb9bbdf98b187605713502728"
+  integrity sha512-LfUivEmQBBBMJzMNy3Cfv/ZtfNw2lF7K2VyVoYqAuRFWXaTpmmj8LiHT3bTsUVL1hr3D99lcaGBzNADZ8QwV0g==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/file-transfer@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/file-transfer/-/file-transfer-5.3.0.tgz#36d284b127cf21f2a0f105eefe5286674e53a68e"
-  integrity sha512-391Bh8n0wAL1IkBtWLuVohwH+VqGVgfRamD/gPSMpeqWicuqGB/doHk7k3IRSN81WxmeFC0LPZEcuPryuTABQQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/file-transfer/-/file-transfer-5.4.0.tgz#efb6acfbf63206000945626244e268dc863443dd"
+  integrity sha512-Z5PQNyAZLlXmRDF7bNxs9sBou+CluYG0wAk11tPNlfoSXYnN/i8OIrk56hJrDfNLw8+yCnyy7+HRFaPocg36ew==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/geolocation@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.3.0.tgz#64a3495a6b9bdf4c2d5eb106a1b49012336eaef0"
-  integrity sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.4.0.tgz#332f0650c16b103d48c8a06b4ba0465ac0f88220"
+  integrity sha512-mcnIVhYZwRvoDMX9yRIgrixZBDSRjbtojIXWLjdWUoaO/YcOv/I5VhsICAUpiKM89NFW8Dcip3YLYDGGmCkSVA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/globalization@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/globalization/-/globalization-5.3.0.tgz#f1cd1a81a5a9079078b05a0defe6ba5216d36675"
-  integrity sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/globalization/-/globalization-5.4.0.tgz#9f6c9f430cb8e7d54425ef3b0e649fbe66ab01d6"
+  integrity sha512-ZUBv7t1MaHn/szbQ8jfrBkCuxSIqEVeM/a+sqESRzp3rpEOSRMXqaRv8oFfqzRUxvavSpunkPgx/xzfVeubhpg==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/google-analytics@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz#6e07f8fe67b24a83d04869d5bb2561530feb997a"
-  integrity sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.4.0.tgz#3155c889b98dc2cb5b30a9a8c2c61324eb16c9bb"
+  integrity sha512-Lk96Oqam0nczNWvSulWvUH8yjfyp0KBxmn9m8/0kEEkQnTZD+tIuQIDYB9zZTXnw7rkpbdqJCWb+Q2CLqoEwjA==
   dependencies:
     "@types/cordova" latest
 
@@ -458,97 +397,98 @@
     "@types/cordova" latest
 
 "@ionic-native/in-app-browser@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz#9e3e3ac12c18a8ebd1052ab35c05f16f090124fb"
-  integrity sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.4.0.tgz#b5a74580a9bf3e0797aabf52f53c3529dee80f0e"
+  integrity sha512-cPRKu7nl9oLKgqJyt/1SeO+aWTABWzu+QzkOQBOLfoAaqP1eXm/AU2C9joULnTl3P+s7oFZqXKiEAKI/jF+x1Q==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/intercom@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.3.0.tgz#e920f1ed774da10944424f9dfa1a89218f8b4546"
-  integrity sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.4.0.tgz#e742e008b14529c09e2825f0d7d936499478adef"
+  integrity sha512-WXEpoRt7auxtd9P4NjMwk+QTCWskEfrcn/XjJHVLDLtyvQid/ek0SLlDbJh8tB0EQuOTpXS4CE4cwfRD28NlBw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/local-notifications@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz#a97ce54f8f8fff198fab79a88a4c65fa64a56a54"
-  integrity sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.4.0.tgz#b8310dafb53bae509af57f5b153095a0ca2063c3"
+  integrity sha512-xKpcljk4mOFhe/6BzsL8AkPPZyB6WloqUcu1jp61ADEKfkeqr4uTzpADfZ/pzlw/aL05waHwvPZRgpQM/uUHlA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/mixpanel@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz#9733569e19ef4268ee3ac5b765569bd1b61f68bd"
-  integrity sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.4.0.tgz#7d022e29c20237208ed7f64db5d7e68251dbe81b"
+  integrity sha512-+f+3des08I3LwJQD8m0JglskOgEjqHivyYoU0DrSHZ0H+sPndOwwL6Q0LNXGwJ00gAv8173YFGxht5TxAP+neQ==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/network@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.3.0.tgz#d7d840e631d1b9374517c521800c8ac8f5d8ebb5"
-  integrity sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.4.0.tgz#4f4c12da0484a1a05fccd520402b402dc1c72af0"
+  integrity sha512-qHDoterYyz65E4nl6W1GdliiNtx7oeIyO/AsA3DFoY4Adlc+SmL7Ks+ZyIBqIPCwTvrK9CQ9VxOU26LsyneLOw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/open-native-settings@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/open-native-settings/-/open-native-settings-5.3.0.tgz#900c85682957983fd2f95c10d8369cae1eb76bb1"
-  integrity sha512-fJlcXSDJInH+hCTBXomee040jDrbzEAUaM8pRhxcukdiQW3ubYeZQMUb3qpFDr0PI6yZCxJmx6u5X6kk+Ers8Q==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/open-native-settings/-/open-native-settings-5.4.0.tgz#610fd93a6258b253c49fbf6b1b42936c8233a40d"
+  integrity sha512-C/082uRZfjjGurbZzzh3lyCb+vEgKcUYACvObf5uagQRS1D+QUEf731r6V/n0NFk9GL5gUXR78o6lV41K8jiJw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/screen-orientation@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/screen-orientation/-/screen-orientation-5.3.0.tgz#ee4358d23721b3eecffa16a84aef5ef2daf91ba2"
-  integrity sha512-0UQYHTl1FxJSRrkuRjQcriipzj/a7rcgiSyYkZk/vzEDVJBHcm7fO22R6PJbsvAyn7I6Ef9oCMsPlyc5CjjNJg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/screen-orientation/-/screen-orientation-5.4.0.tgz#12a8300e618ecea774ac0d6eea9104c5a37087a0"
+  integrity sha512-1Ctamez6ve7O0oXlk6N+8OgrAGzYUev/4cU4cqGwkbVMmyHl3EfKML7yOtQHIDbizO0a1MJp14TbGsZl+yrUhA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/splash-screen@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz#147b005ee7fcea6b816e2549db5d8cc4b550fd84"
-  integrity sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.4.0.tgz#5e90ceab6ccf7d352197dbcd5502c1a649c881ea"
+  integrity sha512-2RkLfEWO9u+L7wgHCS156UBW18ulE8md2iPvWaz3fzwuPddjhYqFEP2Nz3ZM4pKvdex6pKRMNkLlvhBN93CkFw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/status-bar@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-5.3.0.tgz#a25558f59f2eee2aea509d563b54fcab2dc69861"
-  integrity sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-5.4.0.tgz#aa83a4282ee0062de3bdeddcd6b089863481a3b5"
+  integrity sha512-ePt6NBVtUBKr02HoRcNZ8nlq6bAqqx/rVf6veZdV9UK2OEApFKEs++tdq+2fmpjdTBfB3jMGiyN3Kr+7c1dOmA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/unique-device-id@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz#ac63aece625ddf23861427f4e2e4f101107b19e3"
-  integrity sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.4.0.tgz#3a1c2036f518a410c9003a9b9968ffa7b04f50ae"
+  integrity sha512-ManX3ML07ZOgiyJ55+cRE7NmFgKLHb/wx+52UX+K+aTVBhHF1xe/EP9Grj6mTisQyQ9VkwlFEhm6hFa6/TGJsw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/vibration@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.3.0.tgz#0c8a47ece05900e97af0843fa4e888f25b75b12e"
-  integrity sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.4.0.tgz#27d77ea805eb5c9e2e4c5587a6c4ca5629613879"
+  integrity sha512-eKxpz4QpefHfEw9P2N3+QjmlSgKbEbZcCjButpnpM3FhUddrNzQ9ISaWHe3m/IZ8R4aj8x6N7FrZ7V32XVmidQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic/angular-toolkit@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic/angular-toolkit/-/angular-toolkit-1.4.0.tgz#b73c3f52fe6a0ba154012ac3e6ee420c92495506"
-  integrity sha512-TTeJmspi4+URWzKidNNP70O45WnWg1ykb8b98TUF5E2AkYa9IP+sQ3dl/SOdizxJRn8MVQdZmRF3Moufy2O5GA==
+"@ionic/angular-toolkit@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic/angular-toolkit/-/angular-toolkit-1.5.1.tgz#1bcd6c32fb745e63281a58161c66ee378c0bf0b8"
+  integrity sha512-B5LHuzEv/lgFP7yxfOA3/wggDM/X1mDkWFX8rZtaBRZBbC0vtZwdwDu73RnkfFZ0jTFyIgtoBW8qTrrCyd5MLA==
   dependencies:
     "@schematics/angular" "^7.0.3"
     tslib "^1.9.0"
-    typescript "^3.2.4"
+    typescript "~3.3.3333"
+    ws "^6.1.4"
 
 "@ionic/angular@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.1.2.tgz#c14c072c5bbaa7cfc533cb6408d02e769f820776"
-  integrity sha512-GVdtpPekPjAYo/3IiRg/EoVRw1/9RwW07ITW6TRorcX1XOPJlrRXVcQyWFTbHRD9TOikgE1XmMQd/+1Lk0TQFw==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.2.0.tgz#f90ad2b8b5f515a9cfc1025c8b40ec77fddb2c1c"
+  integrity sha512-ALZNxEZjkBJDyLH0mqcZQsgi9yUWB8uW2u6kg6ZjjSGf6atQL1IhOt+tTvdE98GWoNwFghNmdg9IFCFjUhANjw==
   dependencies:
-    "@ionic/core" "4.1.2"
+    "@ionic/core" "4.2.0"
     tslib "^1.9.3"
 
 "@ionic/app-scripts@^3.2.3":
@@ -584,28 +524,6 @@
     ws "3.3.2"
     xml2js "^0.4.19"
 
-"@ionic/cli-framework@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-1.1.0.tgz#aab5ed11d37784761a9bf947d5527ec57b27e720"
-  integrity sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==
-  dependencies:
-    "@ionic/utils-fs" "0.0.2"
-    chalk "^2.3.0"
-    debug "^4.0.0"
-    inquirer "^6.0.0"
-    lodash "^4.17.5"
-    minimist "^1.2.0"
-    rimraf "^2.6.2"
-    slice-ansi "^1.0.0"
-    stream-combiner2 "^1.1.1"
-    string-width "^2.1.1"
-    strip-ansi "^5.0.0"
-    tree-kill "1.2.0"
-    tslib "^1.9.0"
-    untildify "^3.0.2"
-    wrap-ansi "^4.0.0"
-    write-file-atomic "^2.3.0"
-
 "@ionic/cli-framework@1.7.0":
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-1.7.0.tgz#6cb516ad6a95b10c7e3197e9510eb64c1d580587"
@@ -633,10 +551,10 @@
     wrap-ansi "^4.0.0"
     write-file-atomic "^2.3.0"
 
-"@ionic/core@4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.1.2.tgz#cbabd9ae65936f56b1dc6de021cf79778dc991da"
-  integrity sha512-QVJYpDAycmXgQL3mWdvjlIgrLEG0wVl9+NGZQATEBCTEsuDHrOw7BO28FKPlFCdfTjVA6HDJnSj1HwOUi3Yp4w==
+"@ionic/core@4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.2.0.tgz#9b71c4b22a6b58cfe1bd3b1e24142b462ed9b480"
+  integrity sha512-JGnx8NV9z3Bgg/Ds/uEe4PPwp/UWnxqU35koByWZcyDpdb1WTwF8b4iJA8QGoj2DWEyFx7qt3c/bw3Zk/F7JPw==
   dependencies:
     ionicons "4.5.5"
 
@@ -661,32 +579,11 @@
     express "^4.16.2"
     tslib "^1.9.0"
 
-"@ionic/ng-toolkit@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz#b7453b2e8024648ab95fa0afefce73a4c3873b4d"
-  integrity sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==
-  dependencies:
-    "@ionic/cli-framework" "1.1.0"
-    chalk "^2.3.0"
-    debug "^4.0.0"
-    rxjs "~6.2.0"
-    tslib "^1.9.0"
-
 "@ionic/pro@^2.0.4":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@ionic/pro/-/pro-2.0.4.tgz#d9531ddaaf11098b75dde5aad5fea47b23632322"
   integrity sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw==
 
-"@ionic/schematics-angular@^1.0.7":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz#1e5be27346efdc430d75f2eaa86ee0c729e0877a"
-  integrity sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==
-  dependencies:
-    "@schematics/angular" "0.9.0-beta.3"
-    lodash "^4.17.5"
-    tslib "^1.9.0"
-    typescript "3.0.1"
-
 "@ionic/storage@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/storage/-/storage-2.2.0.tgz#ac181991d3bfc8352a5400efb5e9faa5e76b5d4b"
@@ -704,16 +601,6 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-fs@0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-0.0.2.tgz#5d93c4193ef4dde48fa468bce52b179d5d85e5ca"
-  integrity sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==
-  dependencies:
-    debug "^4.0.0"
-    ncp "^2.0.0"
-    through2 "^2.0.3"
-    tslib "^1.9.0"
-
 "@ionic/utils-fs@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-1.2.0.tgz#bc4492c5d57f910dedac2d3a33026d71ff3a51d5"
@@ -785,16 +672,17 @@
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
   dependencies:
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
-  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
+"@ngtools/webpack@7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
+  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -814,9 +702,10 @@
   dependencies:
     tslib "^1.9.0"
 
-"@nodelib/fs.stat@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz#54c5a964462be3d4d78af631363c18d6fa91ac26"
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
 "@opencensus/core@^0.0.8":
   version "0.0.8"
@@ -859,9 +748,9 @@
     ws "^6.0.0"
 
 "@pm2/agent@^0.5.22":
-  version "0.5.23"
-  resolved "https://registry.yarnpkg.com/@pm2/agent/-/agent-0.5.23.tgz#1cb7b868e7f4d49c701506be1587bcbe791bccc0"
-  integrity sha512-mviwkRt51y3wY161uxiqXc0wyHTjgo+sIkJ/Mh6m400dYAnAGQ12LFlK56EbnQRwPfPog0q6txqncbFpn4L5zA==
+  version "0.5.24"
+  resolved "https://registry.yarnpkg.com/@pm2/agent/-/agent-0.5.24.tgz#3175e6291ee1b370b703f7977668beaf6c7dc4dc"
+  integrity sha512-j6lJMMmGvDvxcyPBO3JpqdSdzlQUlWDSfVRWzLSHKioEUMYeq/JBx3ZQmA1D25OoDPzaymwcquP4B0HR6gU1bQ==
   dependencies:
     async "^2.6.0"
     chalk "^2.3.2"
@@ -874,10 +763,10 @@
     semver "^5.5.0"
     ws "^5.1.0"
 
-"@pm2/io@^4.1.0":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@pm2/io/-/io-4.1.2.tgz#a9bb69bc80fc0848ee2c70b15cd251ebd4750b88"
-  integrity sha512-AS4eIjcBGac+hxq2c1Rb9jaXIn3VBv998vhACi6yD9RLb9+jUZ4Ezs6FsIg2i4rfMoiBn3b9DewjCfLGqhYB4g==
+"@pm2/io@^4.1.2":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@pm2/io/-/io-4.1.4.tgz#3d092d829ea1559498764349313d5c3cf77f5c77"
+  integrity sha512-CD5DZaOD2kvclks9MN3EHbohGeN0ZXc3H0607I4YL6LJHf8HaCtrB3na9USFToVbbKN3rNrvVSCTRkjNf22W1g==
   dependencies:
     "@opencensus/core" "^0.0.9"
     "@opencensus/propagation-b3" "^0.0.8"
@@ -893,9 +782,9 @@
     tslib "1.9.3"
 
 "@pm2/js-api@^0.5.43":
-  version "0.5.49"
-  resolved "https://registry.yarnpkg.com/@pm2/js-api/-/js-api-0.5.49.tgz#e6589a31f2cdf2c2e8dc45bd008674c80f9427b8"
-  integrity sha512-H5BP9aAYLadqqKzs8qWisb2Gt9rnWzYfocn42+UKFVSEsDrGpV18dNi8nexIJ3Lm+Z7vraxtQ42K7EQgslJwdA==
+  version "0.5.55"
+  resolved "https://registry.yarnpkg.com/@pm2/js-api/-/js-api-0.5.55.tgz#fc4ae84b076dc959ab2fb5772aa454e4f5ab388b"
+  integrity sha512-GWqSs1ewTOgIaOb+WKyKF+R7qMfMxHLM06WIMa9TBwab7YtVedTTrk0ObsK/NAAmrFk0/eefFRu/ouoh4ICDxw==
   dependencies:
     async "^2.4.1"
     axios "^0.16.2"
@@ -903,40 +792,22 @@
     eventemitter2 "^4.1.0"
     ws "^3.0.0"
 
-"@schematics/angular@0.9.0-beta.3":
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.9.0-beta.3.tgz#dbfbadc52faf63a331a72b57945e807ab115eb6b"
-  integrity sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==
-  dependencies:
-    "@angular-devkit/core" "0.9.0-beta.3"
-    "@angular-devkit/schematics" "0.9.0-beta.3"
-    typescript "3.0.1"
-
-"@schematics/angular@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
-  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    typescript "3.2.4"
-
-"@schematics/angular@^7.0.3":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.4.tgz#ba36efdd5474b793eb693d47772f998e6bd6043e"
-  integrity sha512-Bb5DZQ8MeP8yhxPe6nVqyQ7sGVNwUx6nXPlrQV45ZycD3nJlqsuxr2DE75HFpn5oU+vlkq9J/Sys4WLJ4E/OMw==
+"@schematics/angular@7.3.8", "@schematics/angular@^7.0.3":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
+  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
   dependencies:
-    "@angular-devkit/core" "7.3.4"
-    "@angular-devkit/schematics" "7.3.4"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     typescript "3.2.4"
 
-"@schematics/update@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
-  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
+"@schematics/update@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
+  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -945,8 +816,9 @@
     semver-intersect "1.4.0"
 
 "@types/bson@*":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@types/bson/-/bson-1.0.11.tgz#c95ad69bb0b3f5c33b4bb6cc86d86cafb273335c"
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.0.0.tgz#9073772679d749116eb1dfca56f8eaac6d59cc7a"
+  integrity sha512-pq/rqJwJWkbS10crsG5bgnrisL8pML79KlMKQMoQwLUjlPAkrUHMvHJ3oGwE7WHR61Lv/nadMwXVAD2b+fpD8Q==
   dependencies:
     "@types/node" "*"
 
@@ -960,13 +832,10 @@
   resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.2.2.tgz#80cf7cfff7401587b8f89307ba36fe4a576bc7cf"
   integrity sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==
 
-"@types/events@*":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
-
 "@types/geojson@*":
-  version "7946.0.4"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.4.tgz#4e049756383c3f055dd8f3d24e63fb543e98eb07"
+  version "7946.0.7"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
+  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
 "@types/googlemaps@^3.30.19":
   version "3.30.19"
@@ -974,18 +843,14 @@
   integrity sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==
 
 "@types/graphql@^14.0.7":
-  version "14.0.7"
-  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-14.0.7.tgz#daa09397220a68ce1cbb3f76a315ff3cd92312f6"
-  integrity sha512-BoLDjdvLQsXPZLJux3lEZANwGr3Xag56Ngy0U3y8uoRSDdeLcn43H3oBcgZlnd++iOQElBpaRVDHPzEDekyvXQ==
-
-"@types/jasmine@*":
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-14.2.0.tgz#74e1da5f2a4a744ac6eb3ed57b48242ea9367202"
+  integrity sha512-lELg5m6eBOmATWyCZl8qULEOvnPIUG6B443yXKj930glXIgwQirIBPp5rthP2amJW0YSzUg2s5sfgba4mRRCNw==
 
-"@types/jasmine@^3.3.10":
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.10.tgz#5b90c8e74246487e8810100ddc2547ffc94d31f6"
-  integrity sha512-F4yCbIk3Tgj7j+/cR5qtE5rQHVFyd7vOuG4zqeykztN99SSVCKwiPIea2Q/nVJbC6GJXbtaNKSyFVtMCkoRngA==
+"@types/jasmine@*", "@types/jasmine@^3.3.10":
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.12.tgz#bf282cb540e9ad7a0a04b742082c073b655eab39"
+  integrity sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==
 
 "@types/jasminewd2@^2.0.6":
   version "2.0.6"
@@ -1001,38 +866,31 @@
   dependencies:
     "@types/geojson" "*"
 
-"@types/mongodb@*":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.4.tgz#f0f6dc8d509500c4a8213238066b68f0c8cb25a9"
-  dependencies:
-    "@types/bson" "*"
-    "@types/events" "*"
-    "@types/node" "*"
-
-"@types/mongodb@^3.1.22":
-  version "3.1.22"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.22.tgz#66f96c7acbf7135ce6295a8d6c26f1d97388a84b"
-  integrity sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==
+"@types/mongodb@*", "@types/mongodb@^3.1.22":
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.23.tgz#9aaa105f448427036cb6cd3aa042ab77b2ab8a7a"
+  integrity sha512-TNwS1HPh1nnaYorcQoWi+bH5kJ1Q/WqCjiD9XkU3oBeCZFYXXPafVUuFmoYFbzQ061ojhtsndRLzwNklRhU+4w==
   dependencies:
     "@types/bson" "*"
     "@types/node" "*"
 
 "@types/mongoose@^5.3.22":
-  version "5.3.22"
-  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.22.tgz#cb020926bd742116e4eb62eda5a032fbd8cae8e0"
-  integrity sha512-OVKmjRUH7L3ml1kltLTcKNEE4888Q6tIuepukdSa5p2n40d7BNbhq1vT7HICaCBzk6W+VjEzs3hD+UtrUsxRbQ==
+  version "5.3.26"
+  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.26.tgz#a979014c7fc9395e484695d4cc5647e7686251db"
+  integrity sha512-7NPdpUGU/1ZztTICcP3GxwWBAHTDyOLW0XJxrxlTl5i7R7XbT2Ucq33JussSLkWHKjbxpAmJnDwlYKcjwG7agg==
   dependencies:
     "@types/mongodb" "*"
     "@types/node" "*"
 
-"@types/node@*":
-  version "10.9.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.3.tgz#85f288502503ade0b3bfc049fe1777b05d0327d5"
+"@types/node@*", "@types/node@^11.9.3":
+  version "11.13.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
+  integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
-"@types/node@^11.9.3":
-  version "11.10.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.10.4.tgz#3f5fc4f0f322805f009e00ab35a2ff3d6b778e42"
-  integrity sha512-wa09itaLE8L705aXd8F80jnFpxz3Y1/KRHfKsYL2bPc0XF+wEWu8sR9n5bmeu8Ba1N9z2GRNzm/YdHcghLkLKg==
+"@types/node@^8.0.7":
+  version "8.10.45"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.45.tgz#4c49ba34106bc7dced77ff6bae8eb6543cde8351"
+  integrity sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==
 
 "@types/reflect-metadata@^0.1.0":
   version "0.1.0"
@@ -1052,9 +910,9 @@
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/stripe@^6.25.7":
-  version "6.25.7"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
-  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
+  version "6.25.10"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
+  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
   dependencies:
     "@types/node" "*"
 
@@ -1257,13 +1115,15 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@1:
+abbrev@*, abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
@@ -1271,6 +1131,7 @@ accepts@~1.3.4, accepts@~1.3.5:
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  integrity sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=
   dependencies:
     acorn "^4.0.3"
 
@@ -1279,32 +1140,17 @@ acorn-dynamic-import@^4.0.0:
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
-  dependencies:
-    acorn "^3.0.4"
-
 acorn-walk@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
   integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
-
 acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+  integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
 
 acorn@^5.0.0, acorn@^5.2.1:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.2.tgz#91fa871883485d06708800318404e72bfb26dcc5"
-
-acorn@^5.5.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
@@ -1317,10 +1163,12 @@ acorn@^6.0.5, acorn@^6.0.7:
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.0:
+agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
@@ -1336,26 +1184,12 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-
 ajv-keywords@^3.1.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
-ajv@6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
-  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@6.9.1, ajv@^6.1.0:
+ajv@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
   integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
@@ -1365,18 +1199,30 @@ ajv@6.9.1, ajv@^6.1.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.0.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
   dependencies:
     kind-of "^3.0.2"
     longest "^1.0.1"
@@ -1385,16 +1231,19 @@ align-text@^0.1.1, align-text@^0.1.3:
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 amp-message@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/amp-message/-/amp-message-0.1.2.tgz#a78f1c98995087ad36192a41298e4db49e3dfc45"
+  integrity sha1-p48cmJlQh602GSpBKY5NtJ49/EU=
   dependencies:
     amp "0.3.1"
 
 amp@0.3.1, amp@~0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/amp/-/amp-0.3.1.tgz#6adf8d58a74f361e82c1fa8d389c079e139fc47d"
+  integrity sha1-at+NWKdPNh6CwfqNOJwHnhOfxH0=
 
 android-versions@1.4.0:
   version "1.4.0"
@@ -1424,7 +1273,8 @@ ansi-align@^2.0.0:
 
 ansi-colors@^1.0.1:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
   dependencies:
     ansi-wrap "^0.1.0"
 
@@ -1446,6 +1296,7 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.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"
 
@@ -1457,15 +1308,17 @@ ansi-html@0.0.7:
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -1475,14 +1328,16 @@ ansi-styles@^2.2.1:
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-wrap@0.1.0, 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=
 
-ansi@^0.3.1:
+ansi@*, ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
   integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
@@ -1490,6 +1345,7 @@ ansi@^0.3.1:
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -1506,19 +1362,20 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.0.tgz#67043da828fa474c0e7f98c52eed5cdf7d0aad30"
-  integrity sha512-N/+0BYAbHS16YFghQTaTrbsunKRCB8bjip11NmS9waWNGODbAJHn0oW813MoWpLV8TynaWz1VZRTu5RHkzDlAg==
+apollo-angular-link-http-common@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
+  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
   dependencies:
     tslib "^1.9.0"
 
 apollo-angular-link-http@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz#55411ed97f1f8356ebed5c0ae96f08dbaf3e064c"
-  integrity sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
+  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
   dependencies:
-    apollo-angular-link-http-common "~1.5.0"
+    apollo-angular-link-http-common "~1.6.0"
+    extract-files "5.0.1"
     tslib "^1.9.0"
 
 apollo-angular@^1.5.0:
@@ -1572,11 +1429,12 @@ apollo-link-context@^1.0.17:
     tslib "^1.9.3"
 
 apollo-link-dedup@^1.0.0:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz#028148f1028e806a9ab2f4abf3bde9dc292565e9"
-  integrity sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
+  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
   dependencies:
-    apollo-link "^1.2.8"
+    apollo-link "^1.2.11"
+    tslib "^1.9.3"
 
 apollo-link-ws@^1.0.17:
   version "1.0.17"
@@ -1586,14 +1444,7 @@ apollo-link-ws@^1.0.17:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.8.tgz#0f252adefd5047ac1a9f35ba9439d216587dcd84"
-  integrity sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==
-  dependencies:
-    zen-observable-ts "^0.8.15"
-
-apollo-link@^1.2.11:
+apollo-link@^1.0.0, apollo-link@^1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
   integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
@@ -1613,17 +1464,19 @@ apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
     tslib "^1.9.3"
 
 app-root-path@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
-  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
+  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -1636,6 +1489,7 @@ arg@^4.1.0:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
@@ -1647,74 +1501,67 @@ aria-query@^3.0.0:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
 
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-flatten@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@~2.0.3:
   version "2.0.6"
@@ -1724,6 +1571,7 @@ asap@~2.0.3:
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -1732,22 +1580,26 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
     util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 ast-transform@0.0.0:
   version "0.0.0"
@@ -1764,8 +1616,9 @@ ast-types-flow@0.0.7:
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
 ast-types@0.x.x:
-  version "0.11.7"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.7.tgz#f318bf44e339db6a320be0009ded64ec1471f46c"
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.12.3.tgz#2299c6201d34b2a749a2dd9f2de7ef5f0e84f423"
+  integrity sha512-wJUcAfrdW+IgDoMGNz5MmcvahKgB7BwIbLupdKVVHxHNYt+HVR2k35swdYNv9aZpF8nvlkjbnkp2rrNwxGckZA==
 
 ast-types@^0.7.0:
   version "0.7.8"
@@ -1778,16 +1631,19 @@ astral-regex@^1.0.0:
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-each@^1.0.0, async-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
+  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
 async-listener@^0.6.0:
   version "0.6.10"
@@ -1797,9 +1653,10 @@ async-listener@^0.6.0:
     semver "^5.3.0"
     shimmer "^1.1.0"
 
-async@2.6.1, async@^2.1.2, async@^2.4.1, async@^2.6, async@^2.6.0, async@^2.6.1:
+async@2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
@@ -1808,7 +1665,7 @@ async@^1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.5.0, async@~2.6.1:
+async@^2.1.2, async@^2.4.1, async@^2.5.0, async@^2.6, async@^2.6.0, async@^2.6.1, async@~2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
   integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
@@ -1818,10 +1675,12 @@ async@^2.5.0, async@~2.6.1:
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@9.4.6:
   version "9.4.6"
@@ -1838,6 +1697,7 @@ autoprefixer@9.4.6:
 autoprefixer@^7.2.6:
   version "7.2.6"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
+  integrity sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==
   dependencies:
     browserslist "^2.11.3"
     caniuse-lite "^1.0.30000805"
@@ -1849,14 +1709,17 @@ autoprefixer@^7.2.6:
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 axios@^0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
+  integrity sha1-uk+S8XFn37q0CYN4VFS5rBScPG0=
   dependencies:
     follow-redirects "^1.2.3"
     is-buffer "^1.1.5"
@@ -1871,6 +1734,7 @@ axobject-query@^2.0.2:
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -1958,14 +1822,17 @@ babylon@^6.18.0:
 backo2@1.0.2, backo2@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
-balanced-match@^1.0.0:
+balanced-match@*, balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@0.0.8:
   version "0.0.8"
@@ -1975,14 +1842,17 @@ base64-js@0.0.8:
 base64-js@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+  integrity sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=
 
 base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.2.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1995,16 +1865,19 @@ base@^0.11.1:
 basic-auth@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
   dependencies:
     safe-buffer "5.1.2"
 
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
@@ -2016,6 +1889,7 @@ bcryptjs@^2.3.0:
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
@@ -2035,12 +1909,9 @@ big-integer@1.6.32:
   integrity sha512-ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw==
 
 big-integer@^1.6.7:
-  version "1.6.34"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.34.tgz#701affc8f0d73c490930a6b482dc23ed6ffc7484"
-
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  version "1.6.43"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.43.tgz#8ac15bf13e93e509500859061233e19d8d0d99d1"
+  integrity sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -2048,54 +1919,46 @@ big.js@^5.2.2:
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 blessed@^0.1.81:
   version "0.1.81"
   resolved "https://registry.yarnpkg.com/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129"
+  integrity sha1-+WLWh+wsNpVwrnGvhDJW5tDKESk=
 
-blob@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
 bluebird@3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+  integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
 
 bluebird@^3.5.1, bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
+  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, 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==
 
 bodec@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/bodec/-/bodec-0.1.0.tgz#bc851555430f23c9f7650a75ef64c6a94c3418cc"
-
-body-parser@1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
-    on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
+  integrity sha1-vIUVVUMPI8n3ZQp172TGqUw0GMw=
 
 body-parser@1.18.3:
   version "1.18.3"
@@ -2116,6 +1979,7 @@ body-parser@1.18.3:
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
+  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
   dependencies:
     continuable-cache "^0.3.1"
     error "^7.0.0"
@@ -2137,6 +2001,7 @@ bonjour@^3.5.0:
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 boom@7.x.x:
   version "7.3.0"
@@ -2145,11 +2010,7 @@ boom@7.x.x:
   dependencies:
     hoek "6.x.x"
 
-bootstrap@^4.0.0-alpha.6:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
-
-bootstrap@^4.3.1:
+bootstrap@^4.0.0-alpha.6, bootstrap@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
   integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
@@ -2167,31 +2028,25 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@^0.1.0:
+bplist-parser@*, bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
   integrity sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@^1.1.7:
+brace-expansion@*, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -2217,6 +2072,7 @@ brfs@^1.3.0, brfs@^1.4.0:
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 brotli@^1.2.0:
   version "1.3.2"
@@ -2235,6 +2091,7 @@ browser-resolve@^1.11.0, browser-resolve@^1.8.1:
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -2246,6 +2103,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -2254,6 +2112,7 @@ browserify-cipher@^1.0.0:
 browserify-des@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -2272,6 +2131,7 @@ browserify-optional@^1.0.0:
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -2279,6 +2139,7 @@ browserify-rsa@^4.0.0:
 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=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -2291,24 +2152,26 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
 browserslist@^2.11.3:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
+  integrity sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==
   dependencies:
     caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
 browserslist@^4.4.1:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.2.tgz#6ea8a74d6464bb0bd549105f659b41197d8f0ba2"
-  integrity sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
+  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
   dependencies:
-    caniuse-lite "^1.0.30000939"
-    electron-to-chromium "^1.3.113"
-    node-releases "^1.1.8"
+    caniuse-lite "^1.0.30000955"
+    electron-to-chromium "^1.3.122"
+    node-releases "^1.1.13"
 
 bson@^1.1.1, bson@~1.1.1:
   version "1.1.1"
@@ -2323,6 +2186,7 @@ buffer-equal@0.0.1:
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer-indexof@^1.0.0:
   version "1.1.1"
@@ -2332,22 +2196,26 @@ buffer-indexof@^1.0.0:
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
+builtin-modules@^1.1.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 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"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
@@ -2357,10 +2225,12 @@ builtins@^1.0.3:
 bytes@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
+  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
 cacache@^10.0.4:
   version "10.0.4"
@@ -2404,6 +2274,7 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.2:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -2418,6 +2289,7 @@ cache-base@^1.0.1:
 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"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
 
 call-number@^1.0.1:
   version "1.0.1"
@@ -2431,13 +2303,6 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
-  dependencies:
-    callsites "^0.2.0"
-
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
@@ -2448,11 +2313,7 @@ caller-path@^2.0.0:
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 callsites@^2.0.0:
   version "2.0.0"
@@ -2462,6 +2323,7 @@ callsites@^2.0.0:
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -2469,23 +2331,27 @@ camelcase-keys@^2.0.0:
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 can-promise@0.0.1:
   version "0.0.1"
@@ -2494,14 +2360,10 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
-caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
-  version "1.0.30000882"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000882.tgz#0d5066847a11a5af0e50ffce6c062ef0665f68ea"
-
-caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000939:
-  version "1.0.30000939"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz#b9ab7ac9e861bf78840b80c5dfbc471a5cd7e679"
-  integrity sha512-oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==
+caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955:
+  version "1.0.30000957"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
+  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -2516,10 +2378,12 @@ capture-stack-trace@^1.0.0:
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
   dependencies:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
@@ -2535,7 +2399,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.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"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2544,14 +2408,6 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -2565,6 +2421,7 @@ chardet@^0.7.0:
 charm@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
+  integrity sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=
 
 check-types@^7.3.0:
   version "7.4.0"
@@ -2572,19 +2429,21 @@ check-types@^7.3.0:
   integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
 
 cheerio@^1.0.0-rc.2:
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
   dependencies:
     css-select "~1.2.0"
-    dom-serializer "~0.1.0"
+    dom-serializer "~0.1.1"
     entities "~1.1.1"
     htmlparser2 "^3.9.1"
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@2.0.4, chokidar@^2.0.2, chokidar@^2.0.4:
+chokidar@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -2601,10 +2460,10 @@ chokidar@2.0.4, chokidar@^2.0.2, chokidar@^2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^2.0.0, chokidar@^2.1.1, chokidar@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
-  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -2616,15 +2475,11 @@ chokidar@^2.0.0, chokidar@^2.1.1, chokidar@^2.1.2:
     normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
     readdirp "^2.2.1"
-    upath "^1.1.0"
+    upath "^1.1.1"
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-
-chownr@^1.1.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -2649,6 +2504,7 @@ ci-info@^2.0.0:
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -2658,14 +2514,10 @@ circular-dependency-plugin@5.0.2:
   resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
   integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -2694,6 +2546,7 @@ cli-cursor@^2.0.0, cli-cursor@^2.1.0:
 cli-table-redemption@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cli-table-redemption/-/cli-table-redemption-1.0.1.tgz#0359d8c34df74980029d76dff071a05a127c4fdd"
+  integrity sha512-SjVCciRyx01I4azo2K2rcc0NP/wOceXGzG1ZpYkEulbbIxDA/5YWv0oxG2HtQ4v8zPC6bgbRI7SbNaTZCxMNkg==
   dependencies:
     chalk "^1.1.3"
 
@@ -2705,6 +2558,7 @@ cli-width@^2.0.0:
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
   dependencies:
     center-align "^0.1.1"
     right-align "^0.1.1"
@@ -2713,6 +2567,7 @@ cliui@^2.1.0:
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -2750,19 +2605,22 @@ clone@^2.1.1, clone@^2.1.2:
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-block-writer@^7.2.0:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.2.2.tgz#14ec0120de9a65d2cc5d214561d51d1660dddbb1"
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.3.0.tgz#9a70ca48865d3a733347da31c74104eed734929f"
+  integrity sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 codelyzer@^5.0.0-beta.1:
-  version "5.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0-beta.1.tgz#749bc5d7f9cb73f71cc17594bae85227de0434fb"
-  integrity sha512-Pz+AF7F6SdO/aKvRNeDFFHWqSe0vGzbv3F1gu+OrE7+hbIeXm8RFafXZVYsO3edek9cRP8abo/mw28LK/BUSEA==
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0.tgz#e4032efb23a7c5d4bcfe7321fc1789490c679837"
+  integrity sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==
   dependencies:
     app-root-path "^2.1.0"
     aria-query "^3.0.0"
@@ -2777,6 +2635,7 @@ codelyzer@^5.0.0-beta.1:
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -2784,33 +2643,26 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 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-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==
 
-colors@^1.3.3:
+colors@^1.3.3, colors@latest:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
   integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
 
-colors@latest:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
-
-combined-stream@1.0.6, combined-stream@~1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@^1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
@@ -2820,19 +2672,17 @@ combined-stream@^1.0.6:
 commander@2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-commander@^2.11.0, commander@^2.18.0, commander@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-commander@^2.12.1, commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@~2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
 commander@~2.12.1:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+  integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -2842,38 +2692,44 @@ commondir@^1.0.1:
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.0, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
-compressible@~2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7"
+compressible@~2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
+  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
   dependencies:
-    mime-db ">= 1.34.0 < 2"
+    mime-db ">= 1.38.0 < 2"
 
 compression@^1.5.2, compression@^1.6.0:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.14"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@0.0.1:
+concat-map@*, concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@~1.6.0:
+concat-stream@^1.5.0, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -2913,33 +2769,34 @@ connect@^3.6.6:
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 continuable-cache@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
+  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
 
 continuation-local-storage@^3.2.1:
   version "3.2.1"
@@ -2959,10 +2816,12 @@ convert-source-map@^1.5.0, convert-source-map@^1.5.1:
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 cookiejar@^2.1.2:
   version "2.1.2"
@@ -2984,6 +2843,7 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-webpack-plugin@4.6.0:
   version "4.6.0"
@@ -3000,10 +2860,11 @@ copy-webpack-plugin@4.6.0:
     serialize-javascript "^1.4.0"
 
 cordova-android-support-gradle-release@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz#1a6a834a713310a7ee6ad1cd3e1db6b63cb993c3"
-  integrity sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.1.0.tgz#2d41db1eb7fc5dea32b6514336a37a5e00dfbc21"
+  integrity sha512-rKqNQ5PCHuZ/qUWYrLz5dKJpdJ/ArkhTCEv4CxbFuny0a0JNg5lwufmZ7qfVIqxoK0Nvs9XsIYKiFSGxaQ8lTg==
   dependencies:
+    q "^1.4.1"
     semver "5.1.0"
     xml2js "~0.4.19"
 
@@ -3150,9 +3011,9 @@ cordova-plugin-ionic-keyboard@^2.1.3:
   integrity sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ==
 
 cordova-plugin-ionic-webview@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.0.tgz#d00f36761309d31ade55e9740731ffca141f4e54"
-  integrity sha512-4CNDDXS9PZ+j38ZpzFqC6Ua5GySr/McXTPnWdRfhFSbuFCL6B/xhIHUVoeoj48wo6Sh+gDURvbaH9uu1Z53TJA==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.1.tgz#2ff5e73998d87316d3ab8dbe4b6ccf768ab7f637"
+  integrity sha512-rJf7jFQNw7l0U4Y7P6DjxwmO/qQgS7xqiTgwDbNFS4z4+FZ3EZyupll7/cFEDnxGRNMgWsMKDhIABUo5mIDaUQ==
 
 cordova-plugin-local-notification@0.9.0-beta.2:
   version "0.9.0-beta.2"
@@ -3160,9 +3021,9 @@ cordova-plugin-local-notification@0.9.0-beta.2:
   integrity sha512-63n77K1pt8dnbWnNR8QWETi9Glezi1bvNHvHWmGNIOv0xCb0phZnm+Ku49BQ+omwe8Z5voMvrA4I03SYPpv38w==
 
 cordova-plugin-mixpanel@^4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/cordova-plugin-mixpanel/-/cordova-plugin-mixpanel-4.5.2.tgz#76a78090c6333715618901e53e2782da9d3ac06c"
-  integrity sha512-+mlT7fw4ug+wU5/KlR5TX8lZQbyF7jsk/Ol8PNcizfxI7xU6URA5Y/qhTNzOZGjf4Iga6XhJx/VPz9fEzep1iA==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/cordova-plugin-mixpanel/-/cordova-plugin-mixpanel-4.6.1.tgz#a22de20db37fb552b08b2d7a286aa6291165eba5"
+  integrity sha512-tQ0kvp5mwKhWgSqvjMdERYfbSiQLBKDu01m6e0/wS/3zJEwPkBY5uhmTD/HTwl66HLOV0SGBXppD9shcmoJiKg==
 
 cordova-plugin-network-information@^2.0.1:
   version "2.0.1"
@@ -3199,7 +3060,7 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
   integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw=
@@ -3216,22 +3077,24 @@ cordova-serve@^3.0.0:
     which "^1.3.0"
 
 core-js@^2.4.0:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d"
-  integrity sha512-05qQ5hXShcqGkPZpXEFLIpxayZscVD2kuMBZewxiIPPEagukO4mqgPA9CWhUvFBJfy3ODdK2p9xyHh7FTU9/7A==
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
+  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
 core-js@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957"
-  integrity sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cors@latest:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.4.tgz#2bd381f2eb201020105cd50ea59da63090694686"
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
   dependencies:
     object-assign "^4"
     vary "^1"
@@ -3246,25 +3109,14 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
-  integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-
-cosmiconfig@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
-  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
+cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
+  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    lodash.get "^4.4.2"
+    js-yaml "^3.13.0"
     parse-json "^4.0.0"
 
 cpr@^3.0.1:
@@ -3280,6 +3132,7 @@ cpr@^3.0.1:
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -3294,6 +3147,7 @@ create-error-class@^3.0.0:
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -3304,6 +3158,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   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==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -3313,8 +3168,9 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     sha.js "^2.4.8"
 
 cron@^1.3:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/cron/-/cron-1.4.1.tgz#ce8451ba4d77c4dbc075526bfdcadcee5bf2bda2"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/cron/-/cron-1.7.0.tgz#9102864e0022da7f7475598be7d6110353ff8f96"
+  integrity sha512-I7S7ES2KZtKPfBTGJ5Brc6X23apE71fgYU/PC5ayh8R6VhECpqvTLe/LTkwAEN3ERFzNKXlWzh/PkwsGg3vkDQ==
   dependencies:
     moment-timezone "^0.5.x"
 
@@ -3329,6 +3185,7 @@ cross-env@^5.2.0:
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -3336,6 +3193,7 @@ cross-spawn@^3.0.0:
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
@@ -3362,6 +3220,7 @@ cryptiles@^4.1.3:
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -3392,7 +3251,8 @@ css-parse@1.7.x:
 
 css-select@~1.2.0:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
   dependencies:
     boolbase "~1.0.0"
     css-what "2.1"
@@ -3409,8 +3269,9 @@ css-selector-tokenizer@^0.7.1:
     regexpu-core "^1.0.0"
 
 css-what@2.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d"
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
 cssauron@^1.4.0:
   version "1.4.0"
@@ -3427,10 +3288,12 @@ cssesc@^0.1.0:
 culvert@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/culvert/-/culvert-0.1.2.tgz#9502f5f0154a2d5a22a023e79f71cc936fa6ef6f"
+  integrity sha1-lQL18BVKLVoioCPnn3HMk2+m728=
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
@@ -3442,6 +3305,7 @@ cyclist@~0.2.2:
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
   dependencies:
     es5-ext "^0.10.9"
 
@@ -3453,46 +3317,49 @@ damerau-levenshtein@^1.0.4:
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
-data-uri-to-buffer@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+data-uri-to-buffer@2:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz#ca8f56fe38b1fd329473e9d1b4a9afcd8ce1c045"
+  integrity sha512-OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A==
+  dependencies:
+    "@types/node" "^8.0.7"
 
 date-fns@^1.29.0:
-  version "1.29.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
+  version "1.30.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
+  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
-debug-log@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
-  integrity sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=
-
-debug@*, debug@^4.0.0, debug@^4.1.0:
+debug@*, debug@4, debug@^4.0.0, debug@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
-debug@2, debug@2.6.9, debug@^2.1.0, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.1.0, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@^3.0, debug@^3.1, debug@^3.1.0, debug@~3.1.0:
+debug@3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-debug@^3.2.5, debug@^3.2.6:
+debug@^3.0, debug@^3.1, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3502,6 +3369,7 @@ debug@^3.2.5, debug@^3.2.6:
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decamelize@^2.0.0:
   version "2.0.0"
@@ -3513,6 +3381,7 @@ decamelize@^2.0.0:
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 dedent@^0.7.0:
   version "0.7.0"
@@ -3527,10 +3396,12 @@ deep-equal@^1.0.0, deep-equal@^1.0.1, deep-equal@~1.0.1:
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 default-gateway@^2.6.0:
   version "2.7.2"
@@ -3550,18 +3421,21 @@ define-properties@^1.1.2:
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -3574,23 +3448,12 @@ defined@~1.0.0:
 degenerator@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=
   dependencies:
     ast-types "0.x.x"
     escodegen "1.x.x"
     esprima "3.x.x"
 
-deglob@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/deglob/-/deglob-2.1.1.tgz#d268e168727799862e8eac07042e165957c1f3be"
-  integrity sha512-2kjwuGGonL7gWE1XU4Fv79+vVzpoQCl0V+boMwWtOQJV2AGDabCwez++nB1Nli/8BabAfZQ/UuHPlp6AymKdWw==
-  dependencies:
-    find-root "^1.0.0"
-    glob "^7.0.5"
-    ignore "^3.0.9"
-    pkg-config "^1.1.0"
-    run-parallel "^1.1.2"
-    uniq "^1.0.1"
-
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
@@ -3606,18 +3469,17 @@ del@^3.0.0:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
-depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 dependency-graph@^0.7.2:
   version "0.7.2"
@@ -3627,6 +3489,7 @@ dependency-graph@^0.7.2:
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -3651,6 +3514,7 @@ detect-indent@^4.0.0:
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-node@^2.0.4:
   version "2.0.4"
@@ -3667,6 +3531,7 @@ dfa@^1.0.0:
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diff@^4.0.1:
   version "4.0.1"
@@ -3676,6 +3541,7 @@ diff@^4.0.1:
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -3686,13 +3552,21 @@ dijkstrajs@^1.0.1:
   resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
   integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs=
 
-dir-glob@^2.0.0:
+dir-glob@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
   dependencies:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
+dir-glob@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+  dependencies:
+    path-type "^3.0.0"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -3713,60 +3587,43 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
 doctrine@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
+  integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=
   dependencies:
     esutils "^1.1.6"
     isarray "0.0.1"
 
-doctrine@^2.0.2, doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
-dom-serializer@0, dom-serializer@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+dom-serializer@0, dom-serializer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
   dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
 
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.2.1.tgz#578558ef23befac043a1abb0db07635509393479"
-
-domelementtype@^1.3.0:
-  version "1.3.0"
-  resolved "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
   dependencies:
     domelementtype "1"
 
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -3774,6 +3631,7 @@ domutils@1.5.1:
 domutils@^1.5.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -3788,16 +3646,21 @@ dot-prop@^4.1.0:
 dot@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/dot/-/dot-1.1.2.tgz#c7377019fc4e550798928b2b9afeb66abfa1f2f9"
+  integrity sha1-xzdwGfxOVQeYkosrmv62ar+h8vk=
 
-dotenv-webpack@^1.5.7:
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.5.7.tgz#c44395ab21d1fd28d79a90942a7b14b1debd145f"
+dotenv-defaults@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-1.0.2.tgz#441cf5f067653fca4bbdce9dd3b803f6f84c585d"
+  integrity sha512-iXFvHtXl/hZPiFj++1hBg4lbKwGM+t/GlvELDnRtOFdjXyWP7mubkVr+eZGWG62kdsbulXAef6v/j6kiWc/xGA==
   dependencies:
-    dotenv "^5.0.1"
+    dotenv "^6.2.0"
 
-dotenv@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
+dotenv-webpack@^1.5.7:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz#4384d8c57ee6f405c296278c14a9f9167856d3a1"
+  integrity sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==
+  dependencies:
+    dotenv-defaults "^1.0.2"
 
 dotenv@^6.2.0:
   version "6.2.0"
@@ -3823,7 +3686,8 @@ duplexer3@^0.1.4:
 
 duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
-  resolved "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
@@ -3838,6 +3702,7 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -3845,24 +3710,22 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 ejs@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.113:
-  version "1.3.113"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
-  integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
-
-electron-to-chromium@^1.3.30:
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.62.tgz#2e8e2dc070c800ec8ce23ff9dfcceb585d6f9ed8"
+electron-to-chromium@^1.3.122, electron-to-chromium@^1.3.30:
+  version "1.3.124"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
+  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
 elementtree@0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/elementtree/-/elementtree-0.1.6.tgz#2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"
+  integrity sha1-KsTEbqMFFsjEy9teOsdBjlkt4gw=
   dependencies:
     sax "0.3.5"
 
@@ -3876,6 +3739,7 @@ elementtree@0.1.7, elementtree@^0.1.7:
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -3886,8 +3750,9 @@ elliptic@^6.0.0:
     minimalistic-crypto-utils "^1.0.0"
 
 emitter-listener@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.1.tgz#e8bbbe8244bc8e0d0b4ef71cd14294c7f241c7ec"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
+  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
   dependencies:
     shimmer "^1.2.0"
 
@@ -3899,10 +3764,12 @@ emoji-regex@^7.0.1:
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
   version "0.1.12"
@@ -3919,20 +3786,18 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
     once "^1.4.0"
 
 endent@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/endent/-/endent-1.2.0.tgz#1e43a6072d1e8e517495c0bf13c32b0c6e57206d"
-  integrity sha512-o6JTG7ce2GBLDfWjoB0XWcIoBXXtx59TGc8jHhDC8Pi6su4ifFNMpUvCmEr8ec5FPxpGVowGpmC7/JhKLk0iVw==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/endent/-/endent-1.3.0.tgz#ea86b583d7b7caff5cbee5ad2c7c322eb1900c76"
+  integrity sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==
   dependencies:
     dedent "^0.7.0"
     fast-json-parse "^1.0.3"
     objectorarray "^1.0.3"
-    standard "^11.0.1"
-    tape "^4.8.0"
 
 engine.io-client@~3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.1.tgz#afedb4a07b2ea48b7190c3136bfea98fdd4f0f03"
-  integrity sha512-q66JBFuQcy7CSlfAz9L3jH+v7DTT3i6ZEadYcVj2pOs8/0uJHLxKX3WBkGTvULJMdz0tUCyJag0aKT/dpXL9BQ==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.2.tgz#04e068798d75beda14375a264bb3d742d7bc33aa"
+  integrity sha512-y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -3947,13 +3812,14 @@ engine.io-client@~3.3.1:
     yeast "0.1.2"
 
 engine.io-parser@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
+  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.5"
-    blob "0.0.4"
+    blob "0.0.5"
     has-binary2 "~1.0.2"
 
 enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
@@ -3968,6 +3834,7 @@ enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
 enhanced-resolve@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
+  integrity sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -3977,6 +3844,7 @@ enhanced-resolve@^3.4.0:
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 envalid@^4.2.2:
   version "4.2.2"
@@ -3996,23 +3864,26 @@ err-code@^1.0.0:
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 error@^7.0.0:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02"
+  integrity sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=
   dependencies:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.5.0, es-abstract@^1.7.0:
+es-abstract@^1.5.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
   integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
@@ -4034,16 +3905,18 @@ es-to-primitive@^1.2.0:
     is-symbol "^1.0.2"
 
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.46"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
+  version "0.10.49"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.49.tgz#059a239de862c94494fec28f8150c977028c6c5e"
+  integrity sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
-    next-tick "1"
+    next-tick "^1.0.0"
 
 es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
   dependencies:
     d "1"
     es5-ext "^0.10.35"
@@ -4052,6 +3925,7 @@ es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
 es6-map@^0.1.3:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4066,18 +3940,21 @@ es6-promise-plugin@^4.2.2:
   integrity sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA==
 
 es6-promise@^4.0.3:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
+  integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
-  resolved "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  integrity sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4088,6 +3965,7 @@ es6-set@~0.1.5:
 es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4095,6 +3973,7 @@ es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
 es6-weak-map@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  integrity sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=
   dependencies:
     d "1"
     es5-ext "^0.10.14"
@@ -4104,28 +3983,19 @@ es6-weak-map@^2.0.1:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-regexp@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/escape-regexp/-/escape-regexp-0.0.1.tgz#f44bda12d45bbdf9cb7f862ee7e4827b3dd32254"
+  integrity sha1-9EvaEtRbvfnLf4Yu5+SCez3TIlQ=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-escodegen@1.x.x:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
-  dependencies:
-    esprima "^3.1.3"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
-escodegen@^1.8.1:
+escodegen@1.x.x, escodegen@^1.8.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
   integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
@@ -4163,202 +4033,72 @@ escodegen@~1.9.0:
 escope@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  integrity sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=
   dependencies:
     es6-map "^0.1.3"
     es6-weak-map "^2.0.1"
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-standard-jsx@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-5.0.0.tgz#4abfac554f38668e0078c664569e7b2384e5d2aa"
-  integrity sha512-rLToPAEqLMPBfWnYTu6xRhm2OWziS2n40QFqJ8jAM8NSVzeVKTa3nclhsU4DpPJQRY60F34Oo1wi/71PN/eITg==
-
-eslint-config-standard@11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz#87ee0d3c9d95382dc761958cbb23da9eea31e0ba"
-  integrity sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw==
-
-eslint-import-resolver-node@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
-  integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
-  dependencies:
-    debug "^2.6.9"
-    resolve "^1.5.0"
-
-eslint-module-utils@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz#546178dab5e046c8b562bbb50705e2456d7bda49"
-  integrity sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==
-  dependencies:
-    debug "^2.6.8"
-    pkg-dir "^2.0.0"
-
-eslint-plugin-import@~2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.9.0.tgz#26002efbfca5989b7288ac047508bd24f217b169"
-  integrity sha1-JgAu+/ylmJtyiKwEdQi9JPIXsWk=
-  dependencies:
-    builtin-modules "^1.1.1"
-    contains-path "^0.1.0"
-    debug "^2.6.8"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.1"
-    eslint-module-utils "^2.1.1"
-    has "^1.0.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.3"
-    read-pkg-up "^2.0.0"
-
-eslint-plugin-node@~6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz#bf19642298064379315d7a4b2a75937376fa05e4"
-  integrity sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==
-  dependencies:
-    ignore "^3.3.6"
-    minimatch "^3.0.4"
-    resolve "^1.3.3"
-    semver "^5.4.1"
-
-eslint-plugin-promise@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.7.0.tgz#f4bde5c2c77cdd69557a8f69a24d1ad3cfc9e67e"
-  integrity sha512-2WO+ZFh7vxUKRfR0cOIMrWgYKdR6S1AlOezw6pC52B6oYpd5WFghN+QHxvrRdZMtbo8h3dfUZ2o1rWb0UPbKtg==
-
-eslint-plugin-react@~7.7.0:
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160"
-  integrity sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==
-  dependencies:
-    doctrine "^2.0.2"
-    has "^1.0.1"
-    jsx-ast-utils "^2.0.1"
-    prop-types "^15.6.0"
-
-eslint-plugin-standard@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2"
-  integrity sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=
-
-eslint-scope@^3.7.1:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535"
-  integrity sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.2.tgz#5f10cd6cabb1965bf479fa65745673439e21cb0e"
-  integrity sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-visitor-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
-  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
-
-eslint@~4.18.0:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.2.tgz#0f81267ad1012e7d2051e186a9004cc2267b8d45"
-  integrity sha512-qy4i3wODqKMYfz9LUI8N2qYDkHkoieTbiHpMrYUI/WbjhXJQr7lI4VngixTgaG+yHX+NBCv7nW4hA0ShbvaNKw==
-  dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.2"
-    esquery "^1.0.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
-
-espree@^3.5.2:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
-  integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==
-  dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
-
 esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esprima@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
   integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
 
-esquery@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
-  dependencies:
-    estraverse "^4.0.0"
-
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   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.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
 estraverse@~1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"
   integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=
 
-estree-walker@^0.5.0, estree-walker@^0.5.2:
+estree-walker@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
+  integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
+
+estree-walker@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae"
+  integrity sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==
 
 esutils@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
+  integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
 
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 esutils@~1.0.0:
   version "1.0.0"
@@ -4378,6 +4118,7 @@ ev-emitter@^1.0.0:
 event-emitter@~0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4403,23 +4144,27 @@ event-stream@3.3.4:
 eventemitter2@5.0.1, eventemitter2@^5.0.1, eventemitter2@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-5.0.1.tgz#6197a095d5fb6b57e8942f6fd7eaad63a09c9452"
+  integrity sha1-YZegldX7a1folC9v1+qtY6CclFI=
 
 eventemitter2@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-4.1.2.tgz#0e1a8477af821a6ef3995b311bf74c23a5247f15"
+  integrity sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU=
 
 eventemitter2@~0.4.14:
   version "0.4.14"
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab"
+  integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=
 
 eventemitter3@^3.0.0, eventemitter3@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
   integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
-events@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+events@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
 
 eventsource@^1.0.7:
   version "1.0.7"
@@ -4431,6 +4176,7 @@ eventsource@^1.0.7:
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -4451,6 +4197,7 @@ execa@^0.10.0:
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -4473,66 +4220,20 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
     extend-shallow "^2.0.1"
     posix-character-classes "^0.1.0"
     regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  dependencies:
-    fill-range "^2.1.0"
-
-express@^4.13.3, express@^4.16.3:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.2"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
-express@^4.16.2:
+express@^4.13.3, express@^4.16.2, express@^4.16.3:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -4571,21 +4272,24 @@ express@^4.16.2:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3, 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==
 
-external-editor@^2.0.1, external-editor@^2.0.4:
+external-editor@^2.0.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
@@ -4603,15 +4307,10 @@ external-editor@^3.0.0, external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  dependencies:
-    is-extglob "^1.0.0"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -4622,13 +4321,20 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-files@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz#c9492a8410be643e260a376f0151361993d5f659"
+  integrity sha512-qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w==
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 falafel@^2.1.0:
   version "2.1.0"
@@ -4640,15 +4346,7 @@ falafel@^2.1.0:
     isarray "0.0.1"
     object-keys "^1.0.6"
 
-fancy-log@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    time-stamp "^1.0.0"
-
-fancy-log@^1.3.3:
+fancy-log@^1.3.2, 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==
@@ -4661,6 +4359,7 @@ fancy-log@^1.3.3:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
@@ -4668,14 +4367,15 @@ fast-deep-equal@^2.0.1:
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-glob@^2.0.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.3.tgz#d09d378e9ef6b0076a0fa1ba7519d9d4d9699c28"
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
+  integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.0.1"
+    "@nodelib/fs.stat" "^1.1.2"
     glob-parent "^3.1.0"
     is-glob "^4.0.0"
-    merge2 "^1.2.1"
+    merge2 "^1.2.3"
     micromatch "^3.1.10"
 
 fast-json-parse@^1.0.3:
@@ -4686,10 +4386,12 @@ fast-json-parse@^1.0.3:
 fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastparse@^1.1.1:
   version "1.1.2"
@@ -4713,6 +4415,7 @@ faye-websocket@^0.10.0, faye-websocket@~0.10.0:
 fclone@1.0.11, fclone@^1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fclone/-/fclone-1.0.11.tgz#10e85da38bfea7fc599341c296ee1d77266ee640"
+  integrity sha1-EOhdo4v+p/xZk0HClu4ddyZu5kA=
 
 figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
@@ -4726,14 +4429,6 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
 file-loader@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
@@ -4745,29 +4440,17 @@ file-loader@3.0.1:
 file-uri-to-path@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 filesize@^3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
   integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
 
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -4777,6 +4460,7 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -4809,22 +4493,18 @@ find-cache-dir@^1.0.0:
     pkg-dir "^2.0.0"
 
 find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
     commondir "^1.0.1"
-    make-dir "^1.0.0"
+    make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-root@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
-  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -4832,6 +4512,7 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
@@ -4845,6 +4526,7 @@ find-up@^3.0.0:
 findit2@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/findit2/-/findit2-2.2.3.tgz#58a466697df8a6205cdfdbf395536b8bd777a5f6"
+  integrity sha1-WKRmaX34piBc39vzlVNri9d3pfY=
 
 fizzy-ui-utils@^2.0.0:
   version "2.0.7"
@@ -4853,16 +4535,6 @@ fizzy-ui-utils@^2.0.0:
   dependencies:
     desandro-matches-selector "^2.0.0"
 
-flat-cache@^1.2.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
-  integrity sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==
-  dependencies:
-    circular-json "^0.3.1"
-    graceful-fs "^4.1.2"
-    rimraf "~2.6.2"
-    write "^0.2.1"
-
 flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
@@ -4871,28 +4543,22 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.0.0:
+follow-redirects@^1.0.0, follow-redirects@^1.2.3:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
   integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
   dependencies:
     debug "^3.2.6"
 
-follow-redirects@^1.2.3:
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
-  dependencies:
-    debug "^3.1.0"
-
 font-awesome@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
   integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
 
 fontkit@^1.0.0:
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/fontkit/-/fontkit-1.7.8.tgz#235ba495e70cd5cab9a3462ee5d32d9fa5f08b69"
-  integrity sha512-4bo/Sp+Ob/cE5f2aCre/N42mHe6hcIWUYmTRgEqLmJyPRX0m0KBl1jflMM70Vh7qZRoh97BcS3JQGrRvK1Ga7Q==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/fontkit/-/fontkit-1.8.0.tgz#deb9351619e90ddc91707b6156a9f14c8ab11554"
+  integrity sha512-EFDRCca7khfQWYu1iFhsqeABpi87f03MBdkT93ZE6YhqCdMzb5Eojb6c4dlJikGv5liuhByyzA7ikpIPTSBWbQ==
   dependencies:
     babel-runtime "^6.11.6"
     brfs "^1.4.0"
@@ -4921,12 +4587,7 @@ for-in@^0.1.3:
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  dependencies:
-    for-in "^1.0.1"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^1.0.0:
   version "1.0.0"
@@ -4943,8 +4604,9 @@ foreach@^2.0.5:
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@^2.3.3:
+form-data@^2.3.3, form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
@@ -4953,14 +4615,6 @@ form-data@^2.3.3:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
 formidable@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
@@ -4969,16 +4623,19 @@ formidable@^1.2.0:
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from2@^2.1.0:
   version "2.3.0"
@@ -4996,6 +4653,7 @@ from@~0:
 fs-extra@^4.0.1, fs-extra@^4.0.2:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -5004,20 +4662,13 @@ fs-extra@^4.0.1, fs-extra@^4.0.2:
 fs-extra@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^7.0.1:
+fs-extra@^7.0.0, fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -5029,6 +4680,7 @@ fs-extra@^7.0.1:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
@@ -5045,15 +4697,9 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
-fsevents@^1.2.7:
+fsevents@^1.2.2, fsevents@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
   integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
@@ -5064,6 +4710,7 @@ fsevents@^1.2.7:
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -5073,6 +4720,7 @@ fstream@^1.0.0, fstream@^1.0.2:
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
   dependencies:
     readable-stream "1.1.x"
     xregexp "2.0.0"
@@ -5082,14 +4730,10 @@ function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -5103,6 +4747,7 @@ gauge@~2.7.3:
 gaze@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
@@ -5114,11 +4759,12 @@ genfun@^5.0.0:
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-caller-file@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.1.tgz#25835260d3a2b9665fcdbb08cb039a7bbf7011c0"
-  integrity sha512-SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-size@^2.0.2:
   version "2.0.3"
@@ -5128,6 +4774,7 @@ get-size@^2.0.2:
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stdin@^6.0.0:
   version "6.0.0"
@@ -5137,6 +4784,7 @@ get-stdin@^6.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@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
@@ -5146,54 +4794,47 @@ get-stream@^4.0.0, get-stream@^4.1.0:
     pump "^3.0.0"
 
 get-uri@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.3.tgz#fa13352269781d75162c6fc813c9e905323fbab5"
+  integrity sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==
   dependencies:
-    data-uri-to-buffer "1"
-    debug "2"
-    extend "3"
+    data-uri-to-buffer "2"
+    debug "4"
+    extend "~3.0.2"
     file-uri-to-path "1"
     ftp "~0.3.10"
-    readable-stream "2"
+    readable-stream "3"
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 git-node-fs@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/git-node-fs/-/git-node-fs-1.0.0.tgz#49b215e242ebe43aa4c7561bbba499521752080f"
+  integrity sha1-SbIV4kLr5Dqkx1Ybu6SZUhdSCA8=
 
 git-sha1@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/git-sha1/-/git-sha1-0.1.2.tgz#599ac192b71875825e13a445f3a6e05118c2f745"
+  integrity sha1-WZrBkrcYdYJeE6RF86bgURjC90U=
 
 "gkt@https://tgz.pm2.io/gkt-1.0.0.tgz":
   version "1.0.0"
   resolved "https://tgz.pm2.io/gkt-1.0.0.tgz#405502b007f319c3f47175c4474527300f2ab5ad"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -5201,6 +4842,7 @@ glob-parent@^3.1.0:
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 glob@5.0.15, glob@^5.0.13:
   version "5.0.15"
@@ -5228,6 +4870,7 @@ glob@7.0.x:
 glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1, glob@~7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -5243,11 +4886,6 @@ global-dirs@^0.1.0:
   dependencies:
     ini "^1.3.4"
 
-globals@^11.0.1:
-  version "11.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
-  integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==
-
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -5277,11 +4915,12 @@ globby@^7.1.1:
     slash "^1.0.0"
 
 globby@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
+  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
   dependencies:
     array-union "^1.0.1"
-    dir-glob "^2.0.0"
+    dir-glob "2.0.0"
     fast-glob "^2.0.2"
     glob "^7.1.2"
     ignore "^3.3.5"
@@ -5291,6 +4930,7 @@ globby@^8.0.1:
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
+  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
@@ -5313,24 +4953,20 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.5:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
 graphql-tag@^2.10.1:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02"
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
 
 graphql@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0"
-  integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.1.tgz#779529bf9a01e7207b977a54c20670b48ca6e95c"
+  integrity sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==
   dependencies:
     iterall "^1.2.2"
 
@@ -5348,11 +4984,11 @@ handle-thing@^2.0.0:
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
-  integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
+  integrity sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==
   dependencies:
-    async "^2.5.0"
+    neo-async "^2.6.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
@@ -5361,12 +4997,14 @@ handlebars@^4.1.0:
 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:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
-    ajv "^5.3.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
@@ -5379,20 +5017,24 @@ has-ansi@^2.0.0:
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-symbols@^1.0.0:
   version "1.0.0"
@@ -5402,10 +5044,12 @@ has-symbols@^1.0.0:
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -5414,6 +5058,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -5422,10 +5067,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -5440,13 +5087,15 @@ has@^1.0.1, has@^1.0.3, has@~1.0.3:
 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=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
@@ -5454,15 +5103,16 @@ hash.js@^1.0.0, hash.js@^1.0.3:
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
 hoek@6.x.x:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
-  integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
+  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
 
 hoopy@^0.1.2:
   version "0.1.4"
@@ -5472,6 +5122,7 @@ hoopy@^0.1.2:
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -5489,15 +5140,16 @@ html-entities@^1.2.0, html-entities@^1.2.1:
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 htmlparser2@^3.9.1:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz#5f5e422dcf6119c0d983ed36260ce9ded0bee464"
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
   dependencies:
-    domelementtype "^1.3.0"
+    domelementtype "^1.3.1"
     domhandler "^2.3.0"
     domutils "^1.5.1"
     entities "^1.1.1"
     inherits "^2.0.1"
-    readable-stream "^3.0.6"
+    readable-stream "^3.1.1"
 
 http-auth@3.1.x:
   version "3.1.3"
@@ -5519,18 +5171,10 @@ http-deceiver@^1.2.7:
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
   integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
-  dependencies:
-    depd "1.1.1"
-    inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
-
 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -5538,12 +5182,14 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.4.0:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
+  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
@@ -5570,6 +5216,7 @@ http-proxy@^1.16.2:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -5578,10 +5225,12 @@ http-signature@~1.2.0:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -5610,31 +5259,30 @@ husky@^1.3.1:
     slash "^2.0.0"
 
 i18next@^15.0.4:
-  version "15.0.5"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.5.tgz#9dfaeaa70b6bc0da49c6b8f1790be3646f8cfe2c"
-  integrity sha512-JqcoIM20BuYq0iQm8VLlq2pqhCNoG60+QuOxLE9PCDGZZc+in9kWofw1qLUazo4B53jJDca1ARd2YLmhXcx2uw==
+  version "15.0.9"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.9.tgz#42536407a921bb5a8535a4c090a26f16827a1884"
+  integrity sha512-IdVj7DqErUuMbGuj2dFT431T7zKlmDci63eae6pNA/bMwgBZKT74/KnwHXE0WH7ivo2EV/LNme4pP4Yw6vB79w==
   dependencies:
     "@babel/runtime" "^7.3.1"
 
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -5644,12 +5292,14 @@ iferr@^0.1.5:
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.0.9, ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6:
+ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
 image-size@~0.5.0:
   version "0.5.5"
@@ -5666,6 +5316,7 @@ imagesloaded@^4.1.1, imagesloaded@^4.1.4:
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
 immutable-tuple@^0.4.9:
   version "0.4.10"
@@ -5715,35 +5366,42 @@ imurmurhash@^0.1.4:
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
-inflight@^1.0.4:
+inflight@*, inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@1.3.5, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 inquirer@3.0.6:
   version "3.0.6"
@@ -5783,26 +5441,6 @@ inquirer@6.2.1:
     strip-ansi "^5.0.0"
     through "^2.3.6"
 
-inquirer@^3.0.6:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 inquirer@^6.0.0:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
@@ -5825,6 +5463,7 @@ inquirer@^6.0.0:
 inside@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/inside/-/inside-1.0.0.tgz#db45e993573cdb3db70b9832e8285bad46424770"
+  integrity sha1-20Xpk1c82z23C5gy6ChbrUZCR3A=
 
 internal-ip@^3.0.1:
   version "3.0.1"
@@ -5835,8 +5474,9 @@ internal-ip@^3.0.1:
     ipaddr.js "^1.5.2"
 
 interpret@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
+  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
 invariant@^2.2.2:
   version "2.2.4"
@@ -5848,6 +5488,7 @@ invariant@^2.2.2:
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 invert-kv@^2.0.0:
   version "2.0.0"
@@ -5893,11 +5534,16 @@ ionic@^4.12.0:
     update-notifier "^2.3.0"
     uuid "^3.2.1"
 
-ionicons@4.5.5, ionicons@^4.5.5:
+ionicons@4.5.5:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.5.tgz#b059958a54dd45cfa127acc0baf11503b8671e51"
   integrity sha512-dIGI73XG6Fg2Ps77ry5Ywe36Pq7wUGkDkl0pBhC4uhsiyoW+oXe+pplmarXEnKEcB5fmlkRrBOxYYzZaoRiUGw==
 
+ionicons@^4.5.5:
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.6.tgz#f3b5d2446e7e1b30e67ddcd1fc563271acc60f3c"
+  integrity sha512-/F3U/rxdLPGl8eUW5dMouhBBoJuUPrlFO6rkoz4VNuw1lxP6l+bFtsDA8MaVM1dHABp+gIHxtpt+IhwmB3oIfA==
+
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -5906,10 +5552,12 @@ ip-regex@^2.1.0:
 ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
 ipaddr.js@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
 ipaddr.js@^1.5.2:
   version "1.9.0"
@@ -5919,6 +5567,7 @@ ipaddr.js@^1.5.2:
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
     is-windows "^1.0.1"
@@ -5926,34 +5575,33 @@ is-absolute@^1.0.0:
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-callable@^1.1.3, is-callable@^1.1.4:
   version "1.1.4"
@@ -5977,12 +5625,14 @@ is-ci@^2.0.0:
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
@@ -5994,6 +5644,7 @@ is-date-object@^1.0.1:
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -6002,6 +5653,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -6010,66 +5662,55 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  dependencies:
-    is-primitive "^2.0.0"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -6084,32 +5725,25 @@ is-installed-globally@^0.1.0:
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
 is-negated-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
 
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
   integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -6137,17 +5771,10 @@ is-path-inside@^1.0.0:
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -6168,14 +5795,10 @@ is-regex@^1.0.4:
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
 
-is-resolvable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
-
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -6184,6 +5807,7 @@ is-retry-allowed@^1.0.0:
 is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-symbol@^1.0.2:
   version "1.0.2"
@@ -6195,20 +5819,24 @@ is-symbol@^1.0.2:
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-unc-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
@@ -6218,14 +5846,17 @@ is-wsl@^1.1.0:
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isarray@^2.0.1:
   version "2.0.4"
@@ -6235,20 +5866,24 @@ isarray@^2.0.1:
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-instrumenter-loader@3.0.1:
   version "3.0.1"
@@ -6284,12 +5919,14 @@ iterall@^1.2.1, iterall@^1.2.2:
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
 js-base64@^2.1.8:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
+  integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
 
 js-git@^0.7.8:
   version "0.7.8"
   resolved "https://registry.yarnpkg.com/js-git/-/js-git-0.7.8.tgz#52fa655ab61877d6f1079efc6534b554f31e5444"
+  integrity sha1-UvplWrYYd9bxB578ZTS1VPMeVEQ=
   dependencies:
     bodec "^0.1.0"
     culvert "^0.1.2"
@@ -6304,18 +5941,12 @@ js-git@^0.7.8:
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.7.0, js-yaml@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.9.1:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
-  integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
+js-yaml@^3.13.0, js-yaml@^3.9.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -6328,6 +5959,7 @@ jsbarcode@^3.11.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsesc@^1.3.0:
   version "1.3.0"
@@ -6342,14 +5974,17 @@ jsesc@~0.5.0:
 json-loader@^0.5.4, json-loader@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+  integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==
 
 json-parse-better-errors@^1.0.0, 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"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -6359,24 +5994,22 @@ json-schema-traverse@^0.4.1:
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
   integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
-json5@^0.5.0, json5@^0.5.1:
+json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
 json5@^1.0.1:
   version "1.0.1"
@@ -6395,6 +6028,7 @@ json5@^2.1.0:
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -6406,19 +6040,13 @@ jsonparse@^1.2.0:
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsx-ast-utils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
-  integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
-  dependencies:
-    array-includes "^3.0.3"
-
 kareem@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.0.tgz#ef33c42e9024dce511eeaf440cd684f3af1fc769"
@@ -6439,22 +6067,26 @@ killable@^1.0.0:
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 latest-version@^3.0.0:
   version "3.1.0"
@@ -6466,14 +6098,17 @@ latest-version@^3.0.0:
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
 lazy@~1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/lazy/-/lazy-1.0.11.tgz#daa068206282542c088288e975c297c1ae77b690"
+  integrity sha1-2qBoIGKCVCwIgojpdcKXwa53tpA=
 
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
@@ -6518,9 +6153,10 @@ less@3.9.0:
     request "^2.83.0"
     source-map "~0.6.0"
 
-levn@^0.3.0, levn@~0.3.0:
+levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -6536,6 +6172,7 @@ license-webpack-plugin@2.1.0:
 lie@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
   dependencies:
     immediate "~3.0.5"
 
@@ -6568,12 +6205,14 @@ live-server@^1.2.1:
     serve-index "^1.9.1"
 
 livereload-js@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
+  integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
 
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -6584,27 +6223,19 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
 loader-runner@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+  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.1, loader-utils@^1.0.2:
+loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -6613,14 +6244,6 @@ loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2:
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
-loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
 localforage-cordovasqlitedriver@1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/localforage-cordovasqlitedriver/-/localforage-cordovasqlitedriver-1.7.0.tgz#8b93957759ee688d3a58d5ba7c0477f6ccb53838"
@@ -6645,6 +6268,7 @@ localforage@>=1.5.0:
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -6706,26 +6330,32 @@ lodash.assign@^3.2.0:
 lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.findindex@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106"
+  integrity sha1-oyRd7mH7m24GJLU1ElYku2nBEQY=
 
 lodash.foreach@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
 
 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.isarguments@^3.0.0:
   version "3.1.0"
@@ -6740,6 +6370,7 @@ lodash.isarray@^3.0.0:
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
 lodash.keys@^3.0.0:
   version "3.1.2"
@@ -6753,10 +6384,12 @@ lodash.keys@^3.0.0:
 lodash.last@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash.last/-/lodash.last-3.0.0.tgz#242f663112dd4c6e63728c60a3c909d1bdadbd4c"
+  integrity sha1-JC9mMRLdTG5jcoxgo8kJ0b2tvUw=
 
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
@@ -6768,13 +6401,10 @@ lodash.tail@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
   integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@~4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
-lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 log-driver@^1.2.7:
   version "1.2.7"
@@ -6798,6 +6428,7 @@ loglevel@^1.4.1:
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
 
 loose-envify@^1.0.0:
   version "1.4.0"
@@ -6809,6 +6440,7 @@ loose-envify@^1.0.0:
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -6818,16 +6450,10 @@ lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lru-cache@^4.0.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -6847,15 +6473,17 @@ lunr@^2.3.6:
 macos-release@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb"
+  integrity sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==
 
-macos-release@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
-  integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==
+macos-release@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
+  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
   dependencies:
     vlq "^0.2.2"
 
@@ -6873,6 +6501,14 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
@@ -6905,10 +6541,12 @@ map-age-cleaner@^0.1.1:
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-stream@~0.1.0:
   version "0.1.0"
@@ -6918,13 +6556,14 @@ map-stream@~0.1.0:
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 marked@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.1.tgz#a63addde477bca9613028de4b2bc3629e53a0562"
-  integrity sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
+  integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
 
 masonry-layout@^4.2.0, masonry-layout@^4.2.2:
   version "4.2.2"
@@ -6934,16 +6573,14 @@ masonry-layout@^4.2.0, masonry-layout@^4.2.2:
     get-size "^2.0.2"
     outlayer "^2.1.0"
 
-math-random@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
-
 md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
 meant@^1.0.1:
   version "1.0.1"
@@ -6953,32 +6590,41 @@ meant@^1.0.1:
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.1.0.tgz#aeb9be2d21f47e78af29e4ac5978e8afa2ca5b8a"
-  integrity sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
   dependencies:
     map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
+    mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
 memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memory-pager@^1.0.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
+  integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==
+
 meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -6994,6 +6640,7 @@ meow@^3.7.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 merge-source-map@1.0.4:
   version "1.0.4"
@@ -7002,35 +6649,20 @@ merge-source-map@1.0.4:
   dependencies:
     source-map "^0.5.6"
 
-merge2@^1.2.1:
+merge2@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
+  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
 methods@^1.1.1, methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-
-micromatch@^2.3.11:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
 micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7049,34 +6681,32 @@ micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.34.0 < 2", mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+"mime-db@>= 1.38.0 < 2":
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
+  integrity sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==
 
-mime-db@~1.37.0:
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
-  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
-
-mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  dependencies:
-    mime-db "~1.36.0"
+mime-db@~1.38.0:
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
+  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
 
-mime-types@~2.1.17:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
+  version "2.1.22"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
   dependencies:
-    mime-db "~1.37.0"
+    mime-db "~1.38.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 mime@^1.4.1:
   version "1.6.0"
@@ -7084,13 +6714,19 @@ mime@^1.4.1:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.3.1, mime@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
+  integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+mimic-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 mini-css-extract-plugin@0.5.0:
   version "0.5.0"
@@ -7104,37 +6740,36 @@ mini-css-extract-plugin@0.5.0:
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   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.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
+minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minipass@^2.3.4, minipass@^2.3.5:
+minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -7142,12 +6777,6 @@ minipass@^2.3.4, minipass@^2.3.5:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  dependencies:
-    minipass "^2.2.1"
-
 minizlib@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
@@ -7190,6 +6819,7 @@ mississippi@^3.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -7204,7 +6834,8 @@ mixin-object@^2.0.1:
 
 mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
-  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
@@ -7214,16 +6845,13 @@ module-details-from-path@^1.0.3:
   integrity sha1-EUyUlnPiqKNenTV4hSeqN7Z52is=
 
 moment-timezone@^0.5.x:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.21.tgz#3cba247d84492174dbf71de2a9848fa13207b845"
+  version "0.5.23"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.23.tgz#7cbb00db2c14c71b19303cb47b0fb0a6d8651463"
+  integrity sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==
   dependencies:
     moment ">= 2.9.0"
 
-"moment@>= 2.9.0", moment@^2.21.0, moment@^2.22.2:
-  version "2.22.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-
-moment@^2.24.0:
+"moment@>= 2.9.0", moment@^2.21.0, moment@^2.22.2, moment@^2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
@@ -7250,11 +6878,12 @@ mongodb@3.2.2:
 mongoose-legacy-pluralize@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
+  integrity sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==
 
 mongoose@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.0.tgz#e1bf07cf9953840aaaafb25df163bc12ed70365c"
-  integrity sha512-GZdhdbTXTgikInIgtxR7ODcF3+MoJTumTsKYinX3zxJcQgMVr+Y0jBuFoLJ9YtVdF2nq1ukLnhS6RHfta1ptgQ==
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.1.tgz#a256a08241a1412bb307b85e7ece25629d0b4bbe"
+  integrity sha512-sVDyzADl0RbNvoRWLL/zQDqoFGi1IaSo5+DpOwhvGgFs3pSsvmONPNW3JF1KvZerNkkkGFb8ZMuFBeKEiDqZLw==
   dependencies:
     async "2.6.1"
     bson "~1.1.1"
@@ -7301,6 +6930,7 @@ mpath@0.5.1:
 mquery@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/mquery/-/mquery-3.2.0.tgz#e276472abd5109686a15eb2a8e0761db813c81cc"
+  integrity sha512-qPJcdK/yqcbQiKoemAt62Y0BAc0fTEKo1IThodBD+O5meQRJT/2HSe5QpBNwaa4CjskoGrYWsEyjkqgiE0qjhg==
   dependencies:
     bluebird "3.5.1"
     debug "3.1.0"
@@ -7311,6 +6941,7 @@ mquery@3.2.0:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@2.1.1, ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
@@ -7333,15 +6964,22 @@ multicast-dns@^6.0.1:
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
   dependencies:
     array-differ "^1.0.0"
     array-union "^1.0.1"
     arrify "^1.0.0"
     minimatch "^3.0.0"
 
-mute-stream@0.0.7, mute-stream@~0.0.4:
+mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+mute-stream@~0.0.4:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 mx.ferreyra.callnumber@^0.0.2:
   version "0.0.2"
@@ -7349,12 +6987,14 @@ mx.ferreyra.callnumber@^0.0.2:
   integrity sha512-J9FJiMrfWG9Q8AQEz/cgYLcXTTD/Z5+vfq29hn8K7yVWjxkSzr7zFi7Dpn8wcv2iKHBHDJY+U0z8yoAzDugXMw==
 
 nan@^2.10.0, nan@^2.9.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7368,39 +7008,34 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-
-ncp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
-  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
-
 needle@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.2.tgz#1120ca4c41f2fcc6976fd28a8968afe239929418"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.0.tgz#ce3fea21197267bacb310705a7bbe24f2a3a3492"
+  integrity sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==
   dependencies:
-    debug "^2.1.2"
+    debug "^4.1.0"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
-neo-async@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
+neo-async@^2.5.0, neo-async@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
 netmask@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
+  integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
 
-next-tick@1:
+next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 ng2-completer@^2.0.8:
   version "2.0.8"
@@ -7486,8 +7121,9 @@ node-gyp@^3.8.0:
     which "1"
 
 node-libs-browser@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
+  integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -7496,7 +7132,7 @@ node-libs-browser@^2.0.0:
     constants-browserify "^1.0.0"
     crypto-browserify "^3.11.0"
     domain-browser "^1.1.1"
-    events "^1.0.0"
+    events "^3.0.0"
     https-browserify "^1.0.0"
     os-browserify "^0.3.0"
     path-browserify "0.0.0"
@@ -7510,12 +7146,13 @@ node-libs-browser@^2.0.0:
     timers-browserify "^2.0.4"
     tty-browserify "0.0.0"
     url "^0.11.0"
-    util "^0.10.3"
+    util "^0.11.0"
     vm-browserify "0.0.4"
 
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -7528,10 +7165,10 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.8:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.9.tgz#70d0985ec4bf7de9f08fc481f5dae111889ca482"
-  integrity sha512-oic3GT4OtbWWKfRolz5Syw0Xus0KRFxeorLNj0s93ofX6PWyuzKjsiGxsCtWktBwwmTF6DdRRf2KreGqeOk5KA==
+node-releases@^1.1.13:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
+  integrity sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==
   dependencies:
     semver "^5.3.0"
 
@@ -7577,20 +7214,12 @@ nopt@3.0.1:
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-package-data@^2.4.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7600,9 +7229,10 @@ normalize-package-data@^2.4.0:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
@@ -7614,10 +7244,12 @@ normalize-path@^3.0.0:
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
 npm-bundled@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
+  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
 
 npm-package-arg@6.1.0, npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
@@ -7629,7 +7261,7 @@ npm-package-arg@6.1.0, npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.12:
+npm-packlist@^1.1.12, npm-packlist@^1.1.6:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
   integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
@@ -7637,13 +7269,6 @@ npm-packlist@^1.1.12:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-packlist@^1.1.6:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
 npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
@@ -7668,21 +7293,24 @@ npm-registry-fetch@^3.8.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"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nssocket@0.6.0, nssocket@^0.6.0:
+nssocket@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/nssocket/-/nssocket-0.6.0.tgz#59f96f6ff321566f33c70f7dbeeecdfdc07154fa"
+  integrity sha1-Wflvb/MhVm8zxw99vu7N/cBxVPo=
   dependencies:
     eventemitter2 "~0.4.14"
     lazy "~1.0.11"
@@ -7690,32 +7318,39 @@ nssocket@0.6.0, nssocket@^0.6.0:
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
   dependencies:
     boolbase "~1.0.0"
 
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1, object-assign@latest:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -7732,26 +7367,21 @@ object-inspect@~1.6.0:
   integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
 
 object-keys@^1.0.12, object-keys@^1.0.6:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
@@ -7770,16 +7400,19 @@ obuf@^1.0.0, obuf@^1.1.2:
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+on-headers@~1.0.1, on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
@@ -7790,6 +7423,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+open@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
+  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+  dependencies:
+    is-wsl "^1.1.0"
+
 opencollective@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
@@ -7815,16 +7455,17 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@5.4.0, opn@^5.1.0, opn@^5.2.0, opn@latest:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
+opn@^5.1.0, opn@^5.2.0, opn@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
   dependencies:
     is-wsl "^1.1.0"
 
-opn@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+opn@latest:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-6.0.0.tgz#3c5b0db676d5f97da1233d1ed42d182bc5a27d2d"
+  integrity sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7838,13 +7479,15 @@ optimism@^0.6.9:
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optionator@^0.8.1, optionator@^0.8.2:
+optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -7863,20 +7506,24 @@ original@^1.0.0:
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
@@ -7894,25 +7541,28 @@ os-locale@^3.0.0, os-locale@^3.1.0:
 os-name@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-2.0.1.tgz#b9a386361c17ae3a21736ef0599405c9a8c5dc5e"
+  integrity sha1-uaOGNhwXrjohc27wWZQFyajF3F4=
   dependencies:
     macos-release "^1.0.0"
     win-release "^1.0.0"
 
 os-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.0.0.tgz#e1434dbfddb8e74b44c98b56797d951b7648a5d9"
-  integrity sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
   dependencies:
-    macos-release "^2.0.0"
+    macos-release "^2.2.0"
     windows-release "^3.1.0"
 
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -7934,28 +7584,31 @@ p-defer@^1.0.0:
 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@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
-  integrity sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
 p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
-  integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
   dependencies:
     p-try "^2.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
@@ -7974,15 +7627,17 @@ p-map@^1.1.1:
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pac-proxy-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
+  integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==
   dependencies:
     agent-base "^4.2.0"
     debug "^3.1.0"
@@ -7996,6 +7651,7 @@ pac-proxy-agent@^3.0.0:
 pac-resolver@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
+  integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==
   dependencies:
     co "^4.6.0"
     degenerator "^1.0.4"
@@ -8048,11 +7704,13 @@ pacote@9.4.0:
 
 pako@^0.2.5:
   version "0.2.9"
-  resolved "http://registry.npmjs.org/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
 pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
@@ -8064,33 +7722,28 @@ parallel-transform@^1.1.0:
     readable-stream "^2.1.5"
 
 parse-asn1@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
+  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
     create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
+    safe-buffer "^5.1.1"
 
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -8123,6 +7776,7 @@ parse5@4.0.0:
 parse5@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
   dependencies:
     "@types/node" "*"
 
@@ -8134,46 +7788,55 @@ parse5@^5.1.0:
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -8181,24 +7844,29 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2:
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5, path-parse@^1.0.6:
+path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-to-regexp@^1.0.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
   dependencies:
     isarray "0.0.1"
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -8207,12 +7875,14 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
@@ -8224,8 +7894,9 @@ pause-stream@0.0.11:
     through "~2.3"
 
 pbkdf2@^3.0.3:
-  version "3.0.16"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -8245,9 +7916,9 @@ pdfkit@^0.9.0:
     saslprep "1.0.1"
 
 pdfmake@^0.1.53:
-  version "0.1.53"
-  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.53.tgz#51377ad07f40c9421685df090781026ec76300b1"
-  integrity sha512-VkS4QEs2dSA0CVGscUZOnTXsSegfcUHRHFxdDs11qkJvyfCzMmeI7sWCDYMjrjXzYoPamxeXEgjY7LOmw3zT7Q==
+  version "0.1.54"
+  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.54.tgz#91a9ba862ee689f6dfd1caa07dd581c0fd770bfb"
+  integrity sha512-HO2FX+czmO+8LpWXQMFQfdUCCKnqwSvSEJExGkUKfsV34DRIV5PZjNg0xWS7ypGrnTY6RTTssWpdreX/pbyeyw==
   dependencies:
     iconv-lite "^0.4.24"
     linebreak "^0.3.0"
@@ -8256,6 +7927,7 @@ pdfmake@^0.1.53:
 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=
 
 phonegap-plugin-barcodescanner@^8.0.1:
   version "8.0.1"
@@ -8265,43 +7937,36 @@ phonegap-plugin-barcodescanner@^8.0.1:
 pidusage@^2.0.14:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.17.tgz#6b4a2b4a09026f0e9828f7e5627837e4c0672581"
+  integrity sha512-N8X5v18rBmlBoArfS83vrnD0gIFyZkXEo7a5pAS2aT0i2OLVymFb2AzVg+v8l/QcXnE1JwZcaXR8daJcoJqtjw==
   dependencies:
     safe-buffer "^5.1.2"
 
 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=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-pkg-conf@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.1.0.tgz#2126514ca6f2abfebd168596df18ba57867f0058"
-  integrity sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=
-  dependencies:
-    find-up "^2.0.0"
-    load-json-file "^4.0.0"
-
-pkg-config@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pkg-config/-/pkg-config-1.1.1.tgz#557ef22d73da3c8837107766c52eadabde298fe4"
-  integrity sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q=
-  dependencies:
-    debug-log "^1.0.0"
-    find-root "^1.0.0"
-    xtend "^4.0.1"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^2.0.0:
   version "2.0.0"
@@ -8342,20 +8007,17 @@ plist@^3.0.1:
     xmlbuilder "^9.0.7"
     xmldom "0.1.x"
 
-pluralize@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
-
 pm2-axon-rpc@^0.5.0, pm2-axon-rpc@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/pm2-axon-rpc/-/pm2-axon-rpc-0.5.1.tgz#ad3c43c43811c71f13e5eee2821194d03ceb03fe"
+  integrity sha512-hT8gN3/j05895QLXpwg+Ws8PjO4AVID6Uf9StWpud9HB2homjc1KKCcI0vg9BNOt56FmrqKDT1NQgheIz35+sA==
   dependencies:
     debug "^3.0"
 
 pm2-axon@3.3.0, pm2-axon@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/pm2-axon/-/pm2-axon-3.3.0.tgz#a9badfdb8e083fbd5d7d24317b4a21eb708f0735"
+  integrity sha512-dAFlFYRuFbFjX7oAk41zT+dx86EuaFX/TgOp5QpUKRKwxb946IM6ydnoH5sSTkdI2pHSVZ+3Am8n/l0ocr7jdQ==
   dependencies:
     amp "~0.3.1"
     amp-message "~0.1.1"
@@ -8373,16 +8035,17 @@ pm2-deploy@^0.4.0:
 pm2-multimeter@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/pm2-multimeter/-/pm2-multimeter-0.1.2.tgz#1a1e55153d41a05534cea23cfe860abaa0eb4ace"
+  integrity sha1-Gh5VFT1BoFU0zqI8/oYKuqDrSs4=
   dependencies:
     charm "~0.1.1"
 
 pm2@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/pm2/-/pm2-3.4.0.tgz#d30d05e89f986782e0b0bf011343d46be39c3447"
-  integrity sha512-BLK3zwrCmfE9I9XEvrGweK+/IEkhVlGENc1fgOH0fJHZc1vneC3v6dUmxz32pmsi9aB4DnrYIeZi46RHd6rO3Q==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/pm2/-/pm2-3.5.0.tgz#56930de4c89fe66713f25cf94e374df793cfe831"
+  integrity sha512-/GlQ1cyy97Rw/4pLWXABRzyUkKSj6kmgPx6rygocfvXyLX44bv26RKy89wTOvaL51pb0JOS8v2FM6cRJf1pLrA==
   dependencies:
     "@pm2/agent" "^0.5.22"
-    "@pm2/io" "^4.1.0"
+    "@pm2/io" "^4.1.2"
     "@pm2/js-api" "^0.5.43"
     async "^2.6.1"
     blessed "^0.1.81"
@@ -8398,7 +8061,6 @@ pm2@^3.4.0:
     mkdirp "0.5.1"
     moment "^2.22.2"
     needle "^2.2.1"
-    nssocket "0.6.0"
     pidusage "^2.0.14"
     pm2-axon "3.3.0"
     pm2-axon-rpc "^0.5.1"
@@ -8421,9 +8083,9 @@ png-js@>=0.1.0:
   integrity sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=
 
 pngjs@^3.3.0:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz#85173703bde3edac8998757b96e5821d0966a21b"
-  integrity sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
 portfinder@^1.0.9:
   version "1.0.20"
@@ -8437,6 +8099,7 @@ portfinder@^1.0.9:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-import@12.0.1:
   version "12.0.1"
@@ -8466,11 +8129,7 @@ postcss-loader@3.0.0:
     postcss-load-config "^2.0.0"
     schema-utils "^1.0.0"
 
-postcss-value-parser@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-
-postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   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==
@@ -8487,6 +8146,7 @@ postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13:
 postcss@^6.0.17, postcss@^6.0.21:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
@@ -8495,28 +8155,22 @@ postcss@^6.0.17, postcss@^6.0.21:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 promise-inflight@^1.0.1:
   version "1.0.1"
@@ -8541,17 +8195,10 @@ promise@^7.1.1:
 promptly@^2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/promptly/-/promptly-2.2.0.tgz#2a13fa063688a2a5983b161fff0108a07d26fc74"
+  integrity sha1-KhP6BjaIoqWYOxYf/wEIoH0m/HQ=
   dependencies:
     read "^1.0.4"
 
-prop-types@^15.6.0:
-  version "15.7.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.1.tgz#2fa61e0a699d428b40320127733ee2931f05d9d1"
-  integrity sha512-f8Lku2z9kERjOCcnDOPm68EBJAO2K00Q5mSgPAUE/gJuBgsYLbVy6owSrtcHj90zt8PvW+z0qaIIgsIhHOa1Qw==
-  dependencies:
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
 properties-parser@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/properties-parser/-/properties-parser-0.2.3.tgz#f7591255f707abbff227c7b56b637dbb0373a10f"
@@ -8564,16 +8211,18 @@ protoduck@^5.0.1:
   dependencies:
     genfun "^5.0.0"
 
-proxy-addr@~2.0.3, proxy-addr@~2.0.4:
+proxy-addr@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
   dependencies:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
 
 proxy-agent@3, proxy-agent@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.0.3.tgz#1c1a33db60ef5f2e9e35b876fd63c2bc681c611d"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
+  integrity sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==
   dependencies:
     agent-base "^4.2.0"
     debug "^3.1.0"
@@ -8587,32 +8236,39 @@ proxy-agent@3, proxy-agent@^3.0.3:
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
 
 proxy-middleware@^0.15.0, proxy-middleware@latest:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/proxy-middleware/-/proxy-middleware-0.15.0.tgz#a3fdf1befb730f951965872ac2f6074c61477a56"
+  integrity sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=
 
 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=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
 
 public-encrypt@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
     create-hash "^1.1.0"
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
 
 pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
@@ -8642,10 +8298,12 @@ pumpify@^1.3.3:
 punycode@1.3.2:
   version "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:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
@@ -8660,6 +8318,7 @@ q@1.4.1:
 q@^1.4.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qrcode@^1.3.3:
   version "1.3.3"
@@ -8672,31 +8331,30 @@ qrcode@^1.3.3:
     pngjs "^3.3.0"
     yargs "^12.0.5"
 
-qs@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
-qs@6.5.2, qs@^6.4.0, qs@~6.5.2:
+qs@6.5.2, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
-  integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
+qs@^6.4.0, qs@^6.6.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
-  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
@@ -8707,23 +8365,17 @@ quote-stream@^1.0.1, quote-stream@~1.0.2:
     minimist "^1.1.3"
     through2 "^2.0.0"
 
-randomatic@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -8731,19 +8383,12 @@ randomfill@^1.0.3:
 range-parser@^1.0.3, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
-    unpipe "1.0.0"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raw-body@2.3.3, raw-body@^2.2.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.3"
@@ -8753,6 +8398,7 @@ raw-body@2.3.3, raw-body@^2.2.0:
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
+  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
   dependencies:
     bytes "1"
     string_decoder "0.10"
@@ -8768,17 +8414,13 @@ raw-loader@1.0.0:
 rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-is@^16.8.1:
-  version "16.8.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.1.tgz#a80141e246eb894824fb4f2901c0c50ef31d4cdb"
-  integrity sha512-ioMCzVDWvCvKD8eeT+iukyWrBGrA3DiFYkXfBsVYIRdaREZuBjENG+KjrikavCLasozqRWTwFUagU/O4vPpRMA==
-
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -8789,6 +8431,7 @@ read-cache@^1.0.0:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -8796,6 +8439,7 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -8803,6 +8447,7 @@ read-pkg-up@^2.0.0:
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -8811,6 +8456,7 @@ read-pkg@^1.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=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -8828,12 +8474,14 @@ read-pkg@^4.0.1:
 read@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, 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.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -8845,40 +8493,24 @@ read@^1.0.4:
 
 readable-stream@1.1.x:
   version "1.1.14"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-"readable-stream@2 || 3", readable-stream@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
-  integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.0.6.tgz#351302e4c68b5abd6a2ed55376a7f9a25be3057a"
+"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  dependencies:
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
-
-readdirp@^2.2.1:
+readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
   integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
@@ -8890,19 +8522,22 @@ readdirp@^2.2.1:
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
 reflect-metadata@*, reflect-metadata@^0.1.10, reflect-metadata@^0.1.2:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
+  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
 
 regenerate@^1.2.1:
   version "1.4.0"
@@ -8919,20 +8554,15 @@ 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.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
-
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  dependencies:
-    is-equal-shallow "^0.1.3"
+regenerator-runtime@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
+  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -8940,6 +8570,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexp-clone@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-0.0.1.tgz#a7c2e09891fdbf38fbb10d376fb73003e68ac589"
+  integrity sha1-p8LgmJH9vzj7sQ03b7cwA+aKxYk=
 
 regexpu-core@^1.0.0:
   version "1.0.0"
@@ -8951,9 +8582,9 @@ regexpu-core@^1.0.0:
     regjsparser "^0.1.4"
 
 registry-auth-token@^3.0.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
+  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -8980,24 +8611,29 @@ regjsparser@^0.1.4:
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 request@^2.83.0, 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==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -9023,6 +8659,7 @@ request@^2.83.0, request@^2.87.0, request@^2.88.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-from-string@^2.0.1:
   version "2.0.2"
@@ -9040,23 +8677,17 @@ require-in-the-middle@3.0.0:
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-require-uncached@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 require_optional@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.1.tgz#4cf35a4247f64ca3df8c2ef208cc494b1ca8fc2e"
+  integrity sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==
   dependencies:
     resolve-from "^2.0.0"
     semver "^5.1.0"
@@ -9073,14 +8704,10 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
 resolve-from@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+  integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=
 
 resolve-from@^3.0.0:
   version "3.0.0"
@@ -9090,31 +8717,20 @@ resolve-from@^3.0.0:
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.5, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.3, resolve@^1.5.0:
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@~1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.1.6, resolve@^1.3.2, resolve@^1.4.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  dependencies:
-    path-parse "^1.0.5"
-
-resolve@~1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
-  integrity sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==
-  dependencies:
-    path-parse "^1.0.5"
-
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -9140,6 +8756,7 @@ resumer@~0.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
@@ -9149,16 +8766,11 @@ retry@^0.10.0:
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  dependencies:
-    glob "^7.0.5"
-
-rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@~2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -9168,6 +8780,7 @@ rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@~2.6.2:
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -9175,6 +8788,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 rollup-plugin-commonjs@8.2.6:
   version "8.2.6"
   resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz#27e5b9069ff94005bb01e01bb46a1e4873784677"
+  integrity sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==
   dependencies:
     acorn "^5.2.1"
     estree-walker "^0.5.0"
@@ -9185,6 +8799,7 @@ rollup-plugin-commonjs@8.2.6:
 rollup-plugin-node-resolve@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
+  integrity sha1-i4l8TDAw1QASd7BRSyXSygloPuA=
   dependencies:
     browser-resolve "^1.11.0"
     builtin-modules "^1.1.0"
@@ -9192,15 +8807,17 @@ rollup-plugin-node-resolve@3.0.0:
     resolve "^1.1.6"
 
 rollup-pluginutils@^2.0.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.1.tgz#760d185ccc237dedc12d7ae48c6bcd127b4892d0"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz#203706edd43dfafeaebc355d7351119402fc83ad"
+  integrity sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ==
   dependencies:
-    estree-walker "^0.5.2"
-    micromatch "^2.3.11"
+    estree-walker "^0.6.0"
+    micromatch "^3.1.10"
 
 rollup@0.50.0:
   version "0.50.0"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.50.0.tgz#4c158f4e780e6cb33ff0dbfc184a52cc58cd5f3b"
+  integrity sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==
 
 rsvp@^3.0.21:
   version "3.6.2"
@@ -9219,11 +8836,6 @@ run-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
   integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
 
-run-parallel@^1.1.2:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
-  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
-
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -9231,18 +8843,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-  integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
-
 rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
@@ -9263,13 +8863,6 @@ rxjs-tslint@0.1.5:
     tslint "^5.9.1"
     tsutils "^2.25.0"
 
-rxjs@6.2.2, rxjs@~6.2.0:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
-  integrity sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==
-  dependencies:
-    tslib "^1.9.0"
-
 rxjs@6.3.3:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
@@ -9284,35 +8877,44 @@ rxjs@^6.1.0, rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-json-parse@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
+  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-saslprep@1.0.1, saslprep@^1.0.0:
+saslprep@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.1.tgz#b644e0ba25b156b652f3cb90df7542f896049ba6"
+  integrity sha512-ntN6SbE3hRqd45PKKadRPgA+xHPWg5lPSj2JWJdJvjTwXDDfkPVtXWvP8jJojvnm+rAsZ2b299C5NwZqq818EA==
+
+saslprep@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.2.tgz#da5ab936e6ea0bbae911ffec77534be370c9f52d"
+  integrity sha512-4cDsYuAjXssUSjxHKRe4DTZC0agDwsCqcMqtJAQPzC74nJ7LfAJflAtC1Zed5hMzEQKj82d3tuzqdGNRsLJ4Gw==
+  dependencies:
+    sparse-bitfield "^3.0.3"
 
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -9334,6 +8936,7 @@ sass-loader@7.1.0:
 sax@0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.3.5.tgz#88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"
+  integrity sha1-iPz8H3PAyLvVt8d2ttPzUB7tBz0=
 
 sax@0.5.x:
   version "0.5.8"
@@ -9348,6 +8951,7 @@ sax@1.1.4:
 sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schema-utils@^0.3.0:
   version "0.3.0"
@@ -9376,6 +8980,7 @@ schema-utils@^1.0.0:
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -9418,9 +9023,10 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
 semver@5.1.0:
   version "5.1.0"
@@ -9430,8 +9036,9 @@ semver@5.1.0:
 semver@5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+  integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-semver@5.6.0, semver@^5.0.0, semver@^5.0.3, semver@^5.5.1, semver@^5.6.0:
+semver@5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
@@ -9439,10 +9046,12 @@ semver@5.6.0, semver@^5.0.0, semver@^5.0.3, semver@^5.5.1, semver@^5.6.0:
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
 send@0.16.2, send@latest:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -9479,6 +9088,7 @@ serve-index@^1.7.2, serve-index@^1.9.1:
 serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -9488,18 +9098,17 @@ serve-static@1.13.2:
 serviceworker-cache-polyfill@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
+  integrity sha1-3hnuc77yGrPAdAo3sz22JGS6ves=
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-set-immediate-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -9509,6 +9118,7 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -9518,18 +9128,17 @@ set-value@^2.0.0:
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -9551,19 +9160,21 @@ shallow-copy@~0.0.1:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shelljs@0.5.3, shelljs@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"
   integrity sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=
 
-shelljs@^0.8.1:
+shelljs@^0.8.1, shelljs@~0.8.2:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.3.tgz#a7f3319520ebf09ee81275b2368adb286659b097"
   integrity sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==
@@ -9572,19 +9183,7 @@ shelljs@^0.8.1:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shelljs@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
-shimmer@^1.1.0, shimmer@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.0.tgz#f966f7555789763e74d8841193685a5e78736665"
-
-shimmer@~1.2.0:
+shimmer@^1.1.0, shimmer@^1.2.0, shimmer@~1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
   integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
@@ -9597,23 +9196,18 @@ sift@7.0.1:
 signal-exit@3.0.2, 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=
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
-slice-ansi@1.0.0, slice-ansi@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-
 slice-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -9626,14 +9220,17 @@ slice-ansi@^2.0.0:
 sliced@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41"
+  integrity sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=
 
-smart-buffer@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+smart-buffer@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
+  integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -9642,12 +9239,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -9708,22 +9307,25 @@ sockjs@0.3.19:
     uuid "^3.0.1"
 
 socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
   dependencies:
-    agent-base "~4.2.0"
-    socks "~2.2.0"
+    agent-base "~4.2.1"
+    socks "~2.3.2"
 
-socks@~2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.2.tgz#f061219fc2d4d332afb4af93e865c84d3fa26e2b"
+socks@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
+  integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
   dependencies:
     ip "^1.1.5"
-    smart-buffer "^4.0.1"
+    smart-buffer "4.0.2"
 
 source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-list-map@~0.1.7:
   version "0.1.8"
@@ -9741,6 +9343,7 @@ source-map-loader@0.2.4:
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -9748,7 +9351,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@~0.5.9:
+source-map-support@0.5.10:
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
   integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
@@ -9756,17 +9359,10 @@ source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@~0.5.9:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@^0.5.6:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.10:
-  version "0.5.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
+source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -9774,6 +9370,7 @@ source-map-support@~0.5.10:
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@0.1.x, source-map@~0.1.30:
   version "0.1.43"
@@ -9795,43 +9392,57 @@ source-map@0.7.3:
 source-map@^0.4.2, source-map@~0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 sourcemap-codec@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
   integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
 
+sparse-bitfield@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11"
+  integrity sha1-/0rm5oZWBWuks+eSqzM004JzyhE=
+  dependencies:
+    memory-pager "^1.0.2"
+
 spdx-correct@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
 spdx-expression-parse@^3.0.0:
   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==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
+  integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -9866,13 +9477,14 @@ speed-measure-webpack-plugin@1.3.1:
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split2@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-3.1.0.tgz#064bbfac70cdb66f77827870d42f159a8b442201"
-  integrity sha512-ePE1otNQVMnBRyqf3INbZvZwBPGsdBDThgrOWZ6z8zXGNVQNVCSEoOO9aBMTzDN1mXoNSZJ2kHSFH7AA5SPWww==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-3.1.1.tgz#c51f18f3e06a8c4469aaab487687d8d956160bb6"
+  integrity sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==
   dependencies:
     readable-stream "^3.0.0"
 
@@ -9886,6 +9498,7 @@ split@0.3:
 sprintf-js@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
+  integrity sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=
 
 sprintf-js@^1.1.2:
   version "1.1.2"
@@ -9895,25 +9508,26 @@ sprintf-js@^1.1.2:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 ssh-config@^1.1.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ssh-config/-/ssh-config-1.1.5.tgz#a2d398c611a65c60d101e5b0f976c01f4739a28e"
-  integrity sha512-j3Yo++WWfc+2eFrSFclQZ79RRyMF2BOkDLboaUxyysYNomrLjIoOWanFbulHH5fLErRuW8YrO31p7MKpI4XrZw==
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/ssh-config/-/ssh-config-1.1.6.tgz#c6ce2d7f85f395178c9e47c448d62b8adf9b2523"
+  integrity sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==
 
 sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
 ssri@^5.2.4:
@@ -9930,31 +9544,6 @@ ssri@^6.0.0, ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-standard-engine@~8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-8.0.1.tgz#0b77be8d7ab963675717dbeac1ef1d6675fb62f0"
-  integrity sha512-LA531C3+nljom/XRvdW/hGPXwmilRkaRkENhO3FAGF1Vtq/WtCXzgmnc5S6vUHHsgv534MRy02C1ikMwZXC+tw==
-  dependencies:
-    deglob "^2.1.0"
-    get-stdin "^6.0.0"
-    minimist "^1.1.0"
-    pkg-conf "^2.0.0"
-
-standard@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/standard/-/standard-11.0.1.tgz#49be40c76f1d564964b22bbf7309929ad0335e29"
-  integrity sha512-nu0jAcHiSc8H+gJCXeiziMVZNDYi8MuqrYJKxTgjP4xKXZMKm311boqQIzDrYI/ktosltxt2CbDjYQs9ANC8IA==
-  dependencies:
-    eslint "~4.18.0"
-    eslint-config-standard "11.0.0"
-    eslint-config-standard-jsx "5.0.0"
-    eslint-plugin-import "~2.9.0"
-    eslint-plugin-node "~6.0.0"
-    eslint-plugin-promise "~3.7.0"
-    eslint-plugin-react "~7.7.0"
-    eslint-plugin-standard "~3.0.1"
-    standard-engine "~8.0.0"
-
 static-eval@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
@@ -9965,6 +9554,7 @@ static-eval@^2.0.0:
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -9996,13 +9586,15 @@ stats-webpack-plugin@0.7.0:
   dependencies:
     lodash "^4.17.4"
 
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
 
 statuses@~1.4.0:
   version "1.4.0"
@@ -10012,12 +9604,14 @@ statuses@~1.4.0:
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
   dependencies:
     readable-stream "^2.0.1"
 
 stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -10048,6 +9642,7 @@ stream-each@^1.1.0:
 stream-http@^2.7.2:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -10063,10 +9658,12 @@ stream-shift@^1.0.0:
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
+  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -10075,18 +9672,19 @@ string-width@^1.0.1, string-width@^1.0.2:
 "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
 string-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1"
-  integrity sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
   dependencies:
     emoji-regex "^7.0.1"
     is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
 
 string.prototype.trim@~1.1.2:
   version "1.1.2"
@@ -10100,60 +9698,76 @@ string.prototype.trim@~1.1.2:
 string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  dependencies:
+    safe-buffer "~5.1.0"
 
-string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1:
+string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^4.1.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 stripe@^6.26.1:
-  version "6.26.1"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.26.1.tgz#94d4261bff581682eee057e5bc2467db455dc336"
-  integrity sha512-Zuer93N8lcWf4qNRpN4V/VMF0J6Ur6LNcNeyEENZ2bj4S1iNkYCRwiExtmICc1Q5jn966pIsJwHWE2pkbpmiwQ==
+  version "6.28.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.28.0.tgz#81f2bf174efe9503b50f24930a7e1d195c60f810"
+  integrity sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
@@ -10231,12 +9845,14 @@ supports-color@^2.0.0:
 supports-color@^4.2.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+  integrity sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=
   dependencies:
     has-flag "^2.0.0"
 
 supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
@@ -10258,32 +9874,22 @@ sw-toolbox@^3.6.0:
 symbol-observable@1.2.0, symbol-observable@^1.0.2, symbol-observable@^1.0.4, symbol-observable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-  integrity sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==
-  dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
 tapable@^0.2.7:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.9.tgz#af2d8bbc9b04f74ee17af2b4d9048f807acd18a8"
+  integrity sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==
 
 tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
-  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tape@^4.8.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/tape/-/tape-4.10.0.tgz#c915fcd7595e53f089bc4f99d12c10eda9f6e4f6"
-  integrity sha512-3PgdF0vcZ1t7HEYbpTXdo58KXi19QCGcZfj07A53M2DH14P2Fw3cB3f9pF7e/Br2z+PQm7xlvhjzHH3D8ti99g==
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/tape/-/tape-4.10.1.tgz#f73be60888dcb120f08b57f947af65a829506a5f"
+  integrity sha512-G0DywYV1jQeY3axeYnXUOt6ktnxS9OPJh97FGR3nrua8lhWi1zPflLxcAHavZ7Jf3qUfY7cxcVIVFa4mY2IY1w==
   dependencies:
     deep-equal "~1.0.1"
     defined "~1.0.0"
@@ -10294,7 +9900,7 @@ tape@^4.8.0:
     inherits "~2.0.3"
     minimist "~1.2.0"
     object-inspect "~1.6.0"
-    resolve "~1.7.1"
+    resolve "~1.10.0"
     resumer "~0.0.0"
     string.prototype.trim "~1.1.2"
     through "~2.3.8"
@@ -10302,24 +9908,13 @@ tape@^4.8.0:
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  dependencies:
-    chownr "^1.0.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
-tar@^4.3.0, tar@^4.4.8:
+tar@^4, tar@^4.3.0, tar@^4.4.8:
   version "4.4.8"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
   integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
@@ -10367,16 +9962,7 @@ terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser@^3.16.1:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
-  integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
-    source-map-support "~0.5.9"
-
-terser@^3.17.0:
+terser@^3.16.1, terser@^3.17.0:
   version "3.17.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
   integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
@@ -10385,12 +9971,7 @@ terser@^3.17.0:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
-text-table@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
-through2@^2.0.0, through2@^2.0.3, through2@~2.0.3:
+through2@^2.0.0, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -10408,10 +9989,12 @@ through2@^3.0.0:
 through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4, 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=
 
 thunkify@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
+  integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
 
 thunky@^1.0.2:
   version "1.0.3"
@@ -10421,6 +10004,7 @@ thunky@^1.0.2:
 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.0:
   version "4.0.1"
@@ -10430,6 +10014,7 @@ timed-out@^4.0.0:
 timers-browserify@^2.0.4:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
   dependencies:
     setimmediate "^1.0.4"
 
@@ -10441,6 +10026,7 @@ tiny-inflate@^1.0.0, tiny-inflate@^1.0.2:
 tiny-lr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
+  integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
   dependencies:
     body "^5.1.0"
     debug "^3.1.0"
@@ -10459,10 +10045,12 @@ tmp@^0.0.33:
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
@@ -10472,12 +10060,14 @@ to-fast-properties@^1.0.3:
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -10485,6 +10075,7 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -10494,6 +10085,7 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 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"
@@ -10501,11 +10093,7 @@ tough-cookie@~2.4.3:
 traverse@^0.6.6:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
-
-tree-kill@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
-  integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
+  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
 
 tree-kill@1.2.1:
   version "1.2.1"
@@ -10515,6 +10103,7 @@ tree-kill@1.2.1:
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-right@^1.0.1:
   version "1.0.1"
@@ -10524,6 +10113,7 @@ trim-right@^1.0.1:
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
   dependencies:
     glob "^7.1.2"
 
@@ -10540,9 +10130,9 @@ ts-invariant@^0.2.1:
     tslib "^1.9.3"
 
 ts-invariant@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz#89a2ffeb70879b777258df1df1c59383c35209b0"
-  integrity sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.3.tgz#b5742b1885ecf9e29c31a750307480f045ec0b16"
+  integrity sha512-UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ==
   dependencies:
     tslib "^1.9.3"
 
@@ -10560,6 +10150,7 @@ ts-node@^8.0.3:
 ts-simple-ast@12.4.0:
   version "12.4.0"
   resolved "https://registry.yarnpkg.com/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz#6b53f6d6a59145da637dfe0e8c646d1e66ba278a"
+  integrity sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==
   dependencies:
     "@dsherret/to-absolute-glob" "^2.0.2"
     code-block-writer "^7.2.0"
@@ -10575,19 +10166,21 @@ ts-simple-ast@12.4.0:
 tslib@1.9.3, tslib@^1.0.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tslint-eslint-rules@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba"
+  integrity sha1-fDDniC8mvCdr/5HSOEl1xp2viLo=
   dependencies:
     doctrine "^0.7.2"
     tslib "^1.0.0"
     tsutils "^1.4.0"
 
-tslint@^5.14.0:
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e"
-  integrity sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==
+tslint@^5.14.0, tslint@^5.8.0, tslint@^5.9.1:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
+  integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -10595,7 +10188,7 @@ tslint@^5.14.0:
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     resolve "^1.3.2"
@@ -10603,78 +10196,51 @@ tslint@^5.14.0:
     tslib "^1.8.0"
     tsutils "^2.29.0"
 
-tslint@^5.8.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.7.0"
-    minimatch "^3.0.4"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.27.2"
-
-tslint@^5.9.1:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1"
-  integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==
-  dependencies:
-    babel-code-frame "^6.22.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.7.0"
-    minimatch "^3.0.4"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.27.2"
-
 tsutils@^1.4.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
+  integrity sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=
 
-tsutils@^2.25.0, tsutils@^2.27.2, tsutils@^2.29.0:
+tsutils@^2.25.0, tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tv4@^1.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz#d020c846fadd50c855abb25ebaecc68fc10f7963"
+  integrity sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM=
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.15, type-is@~1.6.16:
+type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.18"
@@ -10687,11 +10253,7 @@ typedarray@^0.0.6:
 typescript@2.9.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
-
-typescript@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
-  integrity sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==
+  integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
 typescript@3.2.4, typescript@~3.2.4:
   version "3.2.4"
@@ -10701,19 +10263,22 @@ typescript@3.2.4, typescript@~3.2.4:
 typescript@^2.4.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
-
-typescript@^3.2.4:
-  version "3.3.3333"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
-  integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
+  integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
 typescript@~2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
+  integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=
+
+typescript@~3.3.3333:
+  version "3.3.4000"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
+  integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
 
 uglify-es@3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.2.2.tgz#15c62b7775002c81b7987a1c49ecd3f126cace73"
+  integrity sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==
   dependencies:
     commander "~2.12.1"
     source-map "~0.6.1"
@@ -10721,6 +10286,7 @@ uglify-es@3.2.2:
 uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
   dependencies:
     source-map "~0.5.1"
     yargs "~3.10.0"
@@ -10728,20 +10294,22 @@ uglify-js@^2.8.29:
     uglify-to-browserify "~1.0.0"
 
 uglify-js@^3.1.4:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.4.tgz#4a64d57f590e20a898ba057f838dcdfb67a939b9"
+  integrity sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.20.0"
     source-map "~0.6.1"
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
 uglifyjs-webpack-plugin@^0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+  integrity sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=
   dependencies:
     source-map "^0.5.6"
     uglify-js "^2.8.29"
@@ -10750,12 +10318,14 @@ uglifyjs-webpack-plugin@^0.4.6:
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
-underscore@^1.8.3:
+underscore@*, underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
   integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
@@ -10779,17 +10349,13 @@ unicode-trie@^0.3.0:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
 unique-filename@^1.1.0, unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
@@ -10814,23 +10380,27 @@ unique-string@^1.0.0:
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unix-crypt-td-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
+  integrity sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
 
-unorm@^1.3.3:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.4.1.tgz#364200d5f13646ca8bcd44490271335614792300"
-  integrity sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA=
+unorm@*, unorm@^1.3.3:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
+  integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -10845,9 +10415,10 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.0.5, upath@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+upath@^1.0.5, upath@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
 update-notifier@^2.3.0:
   version "2.5.0"
@@ -10875,6 +10446,7 @@ uri-js@^4.2.2:
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
@@ -10884,9 +10456,9 @@ url-parse-lax@^1.0.0:
     prepend-http "^1.0.1"
 
 url-parse@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.5.tgz#04cbb6ba2be682a18e4417fa2245aa7e3dfdcc50"
+  integrity sha512-4XDvC5vZRjEpjP0L4znrWeoH8P8F0XGBlfLdABi/6oV4o8xUVbTpyrxWHxkK2bT0pSIpcjdIzSoWUhlUfawCAQ==
   dependencies:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
@@ -10894,6 +10466,7 @@ url-parse@^1.4.3:
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -10901,38 +10474,46 @@ url@^0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
-util@^0.10.3:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
   dependencies:
     inherits "2.0.3"
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.0, uuid@^3.0.1, uuid@^3.2.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 v8-compile-cache@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
+  integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -10952,10 +10533,12 @@ validator@^10.11.0:
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -10964,10 +10547,12 @@ verror@1.10.0:
 viz.js@^1.8.0:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a"
+  integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==
 
 vizion@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/vizion/-/vizion-2.0.2.tgz#fcc263f41a4543b02b655c1b6c4ff1406726d2fa"
+  integrity sha512-UGDB/UdC1iyPkwyQaI9AFMwKcluQyD4FleEXObrlu254MEf16MV8l+AZdpFErY/iVKZVWlQ+OgJlVVJIdeMUYg==
   dependencies:
     async "2.6.1"
     git-node-fs "^1.0.0"
@@ -10981,10 +10566,12 @@ vizion@~2.0.2:
 vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
 
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
   dependencies:
     indexof "0.0.1"
 
@@ -11005,9 +10592,9 @@ wbuf@^1.1.0, wbuf@^1.7.3:
     minimalistic-assert "^1.0.0"
 
 webpack-bundle-analyzer@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz#2f19cbb87bb6d4f3cb4e59cb67c837bd9436e89d"
-  integrity sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz#3da733a900f515914e729fcebcd4c40dde71fc6f"
+  integrity sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==
   dependencies:
     acorn "^6.0.7"
     acorn-walk "^6.1.1"
@@ -11102,7 +10689,7 @@ webpack-merge@4.2.1, webpack-merge@^4.2.1:
   dependencies:
     lodash "^4.17.5"
 
-webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
+webpack-sources@1.3.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
   integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
@@ -11110,13 +10697,6 @@ webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-s
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-sources@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
 webpack-subresource-integrity@1.1.0-rc.6:
   version "1.1.0-rc.6"
   resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
@@ -11185,6 +10765,7 @@ webpack@4.29.0:
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
   dependencies:
     http-parser-js ">=0.4.0"
     websocket-extensions ">=0.1.1"
@@ -11192,6 +10773,7 @@ websocket-driver@>=0.5.1:
 websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
 when@~3.6.x:
   version "3.6.4"
@@ -11201,20 +10783,24 @@ when@~3.6.x:
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@1, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
@@ -11228,6 +10814,7 @@ widest-line@^2.0.0:
 win-release@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/win-release/-/win-release-1.1.1.tgz#5fa55e02be7ca934edfc12665632e849b72e5209"
+  integrity sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=
   dependencies:
     semver "^5.0.1"
 
@@ -11239,25 +10826,29 @@ window-or-global@^1.0.1:
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
 windows-release@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e"
-  integrity sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
 
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 worker-farm@^1.5.2:
   version "1.6.0"
@@ -11269,6 +10860,7 @@ worker-farm@^1.5.2:
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -11290,9 +10882,10 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@1:
+wrappy@*, wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
   version "2.4.2"
@@ -11303,16 +10896,10 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608"
+  integrity sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -11321,6 +10908,7 @@ ws@3.3.2:
 ws@^3.0.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -11329,12 +10917,21 @@ ws@^3.0.0:
 ws@^5.1.0, ws@^5.2.0:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+ws@^6.0.0, ws@^6.1.4:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.0.0, ws@~6.1.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
+ws@~6.1.0:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
   dependencies:
     async-limiter "~1.0.0"
 
@@ -11354,35 +10951,42 @@ xml2js@^0.4.19, xml2js@~0.4.19:
 xmlbuilder@8.2.2:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
+  integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=
 
 xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmldom@0.1.x:
+xmldom@*, xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
+  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
 xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
 
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
   integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
-xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
@@ -11392,14 +10996,17 @@ y18n@^3.2.1:
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
 yamljs@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.3.0.tgz#dc060bf267447b39f7304e9b2bfbe8b5a7ddb03b"
+  integrity sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==
   dependencies:
     argparse "^1.0.7"
     glob "^7.0.5"
@@ -11430,12 +11037,14 @@ yargs-parser@^13.0.0:
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
   dependencies:
     camelcase "^4.1.0"
 
@@ -11514,6 +11123,7 @@ yargs@^13.2.2:
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -11532,6 +11142,7 @@ yargs@^7.0.0:
 yargs@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A=
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -11550,6 +11161,7 @@ yargs@^8.0.2:
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
   dependencies:
     camelcase "^1.0.2"
     cliui "^2.1.0"
@@ -11559,18 +11171,12 @@ yargs@~3.10.0:
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.0.0.tgz#0073c6b56e92aed652fbdfd62431f2d6b9a7a091"
-  integrity sha512-+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q==
-
-zen-observable-ts@^0.8.15:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz#6cf7df6aa619076e4af2f707ccf8a6290d26699b"
-  integrity sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==
-  dependencies:
-    zen-observable "^0.8.0"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.0.tgz#fcbe2db63610361afcc5eb9e0ac91e976d046114"
+  integrity sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg==
 
 zen-observable-ts@^0.8.18:
   version "0.8.18"
@@ -11581,9 +11187,9 @@ zen-observable-ts@^0.8.18:
     zen-observable "^0.8.0"
 
 zen-observable@^0.8.0:
-  version "0.8.13"
-  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.13.tgz#a9f1b9dbdfd2d60a08761ceac6a861427d44ae2e"
-  integrity sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g==
+  version "0.8.14"
+  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
+  integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
 zone.js@^0.8.29:
   version "0.8.29"
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 2960305f8..2bbfd8b21 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -59,7 +59,7 @@
 		"@angular/http": "^7.2.11",
 		"@angular/platform-browser": "^7.2.11",
 		"@angular/platform-browser-dynamic": "^7.2.11",
-		"@angular/pwa": "^0.13.7",
+		"@angular/pwa": "^0.13.8",
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
@@ -145,20 +145,20 @@
 	"devDependencies": {
 		"@angular-builders/custom-webpack": "^7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "^0.13.7",
-		"@angular-devkit/build-angular": "^0.13.7",
-		"@angular-devkit/core": "^7.3.7",
-		"@angular-devkit/schematics": "^7.3.7",
-		"@angular/cli": "^7.3.7",
-		"@angular/compiler": "^7.2.11",
-		"@angular/compiler-cli": "^7.2.11",
-		"@angular/language-service": "^7.2.11",
+		"@angular-devkit/architect": "^0.13.8",
+		"@angular-devkit/build-angular": "^0.13.8",
+		"@angular-devkit/build-webpack": "^0.13.8",
+		"@angular-devkit/core": "^7.3.8",
+		"@angular-devkit/schematics": "^7.3.8",
+		"@angular/cli": "^7.3.8",
+		"@angular/compiler": "^7.2.12",
+		"@angular/compiler-cli": "^7.2.12",
+		"@angular/language-service": "^7.2.12",
+		"@schematics/angular": "^7.3.8",
 		"@compodoc/compodoc": "^1.1.9",
-		"@ionic/angular-toolkit": "^1.5.0",
+		"@ionic/angular-toolkit": "^1.5.1",
 		"@ionic/app-scripts": "^3.2.3",
 		"@ionic/lab": "^1.0.24",
-		"@ionic/ng-toolkit": "^1.1.0",
-		"@ionic/schematics-angular": "^1.0.7",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
 		"@types/graphql": "^14.0.7",
@@ -174,7 +174,7 @@
 		"@types/yargs": "^13.0.0",
 		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
-		"codelyzer": "^5.0.0-beta.1",
+		"codelyzer": "^5.0.0",
 		"cross-env": "^5.2.0",
 		"cpr": "^3.0.1",
 		"husky": "^1.3.1",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index cec7d75a2..7c7999c38 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -14,24 +14,24 @@
   resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
   integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
 
-"@angular-devkit/architect@0.13.7", "@angular-devkit/architect@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
-  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
+"@angular-devkit/architect@0.13.8", "@angular-devkit/architect@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
+  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
-  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
+"@angular-devkit/build-angular@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
+  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/build-optimizer" "0.13.7"
-    "@angular-devkit/build-webpack" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@ngtools/webpack" "7.3.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/build-optimizer" "0.13.8"
+    "@angular-devkit/build-webpack" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@ngtools/webpack" "7.3.8"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -47,7 +47,7 @@
     loader-utils "1.2.3"
     mini-css-extract-plugin "0.5.0"
     minimatch "3.0.4"
-    opn "5.4.0"
+    open "6.0.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
@@ -84,40 +84,29 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
-  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
+"@angular-devkit/build-optimizer@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
+  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
-  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
+"@angular-devkit/build-webpack@0.13.8", "@angular-devkit/build-webpack@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
+  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-devkit/core@0.9.0-beta.3":
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.9.0-beta.3.tgz#9263e071bc606995b6d413e463139a87106fb67d"
-  integrity sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==
-  dependencies:
-    ajv "6.5.3"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.2.2"
-    source-map "0.7.3"
-
-"@angular-devkit/core@7.3.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.3.tgz#cd6d5a8eca25ef07b6394bc2b08133d90d08d39f"
-  integrity sha512-fosULDtMoDWrOyUzTmBkJccOy7zodo02kENyKai7vOv9EWfv9jytkVdNc+jl0ys9OE2QadvSYBo49jhnZxFXfQ==
+"@angular-devkit/core@7.3.8", "@angular-devkit/core@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
+  integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
   dependencies:
     ajv "6.9.1"
     chokidar "2.0.4"
@@ -125,78 +114,51 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.7", "@angular-devkit/core@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
-  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
+"@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
+  integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
   dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
-"@angular-devkit/schematics@0.9.0-beta.3":
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz#c96ea603d5b8c98cbed1250746ccfd0d7d308ceb"
-  integrity sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==
-  dependencies:
-    "@angular-devkit/core" "0.9.0-beta.3"
-    rxjs "6.2.2"
-
-"@angular-devkit/schematics@7.3.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.3.tgz#80e9dc3197a3181f32edfb5c07e7ac016eace7d3"
-  integrity sha512-SdDq9eKwceb6WLwci1fywtZ/kARR5CYyzi5dZIR1lOxrz00682uUBqH/X39mKdqc6eVqR7rtPceqNm6nQpOIMg==
-  dependencies:
-    "@angular-devkit/core" "7.3.3"
-    rxjs "6.3.3"
-
-"@angular-devkit/schematics@7.3.7", "@angular-devkit/schematics@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
-  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
 "@angular/animations@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
-  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
+  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
-  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
+"@angular/cli@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
+  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
-    "@schematics/update" "0.13.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
+    "@schematics/angular" "7.3.8"
+    "@schematics/update" "0.13.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
     npm-package-arg "6.1.0"
-    opn "5.4.0"
+    open "6.0.0"
     pacote "9.4.0"
     semver "5.6.0"
     symbol-observable "1.2.0"
 
 "@angular/common@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
-  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
+  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz#0835a17dd9cea4bb03c5073d943a5074fed539ff"
-  integrity sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==
+"@angular/compiler-cli@^7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
+  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -210,75 +172,75 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.11.tgz#d547bf781e5c8b28da9af2460a6dfb5683d325ae"
-  integrity sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==
+"@angular/compiler@^7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
+  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
-  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
+  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/forms@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
-  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
+  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/http@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.11.tgz#c52a491374d937cd05789a5c13d70a1c5fdddf4d"
-  integrity sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.12.tgz#0ec28f6dc7814c85761833b1fd4b53b397b5e882"
+  integrity sha512-cceU+SWIQFOL3gRKqm5SYHQM3VoKbXne2XQRSY2Fdoc3XsipOzTEvJQPLm5ZcTEXdmRFlfianDoDaWEIvGbXkw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.11.tgz#1967ebcef5fc03e462941aa70dc41562d5dce06e"
-  integrity sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==
+"@angular/language-service@^7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
+  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
 
 "@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
-  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
+  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
-  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
+  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.7.tgz#c994b6ffa6e64f07d9e9bd558a81412a45dfe0af"
-  integrity sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==
+"@angular/pwa@^0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.8.tgz#20799d6c5a00c8b15d56874bc5c2344e13683a1a"
+  integrity sha512-Yu9bFh/9Vq2Wi3X4foki2qM3kLRs/GTROaI2Na+OfCpACMn6vNTHgJdqyjzSW9DpFTbW/4Fsb2NMmPf8CgAScw==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
+    "@schematics/angular" "7.3.8"
     parse5-html-rewriting-stream "5.1.0"
     rxjs "6.3.3"
 
 "@angular/router@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
-  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
+  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/service-worker@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.11.tgz#ab61d4b1c75359fde461b4073b90438abff4d9e9"
-  integrity sha512-MalD4T2Iur582TMmHKFDmoqSYMys1EjdTZWt0qME85ri1w7yBriujvTyy9/aZmT2bFBGeJvbqhohoU46CsnqsA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.12.tgz#9d3ca7399a105900a4d706cf5da5954cbe5b66dc"
+  integrity sha512-0hvKy+EXPoGrLujqzXK02gfVUZ187o/aDvmBuH2Io9us93RgGew/Se1iFl2YaawhPYSsuwwbrcjoSVMznoI1GQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -289,12 +251,12 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.2.2":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.3.tgz#185962ade59a52e00ca2bdfcfd1d58e528d4e39e"
-  integrity sha512-aEADYwRRZjJyMnKN7llGIlircxTCofm3dtV5pmY6ob18MSIuipHpA2yZWkPlycwu5HJcx/pADS3zssd8eY7/6A==
+"@babel/generator@^7.0.0", "@babel/generator@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.0.tgz#c230e79589ae7a729fd4631b9ded4dc220418196"
+  integrity sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==
   dependencies:
-    "@babel/types" "^7.3.3"
+    "@babel/types" "^7.4.0"
     jsesc "^2.5.1"
     lodash "^4.17.11"
     source-map "^0.5.0"
@@ -316,12 +278,12 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
+"@babel/helper-split-export-declaration@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz#571bfd52701f492920d63b7f735030e9a3e10b55"
+  integrity sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -332,46 +294,46 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.3.tgz#092d450db02bdb6ccb1ca8ffd47d8774a91aef87"
-  integrity sha512-xsH1CJoln2r74hR+y7cg2B5JCPaTh+Hd+EbBRk9nWGSNspuo6krjhX0Om6RnRQuIvFq8wVXCLKH3kwKDYhanSg==
+"@babel/parser@^7.0.0", "@babel/parser@^7.4.0", "@babel/parser@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.3.tgz#eb3ac80f64aa101c907d4ce5406360fe75b7895b"
+  integrity sha512-gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ==
 
 "@babel/runtime@^7.3.1":
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.2.tgz#f5ab6897320f16decd855eed70b705908a313fe8"
-  integrity sha512-7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA==
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
+  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
   dependencies:
     regenerator-runtime "^0.13.2"
 
 "@babel/template@^7.0.0", "@babel/template@^7.1.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
-  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.0.tgz#12474e9c077bae585c5d835a95c0b0b790c25c8b"
+  integrity sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.2.2"
-    "@babel/types" "^7.2.2"
+    "@babel/parser" "^7.4.0"
+    "@babel/types" "^7.4.0"
 
 "@babel/traverse@^7.0.0":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
-  integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.3.tgz#1a01f078fc575d589ff30c0f71bf3c3d9ccbad84"
+  integrity sha512-HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.2.2"
+    "@babel/generator" "^7.4.0"
     "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.2.3"
-    "@babel/types" "^7.2.2"
+    "@babel/helper-split-export-declaration" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/types" "^7.4.0"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.3.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.3.tgz#6c44d1cdac2a7625b624216657d5bc6c107ab436"
-  integrity sha512-2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ==
+"@babel/types@^7.0.0", "@babel/types@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.0.tgz#670724f77d24cce6cc7d8cf64599d511d164894c"
+  integrity sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.11"
@@ -439,65 +401,65 @@
     is-negated-glob "^1.0.0"
 
 "@ionic-native/barcode-scanner@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz#e04bb2884f6f0a76b135d34f41c40e8d3a52b72d"
-  integrity sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.4.0.tgz#b38db6a40973ee2780dd993c3521f3962d3f083a"
+  integrity sha512-p7/wBtu3P20jX98eVoAvxoPNw9UhlVPjDTJ/DHimlFlUnj5jRl0jcQJ7ZXo8AYCYfs7vC8a32BDnqTkQlo6Lfw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/call-number@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.3.0.tgz#4a9318fecb4b1dce804786ecb78b51c84f05f06f"
-  integrity sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.4.0.tgz#097ec2f732b8e8eaf12bc6797e4ebf7511c6d4cd"
+  integrity sha512-rG/rLePAqWxNNgh0YlneiT0QdArRXICWF0Zz/YyqD9vuXr2D0as1xPomXSjWhoUu0J6UO5LdLK5Up2PL9+LwGw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/camera@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.3.0.tgz#fbd58cdb9c7a53fd2f65697f6395ea481743b67c"
-  integrity sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.4.0.tgz#d10461b9486ef8b064a7314b77c090b59620208f"
+  integrity sha512-lReblyrDaDA3Nr4uLYozOpixvdrHrpLVaGfPd7I1oR0sIYWyphFPXiCMFQL2r29GDl4hRm0jsxG5ygAvjXVTXw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/core@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/core/-/core-5.3.0.tgz#50934ded237a03489cf45bef3f1d3a7f1a0a71c4"
-  integrity sha512-oIsBvkB/Q63bjKvHGW7zAFMWSXIwnZ/U962UFyuqrF9dKvNSPI5cz8iPOaqKE+jzb2XhlcGKEbp5qAhTI0BcZQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/core/-/core-5.4.0.tgz#4bb126d9f14c337be65542bb5f653bc202ee9dbf"
+  integrity sha512-GSrwIcOqGq9a7axYGVDPvIS0FoBRPNIC6b4RkcC0rcvjbIDebgZG7zsZ2x6mhe4HC7fTUV2y8qBO8timMHv3oA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/device@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.3.0.tgz#6734f6adb5bed0aaa34da1aad84b658583e17d0b"
-  integrity sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.4.0.tgz#1f071460a2559468256a8b7a82127cd7c1ebacff"
+  integrity sha512-C9j2iryuDzWXkFucR0liKgA2DU0vVkEWweOIqgPXcYSlS6NgdguYcbBWh8Bi+JKhT/lqTNq9bKrquZUwkf1IcA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/dialogs@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.3.0.tgz#6b565119d08ffcb7c5dd1f68248b8d0739cf3aeb"
-  integrity sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.4.0.tgz#650357eb0c3ea444eabfaa12cae34fba555d284d"
+  integrity sha512-8JlLXsGjvWmLWjVJJUnfKaR1jFQD5qK5gqKcoylkQRakUBpuzTB/fFAMwOyBcHZcioXWkKDInELq2h2fu5T+WA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/geolocation@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.3.0.tgz#64a3495a6b9bdf4c2d5eb106a1b49012336eaef0"
-  integrity sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.4.0.tgz#332f0650c16b103d48c8a06b4ba0465ac0f88220"
+  integrity sha512-mcnIVhYZwRvoDMX9yRIgrixZBDSRjbtojIXWLjdWUoaO/YcOv/I5VhsICAUpiKM89NFW8Dcip3YLYDGGmCkSVA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/globalization@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/globalization/-/globalization-5.3.0.tgz#f1cd1a81a5a9079078b05a0defe6ba5216d36675"
-  integrity sha512-hI/KwkBzszdOermtdCzgJG6wtC4ONMA9vnbh6b5Uz3EdxEbMshRIudyyUoGt8CKSjQWTpyOed6FGfpMPmBgCaw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/globalization/-/globalization-5.4.0.tgz#9f6c9f430cb8e7d54425ef3b0e649fbe66ab01d6"
+  integrity sha512-ZUBv7t1MaHn/szbQ8jfrBkCuxSIqEVeM/a+sqESRzp3rpEOSRMXqaRv8oFfqzRUxvavSpunkPgx/xzfVeubhpg==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/google-analytics@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz#6e07f8fe67b24a83d04869d5bb2561530feb997a"
-  integrity sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.4.0.tgz#3155c889b98dc2cb5b30a9a8c2c61324eb16c9bb"
+  integrity sha512-Lk96Oqam0nczNWvSulWvUH8yjfyp0KBxmn9m8/0kEEkQnTZD+tIuQIDYB9zZTXnw7rkpbdqJCWb+Q2CLqoEwjA==
   dependencies:
     "@types/cordova" latest
 
@@ -509,72 +471,72 @@
     "@types/cordova" latest
 
 "@ionic-native/in-app-browser@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz#9e3e3ac12c18a8ebd1052ab35c05f16f090124fb"
-  integrity sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.4.0.tgz#b5a74580a9bf3e0797aabf52f53c3529dee80f0e"
+  integrity sha512-cPRKu7nl9oLKgqJyt/1SeO+aWTABWzu+QzkOQBOLfoAaqP1eXm/AU2C9joULnTl3P+s7oFZqXKiEAKI/jF+x1Q==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/intercom@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.3.0.tgz#e920f1ed774da10944424f9dfa1a89218f8b4546"
-  integrity sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.4.0.tgz#e742e008b14529c09e2825f0d7d936499478adef"
+  integrity sha512-WXEpoRt7auxtd9P4NjMwk+QTCWskEfrcn/XjJHVLDLtyvQid/ek0SLlDbJh8tB0EQuOTpXS4CE4cwfRD28NlBw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/local-notifications@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz#a97ce54f8f8fff198fab79a88a4c65fa64a56a54"
-  integrity sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.4.0.tgz#b8310dafb53bae509af57f5b153095a0ca2063c3"
+  integrity sha512-xKpcljk4mOFhe/6BzsL8AkPPZyB6WloqUcu1jp61ADEKfkeqr4uTzpADfZ/pzlw/aL05waHwvPZRgpQM/uUHlA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/mixpanel@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz#9733569e19ef4268ee3ac5b765569bd1b61f68bd"
-  integrity sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.4.0.tgz#7d022e29c20237208ed7f64db5d7e68251dbe81b"
+  integrity sha512-+f+3des08I3LwJQD8m0JglskOgEjqHivyYoU0DrSHZ0H+sPndOwwL6Q0LNXGwJ00gAv8173YFGxht5TxAP+neQ==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/network@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.3.0.tgz#d7d840e631d1b9374517c521800c8ac8f5d8ebb5"
-  integrity sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.4.0.tgz#4f4c12da0484a1a05fccd520402b402dc1c72af0"
+  integrity sha512-qHDoterYyz65E4nl6W1GdliiNtx7oeIyO/AsA3DFoY4Adlc+SmL7Ks+ZyIBqIPCwTvrK9CQ9VxOU26LsyneLOw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/splash-screen@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.3.0.tgz#147b005ee7fcea6b816e2549db5d8cc4b550fd84"
-  integrity sha512-4uSdsvXNZOw8RCGrMb8UJ0l0EWxdCAlBAp/9QVjBwiMMRuBRbEHRyBLVuMb50vJvqYhjXsOGjAX4ExxSAw6ICg==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/splash-screen/-/splash-screen-5.4.0.tgz#5e90ceab6ccf7d352197dbcd5502c1a649c881ea"
+  integrity sha512-2RkLfEWO9u+L7wgHCS156UBW18ulE8md2iPvWaz3fzwuPddjhYqFEP2Nz3ZM4pKvdex6pKRMNkLlvhBN93CkFw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/status-bar@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-5.3.0.tgz#a25558f59f2eee2aea509d563b54fcab2dc69861"
-  integrity sha512-iKeaETs0FeNq7bnwID+aoDF7gGFOT4BudsM89msIwQz9oqD9qZsB8G3WLqcWHwzeQNX3f6/wRrOQ8GxDCd4CHQ==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-5.4.0.tgz#aa83a4282ee0062de3bdeddcd6b089863481a3b5"
+  integrity sha512-ePt6NBVtUBKr02HoRcNZ8nlq6bAqqx/rVf6veZdV9UK2OEApFKEs++tdq+2fmpjdTBfB3jMGiyN3Kr+7c1dOmA==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/unique-device-id@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.3.0.tgz#ac63aece625ddf23861427f4e2e4f101107b19e3"
-  integrity sha512-/zxXmeDJqqmmnxQ2H6IiJ7e437863FCTohq3BQVFY9bgnJ01piCCA/vx/+jB/fABLucm9eYZXBWYw36aGcwYEw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/unique-device-id/-/unique-device-id-5.4.0.tgz#3a1c2036f518a410c9003a9b9968ffa7b04f50ae"
+  integrity sha512-ManX3ML07ZOgiyJ55+cRE7NmFgKLHb/wx+52UX+K+aTVBhHF1xe/EP9Grj6mTisQyQ9VkwlFEhm6hFa6/TGJsw==
   dependencies:
     "@types/cordova" latest
 
 "@ionic-native/vibration@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.3.0.tgz#0c8a47ece05900e97af0843fa4e888f25b75b12e"
-  integrity sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.4.0.tgz#27d77ea805eb5c9e2e4c5587a6c4ca5629613879"
+  integrity sha512-eKxpz4QpefHfEw9P2N3+QjmlSgKbEbZcCjButpnpM3FhUddrNzQ9ISaWHe3m/IZ8R4aj8x6N7FrZ7V32XVmidQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic/angular-toolkit@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@ionic/angular-toolkit/-/angular-toolkit-1.5.0.tgz#8c0e48ea4c1ad7aeb9e87854bdb86a87e50f1fe2"
-  integrity sha512-KHUu7MHi+s1LKox+EBOSN6HO6Sk79qOmBIMGHQMboPbqHGzb5aqCbTmtwa/BJZ1kytZ+yQ8kEejv8YwvrJIZEQ==
+"@ionic/angular-toolkit@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic/angular-toolkit/-/angular-toolkit-1.5.1.tgz#1bcd6c32fb745e63281a58161c66ee378c0bf0b8"
+  integrity sha512-B5LHuzEv/lgFP7yxfOA3/wggDM/X1mDkWFX8rZtaBRZBbC0vtZwdwDu73RnkfFZ0jTFyIgtoBW8qTrrCyd5MLA==
   dependencies:
     "@schematics/angular" "^7.0.3"
     tslib "^1.9.0"
@@ -582,11 +544,11 @@
     ws "^6.1.4"
 
 "@ionic/angular@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.1.2.tgz#c14c072c5bbaa7cfc533cb6408d02e769f820776"
-  integrity sha512-GVdtpPekPjAYo/3IiRg/EoVRw1/9RwW07ITW6TRorcX1XOPJlrRXVcQyWFTbHRD9TOikgE1XmMQd/+1Lk0TQFw==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.2.0.tgz#f90ad2b8b5f515a9cfc1025c8b40ec77fddb2c1c"
+  integrity sha512-ALZNxEZjkBJDyLH0mqcZQsgi9yUWB8uW2u6kg6ZjjSGf6atQL1IhOt+tTvdE98GWoNwFghNmdg9IFCFjUhANjw==
   dependencies:
-    "@ionic/core" "4.1.2"
+    "@ionic/core" "4.2.0"
     tslib "^1.9.3"
 
 "@ionic/app-scripts@^3.2.3":
@@ -622,28 +584,6 @@
     ws "3.3.2"
     xml2js "^0.4.19"
 
-"@ionic/cli-framework@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-1.1.0.tgz#aab5ed11d37784761a9bf947d5527ec57b27e720"
-  integrity sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==
-  dependencies:
-    "@ionic/utils-fs" "0.0.2"
-    chalk "^2.3.0"
-    debug "^4.0.0"
-    inquirer "^6.0.0"
-    lodash "^4.17.5"
-    minimist "^1.2.0"
-    rimraf "^2.6.2"
-    slice-ansi "^1.0.0"
-    stream-combiner2 "^1.1.1"
-    string-width "^2.1.1"
-    strip-ansi "^5.0.0"
-    tree-kill "1.2.0"
-    tslib "^1.9.0"
-    untildify "^3.0.2"
-    wrap-ansi "^4.0.0"
-    write-file-atomic "^2.3.0"
-
 "@ionic/cli-framework@1.7.0":
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-1.7.0.tgz#6cb516ad6a95b10c7e3197e9510eb64c1d580587"
@@ -671,10 +611,10 @@
     wrap-ansi "^4.0.0"
     write-file-atomic "^2.3.0"
 
-"@ionic/core@4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.1.2.tgz#cbabd9ae65936f56b1dc6de021cf79778dc991da"
-  integrity sha512-QVJYpDAycmXgQL3mWdvjlIgrLEG0wVl9+NGZQATEBCTEsuDHrOw7BO28FKPlFCdfTjVA6HDJnSj1HwOUi3Yp4w==
+"@ionic/core@4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.2.0.tgz#9b71c4b22a6b58cfe1bd3b1e24142b462ed9b480"
+  integrity sha512-JGnx8NV9z3Bgg/Ds/uEe4PPwp/UWnxqU35koByWZcyDpdb1WTwF8b4iJA8QGoj2DWEyFx7qt3c/bw3Zk/F7JPw==
   dependencies:
     ionicons "4.5.5"
 
@@ -699,32 +639,11 @@
     express "^4.16.2"
     tslib "^1.9.0"
 
-"@ionic/ng-toolkit@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz#b7453b2e8024648ab95fa0afefce73a4c3873b4d"
-  integrity sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==
-  dependencies:
-    "@ionic/cli-framework" "1.1.0"
-    chalk "^2.3.0"
-    debug "^4.0.0"
-    rxjs "~6.2.0"
-    tslib "^1.9.0"
-
 "@ionic/pro@^2.0.4":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@ionic/pro/-/pro-2.0.4.tgz#d9531ddaaf11098b75dde5aad5fea47b23632322"
   integrity sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw==
 
-"@ionic/schematics-angular@^1.0.7":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz#1e5be27346efdc430d75f2eaa86ee0c729e0877a"
-  integrity sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==
-  dependencies:
-    "@schematics/angular" "0.9.0-beta.3"
-    lodash "^4.17.5"
-    tslib "^1.9.0"
-    typescript "3.0.1"
-
 "@ionic/storage@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/storage/-/storage-2.2.0.tgz#ac181991d3bfc8352a5400efb5e9faa5e76b5d4b"
@@ -742,16 +661,6 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-fs@0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-0.0.2.tgz#5d93c4193ef4dde48fa468bce52b179d5d85e5ca"
-  integrity sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==
-  dependencies:
-    debug "^4.0.0"
-    ncp "^2.0.0"
-    through2 "^2.0.3"
-    tslib "^1.9.0"
-
 "@ionic/utils-fs@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-1.2.0.tgz#bc4492c5d57f910dedac2d3a33026d71ff3a51d5"
@@ -828,12 +737,12 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
-  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
+"@ngtools/webpack@7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
+  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -865,40 +774,22 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@schematics/angular@0.9.0-beta.3":
-  version "0.9.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.9.0-beta.3.tgz#dbfbadc52faf63a331a72b57945e807ab115eb6b"
-  integrity sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==
-  dependencies:
-    "@angular-devkit/core" "0.9.0-beta.3"
-    "@angular-devkit/schematics" "0.9.0-beta.3"
-    typescript "3.0.1"
-
-"@schematics/angular@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
-  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
+"@schematics/angular@7.3.8", "@schematics/angular@^7.0.3", "@schematics/angular@^7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
+  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     typescript "3.2.4"
 
-"@schematics/angular@^7.0.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.3.tgz#aaa63331365bf67b1b908cc18cfc5d7097ec8377"
-  integrity sha512-HbH8vajYPka0xGcFAN5IUBx8n8SFMQLFb9di2dJCOBaEakbKVkk8qtOpil54oFQbx7DFCvutq/p0u42JfEbuMQ==
+"@schematics/update@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
+  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
   dependencies:
-    "@angular-devkit/core" "7.3.3"
-    "@angular-devkit/schematics" "7.3.3"
-    typescript "3.2.4"
-
-"@schematics/update@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
-  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -924,9 +815,9 @@
   integrity sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==
 
 "@types/geojson@*":
-  version "7946.0.6"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.6.tgz#416f388a06b227784a2d91a88a53f14de05cd54b"
-  integrity sha512-f6qai3iR62QuMPPdgyH+LyiXTL2n9Rf62UniJjV7KHrbiwzLTZUKsdq0mFSTxAHbO7JvwxwC4tH0m1UnweuLrA==
+  version "7946.0.7"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
+  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
 "@types/googlemaps@^3.30.19":
   version "3.30.19"
@@ -934,16 +825,11 @@
   integrity sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==
 
 "@types/graphql@^14.0.7":
-  version "14.0.7"
-  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-14.0.7.tgz#daa09397220a68ce1cbb3f76a315ff3cd92312f6"
-  integrity sha512-BoLDjdvLQsXPZLJux3lEZANwGr3Xag56Ngy0U3y8uoRSDdeLcn43H3oBcgZlnd++iOQElBpaRVDHPzEDekyvXQ==
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-14.2.0.tgz#74e1da5f2a4a744ac6eb3ed57b48242ea9367202"
+  integrity sha512-lELg5m6eBOmATWyCZl8qULEOvnPIUG6B443yXKj930glXIgwQirIBPp5rthP2amJW0YSzUg2s5sfgba4mRRCNw==
 
-"@types/jasmine@*":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.9.tgz#ee886a9113db567e722a8a0c37f0e6283f2cefa3"
-  integrity sha512-vw3VyFPa9mlba6NZPBZC3q2Zrnkgy5xuCVI43/tTLX6umdYrYvcFtQUKi2zH3PjFZQ9XCxNM/NMrM9uk8TPOzg==
-
-"@types/jasmine@^3.3.12":
+"@types/jasmine@*", "@types/jasmine@^3.3.12":
   version "3.3.12"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.12.tgz#bf282cb540e9ad7a0a04b742082c073b655eab39"
   integrity sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==
@@ -962,44 +848,31 @@
   dependencies:
     "@types/geojson" "*"
 
-"@types/mongodb@*":
-  version "3.1.19"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.19.tgz#40c4310986888975771857810aa47fd3ea8e1acf"
-  integrity sha512-H54hQEovAhyLrIZOhPNfGyCCDoTqKsjb8GQBy8nptJqfxrYCp5WVcPJf9v0kfTPR72xOhaz9+WcYxOXWwEg1Vg==
-  dependencies:
-    "@types/bson" "*"
-    "@types/node" "*"
-
-"@types/mongodb@^3.1.22":
-  version "3.1.22"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.22.tgz#66f96c7acbf7135ce6295a8d6c26f1d97388a84b"
-  integrity sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==
+"@types/mongodb@*", "@types/mongodb@^3.1.22":
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.23.tgz#9aaa105f448427036cb6cd3aa042ab77b2ab8a7a"
+  integrity sha512-TNwS1HPh1nnaYorcQoWi+bH5kJ1Q/WqCjiD9XkU3oBeCZFYXXPafVUuFmoYFbzQ061ojhtsndRLzwNklRhU+4w==
   dependencies:
     "@types/bson" "*"
     "@types/node" "*"
 
 "@types/mongoose@^5.3.23":
-  version "5.3.23"
-  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.23.tgz#5a37bb73313f4892af9e2e6b9641a6f7b164200c"
-  integrity sha512-UZJOkFe/ShSt3iYFBiadwwCu2Y8qm/RZyAoCQI2uf88wr3NfDBpbqqoIyrchBy1y2XtvAAyktEPzvvR7up6/TQ==
+  version "5.3.26"
+  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.26.tgz#a979014c7fc9395e484695d4cc5647e7686251db"
+  integrity sha512-7NPdpUGU/1ZztTICcP3GxwWBAHTDyOLW0XJxrxlTl5i7R7XbT2Ucq33JussSLkWHKjbxpAmJnDwlYKcjwG7agg==
   dependencies:
     "@types/mongodb" "*"
     "@types/node" "*"
 
-"@types/node@*":
-  version "11.9.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.9.4.tgz#ceb0048a546db453f6248f2d1d95e937a6f00a14"
-  integrity sha512-Zl8dGvAcEmadgs1tmSPcvwzO1YRsz38bVJQvH1RvRqSR9/5n61Q1ktcDL0ht3FXWR+ZpVmXVwN1LuH4Ax23NsA==
-
-"@types/node@^11.9.3":
-  version "11.11.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.3.tgz#7c6b0f8eaf16ae530795de2ad1b85d34bf2f5c58"
-  integrity sha512-wp6IOGu1lxsfnrD+5mX6qwSwWuqsdkKKxTN4aQc4wByHAKZJf9/D4KXPQ1POUjEbnCP5LMggB0OEFNY9OTsMqg==
+"@types/node@*", "@types/node@^11.9.3":
+  version "11.13.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
+  integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
 "@types/node@^8.0.7":
-  version "8.10.40"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.40.tgz#4314888d5cd537945d73e9ce165c04cc550144a4"
-  integrity sha512-RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ==
+  version "8.10.45"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.45.tgz#4c49ba34106bc7dced77ff6bae8eb6543cde8351"
+  integrity sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==
 
 "@types/q@^0.0.32":
   version "0.0.32"
@@ -1014,9 +887,9 @@
     reflect-metadata "*"
 
 "@types/selenium-webdriver@^3.0.0":
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.15.tgz#024c24051c3798e9a0cf5cceb1c893140df1bc31"
-  integrity sha512-5nh8/K2u9p4bk95GGCJB7KBvewaB0TUziZ9DTr+mR2I6RoO4OJVqx7rxK83hs2J1tomwtCGkhiW+Dy8EUnfB+Q==
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz#50a4755f8e33edacd9c406729e9b930d2451902a"
+  integrity sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==
 
 "@types/socket.io-client@^1.4.32":
   version "1.4.32"
@@ -1029,9 +902,9 @@
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/stripe@^6.25.7":
-  version "6.25.7"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
-  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
+  version "6.25.10"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
+  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
   dependencies:
     "@types/node" "*"
 
@@ -1056,10 +929,17 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/yargs@^12.0.10":
-  version "12.0.10"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.10.tgz#17a8ec65cd8e88f51b418ceb271af18d3137df67"
-  integrity sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==
+"@types/yargs-parser@*":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
+  integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw==
+
+"@types/yargs@^13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.0.tgz#d2acb3bec0047d8f648ebacdab6b928a900c42c4"
+  integrity sha512-hY0o+kcz9M6kH32NUeb6VURghqMuCVkiUx+8Btsqhj4Hhov/hVGUx9DmBJeIkzlp1uAQK4wngQBCjqWdUUkFyA==
+  dependencies:
+    "@types/yargs-parser" "*"
 
 "@types/zen-observable@^0.8.0":
   version "0.8.0"
@@ -1232,7 +1112,7 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@1:
+abbrev@*, abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -1272,12 +1152,7 @@ acorn@^5.0.0, acorn@^5.2.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.5:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818"
-  integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==
-
-acorn@^6.0.7:
+acorn@^6.0.5, acorn@^6.0.7:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
@@ -1292,7 +1167,7 @@ after@0.8.2:
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
   integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.0:
+agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
@@ -1316,17 +1191,7 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
-ajv@6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
-  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@6.9.1, ajv@^6.1.0, ajv@^6.5.5:
+ajv@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
   integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
@@ -1346,6 +1211,16 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -1387,9 +1262,9 @@ ansi-colors@^1.0.1:
     ansi-wrap "^0.1.0"
 
 ansi-colors@^3.0.0:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
 ansi-escapes@^1.1.0:
   version "1.4.0"
@@ -1423,10 +1298,10 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -1445,7 +1320,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
-ansi@^0.3.1:
+ansi@*, ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
   integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
@@ -1470,19 +1345,20 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.0.tgz#67043da828fa474c0e7f98c52eed5cdf7d0aad30"
-  integrity sha512-N/+0BYAbHS16YFghQTaTrbsunKRCB8bjip11NmS9waWNGODbAJHn0oW813MoWpLV8TynaWz1VZRTu5RHkzDlAg==
+apollo-angular-link-http-common@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
+  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
   dependencies:
     tslib "^1.9.0"
 
 apollo-angular-link-http@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz#55411ed97f1f8356ebed5c0ae96f08dbaf3e064c"
-  integrity sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
+  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
   dependencies:
-    apollo-angular-link-http-common "~1.5.0"
+    apollo-angular-link-http-common "~1.6.0"
+    extract-files "5.0.1"
     tslib "^1.9.0"
 
 apollo-angular@^1.5.0:
@@ -1536,11 +1412,12 @@ apollo-link-context@^1.0.17:
     tslib "^1.9.3"
 
 apollo-link-dedup@^1.0.0:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz#028148f1028e806a9ab2f4abf3bde9dc292565e9"
-  integrity sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
+  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
   dependencies:
-    apollo-link "^1.2.8"
+    apollo-link "^1.2.11"
+    tslib "^1.9.3"
 
 apollo-link-ws@^1.0.17:
   version "1.0.17"
@@ -1550,14 +1427,7 @@ apollo-link-ws@^1.0.17:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.8.tgz#0f252adefd5047ac1a9f35ba9439d216587dcd84"
-  integrity sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==
-  dependencies:
-    zen-observable-ts "^0.8.15"
-
-apollo-link@^1.2.11:
+apollo-link@^1.0.0, apollo-link@^1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
   integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
@@ -1577,9 +1447,9 @@ apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
     tslib "^1.9.3"
 
 app-root-path@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
-  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
+  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
 
 append-transform@^1.0.0:
   version "1.0.0"
@@ -1736,9 +1606,9 @@ ast-types-flow@0.0.7:
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
 ast-types@0.x.x:
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.12.2.tgz#341656049ee328ac03fc805c156b49ebab1e4462"
-  integrity sha512-8c83xDLJM/dLDyXNLiR6afRRm4dPKN6KAnKqytRK3DBJul9lA+atxdQkNDkSVPdTqea5HiRq3lnnOIZ0MBpvdg==
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.12.3.tgz#2299c6201d34b2a749a2dd9f2de7ef5f0e84f423"
+  integrity sha512-wJUcAfrdW+IgDoMGNz5MmcvahKgB7BwIbLupdKVVHxHNYt+HVR2k35swdYNv9aZpF8nvlkjbnkp2rrNwxGckZA==
 
 ast-types@^0.7.0:
   version "0.7.8"
@@ -1751,9 +1621,9 @@ astral-regex@^1.0.0:
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-each@^1.0.0, async-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
+  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
 async-foreach@^0.1.3:
   version "0.1.3"
@@ -1921,7 +1791,7 @@ backo2@1.0.2, backo2@^1.0.2:
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
   integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
-balanced-match@^1.0.0:
+balanced-match@*, balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
@@ -2011,9 +1881,9 @@ big-integer@1.6.32:
   integrity sha512-ljKJdR3wk9thHfLj4DtrNiOSTxvGFaMjWrG4pW75juXC4j7+XuKJVFdg4kgFMYp85PVkO05dFMj2dk2xVsH4xw==
 
 big-integer@^1.6.7:
-  version "1.6.41"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.41.tgz#6fb0e51bc8661129ef3832d46c939170b81ca794"
-  integrity sha512-d5AT9lMTYJ/ZE/4gzxb+5ttPcRWljVsvv7lF1w9KzkPhVUhBtHrjDo1J8swfZKepfLsliDhYa31zRYwcD0Yg9w==
+  version "1.6.43"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.43.tgz#8ac15bf13e93e509500859061233e19d8d0d99d1"
+  integrity sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -2021,9 +1891,9 @@ big.js@^5.2.2:
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1"
-  integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 blob@0.0.5:
   version "0.0.5"
@@ -2045,9 +1915,9 @@ blocking-proxy@^1.0.0:
     minimist "^1.2.0"
 
 bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
+  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -2122,14 +1992,14 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@^0.1.0:
+bplist-parser@*, bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
   integrity sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@^1.1.7:
+brace-expansion@*, brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
@@ -2259,13 +2129,13 @@ browserslist@^2.11.3:
     electron-to-chromium "^1.3.30"
 
 browserslist@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
-  integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
+  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
   dependencies:
-    caniuse-lite "^1.0.30000929"
-    electron-to-chromium "^1.3.103"
-    node-releases "^1.1.3"
+    caniuse-lite "^1.0.30000955"
+    electron-to-chromium "^1.3.122"
+    node-releases "^1.1.13"
 
 browserstack@^1.5.1:
   version "1.5.2"
@@ -2463,9 +2333,9 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 can-promise@0.0.1:
   version "0.0.1"
@@ -2474,10 +2344,10 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
-caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000929:
-  version "1.0.30000938"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz#b64bf1427438df40183fce910fe24e34feda7a3f"
-  integrity sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==
+caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955:
+  version "1.0.30000957"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
+  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -2538,12 +2408,12 @@ check-types@^7.3.0:
   integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
 
 cheerio@^1.0.0-rc.2:
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
-  integrity sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
   dependencies:
     css-select "~1.2.0"
-    dom-serializer "~0.1.0"
+    dom-serializer "~0.1.1"
     entities "~1.1.1"
     htmlparser2 "^3.9.1"
     lodash "^4.15.0"
@@ -2569,29 +2439,10 @@ chokidar@2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
-  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.0"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-chokidar@^2.1.2:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.4.tgz#244a65d68beedf1078c2f193cf2735c2cfdc7da2"
-  integrity sha512-ZVuFiB9IGOHqu+Jh7B7fSTmzsfDmUtC6yqd/V72UPQeXbNHONbMV0chOXtLXjsP3NvdUsHTNMg02NtXPDaSmNQ==
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -2729,19 +2580,19 @@ co@^4.6.0:
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-block-writer@^7.2.0:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.2.2.tgz#14ec0120de9a65d2cc5d214561d51d1660dddbb1"
-  integrity sha512-8SyXM1bWsMDCzvCoTdnDBhnnUbHntxcba4ApBIO3S3QX0M2Iq0xZCzs6SYdBOGaSUi4drysvrAK15JoXhlpsvQ==
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.3.0.tgz#9a70ca48865d3a733347da31c74104eed734929f"
+  integrity sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^5.0.0-beta.1:
-  version "5.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0-beta.1.tgz#749bc5d7f9cb73f71cc17594bae85227de0434fb"
-  integrity sha512-Pz+AF7F6SdO/aKvRNeDFFHWqSe0vGzbv3F1gu+OrE7+hbIeXm8RFafXZVYsO3edek9cRP8abo/mw28LK/BUSEA==
+codelyzer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0.tgz#e4032efb23a7c5d4bcfe7321fc1789490c679837"
+  integrity sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==
   dependencies:
     app-root-path "^2.1.0"
     aria-query "^3.0.0"
@@ -2795,21 +2646,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@~2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
 commander@~2.12.1:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
   integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
 
-commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -2835,7 +2681,7 @@ component-inherit@0.0.3:
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
   integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
-compressible@~2.0.14:
+compressible@~2.0.16:
   version "2.0.16"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
   integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
@@ -2843,19 +2689,19 @@ compressible@~2.0.14:
     mime-db ">= 1.38.0 < 2"
 
 compression@^1.5.2, compression@^1.6.0:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.14"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@0.0.1:
+concat-map@*, concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
@@ -2983,10 +2829,11 @@ copy-webpack-plugin@4.6.0:
     serialize-javascript "^1.4.0"
 
 cordova-android-support-gradle-release@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.0.1.tgz#1a6a834a713310a7ee6ad1cd3e1db6b63cb993c3"
-  integrity sha512-HlX75PN8b9y3LIlAFLQspSbO7dr7hTRi2/n4A2Hz4AHb7NxiVt6VU+6j+JcseDveVdddh1sKMZd0xPtFMVNjXA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-2.1.0.tgz#2d41db1eb7fc5dea32b6514336a37a5e00dfbc21"
+  integrity sha512-rKqNQ5PCHuZ/qUWYrLz5dKJpdJ/ArkhTCEv4CxbFuny0a0JNg5lwufmZ7qfVIqxoK0Nvs9XsIYKiFSGxaQ8lTg==
   dependencies:
+    q "^1.4.1"
     semver "5.1.0"
     xml2js "~0.4.19"
 
@@ -3103,14 +2950,14 @@ cordova-plugin-ionic-keyboard@^2.1.3:
   integrity sha512-6ucQ6FdlLdBm8kJfFnzozmBTjru/0xekHP/dAhjoCZggkGRlgs8TsUJFkxa/bV+qi7Dlo50JjmpE4UMWAO+aOQ==
 
 cordova-plugin-ionic-webview@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.0.tgz#d00f36761309d31ade55e9740731ffca141f4e54"
-  integrity sha512-4CNDDXS9PZ+j38ZpzFqC6Ua5GySr/McXTPnWdRfhFSbuFCL6B/xhIHUVoeoj48wo6Sh+gDURvbaH9uu1Z53TJA==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.0.1.tgz#2ff5e73998d87316d3ab8dbe4b6ccf768ab7f637"
+  integrity sha512-rJf7jFQNw7l0U4Y7P6DjxwmO/qQgS7xqiTgwDbNFS4z4+FZ3EZyupll7/cFEDnxGRNMgWsMKDhIABUo5mIDaUQ==
 
 cordova-plugin-mixpanel@^4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/cordova-plugin-mixpanel/-/cordova-plugin-mixpanel-4.5.2.tgz#76a78090c6333715618901e53e2782da9d3ac06c"
-  integrity sha512-+mlT7fw4ug+wU5/KlR5TX8lZQbyF7jsk/Ol8PNcizfxI7xU6URA5Y/qhTNzOZGjf4Iga6XhJx/VPz9fEzep1iA==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/cordova-plugin-mixpanel/-/cordova-plugin-mixpanel-4.6.1.tgz#a22de20db37fb552b08b2d7a286aa6291165eba5"
+  integrity sha512-tQ0kvp5mwKhWgSqvjMdERYfbSiQLBKDu01m6e0/wS/3zJEwPkBY5uhmTD/HTwl66HLOV0SGBXppD9shcmoJiKg==
 
 cordova-plugin-splashscreen@^5.0.2:
   version "5.0.2"
@@ -3137,7 +2984,7 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
   integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw=
@@ -3159,9 +3006,9 @@ core-js@^2.2.0, core-js@^2.4.0:
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
 core-js@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957"
-  integrity sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -3187,14 +3034,13 @@ cosmiconfig@^4.0.0:
     require-from-string "^2.0.1"
 
 cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
-  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
+  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    lodash.get "^4.4.2"
+    js-yaml "^3.13.0"
     parse-json "^4.0.0"
 
 cpr@^3.0.1:
@@ -3393,9 +3239,9 @@ dashdash@^1.12.0:
     assert-plus "^1.0.0"
 
 data-uri-to-buffer@2:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.0.tgz#0ba23671727349828c32cfafddea411908d13d23"
-  integrity sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz#ca8f56fe38b1fd329473e9d1b4a9afcd8ce1c045"
+  integrity sha512-OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A==
   dependencies:
     "@types/node" "^8.0.7"
 
@@ -3416,7 +3262,7 @@ debug@*, debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@2.6.9, debug@^2.1.0, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+debug@2.6.9, debug@^2.1.0, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -3696,7 +3542,7 @@ dom-serialize@^2.2.0:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@0, dom-serializer@~0.1.0:
+dom-serializer@0, dom-serializer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
   integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
@@ -3825,10 +3671,10 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.30:
-  version "1.3.113"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
-  integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
+electron-to-chromium@^1.3.122, electron-to-chromium@^1.3.30:
+  version "1.3.124"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
+  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
 elementtree@0.1.6:
   version "0.1.6"
@@ -4040,13 +3886,13 @@ es-to-primitive@^1.2.0:
     is-symbol "^1.0.2"
 
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.47"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.47.tgz#d24232e1380daad5449a817be19bde9729024a11"
-  integrity sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==
+  version "0.10.49"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.49.tgz#059a239de862c94494fec28f8150c977028c6c5e"
+  integrity sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
-    next-tick "1"
+    next-tick "^1.0.0"
 
 es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
   version "2.0.3"
@@ -4166,9 +4012,9 @@ escope@^3.6.0:
     estraverse "^4.1.1"
 
 eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -4439,6 +4285,11 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-files@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz#c9492a8410be643e260a376f0151361993d5f659"
+  integrity sha512-qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w==
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -4609,12 +4460,12 @@ find-cache-dir@^1.0.0:
     pkg-dir "^2.0.0"
 
 find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
     commondir "^1.0.1"
-    make-dir "^1.0.0"
+    make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
 find-up@^1.0.0:
@@ -4883,9 +4734,9 @@ get-caller-file@^1.0.1:
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-caller-file@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.1.tgz#25835260d3a2b9665fcdbb08cb039a7bbf7011c0"
-  integrity sha512-SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-stdin@^4.0.1:
   version "4.0.1"
@@ -5083,9 +4934,9 @@ graphql-tag@^2.10.1:
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
 
 graphql@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0"
-  integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.1.tgz#779529bf9a01e7207b977a54c20670b48ca6e95c"
+  integrity sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==
   dependencies:
     iterall "^1.2.2"
 
@@ -5103,11 +4954,11 @@ handle-thing@^2.0.0:
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
-  integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
+  integrity sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==
   dependencies:
-    async "^2.5.0"
+    neo-async "^2.6.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
@@ -5229,9 +5080,9 @@ hmac-drbg@^1.0.0:
     minimalistic-crypto-utils "^1.0.1"
 
 hoek@6.x.x:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
-  integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
+  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
 
 hoopy@^0.1.2:
   version "0.1.4"
@@ -5378,9 +5229,9 @@ husky@^1.3.1:
     slash "^2.0.0"
 
 i18next@^15.0.4:
-  version "15.0.7"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.7.tgz#2f61240c8b2b6656233217a8eee07a09a5707fea"
-  integrity sha512-KCSmTOE0nsku53cI0sSBY21ftXhsAfCjcNQBx54Y0AxcTxSs+v+qGFQ38ab+vi6F4NZEm8JupO36vlWoeF47cA==
+  version "15.0.9"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.9.tgz#42536407a921bb5a8535a4c090a26f16827a1884"
+  integrity sha512-IdVj7DqErUuMbGuj2dFT431T7zKlmDci63eae6pNA/bMwgBZKT74/KnwHXE0WH7ivo2EV/LNme4pP4Yw6vB79w==
   dependencies:
     "@babel/runtime" "^7.3.1"
 
@@ -5399,9 +5250,9 @@ iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -5492,7 +5343,7 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
-inflight@^1.0.4:
+inflight@*, inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
@@ -5500,7 +5351,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -5641,11 +5492,16 @@ ionic@^4.12.0:
     update-notifier "^2.3.0"
     uuid "^3.2.1"
 
-ionicons@4.5.5, ionicons@^4.5.5:
+ionicons@4.5.5:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.5.tgz#b059958a54dd45cfa127acc0baf11503b8671e51"
   integrity sha512-dIGI73XG6Fg2Ps77ry5Ywe36Pq7wUGkDkl0pBhC4uhsiyoW+oXe+pplmarXEnKEcB5fmlkRrBOxYYzZaoRiUGw==
 
+ionicons@^4.5.5:
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.6.tgz#f3b5d2446e7e1b30e67ddcd1fc563271acc60f3c"
+  integrity sha512-/F3U/rxdLPGl8eUW5dMouhBBoJuUPrlFO6rkoz4VNuw1lxP6l+bFtsDA8MaVM1dHABp+gIHxtpt+IhwmB3oIfA==
+
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -5810,9 +5666,9 @@ is-glob@^3.1.0:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -6098,10 +5954,10 @@ iterall@^1.2.1, iterall@^1.2.2:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
-jasmine-core@^3.3, jasmine-core@^3.3.0, jasmine-core@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
-  integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
+jasmine-core@^3.3, jasmine-core@^3.3.0, jasmine-core@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
@@ -6125,12 +5981,12 @@ jasmine@2.8.0:
     jasmine-core "~2.8.0"
 
 jasmine@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.3.1.tgz#d61bb1dd8888859bd11ea83074a78ee13d949905"
-  integrity sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.4.0.tgz#0fa68903ff0c9697459cd044b44f4dcef5ec8bdc"
+  integrity sha512-sR9b4n+fnBFDEd7VS2el2DeHgKcPiMVn44rtKFumq9q7P/t8WrxsVIZPob4UDdgcDNCwyDqwxCt4k9TDRmjPoQ==
   dependencies:
-    glob "^7.0.6"
-    jasmine-core "~3.3.0"
+    glob "^7.1.3"
+    jasmine-core "~3.4.0"
 
 jasminewd2@^2.1.0:
   version "2.2.0"
@@ -6152,10 +6008,10 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
-  integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
+js-yaml@^3.12.0, js-yaml@^3.13.0, js-yaml@^3.9.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -6262,9 +6118,9 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jszip@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.0.tgz#1c179e8692777490ca4e9b8f3ced08f9b820da2c"
-  integrity sha512-4WjbsaEtBK/DHeDZOPiPw5nzSGLDEDDreFRDEgnoMwmknPjTqa+23XuYFk6NiGbeiAeZCctiQ/X/z0lQBmDVOQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.1.tgz#c5d32df7274042282b157efb16e522b43435e01a"
+  integrity sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
@@ -6624,11 +6480,6 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-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.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -6683,15 +6534,15 @@ log-update@^2.3.0:
     wrap-ansi "^3.0.1"
 
 log4js@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.0.2.tgz#0c73e623ca4448669653eb0e9f629beacc7fbbe3"
-  integrity sha512-KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.1.0.tgz#57983c6a443546a8c8607e9cb045d2a117c27644"
+  integrity sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==
   dependencies:
     date-format "^2.0.0"
-    debug "^3.1.0"
+    debug "^4.1.1"
     flatted "^2.0.0"
     rfdc "^1.1.2"
-    streamroller "^1.0.1"
+    streamroller "^1.0.4"
 
 loglevel@^1.4.1:
   version "1.6.1"
@@ -6748,10 +6599,10 @@ macos-release@^1.0.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb"
   integrity sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==
 
-macos-release@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
-  integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==
+macos-release@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
+  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
 magic-string@^0.22.4:
   version "0.22.5"
@@ -6774,6 +6625,14 @@ make-dir@^1.0.0, make-dir@^1.3.0:
   dependencies:
     pify "^3.0.0"
 
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
@@ -6831,9 +6690,9 @@ map-visit@^1.0.0:
     object-visit "^1.0.0"
 
 marked@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.1.tgz#a63addde477bca9613028de4b2bc3629e53a0562"
-  integrity sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
+  integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
 
 md5.js@^1.3.4:
   version "1.3.5"
@@ -6862,12 +6721,12 @@ mem@^1.1.0:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.1.0.tgz#aeb9be2d21f47e78af29e4ac5978e8afa2ca5b8a"
-  integrity sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
   dependencies:
     map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
+    mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
 memory-fs@^0.4.0, memory-fs@~0.4.1:
@@ -6943,7 +6802,12 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.38.0 < 2", mime-db@~1.38.0:
+"mime-db@>= 1.38.0 < 2":
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
+  integrity sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==
+
+mime-db@~1.38.0:
   version "1.38.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
   integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
@@ -6966,15 +6830,20 @@ mime@^1.4.1:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.3.1, mime@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
+  integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
+mimic-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
 mingo@1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/mingo/-/mingo-1.3.3.tgz#6922c4d147efc771a01425a2c4c8f7784478c546"
@@ -6999,7 +6868,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -7158,9 +7027,9 @@ mx.ferreyra.callnumber@0.0.2:
   integrity sha512-J9FJiMrfWG9Q8AQEz/cgYLcXTTD/Z5+vfq29hn8K7yVWjxkSzr7zFi7Dpn8wcv2iKHBHDJY+U0z8yoAzDugXMw==
 
 nan@^2.10.0, nan@^2.9.2:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
-  integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -7179,17 +7048,12 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-ncp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
-  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
-
 needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.0.tgz#ce3fea21197267bacb310705a7bbe24f2a3a3492"
+  integrity sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==
   dependencies:
-    debug "^2.1.2"
+    debug "^4.1.0"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
@@ -7198,7 +7062,7 @@ negotiator@0.6.1:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
-neo-async@^2.5.0:
+neo-async@^2.5.0, neo-async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
@@ -7208,7 +7072,7 @@ netmask@^1.0.6:
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
   integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
 
-next-tick@1:
+next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
@@ -7303,10 +7167,10 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.3:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.8.tgz#32a63fff63c5e51b7e0f540ac95947d220fc6862"
-  integrity sha512-gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA==
+node-releases@^1.1.13:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
+  integrity sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==
   dependencies:
     semver "^5.3.0"
 
@@ -7502,9 +7366,9 @@ object-inspect@~1.6.0:
   integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
 
 object-keys@^1.0.12, object-keys@^1.0.6:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
@@ -7539,12 +7403,12 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
-  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
+on-headers@~1.0.1, on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -7558,6 +7422,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+open@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
+  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+  dependencies:
+    is-wsl "^1.1.0"
+
 opencollective@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
@@ -7583,10 +7454,17 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@5.4.0, opn@^5.1.0, opn@^5.2.0, opn@^5.3.0, opn@latest:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
+opn@^5.1.0, opn@^5.2.0, opn@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+  dependencies:
+    is-wsl "^1.1.0"
+
+opn@latest:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-6.0.0.tgz#3c5b0db676d5f97da1233d1ed42d182bc5a27d2d"
+  integrity sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7668,11 +7546,11 @@ os-name@^2.0.1:
     win-release "^1.0.0"
 
 os-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.0.0.tgz#e1434dbfddb8e74b44c98b56797d951b7648a5d9"
-  integrity sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
   dependencies:
-    macos-release "^2.0.0"
+    macos-release "^2.2.0"
     windows-release "^3.1.0"
 
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
@@ -7699,9 +7577,9 @@ p-finally@^1.0.0:
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-is-promise@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
-  integrity sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
 p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
@@ -7711,9 +7589,9 @@ p-limit@^1.0.0, p-limit@^1.1.0:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
-  integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
   dependencies:
     p-try "^2.0.0"
 
@@ -7742,9 +7620,9 @@ p-try@^1.0.0:
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pac-proxy-agent@^3.0.0:
   version "3.0.0"
@@ -7820,9 +7698,9 @@ pako@^0.2.5:
   integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
 pako@~1.0.2, pako@~1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4"
-  integrity sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
@@ -8049,6 +7927,11 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -8106,9 +7989,9 @@ png-js@>=0.1.0:
   integrity sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=
 
 pngjs@^3.3.0:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz#85173703bde3edac8998757b96e5821d0966a21b"
-  integrity sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
 portfinder@^1.0.9:
   version "1.0.20"
@@ -8257,9 +8140,9 @@ proxy-addr@~2.0.4:
     ipaddr.js "1.8.0"
 
 proxy-agent@3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.0.3.tgz#1c1a33db60ef5f2e9e35b876fd63c2bc681c611d"
-  integrity sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
+  integrity sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==
   dependencies:
     agent-base "^4.2.0"
     debug "^3.1.0"
@@ -8379,9 +8262,9 @@ qs@6.5.2, qs@~6.5.2:
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 qs@^6.4.0, qs@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
-  integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 querystring-es3@^0.2.0:
   version "0.2.1"
@@ -8394,9 +8277,9 @@ querystring@0.2.0:
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
-  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
@@ -8537,9 +8420,9 @@ readable-stream@1.1.x:
     string_decoder "~0.10.x"
 
 "readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
-  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -8612,9 +8495,9 @@ regexpu-core@^1.0.0:
     regjsparser "^0.1.4"
 
 registry-auth-token@^3.0.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
+  integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -8821,9 +8704,9 @@ rollup-plugin-node-resolve@3.0.0:
     resolve "^1.1.6"
 
 rollup-pluginutils@^2.0.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.4.1.tgz#de43ab54965bbf47843599a7f3adceb723de38db"
-  integrity sha512-wesMQ9/172IJDIW/lYWm0vW0LiKe5Ekjws481R7z9WTRtmO59cqyM/2uUlxvf6yzm/fElFmHUobeQOYz46dZJw==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz#203706edd43dfafeaebc355d7351119402fc83ad"
+  integrity sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ==
   dependencies:
     estree-walker "^0.6.0"
     micromatch "^3.1.10"
@@ -8877,13 +8760,6 @@ rxjs-tslint@0.1.5:
     tslint "^5.9.1"
     tsutils "^2.25.0"
 
-rxjs@6.2.2, rxjs@~6.2.0:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
-  integrity sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==
-  dependencies:
-    tslib "^1.9.0"
-
 rxjs@6.3.3:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
@@ -9064,10 +8940,10 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@5.6.0, semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
 semver@5.1.0:
   version "5.1.0"
@@ -9079,6 +8955,11 @@ semver@5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
+semver@5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -9234,13 +9115,6 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
-slice-ansi@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-
 slice-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -9381,17 +9255,17 @@ sockjs@0.3.19:
     uuid "^3.0.1"
 
 socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
-  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
   dependencies:
-    agent-base "~4.2.0"
-    socks "~2.2.0"
+    agent-base "~4.2.1"
+    socks "~2.3.2"
 
-socks@~2.2.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.3.tgz#7399ce11e19b2a997153c983a9ccb6306721f2dc"
-  integrity sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==
+socks@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
+  integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
   dependencies:
     ip "^1.1.5"
     smart-buffer "4.0.2"
@@ -9425,7 +9299,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.9:
+source-map-support@0.5.10:
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
   integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
@@ -9433,6 +9307,14 @@ source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@^0.5.6,
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@~0.4.0:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
@@ -9440,14 +9322,6 @@ source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@~0.5.10:
-  version "0.5.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -9514,9 +9388,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
-  integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
+  integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -9556,9 +9430,9 @@ split-string@^3.0.1, split-string@^3.0.2:
     extend-shallow "^3.0.0"
 
 split2@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-3.1.0.tgz#064bbfac70cdb66f77827870d42f159a8b442201"
-  integrity sha512-ePE1otNQVMnBRyqf3INbZvZwBPGsdBDThgrOWZ6z8zXGNVQNVCSEoOO9aBMTzDN1mXoNSZJ2kHSFH7AA5SPWww==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-3.1.1.tgz#c51f18f3e06a8c4469aaab487687d8d956160bb6"
+  integrity sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==
   dependencies:
     readable-stream "^3.0.0"
 
@@ -9587,9 +9461,9 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 ssh-config@^1.1.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ssh-config/-/ssh-config-1.1.5.tgz#a2d398c611a65c60d101e5b0f976c01f4739a28e"
-  integrity sha512-j3Yo++WWfc+2eFrSFclQZ79RRyMF2BOkDLboaUxyysYNomrLjIoOWanFbulHH5fLErRuW8YrO31p7MKpI4XrZw==
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/ssh-config/-/ssh-config-1.1.6.tgz#c6ce2d7f85f395178c9e47c448d62b8adf9b2523"
+  integrity sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==
 
 sshpk@^1.7.0:
   version "1.16.1"
@@ -9744,10 +9618,10 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
   integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
-streamroller@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.3.tgz#cb51e7e382f799a9381a5d7490ce3053b325fba3"
-  integrity sha512-P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg==
+streamroller@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.4.tgz#d485c7624796d5e2eb34190c79afcbf006afb5e6"
+  integrity sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==
   dependencies:
     async "^2.6.1"
     date-format "^2.0.0"
@@ -9778,13 +9652,13 @@ string-width@^1.0.1, string-width@^1.0.2:
     strip-ansi "^4.0.0"
 
 string-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1"
-  integrity sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
   dependencies:
     emoji-regex "^7.0.1"
     is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
 
 string.prototype.trim@~1.1.2:
   version "1.1.2"
@@ -9828,12 +9702,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^4.1.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
@@ -9982,9 +9856,9 @@ tapable@^0.2.7:
   integrity sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==
 
 tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
-  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tape@^4.8.0:
   version "4.10.1"
@@ -10034,7 +9908,7 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.2, terser-webpack-plugin@^1.1.0:
+terser-webpack-plugin@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
   integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
@@ -10048,7 +9922,7 @@ terser-webpack-plugin@1.2.2, terser-webpack-plugin@^1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser-webpack-plugin@^1.2.3:
+terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
   integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
@@ -10062,16 +9936,7 @@ terser-webpack-plugin@^1.2.3:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser@^3.16.1:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
-  integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
-    source-map-support "~0.5.9"
-
-terser@^3.17.0:
+terser@^3.16.1, terser@^3.17.0:
   version "3.17.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
   integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
@@ -10080,7 +9945,7 @@ terser@^3.17.0:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
-through2@^2.0.0, through2@^2.0.3, through2@~2.0.3:
+through2@^2.0.0, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -10089,12 +9954,11 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.3:
     xtend "~4.0.1"
 
 through2@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.0.tgz#468b461df9cd9fcc170f22ebf6852e467e578ff2"
-  integrity sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
   dependencies:
     readable-stream "2 || 3"
-    xtend "~4.0.1"
 
 through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4, through@~2.3.8:
   version "2.3.8"
@@ -10217,11 +10081,6 @@ traverse@^0.6.6:
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
   integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
 
-tree-kill@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
-  integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
-
 tree-kill@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
@@ -10257,9 +10116,9 @@ ts-invariant@^0.2.1:
     tslib "^1.9.3"
 
 ts-invariant@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz#89a2ffeb70879b777258df1df1c59383c35209b0"
-  integrity sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.3.tgz#b5742b1885ecf9e29c31a750307480f045ec0b16"
+  integrity sha512-UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ==
   dependencies:
     tslib "^1.9.3"
 
@@ -10304,10 +10163,10 @@ tslint-eslint-rules@^4.1.1:
     tslib "^1.0.0"
     tsutils "^1.4.0"
 
-tslint@^5.14.0:
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e"
-  integrity sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==
+tslint@^5.14.0, tslint@^5.8.0, tslint@^5.9.1:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
+  integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -10315,7 +10174,7 @@ tslint@^5.14.0:
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     resolve "^1.3.2"
@@ -10323,30 +10182,12 @@ tslint@^5.14.0:
     tslib "^1.8.0"
     tsutils "^2.29.0"
 
-tslint@^5.8.0, tslint@^5.9.1:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1"
-  integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==
-  dependencies:
-    babel-code-frame "^6.22.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.7.0"
-    minimatch "^3.0.4"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.27.2"
-
 tsutils@^1.4.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
   integrity sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=
 
-tsutils@^2.25.0, tsutils@^2.27.2, tsutils@^2.29.0:
+tsutils@^2.25.0, tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
   integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
@@ -10395,11 +10236,6 @@ typescript@2.9.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
   integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
-typescript@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
-  integrity sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==
-
 typescript@3.2.4, typescript@~3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
@@ -10439,11 +10275,11 @@ uglify-js@^2.8.29:
     uglify-to-browserify "~1.0.0"
 
 uglify-js@^3.1.4:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.4.tgz#4a64d57f590e20a898ba057f838dcdfb67a939b9"
+  integrity sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.20.0"
     source-map "~0.6.1"
 
 uglify-to-browserify@~1.0.0:
@@ -10470,7 +10306,7 @@ unc-path-regex@^0.1.2:
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
-underscore@^1.8.3:
+underscore@*, underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
   integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
@@ -10532,7 +10368,7 @@ unix-crypt-td-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
   integrity sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
 
-unorm@^1.3.3:
+unorm@*, unorm@^1.3.3:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
   integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
@@ -10560,12 +10396,7 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.0.5, upath@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
-
-upath@^1.1.1:
+upath@^1.0.5, upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
@@ -10606,9 +10437,9 @@ url-parse-lax@^1.0.0:
     prepend-http "^1.0.1"
 
 url-parse@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.5.tgz#04cbb6ba2be682a18e4417fa2245aa7e3dfdcc50"
+  integrity sha512-4XDvC5vZRjEpjP0L4znrWeoH8P8F0XGBlfLdABi/6oV4o8xUVbTpyrxWHxkK2bT0pSIpcjdIzSoWUhlUfawCAQ==
   dependencies:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
@@ -10761,9 +10592,9 @@ webdriver-manager@^12.0.6:
     xml2js "^0.4.17"
 
 webpack-bundle-analyzer@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz#2f19cbb87bb6d4f3cb4e59cb67c837bd9436e89d"
-  integrity sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz#3da733a900f515914e729fcebcd4c40dde71fc6f"
+  integrity sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==
   dependencies:
     acorn "^6.0.7"
     acorn-walk "^6.1.1"
@@ -10998,11 +10829,11 @@ window-size@0.1.0:
   integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
 windows-release@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e"
-  integrity sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
 
 wordwrap@0.0.2:
   version "0.0.2"
@@ -11051,7 +10882,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@1:
+wrappy@*, wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
@@ -11081,17 +10912,10 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.0.0, ws@~6.1.0:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
-  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
-  dependencies:
-    async-limiter "~1.0.0"
-
-ws@^6.1.4:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526"
-  integrity sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==
+ws@^6.0.0, ws@^6.1.4:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
@@ -11104,6 +10928,13 @@ ws@~3.3.1:
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
+ws@~6.1.0:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
+  dependencies:
+    async-limiter "~1.0.0"
+
 xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
@@ -11127,7 +10958,7 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmldom@0.1.x:
+xmldom@*, xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
   integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
@@ -11335,16 +11166,9 @@ yeast@0.1.2:
   integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.0.0.tgz#0073c6b56e92aed652fbdfd62431f2d6b9a7a091"
-  integrity sha512-+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q==
-
-zen-observable-ts@^0.8.15:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz#6cf7df6aa619076e4af2f707ccf8a6290d26699b"
-  integrity sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==
-  dependencies:
-    zen-observable "^0.8.0"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.0.tgz#fcbe2db63610361afcc5eb9e0ac91e976d046114"
+  integrity sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg==
 
 zen-observable-ts@^0.8.18:
   version "0.8.18"
@@ -11355,9 +11179,9 @@ zen-observable-ts@^0.8.18:
     zen-observable "^0.8.0"
 
 zen-observable@^0.8.0:
-  version "0.8.13"
-  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.13.tgz#a9f1b9dbdfd2d60a08761ceac6a861427d44ae2e"
-  integrity sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g==
+  version "0.8.14"
+  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
+  integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
 zone.js@^0.9.0:
   version "0.9.0"
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index f0612ea12..494492ee8 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -7,24 +7,24 @@
   resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.5.tgz#6dbceb666b2dbc4a868b97e1340a3faceb5f2113"
   integrity sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ==
 
-"@angular-devkit/architect@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.7.tgz#b09e80dedeacddb86a94d3002c7fb8627733554f"
-  integrity sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==
+"@angular-devkit/architect@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
+  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
 "@angular-devkit/build-angular@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz#dacf124dd94aa9b5ed831a9ba9f458c51249c5f4"
-  integrity sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==
-  dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/build-optimizer" "0.13.7"
-    "@angular-devkit/build-webpack" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@ngtools/webpack" "7.3.7"
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
+  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
+  dependencies:
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/build-optimizer" "0.13.8"
+    "@angular-devkit/build-webpack" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@ngtools/webpack" "7.3.8"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -40,7 +40,7 @@
     loader-utils "1.2.3"
     mini-css-extract-plugin "0.5.0"
     minimatch "3.0.4"
-    opn "5.4.0"
+    open "6.0.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
@@ -67,29 +67,29 @@
   optionalDependencies:
     node-sass "4.11.0"
 
-"@angular-devkit/build-optimizer@0.13.7", "@angular-devkit/build-optimizer@^0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz#c30d3b3fea5379144aed0f6ea5bf90c28c2efb86"
-  integrity sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==
+"@angular-devkit/build-optimizer@0.13.8", "@angular-devkit/build-optimizer@^0.13.7":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
+  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz#4c430005cdfbe86857012129bac28afe9ecfcbe9"
-  integrity sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==
+"@angular-devkit/build-webpack@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
+  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
   dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-devkit/core@7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.4.tgz#fae0521652c7430237025f117531ca3262ef8335"
-  integrity sha512-MBfen51iOBKfK4tlg5KwmPxePsF1QoFNUMGLuvUUwPkteonrGcupX1Q7NWTpf+HA+i08mOnZGuepeuQkD12IQw==
+"@angular-devkit/core@7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
+  integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
   dependencies:
     ajv "6.9.1"
     chokidar "2.0.4"
@@ -97,79 +97,68 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.7.tgz#9b93e8b88bc776c6b08895799123d718a20e3b41"
-  integrity sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==
-  dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
-"@angular-devkit/schematics@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.7.tgz#268465d355aa03d16189d0ea89467703dae4d581"
-  integrity sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==
+"@angular-devkit/schematics@7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
+  integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
 "@angular-extensions/testing-library@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-extensions/testing-library/-/testing-library-3.1.0.tgz#cb3efc039527f202867e2a734d835489dad1ff5f"
-  integrity sha512-giSP7FezcBS2uQxlKd071jEs8e1s7iiwt17FtA5ZRPQgcIewb/c8j1i1aT5+aGEmnXvOxnlDLOKPYNx3l62zPQ==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@angular-extensions/testing-library/-/testing-library-3.2.0.tgz#989a155268b915de3648744cf9a74befb9d6b206"
+  integrity sha512-lFobw3XVD8kcU15c0eSVQOUZzwelltdkNve1P0j72JY5Hb5muzQ+RX+ESMtDlEfw6uiWudge14BbNVeh8ygxRg==
   dependencies:
     dom-testing-library "^3.11.1"
     tslib "^1.9.0"
 
 "@angular/animations@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.11.tgz#379015467aa97f5987a2c4b56c5a7cbdfce3fefc"
-  integrity sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
+  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/cdk@^7.3.6":
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.6.tgz#4c330cacd11df4adade6c1cd3ed587745f9912fd"
-  integrity sha512-ZuOz8nQk0bdo8YyNFcwnmSl4MPaQDAFTbLK29w4Vd/LfPnhBI3pAr0wVuPFb0fl3eSvvUrfTb/+kPbQcE07A0A==
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.7.tgz#ce1ad53ba04beb9c8e950acc5691ea0143753764"
+  integrity sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
 "@angular/cli@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.7.tgz#49c9dc0519e2ec3a75e522ae3fec9cb6a462ec4f"
-  integrity sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==
-  dependencies:
-    "@angular-devkit/architect" "0.13.7"
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
-    "@schematics/angular" "7.3.7"
-    "@schematics/update" "0.13.7"
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
+  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
+  dependencies:
+    "@angular-devkit/architect" "0.13.8"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
+    "@schematics/angular" "7.3.8"
+    "@schematics/update" "0.13.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
     npm-package-arg "6.1.0"
-    opn "5.4.0"
+    open "6.0.0"
     pacote "9.4.0"
     semver "5.6.0"
     symbol-observable "1.2.0"
 
 "@angular/common@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.11.tgz#311ff4f9c0ae33b54456555f9da9a0d8c97ce27d"
-  integrity sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
+  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz#0835a17dd9cea4bb03c5073d943a5074fed539ff"
-  integrity sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
+  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -184,88 +173,81 @@
     yargs "9.0.1"
 
 "@angular/compiler@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.11.tgz#d547bf781e5c8b28da9af2460a6dfb5683d325ae"
-  integrity sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
+  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.11.tgz#c42164cdc1d4cf98973bae078384bb3845207f99"
-  integrity sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
+  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/forms@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.11.tgz#0f040cd8d1e072c054f10cfed804827f1db87f88"
-  integrity sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
+  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/language-service@^7.2.9":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.11.tgz#1967ebcef5fc03e462941aa70dc41562d5dce06e"
-  integrity sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
+  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
 
 "@angular/material@^7.3.3":
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.3.3.tgz#f3f87fa90c685cfad0b6974489c69d2676199052"
-  integrity sha512-DZdJaVpXsd5QlfpN5P871llw8AKh5QvRiyro3QRmEajYN85Xiawqpbt7O60TrwcFM6DzYLI3UeyWq8LFdmi/+Q==
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.3.7.tgz#dcd95e6618ba6254c5880efee1aad349cf5b9140"
+  integrity sha512-Eq+7frkeNGkLOfEtmkmJgR+AgoWajOipXZWWfCSamNfpCcPof82DwvGOpAmgGni9FuN2XFQdqP5MoaffQzIvUA==
   dependencies:
     tslib "^1.7.1"
 
 "@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz#b5afa0758fc8a3be27851dd4912c739087fa4787"
-  integrity sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
+  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.11.tgz#8357e5ce524ffc2ddf72f19c6fa3652edf1dc2a0"
-  integrity sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
+  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-server@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.11.tgz#abb37f4d4f74966cf7b643adbd073d93cf6d8644"
-  integrity sha512-IPxgOvgjfe2P8OmfAZZhU4ioGAxa8tXleGZjQbXB68JbVM2pxhRVVe5ooMcQjrjhVS8avd/yb/F5h5kOS4mQYg==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.12.tgz#8c5bf58476958629ff14dce7d25ae60389ba1dc3"
+  integrity sha512-e3kBeiq9CHqTrxjO65XZm0kIG7HUq8zI0vrsSxgznCmH+vJCL+qQOblHrlkdDESU76FbZgYzDIsYBoz31/OpaA==
   dependencies:
     domino "^2.1.0"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
 "@angular/router@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.11.tgz#a134dd4f06cdd2ccbf798688aedd4a2d5fb584ca"
-  integrity sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
+  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/service-worker@^7.2.11":
-  version "7.2.11"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.11.tgz#ab61d4b1c75359fde461b4073b90438abff4d9e9"
-  integrity sha512-MalD4T2Iur582TMmHKFDmoqSYMys1EjdTZWt0qME85ri1w7yBriujvTyy9/aZmT2bFBGeJvbqhohoU46CsnqsA==
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.12.tgz#9d3ca7399a105900a4d706cf5da5954cbe5b66dc"
+  integrity sha512-0hvKy+EXPoGrLujqzXK02gfVUZ187o/aDvmBuH2Io9us93RgGew/Se1iFl2YaawhPYSsuwwbrcjoSVMznoI1GQ==
   dependencies:
     tslib "^1.9.0"
 
-"@babel/runtime@^7.1.5":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
-  integrity sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/runtime@^7.3.1":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
-  integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==
+"@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
+  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
   dependencies:
-    regenerator-runtime "^0.12.0"
+    regenerator-runtime "^0.13.2"
 
 "@compodoc/compodoc@^1.1.9":
   version "1.1.9"
@@ -304,6 +286,7 @@
 "@compodoc/ngd-core@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz#e31a6cbbdfa8de648b027aa4169468bc496544c9"
+  integrity sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==
   dependencies:
     ansi-colors "^1.0.1"
     fancy-log "^1.3.2"
@@ -312,6 +295,7 @@
 "@compodoc/ngd-transformer@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz#89e858dd332198cde262f0cf3648bd0969d0da62"
+  integrity sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==
   dependencies:
     "@compodoc/ngd-core" "~2.0.0"
     dot "^1.1.1"
@@ -321,6 +305,7 @@
 "@dsherret/to-absolute-glob@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@dsherret/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1f6475dc8bd974cea07a2daf3864b317b1dd332c"
+  integrity sha1-H2R13IvZdM6gei2vOGSzF7HdMyw=
   dependencies:
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
@@ -332,68 +317,66 @@
   dependencies:
     tslib "^1.9.0"
 
-"@fortawesome/fontawesome-common-types@^0.2.15":
-  version "0.2.15"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.15.tgz#16af950653083d1e3064061de9f8e5e3b579f688"
-  integrity sha512-ATBRyKJw1d2ko+0DWN9+BXau0EK3I/Q6pPzPv3LhJD7r052YFAkAdfb1Bd7ZqhBsJrdse/S7jKxWUOZ61qBD4g==
+"@fortawesome/fontawesome-common-types@^0.2.17":
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.17.tgz#d8c36e6f6f3b3415fa1f83eaffe4f41bd313715c"
+  integrity sha512-DEYsEb/iiGVoMPQGjhG2uOylLVuMzTxOxysClkabZ5n80Q3oFDWGnshCLKvOvKoeClsgmKhWVrnnqvsMI1cAbw==
 
 "@fortawesome/fontawesome-free@^5.7.2":
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.7.2.tgz#1498c3eb78ee7c78c5488418707de90aaf58d5d7"
-  integrity sha512-Ha4HshKdCVKgu4TVCtG8XyPPYdzTzNW4/fvPnn+LT7AosRABryhlRv4cc4+o84dgpvVJN9reN7jo/c+nYujFug==
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz#cbafbfe8894c4e3e3c3a9da6774e249ac1f2da8b"
+  integrity sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA==
 
 "@fortawesome/fontawesome-svg-core@^1.2.15":
-  version "1.2.15"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.15.tgz#368f9fc7e8e8d8636495dc7483f97510f920ba97"
-  integrity sha512-M/sHyl4g2VBtKYkay1Z+XImMyTVcaBPmehYtPw4HKD9zg2E7eovB7Yx98aUfZjPbroGqa+IL4/+KhWBMOGlHIQ==
+  version "1.2.17"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.17.tgz#8fce4402e824ebe99a04b1949d56d696eeae2e6d"
+  integrity sha512-TORMW/wIX2QyyGBd4XwHGPir4/0U18Wxf+iDBAUW3EIJ0/VC/ZMpJOiyiCe1f8g9h0PPzA7sqVtl8JtTUtm4uA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.15"
+    "@fortawesome/fontawesome-common-types" "^0.2.17"
 
 "@fortawesome/free-brands-svg-icons@^5.7.2":
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.7.2.tgz#80ea37f12d22a281a5eadcd0cd3c870683e5dec1"
-  integrity sha512-91rIjo00vy7PNrXg5auDsPOSTjmgzc+UUqMyUZHmIrXG5OXMHgjAYMTgEIgs91Lm5XcJtggFZCQz1u5fGFnj2A==
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.8.1.tgz#8f188a4699adb31e505abca64740d7046222b9a1"
+  integrity sha512-NN5Nap2D5e7Lusa5uarAUkcaO7PMbme5wmUF8kofZzPUZR753zDg/UFffi+LLE2Mi9zRXCJEYmIRfMON9SxLPg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.15"
+    "@fortawesome/fontawesome-common-types" "^0.2.17"
 
 "@fortawesome/free-regular-svg-icons@^5.7.2":
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.7.2.tgz#7113bf9df5a970918b8cac8eb45e5ad120818741"
-  integrity sha512-ZO+zQcncfT7omTsTIjBkugj/dFXiSnoK44I5p0/WAoNX8aX2Au7j+uxq1qFX4bevkfGFGsPeJUYU1+Q1PB/5pQ==
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.8.1.tgz#9477a973fe3f681f871375fa95ff32a87dcb5111"
+  integrity sha512-U+tFjDyQpVdD0UPWoKRBVLhh0J1/q3iaWDrnxNMJKuKRmerc4d0jfiZdM2X7agOTcG7amvcllRBiWCu2FwYlMA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.15"
+    "@fortawesome/fontawesome-common-types" "^0.2.17"
 
 "@fortawesome/free-solid-svg-icons@^5.7.2":
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.7.2.tgz#9ec2ed353d630092a8e19cc8aae2f716572963e5"
-  integrity sha512-iujcXMyAvIbWM8W3jkOLpvJbR+rPpdN1QyqhZeJaLRdHPH4JmuovIAYP4vx5Sa1csZVXfRD1eDWqVZ/jGM620A==
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.8.1.tgz#086c70f95b34a4bcf6f50ff1078d46e53486eb52"
+  integrity sha512-FUcxR75PtMOo3ihRHJOZz64IsWIVdWgB2vCMLJjquTv487wVVCMH5H5gWa72et2oI9lKKD2jvjQ+y+7mxhscVQ==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "^0.2.17"
+
+"@jest/types@^24.7.0":
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.7.0.tgz#c4ec8d1828cdf23234d9b4ee31f5482a3f04f48b"
+  integrity sha512-ipJUa2rFWiKoBqMKP63Myb6h9+iT3FHRTF2M8OR6irxWzItisa8i4dcSg14IbvmXUnBlHBlUQPYUHWyX3UPpYA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.15"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/yargs" "^12.0.9"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
   dependencies:
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.7.tgz#52f7f44aec736c630db8ae9fc380a5f789a9e681"
-  integrity sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==
-  dependencies:
-    "@angular-devkit/core" "7.3.7"
-    enhanced-resolve "4.1.0"
-    rxjs "6.3.3"
-    tree-kill "1.2.1"
-    webpack-sources "1.3.0"
-
-"@ngtools/webpack@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.4.tgz#069b3425ef928ecf91f34b0c4c04dde158534a85"
-  integrity sha512-qTfw/LGZ3kDZAgqb6gMVr36E0W3M+bnS/xAxNTxshxmJOCQr9AcKtX4sP65QweKS60KoBBR1a7nR6SOi1NJkxA==
+"@ngtools/webpack@7.3.8", "@ngtools/webpack@^7.3.4":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
+  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
   dependencies:
-    "@angular-devkit/core" "7.3.4"
+    "@angular-devkit/core" "7.3.8"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -413,31 +396,27 @@
   dependencies:
     tslib "^1.9.0"
 
-"@nodelib/fs.stat@^1.0.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.1.tgz#53f349bb986ab273d601175aa1b25a655ab90ee3"
-
 "@nodelib/fs.stat@^1.1.2":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@schematics/angular@7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.7.tgz#6c219d71930c1127033e77f25d6ec3782306fa91"
-  integrity sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==
+"@schematics/angular@7.3.8":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
+  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     typescript "3.2.4"
 
-"@schematics/update@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.7.tgz#8b4d7146ae0ecedfe6ffc88b7fdec3ac165c89e4"
-  integrity sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==
+"@schematics/update@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
+  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
   dependencies:
-    "@angular-devkit/core" "7.3.7"
-    "@angular-devkit/schematics" "7.3.7"
+    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/schematics" "7.3.8"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -451,37 +430,42 @@
   integrity sha512-vTCdPp/T/Q3oSqwHmZ5Kpa9oI7iLtGl3RQaA/NyLHikvcrPxACkkKVr/XzkSPJWXHRhKGzVvb0urJsbMlRxi1Q==
 
 "@types/anymatch@*":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.0.tgz#d1d55958d1fccc5527d4aba29fc9c4b942f563ff"
-  integrity sha512-7WcbyctkE8GTzogDb0ulRAEw7v8oIS54ft9mQTU7PfM0hp5e+8kpa+HeQ7IQrFbKtJXBKcZ4bh+Em9dTw5L6AQ==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
+  integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
 
 "@types/bson@*":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@types/bson/-/bson-1.0.11.tgz#c95ad69bb0b3f5c33b4bb6cc86d86cafb273335c"
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.0.0.tgz#9073772679d749116eb1dfca56f8eaac6d59cc7a"
+  integrity sha512-pq/rqJwJWkbS10crsG5bgnrisL8pML79KlMKQMoQwLUjlPAkrUHMvHJ3oGwE7WHR61Lv/nadMwXVAD2b+fpD8Q==
   dependencies:
     "@types/node" "*"
 
 "@types/events@*":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
 "@types/fs-extra@^5.0.3":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.4.tgz#b971134d162cc0497d221adde3dbb67502225599"
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.5.tgz#080d90a792f3fa2c5559eb44bd8ef840aae9104b"
+  integrity sha512-w7iqhDH9mN8eLClQOYTkhdYUOSpp25eXxfc6VbFOGtzxW34JcvctH2bKjj4jD4++z4R5iO5D+pg48W2e03I65A==
   dependencies:
     "@types/node" "*"
 
-"@types/glob@*":
-  version "5.0.35"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
+"@types/glob@*", "@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
   dependencies:
     "@types/events" "*"
     "@types/minimatch" "*"
     "@types/node" "*"
 
 "@types/googlemaps@^3.30.16":
-  version "3.30.16"
-  resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.16.tgz#3264d5ef7c3a92fab2a9f00e09e3247866ff3532"
+  version "3.30.19"
+  resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.19.tgz#359c025e244490b0775826fb216bed093fd66b16"
+  integrity sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==
 
 "@types/hammerjs@^2.0.36":
   version "2.0.36"
@@ -489,70 +473,82 @@
   integrity sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==
 
 "@types/handlebars@^4.0.38":
-  version "4.0.39"
-  resolved "https://registry.yarnpkg.com/@types/handlebars/-/handlebars-4.0.39.tgz#961fb54db68030890942e6aeffe9f93a957807bd"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@types/handlebars/-/handlebars-4.1.0.tgz#3fcce9bf88f85fe73dc932240ab3fb682c624850"
+  integrity sha512-gq9YweFKNNB1uFK71eRqsd4niVkXrxHugqWFQkeLRJvGjnxsLr16bYtcsG4tOFwmYi0Bax+wCkbf1reUfdl4kA==
+  dependencies:
+    handlebars "*"
 
 "@types/highlight.js@^9.12.3":
   version "9.12.3"
   resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.3.tgz#b672cfaac25cbbc634a0fd92c515f66faa18dbca"
+  integrity sha512-pGF/zvYOACZ/gLGWdQH8zSwteQS1epp68yRcVLJMgUck/MjEn/FBYmPub9pXT8C1e4a8YZfHo1CKyV8q1vKUnQ==
+
+"@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz#1eb8c033e98cf4e1a4cedcaf8bcafe8cb7591e85"
+  integrity sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg==
 
 "@types/jasmine@^3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.9.tgz#ee886a9113db567e722a8a0c37f0e6283f2cefa3"
-  integrity sha512-vw3VyFPa9mlba6NZPBZC3q2Zrnkgy5xuCVI43/tTLX6umdYrYvcFtQUKi2zH3PjFZQ9XCxNM/NMrM9uk8TPOzg==
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.12.tgz#bf282cb540e9ad7a0a04b742082c073b655eab39"
+  integrity sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==
 
 "@types/lodash@^4.14.110":
-  version "4.14.117"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.117.tgz#695a7f514182771a1e0f4345d189052ee33c8778"
+  version "4.14.123"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
+  integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
 
 "@types/marked@^0.4.0":
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.4.2.tgz#64a89e53ea37f61cc0f3ee1732c555c2dbf6452f"
+  integrity sha512-cDB930/7MbzaGF6U3IwSQp6XBru8xWajF5PV2YZZeV8DyiliTuld11afVztGI9+yJZ29il5E+NpGA6ooV/Cjkg==
 
 "@types/minimatch@*", "@types/minimatch@3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/minimist@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
+  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/mongodb@*":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.4.tgz#f0f6dc8d509500c4a8213238066b68f0c8cb25a9"
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.23.tgz#9aaa105f448427036cb6cd3aa042ab77b2ab8a7a"
+  integrity sha512-TNwS1HPh1nnaYorcQoWi+bH5kJ1Q/WqCjiD9XkU3oBeCZFYXXPafVUuFmoYFbzQ061ojhtsndRLzwNklRhU+4w==
   dependencies:
     "@types/bson" "*"
-    "@types/events" "*"
     "@types/node" "*"
 
 "@types/mongoose@^5.3.20":
-  version "5.3.20"
-  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.20.tgz#3daf682cc326b685d1df3eca6d40181962a6aeca"
-  integrity sha512-KXD/wRaUkxA7NwU+0yp60WEFFmkhzJ4idGawycjUxFMTANIM7ZqlZsoXhHu3p33cg450D8PuwtAorFUwuMXLwA==
+  version "5.3.26"
+  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.26.tgz#a979014c7fc9395e484695d4cc5647e7686251db"
+  integrity sha512-7NPdpUGU/1ZztTICcP3GxwWBAHTDyOLW0XJxrxlTl5i7R7XbT2Ucq33JussSLkWHKjbxpAmJnDwlYKcjwG7agg==
   dependencies:
     "@types/mongodb" "*"
     "@types/node" "*"
 
-"@types/node@*":
-  version "10.9.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
-
-"@types/node@^11.9.3":
-  version "11.9.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.9.3.tgz#14adbb5ab8cd563f549fbae8dbe92e0b7d6e76cc"
-  integrity sha512-DMiqG51GwES/c4ScBY0u5bDlH44+oY8AeYHjY1SGCWidD7h08o1dfHue/TGK7REmif2KiJzaUskO+Q0eaeZ2fQ==
+"@types/node@*", "@types/node@^11.9.3":
+  version "11.13.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
+  integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
+  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
 "@types/selenium-webdriver@^3.0.0":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.10.tgz#e98cc6f05b4b436277671c784ee2f9d05a634f9b"
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz#50a4755f8e33edacd9c406729e9b930d2451902a"
+  integrity sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==
 
 "@types/shelljs@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.0.tgz#0caa56b68baae4f68f44e0dd666ab30b098e3632"
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.4.tgz#b903e41ad5e5195b7d5e34d3cd33c94bdbd07895"
+  integrity sha512-UNACC6scKFVljWEvO3rHBkbbKXu3QkKPBOMCisxI7au9cnFK7tjOGPsKh5OjedAPLmtsKSarmk+YeehKTQSKtg==
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
@@ -560,6 +556,7 @@
 "@types/socket.io-client@^1.4.32":
   version "1.4.32"
   resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14"
+  integrity sha512-Vs55Kq8F+OWvy1RLA31rT+cAyemzgm0EWNeax6BWF8H7QiiOYMJIdcwSDdm5LVgfEkoepsWkS+40+WNb7BUMbg==
 
 "@types/source-list-map@*":
   version "0.1.2"
@@ -576,27 +573,23 @@
 "@types/stripe-node@^4.7.1":
   version "4.7.1"
   resolved "https://registry.yarnpkg.com/@types/stripe-node/-/stripe-node-4.7.1.tgz#cb11d65e73136509801582bd0daac50b794cfdc1"
+  integrity sha512-ueF+sxvqoVySbMQKJZUwSvT9pnm3tShKd0PvzW5lI902nvUtBoSGJsyZaX5XCKh5KhSpcssAagSW0vFdjGgH8g==
   dependencies:
     "@types/node" "*"
 
 "@types/stripe@^6.25.7":
-  version "6.25.7"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
-  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
+  version "6.25.10"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
+  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
   dependencies:
     "@types/node" "*"
 
 "@types/tapable@*":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
+  integrity sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==
 
-"@types/uglify-js@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.3.tgz#801a5ca1dc642861f47c46d14b700ed2d610840b"
-  dependencies:
-    source-map "^0.6.1"
-
-"@types/uglify-js@^3.0.4":
+"@types/uglify-js@*", "@types/uglify-js@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz#96beae23df6f561862a830b4288a49e86baac082"
   integrity sha512-SudIN9TRJ+v8g5pTG8RRCqfqTMNqgWCKKd3vtynhGzkIIjxaicNAMuY5TRadJ6tzDu3Dotf3ngaMILtmOdmWEQ==
@@ -606,6 +599,7 @@
 "@types/uuid@^3.4.4":
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.4.tgz#7af69360fa65ef0decb41fd150bf4ca5c0cefdf5"
+  integrity sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==
   dependencies:
     "@types/node" "*"
 
@@ -619,9 +613,9 @@
     source-map "^0.6.1"
 
 "@types/webpack@^4.4.25":
-  version "4.4.25"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.25.tgz#c8a1eb968a33a3e6da641f529c5add0d44d34809"
-  integrity sha512-YaYVbSK1bC3xiAWFLSgDQyVHdCTNq5cLlcx633basmrwSoUxJiv4SZ0SoT1uoF15zWx98afOcCbqA1YHeCdRYA==
+  version "4.4.27"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.27.tgz#8bb9429185977a6b3b9e6e6132f561066aa7e7c2"
+  integrity sha512-xSll/4UXnLQ0xjdAoTRIFxA6NPC2abJ8nHxRH6SqTymHrfGCc8er7qH0npwCP8q3VFoJh2Hjz1wH8oTjwx9/jQ==
   dependencies:
     "@types/anymatch" "*"
     "@types/node" "*"
@@ -634,6 +628,11 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
   integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw==
 
+"@types/yargs@^12.0.9":
+  version "12.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
+  integrity sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==
+
 "@types/yargs@^13.0.0":
   version "13.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.0.tgz#d2acb3bec0047d8f648ebacdab6b928a900c42c4"
@@ -966,14 +965,17 @@ JSONStream@^1.0.4, JSONStream@^1.3.4:
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+  integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
 
 accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
@@ -991,18 +993,14 @@ acorn-walk@^6.1.1:
 acorn@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
 
 acorn@^5.0.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.5:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818"
-  integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==
-
-acorn@^6.0.7:
+acorn@^6.0.5, acorn@^6.0.7:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
@@ -1017,16 +1015,19 @@ add-asset-html-webpack-plugin@^3.1.3:
     p-each-series "^1.0.0"
 
 adm-zip@^0.4.9:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.13.tgz#597e2f8cc3672151e1307d3e95cddbc75672314a"
+  integrity sha512-fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
@@ -1038,12 +1039,14 @@ agentkeepalive@^3.4.1:
     humanize-ms "^1.2.1"
 
 ajv-errors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
 ajv-keywords@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
+  integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
 ajv@6.9.1:
   version "6.9.1"
@@ -1055,59 +1058,59 @@ ajv@6.9.1:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^5.0.0, ajv@^5.3.0:
+ajv@^5.0.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
+ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-align-text@^0.1.1, align-text@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-  dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
-
 amdefine@>=0.0.4, amdefine@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 angular2-logger@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/angular2-logger/-/angular2-logger-0.7.0.tgz#60f8a3f0d94bc715275af387f7afdc000c44e51f"
+  integrity sha512-fB2ucBEKqJ6K+PyQEVKwIZhwcB2NvxPashHJEBGTG5Ex+NhC2xUNDhd1AILX+ZIRi3hz6QEKzbqGAxmusdUCkw==
 
 angular2-template-loader@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/angular2-template-loader/-/angular2-template-loader-0.6.2.tgz#c0d44e90fff0fac95e8b23f043acda7fd1c51d7c"
+  integrity sha1-wNROkP/w+sleiyPwQ6zaf9HFHXw=
   dependencies:
     loader-utils "^0.2.15"
 
 ansi-colors@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
   dependencies:
     ansi-wrap "^0.1.0"
 
 ansi-colors@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.0.5.tgz#cb9dc64993b64fd6945485f797fc3853137d9a7b"
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
 ansi-cyan@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
+  integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=
   dependencies:
     ansi-wrap "0.1.0"
 
@@ -1117,55 +1120,65 @@ ansi-escapes@^1.1.0:
   integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
 
 ansi-escapes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 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"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
 
 ansi-red@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
+  integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=
   dependencies:
     ansi-wrap "0.1.0"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+ansi-regex@^4.0.0, ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-wrap@0.1.0, 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"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -1182,19 +1195,20 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.5.0.tgz#67043da828fa474c0e7f98c52eed5cdf7d0aad30"
-  integrity sha512-N/+0BYAbHS16YFghQTaTrbsunKRCB8bjip11NmS9waWNGODbAJHn0oW813MoWpLV8TynaWz1VZRTu5RHkzDlAg==
+apollo-angular-link-http-common@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
+  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
   dependencies:
     tslib "^1.9.0"
 
 apollo-angular-link-http@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.5.0.tgz#55411ed97f1f8356ebed5c0ae96f08dbaf3e064c"
-  integrity sha512-CCDem+mRPn0UbRL2vkHIU6G/aqXfMTMP1Apte6ucvxUOy91jV5gnwc+nB8lZdCxUQNPO1ZWyJAY1F0SyVeYeDw==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
+  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
   dependencies:
-    apollo-angular-link-http-common "~1.5.0"
+    apollo-angular-link-http-common "~1.6.0"
+    extract-files "5.0.1"
     tslib "^1.9.0"
 
 apollo-angular@^1.5.0:
@@ -1240,25 +1254,30 @@ apollo-client@^2.5.1:
     zen-observable "^0.8.0"
 
 apollo-link-context@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.14.tgz#6265eef49bedadddbbcff4026d04cd351094cd6c"
-  integrity sha512-l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ==
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.17.tgz#439272cfb43ec1891506dd175ed907845b7de36c"
+  integrity sha512-W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q==
   dependencies:
-    apollo-link "^1.2.8"
+    apollo-link "^1.2.11"
+    tslib "^1.9.3"
 
 apollo-link-dedup@^1.0.0:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz#028148f1028e806a9ab2f4abf3bde9dc292565e9"
-  integrity sha512-14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w==
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
+  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
   dependencies:
-    apollo-link "^1.2.8"
+    apollo-link "^1.2.11"
+    tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.8.tgz#0f252adefd5047ac1a9f35ba9439d216587dcd84"
-  integrity sha512-lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA==
+apollo-link@^1.0.0, apollo-link@^1.2.11:
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
+  integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
   dependencies:
-    zen-observable-ts "^0.8.15"
+    apollo-utilities "^1.2.1"
+    ts-invariant "^0.3.2"
+    tslib "^1.9.3"
+    zen-observable-ts "^0.8.18"
 
 apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
   version "1.2.1"
@@ -1270,16 +1289,19 @@ apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
     tslib "^1.9.3"
 
 app-root-path@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
+  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -1292,12 +1314,14 @@ arg@^4.1.0:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
+  integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo=
   dependencies:
     arr-flatten "^1.0.1"
     array-slice "^0.2.3"
@@ -1305,38 +1329,47 @@ arr-diff@^1.0.1:
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
+  integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
 
 array-filter@~0.0.0:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
 
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-flatten@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
 array-ify@^1.0.0:
   version "1.0.0"
@@ -1346,36 +1379,44 @@ array-ify@^1.0.0:
 array-map@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
 
 array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
 
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
 
 array-union@^1.0.1, array-union@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@~2.0.3:
   version "2.0.6"
@@ -1385,6 +1426,7 @@ asap@~2.0.3:
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -1393,16 +1435,19 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
     util "0.10.3"
 
@@ -1419,6 +1464,7 @@ assets-webpack-plugin@^3.9.10:
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 ast-transform@0.0.0:
   version "0.0.0"
@@ -1432,6 +1478,7 @@ ast-transform@0.0.0:
 ast-types@0.9.6:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
+  integrity sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=
 
 ast-types@^0.7.0:
   version "0.7.8"
@@ -1439,34 +1486,41 @@ ast-types@^0.7.0:
   integrity sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=
 
 async-each@^1.0.0, async-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
+  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@1.x, async@^1.4.0, async@^1.5.2:
+async@1.x, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@^2.0.0, async@^2.4.1, async@^2.5.0, async@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
+  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@9.4.6:
   version "9.4.6"
@@ -1497,14 +1551,17 @@ awesome-typescript-loader@^5.2.1:
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -1513,6 +1570,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
 babel-generator@^6.18.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -1526,6 +1584,7 @@ babel-generator@^6.18.0:
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
     babel-runtime "^6.22.0"
 
@@ -1541,6 +1600,7 @@ babel-polyfill@6.23.0:
 babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.22.0, 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=
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
@@ -1548,6 +1608,7 @@ babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.22.0, babel-runtim
 babel-template@^6.16.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -1558,6 +1619,7 @@ babel-template@^6.16.0:
 babel-traverse@^6.18.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -1572,6 +1634,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.26.0:
 babel-types@^6.18.0, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
@@ -1581,18 +1644,22 @@ babel-types@^6.18.0, babel-types@^6.26.0:
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@0.0.8:
   version "0.0.8"
@@ -1602,14 +1669,17 @@ base64-js@0.0.8:
 base64-js@^1.0.2, base64-js@^1.1.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1620,18 +1690,21 @@ base@^0.11.1:
     pascalcase "^0.1.1"
 
 basic-auth@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.0.tgz#015db3f353e02e56377755f962742e8981e7bbba"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
   dependencies:
-    safe-buffer "5.1.1"
+    safe-buffer "5.1.2"
 
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
@@ -1643,6 +1716,7 @@ bcryptjs@^2.3.0:
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
@@ -1659,6 +1733,7 @@ bfj@^6.1.1:
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -1666,56 +1741,43 @@ big.js@^5.2.2:
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
-blob@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
 blocking-proxy@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
+  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^3.3.0, bluebird@^3.4.7, bluebird@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-
-bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+bluebird@^3.3.0, bluebird@^3.4.7, bluebird@^3.5.1, bluebird@^3.5.3:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
+  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-
-body-parser@1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
-    on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
 body-parser@1.18.3, body-parser@^1.16.1:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
   dependencies:
     bytes "3.0.0"
     content-type "~1.0.4"
@@ -1731,6 +1793,7 @@ body-parser@1.18.3, body-parser@^1.16.1:
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
   dependencies:
     array-flatten "^2.1.0"
     deep-equal "^1.0.1"
@@ -1742,6 +1805,7 @@ bonjour@^3.5.0:
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 boom@7.x.x:
   version "7.3.0"
@@ -1758,6 +1822,7 @@ bootstrap@^4.3.1:
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1765,6 +1830,7 @@ brace-expansion@^1.1.7:
 braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -1790,6 +1856,7 @@ brfs@^1.3.0, brfs@^1.4.0:
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 brotli@^1.2.0:
   version "1.3.2"
@@ -1815,6 +1882,7 @@ browser-resolve@^1.8.1:
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1826,6 +1894,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -1834,6 +1903,7 @@ browserify-cipher@^1.0.0:
 browserify-des@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1852,6 +1922,7 @@ browserify-optional@^1.0.0:
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -1859,6 +1930,7 @@ browserify-rsa@^4.0.0:
 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=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1871,21 +1943,23 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
 browserslist@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
-  integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
+  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
   dependencies:
-    caniuse-lite "^1.0.30000929"
-    electron-to-chromium "^1.3.103"
-    node-releases "^1.1.3"
+    caniuse-lite "^1.0.30000955"
+    electron-to-chromium "^1.3.122"
+    node-releases "^1.1.13"
 
 browserstack@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.2.tgz#17d8bb76127a1cc0ea416424df80d218f803673f"
+  integrity sha512-+6AFt9HzhKykcPF79W6yjEUJcdvZOV0lIXdkORXMJftGrDl0OKWqRF4GHqpDNkxiceDT/uB7Fb/aDwktvXX7dg==
   dependencies:
     https-proxy-agent "^2.2.1"
 
@@ -1897,10 +1971,12 @@ bson-objectid@^1.2.4:
 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"
@@ -1913,46 +1989,56 @@ buffer-equal@0.0.1:
 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"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
   version "4.9.1"
-  resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.1:
+builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 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"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
 cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -1991,6 +2077,7 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0, cacache@^11.3.1, cacache@^11.
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -2005,6 +2092,7 @@ cache-base@^1.0.1:
 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"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
 
 caller-callsite@^2.0.0:
   version "2.0.0"
@@ -2023,6 +2111,7 @@ caller-path@^2.0.0:
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 callsites@^2.0.0:
   version "2.0.0"
@@ -2032,6 +2121,7 @@ callsites@^2.0.0:
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
   dependencies:
     no-case "^2.2.0"
     upper-case "^1.1.1"
@@ -2039,6 +2129,7 @@ camel-case@3.0.x:
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -2052,30 +2143,30 @@ camelcase-keys@^4.0.0:
     map-obj "^2.0.0"
     quick-lru "^1.0.0"
 
-camelcase@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
+camelcase@^5.0.0, camelcase@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30000929:
-  version "1.0.30000935"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000935.tgz#d1b59df00b46f4921bb84a8a34c1d172b346df59"
-  integrity sha512-1Y2uJ5y56qDt3jsDTdBHL1OqiImzjoQcBG6Yl3Qizq8mcc2SgCFpi+ZwLLqkztYnk9l87IYqRlNBnPSOTbFkXQ==
+caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955:
+  version "1.0.30000957"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
+  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -2085,17 +2176,12 @@ canonical-path@1.0.0:
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
-  resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -2103,15 +2189,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.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"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2128,6 +2206,7 @@ chardet@^0.4.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==
 
 check-types@^7.3.0:
   version "7.4.0"
@@ -2135,19 +2214,21 @@ check-types@^7.3.0:
   integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
 
 cheerio@^1.0.0-rc.2:
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
   dependencies:
     css-select "~1.2.0"
-    dom-serializer "~0.1.0"
+    dom-serializer "~0.1.1"
     entities "~1.1.1"
     htmlparser2 "^3.9.1"
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
+chokidar@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -2164,10 +2245,10 @@ chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^2.1.1, chokidar@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
-  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2, chokidar@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -2179,15 +2260,11 @@ chokidar@^2.1.1, chokidar@^2.1.2:
     normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
     readdirp "^2.2.1"
-    upath "^1.1.0"
+    upath "^1.1.1"
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-
-chownr@^1.1.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -2195,6 +2272,7 @@ chownr@^1.1.1:
 chrome-trace-event@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
   dependencies:
     tslib "^1.9.0"
 
@@ -2206,6 +2284,7 @@ ci-info@^2.0.0:
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -2218,6 +2297,7 @@ circular-dependency-plugin@5.0.2:
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -2227,6 +2307,7 @@ class-utils@^0.3.5:
 classlist.js@^1.1.20150312:
   version "1.1.20150312"
   resolved "https://registry.yarnpkg.com/classlist.js/-/classlist.js-1.1.20150312.tgz#1d70842f7022f08d9ac086ce69e5b250f2c57789"
+  integrity sha1-HXCEL3Ai8I2awIbOaeWyUPLFd4k=
 
 clean-css@4.2.1, clean-css@4.2.x:
   version "4.2.1"
@@ -2238,24 +2319,19 @@ clean-css@4.2.1, clean-css@4.2.x:
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -2264,6 +2340,7 @@ cliui@^3.2.0:
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -2272,6 +2349,7 @@ cliui@^4.0.0:
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
   dependencies:
     for-own "^1.0.0"
     is-plain-object "^2.0.4"
@@ -2291,14 +2369,17 @@ clone@^2.1.1, clone@^2.1.2:
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-block-writer@^7.2.0:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.2.1.tgz#c03073518fdb98d4d1a5bb46dcd60137958b5a3a"
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-7.3.0.tgz#9a70ca48865d3a733347da31c74104eed734929f"
+  integrity sha512-iGC+pUyszu574/YvbMvgXlLfkxHBZZ483CkrElFTZub9fxhvnTOm6nK/rGccKglaQ9Uno1IXO1FYSwPB8WrUPw==
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 codelyzer@^4.5.0:
   version "4.5.0"
@@ -2315,6 +2396,7 @@ codelyzer@^4.5.0:
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -2322,45 +2404,53 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-convert@~0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
+  integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
 
 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-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==
 
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
 
-colors@^1.1.0, colors@latest:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
-
-colors@^1.3.3:
+colors@^1.1.0, colors@^1.3.3, colors@latest:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
   integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
 
-combined-stream@1.0.6, combined-stream@~1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.17.x, commander@^2.12.1, commander@~2.17.1:
+commander@2.17.x:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+
+commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@~2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
-commander@^2.18.0, commander@^2.19.0:
+commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -2368,6 +2458,7 @@ commander@^2.18.0, commander@^2.19.0:
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 compare-func@^1.3.1:
   version "1.3.2"
@@ -2380,49 +2471,67 @@ compare-func@^1.3.1:
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
-compressible@~2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7"
+compressible@~2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
+  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
   dependencies:
-    mime-db ">= 1.34.0 < 2"
+    mime-db ">= 1.38.0 < 2"
 
-compression@^1.5.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+compression@^1.5.2, compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.14"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@^1.6.0, concat-stream@~1.6.0:
+concat-stream@^1.5.0, concat-stream@^1.5.1, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-connect-history-api-fallback@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+concat-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
+  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.0.2"
+    typedarray "^0.0.6"
+
+connect-history-api-fallback@^1.3.0, connect-history-api-fallback@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
 connect@^3.6.0, connect@^3.6.6:
   version "3.6.6"
@@ -2437,24 +2546,29 @@ connect@^3.6.0, connect@^3.6.6:
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 conventional-changelog-angular@^5.0.3:
   version "5.0.3"
@@ -2478,13 +2592,21 @@ conventional-changelog-codemirror@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-core@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.6.tgz#ac1731a461c50d150d29c1ad4f33143293bcd32f"
-  integrity sha512-5teTAZOtJ4HLR6384h50nPAaKdDr+IaU0rnD2Gg2C3MS7hKsEPH8pZxrDNqam9eOSPQg9tET6uZY79zzgSz+ig==
+conventional-changelog-conventionalcommits@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-1.1.1.tgz#322351f6a0422876d89ec54491365695b073a709"
+  integrity sha512-21BcbiSfvYIon7sF80Rwn6vnfhaiuZUyHHFYr9Zz8H2B+O/3grud5TbEYpU1/SFXD5aD48IdSme/KkJl9wCsCw==
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-core@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0"
+  integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==
   dependencies:
-    conventional-changelog-writer "^4.0.3"
-    conventional-commits-parser "^3.0.1"
+    conventional-changelog-writer "^4.0.5"
+    conventional-commits-parser "^3.0.2"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
     git-raw-commits "2.0.0"
@@ -2495,7 +2617,7 @@ conventional-changelog-core@^3.1.6:
     q "^1.5.1"
     read-pkg "^3.0.0"
     read-pkg-up "^3.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
 conventional-changelog-ember@^2.0.2:
   version "2.0.2"
@@ -2504,10 +2626,10 @@ conventional-changelog-ember@^2.0.2:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-eslint@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.1.tgz#f65e0e7f63dc09c044244b8785313a602e628002"
-  integrity sha512-yH3+bYrtvgKxSFChUBQnKNh9/U9kN2JElYBm253VpYs5wXhPHVc9ENcuVGWijh24nnOkei7wEJmnmUzgZ4ok+A==
+conventional-changelog-eslint@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.2.tgz#e9eb088cda6be3e58b2de6a5aac63df0277f3cbe"
+  integrity sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ==
   dependencies:
     q "^1.5.1"
 
@@ -2533,18 +2655,18 @@ conventional-changelog-jshint@^2.0.1:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-preset-loader@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
-  integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ==
+conventional-changelog-preset-loader@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4"
+  integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA==
 
-conventional-changelog-writer@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.3.tgz#916a2b302d0bb5ef18efd236a034c13fb273cde1"
-  integrity sha512-bIlpSiQtQZ1+nDVHEEh798Erj2jhN/wEjyw9sfxY9es6h7pREE5BNJjfv0hXGH/FTrAsEpHUq4xzK99eePpwuA==
+conventional-changelog-writer@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.5.tgz#fb9e384bb294e8e8a9f2568a3f4d1e11953d8641"
+  integrity sha512-g/Myp4MaJ1A+f7Ai+SnVhkcWtaHk6flw0SYN7A+vQ+MTu0+gSovQWs4Pg4NtcNUcIztYQ9YHsoxHP+GGQplI7Q==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.1"
+    conventional-commits-filter "^2.0.2"
     dateformat "^3.0.0"
     handlebars "^4.1.0"
     json-stringify-safe "^5.0.1"
@@ -2552,64 +2674,61 @@ conventional-changelog-writer@^4.0.3:
     meow "^4.0.0"
     semver "^5.5.0"
     split "^1.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
 conventional-changelog@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.0.6.tgz#a0bd3b51a0549ec03eb6ef90af7f9fa8c358b15f"
-  integrity sha512-1b96x3G67lDKakRvMm+VvYGwgRk+C8aapHKL5iZ/TJzzD/RuyGA2diHNEsR+uPHmQ7/A4Ts7j6N+VNqUoOfksg==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.3.tgz#decb10d89c46c838e74eb5160bcf4987992f7534"
+  integrity sha512-JBfdDSdSGasTNaBRZbOeFn8CJTIpP/sB/kiawmWAiLapLZ+wCDVDZR6Q+Hh9rjh3dxNAFR03bWTeqjKajXvPYA==
   dependencies:
     conventional-changelog-angular "^5.0.3"
     conventional-changelog-atom "^2.0.1"
     conventional-changelog-codemirror "^2.0.1"
-    conventional-changelog-core "^3.1.6"
+    conventional-changelog-conventionalcommits "^1.1.1"
+    conventional-changelog-core "^3.2.2"
     conventional-changelog-ember "^2.0.2"
-    conventional-changelog-eslint "^3.0.1"
+    conventional-changelog-eslint "^3.0.2"
     conventional-changelog-express "^2.0.1"
     conventional-changelog-jquery "^3.0.4"
     conventional-changelog-jshint "^2.0.1"
-    conventional-changelog-preset-loader "^2.0.2"
+    conventional-changelog-preset-loader "^2.1.1"
 
-conventional-commits-filter@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3"
-  integrity sha512-92OU8pz/977udhBjgPEbg3sbYzIxMDFTlQT97w7KdhR9igNqdJvy8smmedAAgn4tPiqseFloKkrVfbXCVd+E7A==
+conventional-commits-filter@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
+  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
   dependencies:
-    is-subset "^0.1.1"
+    lodash.ismatch "^4.4.0"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
-  integrity sha512-P6U5UOvDeidUJ8ebHVDIoXzI7gMlQ1OF/id6oUvp8cnZvOXMt1n8nYl74Ey9YMn0uVQtxmCtjPQawpsssBWtGg==
+conventional-commits-parser@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.2.tgz#1295590dd195f64f53d6f8eb7c41114bb9a60742"
+  integrity sha512-y5eqgaKR0F6xsBNVSQ/5cI5qIF3MojddSUi1vKIggRkqUTbkqFKH9P5YX/AT1BVZp9DtSzBTIkvjyVLotLsVog==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
     lodash "^4.2.1"
     meow "^4.0.0"
     split2 "^2.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
 
 conventional-recommended-bump@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
-  integrity sha512-9mY5Yoblq+ZMqJpBzgS+RpSq+SUfP2miOR3H/NR9drGf08WCrY9B6HAGJZEm6+ThsVP917VHAahSOjM6k1vhPg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.1.1.tgz#37014fadeda267d0607e2fc81124da840a585127"
+  integrity sha512-JT2vKfSP9kR18RXXf55BRY1O3AHG8FPg5btP3l7LYfcWJsiXI6MCf30DepQ98E8Qhowvgv7a8iev0J1bEDkTFA==
   dependencies:
-    concat-stream "^1.6.0"
-    conventional-changelog-preset-loader "^2.0.2"
-    conventional-commits-filter "^2.0.1"
-    conventional-commits-parser "^3.0.1"
+    concat-stream "^2.0.0"
+    conventional-changelog-preset-loader "^2.1.1"
+    conventional-commits-filter "^2.0.2"
+    conventional-commits-parser "^3.0.2"
     git-raw-commits "2.0.0"
     git-semver-tags "^2.0.2"
     meow "^4.0.0"
     q "^1.5.1"
 
-convert-source-map@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
-
-convert-source-map@^1.5.1:
+convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
   integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
@@ -2619,14 +2738,17 @@ convert-source-map@^1.5.1:
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -2638,6 +2760,7 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-webpack-plugin@4.6.0:
   version "4.6.0"
@@ -2654,12 +2777,13 @@ copy-webpack-plugin@4.6.0:
     serialize-javascript "^1.4.0"
 
 copy-webpack-plugin@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.0.tgz#db3269ab83e8a2c3316c1bc9cba54019bbcf5c17"
-  integrity sha512-iiDj+8nnZeW/i8vYJ3+ABSZkOefJnDYIGLojiZKKFDvf1wcEInABXH1+hN7axQMn04qvJxKjgVOee0e14XPtCg==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
+  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
   dependencies:
     cacache "^11.3.1"
     find-cache-dir "^2.0.0"
+    glob-parent "^3.1.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^1.1.0"
@@ -2669,26 +2793,20 @@ copy-webpack-plugin@^5.0.0:
     serialize-javascript "^1.4.0"
     webpack-log "^2.0.0"
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-
-core-js@^2.6.5:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.5:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
-core-js@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
-
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cors@latest:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.4.tgz#2bd381f2eb201020105cd50ea59da63090694686"
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
   dependencies:
     object-assign "^4"
     vary "^1"
@@ -2696,6 +2814,7 @@ cors@latest:
 corser@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
+  integrity sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=
 
 cosmiconfig@^4.0.0:
   version "4.0.0"
@@ -2707,30 +2826,20 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
-  integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-
-cosmiconfig@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
-  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
+cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
+  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    lodash.get "^4.4.2"
+    js-yaml "^3.13.0"
     parse-json "^4.0.0"
 
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2738,6 +2847,7 @@ create-ecdh@^4.0.0:
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -2748,6 +2858,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   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==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2759,6 +2870,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 cross-env@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2"
+  integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==
   dependencies:
     cross-spawn "^6.0.5"
     is-windows "^1.0.0"
@@ -2766,6 +2878,7 @@ cross-env@^5.2.0:
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -2773,6 +2886,7 @@ cross-spawn@^3.0.0:
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
@@ -2781,6 +2895,7 @@ cross-spawn@^5.0.1:
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -2798,6 +2913,7 @@ cryptiles@^4.1.3:
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -2822,17 +2938,18 @@ css-element-queries@^1.1.1:
   integrity sha512-/PX6Bkk77ShgbOx/mpawHdEvS3PGgy1mmMktcztDPndWdMJxcorcQiivrs+nEljqtBpvNEhAmQky9tQR6FSm8Q==
 
 css-loader@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.0.tgz#42952ac22bca5d076978638e9813abce49b8f0cc"
-  integrity sha512-MoOu+CStsGrSt5K2OeZ89q3Snf+IkxRfAIt9aAKg4piioTrhtP1iEFPu+OVn3Ohz24FO6L+rw9UJxBILiSBw5Q==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea"
+  integrity sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==
   dependencies:
-    icss-utils "^4.0.0"
-    loader-utils "^1.2.1"
-    lodash "^4.17.11"
-    postcss "^7.0.6"
+    camelcase "^5.2.0"
+    icss-utils "^4.1.0"
+    loader-utils "^1.2.3"
+    normalize-path "^3.0.0"
+    postcss "^7.0.14"
     postcss-modules-extract-imports "^2.0.0"
-    postcss-modules-local-by-default "^2.0.3"
-    postcss-modules-scope "^2.0.0"
+    postcss-modules-local-by-default "^2.0.6"
+    postcss-modules-scope "^2.1.0"
     postcss-modules-values "^2.0.0"
     postcss-value-parser "^3.3.0"
     schema-utils "^1.0.0"
@@ -2845,6 +2962,7 @@ css-parse@1.7.x:
 css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
   dependencies:
     boolbase "~1.0.0"
     css-what "2.1"
@@ -2852,44 +2970,57 @@ css-select@^1.1.0, css-select@~1.2.0:
     nth-check "~1.0.1"
 
 css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
+  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
 css-what@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
 cssauron@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
+  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
   dependencies:
     through X.X.X
 
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
 
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
   dependencies:
     es5-ext "^0.10.9"
 
@@ -2903,6 +3034,7 @@ dargs@^4.0.1:
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
@@ -2914,10 +3046,12 @@ date-format@^2.0.0:
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 dateformat@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
+  integrity sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=
   dependencies:
     get-stdin "^4.0.1"
     meow "^3.3.0"
@@ -2934,19 +3068,21 @@ debug@*, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@^3.1.0, debug@~3.1.0:
+debug@3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-debug@^3.2.5:
+debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2961,43 +3097,50 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decamelize@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
   dependencies:
     xregexp "4.0.0"
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 deep-equal@^1.0.0, deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
 
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 default-gateway@^2.6.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
+  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
   dependencies:
     execa "^0.10.0"
     ip-regex "^2.1.0"
 
-default-gateway@^4.0.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.1.2.tgz#b49196b51b26609e5d1af636287517a11a9aaf42"
-  integrity sha512-xhJUAp3u02JsBGovj0V6B6uYhKCUOmiNc8xGmReUwGu77NmvcpxPVB0pCielxMFumO7CmXBG02XjM8HB97k8Hw==
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
   dependencies:
     execa "^1.0.0"
     ip-regex "^2.1.0"
@@ -3005,24 +3148,28 @@ default-gateway@^4.0.1:
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
     object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -3030,6 +3177,7 @@ define-property@^2.0.2:
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -3042,6 +3190,7 @@ del@^2.2.0:
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
   dependencies:
     globby "^6.1.0"
     is-path-cwd "^1.0.0"
@@ -3050,21 +3199,32 @@ del@^3.0.0:
     pify "^3.0.0"
     rimraf "^2.2.8"
 
+del@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.0.tgz#049543b8290e1a9293e2bd150ab3a06f637322b8"
+  integrity sha512-C4kvKNlYrwXhKxz97BuohF8YoGgQ23Xm9lvoHmgT7JaPGprSEjk3+XFled74Yt/x0ZABUHg2D67covzAPUKx5Q==
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
-depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 dependency-graph@^0.7.2:
   version "0.7.2"
@@ -3074,6 +3234,7 @@ dependency-graph@^0.7.2:
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -3081,10 +3242,12 @@ des.js@^1.0.0:
 desandro-matches-selector@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz#717beed4dc13e7d8f3762f707a6d58a6774218e1"
+  integrity sha1-cXvu1NwT59jzdi9wem1YpndCGOE=
 
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-file@^1.0.0:
   version "1.0.0"
@@ -3094,6 +3257,7 @@ detect-file@^1.0.0:
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
@@ -3105,6 +3269,7 @@ detect-indent@^5.0.0:
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-newline@^2.1.0:
   version "2.1.0"
@@ -3126,27 +3291,31 @@ dfa@^1.0.0:
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
 
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^2.0.0:
+dir-glob@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
   dependencies:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
-dir-glob@^2.2.1:
+dir-glob@^2.0.0, dir-glob@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
   integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
@@ -3156,10 +3325,12 @@ dir-glob@^2.2.1:
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -3167,79 +3338,71 @@ dns-packet@^1.3.1:
 dns-txt@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
   dependencies:
     buffer-indexof "^1.0.0"
 
-dom-converter@~0.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+dom-converter@^0.2:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
+  integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
   dependencies:
-    utila "~0.3"
+    utila "~0.4"
 
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
   dependencies:
     custom-event "~1.0.0"
     ent "~2.2.0"
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@0, dom-serializer@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+dom-serializer@0, dom-serializer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
   dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
 
 dom-testing-library@^3.11.1:
-  version "3.16.5"
-  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-3.16.5.tgz#8c71f127c6b4ee48115660798040291b59dfc894"
-  integrity sha512-t3OaTcDdsAqtAZNeZ13KnOJmt+2HaDJqYWyf0iBRzbG6GwrNtpF0122Ygu/qkerIwcnHMX1ihwZVx/DhaLpmTw==
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-3.19.0.tgz#652ade2cd93ae98beb52b2878eeb9420d7599832"
+  integrity sha512-gkGXP5GevcjC24Tk6Y6RwrZ7Nz0Ul4bchXV4yHLcnMidMp/EdBCvtHEgHTsZ2yZ4DhUpLowGbJv/1u1Z7bPvtw==
   dependencies:
-    "@babel/runtime" "^7.1.5"
+    "@babel/runtime" "^7.3.4"
     "@sheerun/mutationobserver-shim" "^0.3.2"
-    pretty-format "^24.0.0"
+    pretty-format "^24.5.0"
     wait-for-expect "^1.1.0"
 
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@1, domelementtype@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-
-domhandler@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
-  dependencies:
-    domelementtype "1"
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
   dependencies:
     domelementtype "1"
 
 domino@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.1.tgz#cd5c639940db72bb7cde1cdb5beea466a4113136"
-  integrity sha512-fqoTi6oQ881wYRENIEmz78hKVoc3X9HqVpklo419yxzebys6dtU5c83iVh3UYvvexPFdAuwlDYCsUM9//CrMMg==
-
-domutils@1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
-  dependencies:
-    domelementtype "1"
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.3.tgz#0ca1ad02cbd316ebe2e99e0ac9fb0010407d4601"
+  integrity sha512-EwjTbUv1Q/RLQOdn9k7ClHutrQcWGsfXaRQNOnM/KgK4xDBoLFEcIRFuBSxAx13Vfa63X029gXYrNFrSy+DOSg==
 
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -3247,6 +3410,7 @@ domutils@1.5.1:
 domutils@^1.5.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
@@ -3261,18 +3425,19 @@ dot-prop@^3.0.0:
 dot@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/dot/-/dot-1.1.2.tgz#c7377019fc4e550798928b2b9afeb66abfa1f2f9"
+  integrity sha1-xzdwGfxOVQeYkosrmv62ar+h8vk=
 
 dotenv@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
   integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
-dotgitignore@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-1.0.3.tgz#a442cbde7dc20dff51cdb849e4c5a64568c07923"
-  integrity sha512-eu5XjSstm0WXQsARgo6kPjkINYZlOUW+z/KtAAIBjHa5mUpMPrxJytbPIndWz6GubBuuuH5ljtVcXKnVnH5q8w==
+dotgitignore@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-2.1.0.tgz#a4b15a4e4ef3cf383598aaf1dfa4a04bcc089b7b"
+  integrity sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==
   dependencies:
-    find-up "^2.1.0"
+    find-up "^3.0.0"
     minimatch "^3.0.4"
 
 duplexer2@~0.1.4:
@@ -3285,10 +3450,12 @@ duplexer2@~0.1.4:
 duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -3298,13 +3465,15 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
 ecstatic@^3.0.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.2.2.tgz#4cc37c80ea88c021ca7cde66a15606ceaa9348e7"
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.1.tgz#b15b5b036c2233defc78d7bacbd8765226c95577"
+  integrity sha512-/rrctvxZ78HMI/tPIsqdvFKHHscxR3IJuKrZI2ZoUgkt2SiufyLFBmcco+aqQBIu6P1qBsUNG3drAAGLx80vTQ==
   dependencies:
     he "^1.1.1"
     mime "^1.6.0"
@@ -3314,20 +3483,22 @@ ecstatic@^3.0.0:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 ejs@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.103:
-  version "1.3.113"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
-  integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
+electron-to-chromium@^1.3.122:
+  version "1.3.124"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
+  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -3350,10 +3521,12 @@ emoji-regex@^7.0.1:
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
   version "0.1.12"
@@ -3365,6 +3538,7 @@ encoding@^0.1.11:
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
   dependencies:
     once "^1.4.0"
 
@@ -3386,9 +3560,9 @@ engine.io-client@~3.2.0:
     yeast "0.1.2"
 
 engine.io-client@~3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.1.tgz#afedb4a07b2ea48b7190c3136bfea98fdd4f0f03"
-  integrity sha512-q66JBFuQcy7CSlfAz9L3jH+v7DTT3i6ZEadYcVj2pOs8/0uJHLxKX3WBkGTvULJMdz0tUCyJag0aKT/dpXL9BQ==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.3.2.tgz#04e068798d75beda14375a264bb3d742d7bc33aa"
+  integrity sha512-y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -3403,13 +3577,14 @@ engine.io-client@~3.3.1:
     yeast "0.1.2"
 
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
+  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.5"
-    blob "0.0.4"
+    blob "0.0.5"
     has-binary2 "~1.0.2"
 
 engine.io@~3.2.0:
@@ -3427,6 +3602,7 @@ engine.io@~3.2.0:
 enhanced-resolve@4.1.0, enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -3435,10 +3611,12 @@ enhanced-resolve@4.1.0, enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
 entities@^1.1.1, entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 envalid@^4.2.2:
   version "4.2.2"
@@ -3458,16 +3636,18 @@ err-code@^1.0.0:
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.12.0:
+es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.1:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
   integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
@@ -3479,24 +3659,6 @@ es-abstract@^1.12.0:
     is-regex "^1.0.4"
     object-keys "^1.0.12"
 
-es-abstract@^1.4.3, es-abstract@^1.5.1:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
-  dependencies:
-    is-callable "^1.1.1"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
-
 es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
@@ -3507,38 +3669,39 @@ es-to-primitive@^1.2.0:
     is-symbol "^1.0.2"
 
 es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.46"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
+  version "0.10.49"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.49.tgz#059a239de862c94494fec28f8150c977028c6c5e"
+  integrity sha512-3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg==
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
-    next-tick "1"
+    next-tick "^1.0.0"
 
 es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
   dependencies:
     d "1"
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
 es6-promise@^4.0.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
-
-es6-promise@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
+  integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -3546,14 +3709,17 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.1:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@1.8.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  integrity sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -3598,8 +3764,9 @@ escodegen@~1.9.0:
     source-map "~0.6.1"
 
 eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -3607,6 +3774,7 @@ eslint-scope@^4.0.0:
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
 esprima@^3.1.3, esprima@~3.1.0:
   version "3.1.3"
@@ -3616,6 +3784,7 @@ esprima@^3.1.3, esprima@~3.1.0:
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esprima@~1.0.4:
   version "1.0.4"
@@ -3625,16 +3794,19 @@ esprima@~1.0.4:
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
     estraverse "^4.1.0"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+  integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
 estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
 estraverse@~1.5.0:
   version "1.5.1"
@@ -3644,10 +3816,12 @@ estraverse@~1.5.0:
 estree-walker@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
+  integrity sha1-5rGlHPcpJSTnI3wxLl/mZgwc4ao=
 
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 esutils@~1.0.0:
   version "1.0.0"
@@ -3657,10 +3831,12 @@ esutils@~1.0.0:
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 ev-emitter@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ev-emitter/-/ev-emitter-1.1.1.tgz#8f18b0ce5c76a5d18017f71c0a795c65b9138f2a"
+  integrity sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q==
 
 event-stream@3.3.4:
   version "3.3.4"
@@ -3678,10 +3854,12 @@ event-stream@3.3.4:
 eventemitter3@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
-events@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+events@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
 
 eventsource@^1.0.7:
   version "1.0.7"
@@ -3693,6 +3871,7 @@ eventsource@^1.0.7:
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -3700,6 +3879,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
 execa@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^3.0.0"
@@ -3712,6 +3892,7 @@ execa@^0.10.0:
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -3737,10 +3918,12 @@ execa@^1.0.0:
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -3760,6 +3943,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
 exports-loader@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.7.0.tgz#84881c784dea6036b8e1cd1dac3da9b6409e21a5"
+  integrity sha512-RKwCrO4A6IiKm0pG3c9V46JxIHcDplwwGJn6+JJ1RcVnh/WSGJa0xkmk5cRVtgOPzCAtTMGj2F7nluh9L0vpSA==
   dependencies:
     loader-utils "^1.1.0"
     source-map "0.5.0"
@@ -3767,14 +3951,16 @@ exports-loader@^0.7.0:
 expose-loader@^0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.5.tgz#e29ea2d9aeeed3254a3faa1b35f502db9f9c3f6f"
+  integrity sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw==
 
-express@^4.16.2:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+express@^4.16.2, express@^4.16.3, express@^4.16.4:
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
+  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
   dependencies:
     accepts "~1.3.5"
     array-flatten "1.1.1"
-    body-parser "1.18.2"
+    body-parser "1.18.3"
     content-disposition "0.5.2"
     content-type "~1.0.4"
     cookie "0.3.1"
@@ -3791,46 +3977,10 @@ express@^4.16.2:
     on-finished "~2.3.0"
     parseurl "~1.3.2"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
+    proxy-addr "~2.0.4"
+    qs "6.5.2"
     range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-express@^4.16.3:
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
-  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.3"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.4"
-    qs "6.5.2"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.2"
+    safe-buffer "5.1.2"
     send "0.16.2"
     serve-static "1.13.2"
     setprototypeof "1.1.0"
@@ -3842,18 +3992,21 @@ express@^4.16.3:
 extend-shallow@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
+  integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=
   dependencies:
     kind-of "^1.1.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -3861,6 +4014,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@^3.0.0, 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==
 
 external-editor@^2.0.1:
   version "2.2.0"
@@ -3874,6 +4028,7 @@ external-editor@^2.0.1:
 external-editor@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -3882,6 +4037,7 @@ external-editor@^3.0.0:
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -3892,9 +4048,15 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-files@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz#c9492a8410be643e260a376f0151361993d5f659"
+  integrity sha512-qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w==
+
 extract-text-webpack-plugin@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
+  integrity sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==
   dependencies:
     async "^2.4.1"
     loader-utils "^1.1.0"
@@ -3904,10 +4066,12 @@ extract-text-webpack-plugin@~3.0.2:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 falafel@^2.1.0:
   version "2.1.0"
@@ -3919,15 +4083,7 @@ falafel@^2.1.0:
     isarray "0.0.1"
     object-keys "^1.0.6"
 
-fancy-log@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    time-stamp "^1.0.0"
-
-fancy-log@^1.3.3:
+fancy-log@^1.3.2, 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==
@@ -3940,23 +4096,14 @@ fancy-log@^1.3.3:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
-fast-glob@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.2.tgz#71723338ac9b4e0e2fff1d6748a2a13d5ed352bf"
-  dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.0.1"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.1"
-    micromatch "^3.1.10"
-
-fast-glob@^2.2.6:
+fast-glob@^2.0.2, fast-glob@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
   integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
@@ -3971,14 +4118,17 @@ fast-glob@^2.2.6:
 fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
 faye-websocket@0.11.x, faye-websocket@~0.11.1:
   version "0.11.1"
@@ -3990,6 +4140,7 @@ faye-websocket@0.11.x, faye-websocket@~0.11.1:
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
   dependencies:
     websocket-driver ">=0.5.1"
 
@@ -4001,6 +4152,7 @@ figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
@@ -4015,10 +4167,12 @@ file-loader@3.0.1, file-loader@^3.0.1:
 filename-reserved-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
+  integrity sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=
 
 filenamify-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/filenamify-url/-/filenamify-url-1.0.0.tgz#b32bd81319ef5863b73078bed50f46a4f7975f50"
+  integrity sha1-syvYExnvWGO3MHi+1Q9GpPeXX1A=
   dependencies:
     filenamify "^1.0.0"
     humanize-url "^1.0.0"
@@ -4026,6 +4180,7 @@ filenamify-url@^1.0.0:
 filenamify@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-1.2.1.tgz#a9f2ffd11c503bed300015029272378f1f1365a5"
+  integrity sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=
   dependencies:
     filename-reserved-regex "^1.0.0"
     strip-outer "^1.0.0"
@@ -4039,6 +4194,7 @@ filesize@^3.6.1:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -4048,6 +4204,7 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -4060,6 +4217,7 @@ finalhandler@1.1.0:
 finalhandler@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
@@ -4072,27 +4230,30 @@ finalhandler@1.1.1:
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
 find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
   dependencies:
     commondir "^1.0.1"
-    make-dir "^1.0.0"
+    make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
 find-root@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -4100,18 +4261,21 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
 
 findit2@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/findit2/-/findit2-2.2.3.tgz#58a466697df8a6205cdfdbf395536b8bd777a5f6"
+  integrity sha1-WKRmaX34piBc39vzlVNri9d3pfY=
 
 findup-sync@^2.0.0:
   version "2.0.0"
@@ -4126,6 +4290,7 @@ findup-sync@^2.0.0:
 fizzy-ui-utils@^2.0.0:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/fizzy-ui-utils/-/fizzy-ui-utils-2.0.7.tgz#7df45dcc4eb374a08b65d39bb9a4beedf7330505"
+  integrity sha512-CZXDVXQ1If3/r8s0T+v+qVeMshhfcuq0rqIFgJnrtd+Bu8GmDmqMjntjUePypVtjHXKJ6V4sw9zeyox34n9aCg==
   dependencies:
     desandro-matches-selector "^2.0.0"
 
@@ -4135,22 +4300,24 @@ flatted@^2.0.0:
   integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
 
 flush-write-stream@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
   dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.4"
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
+  integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
   dependencies:
-    debug "^3.1.0"
+    debug "^3.2.6"
 
 fontkit@^1.0.0:
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/fontkit/-/fontkit-1.7.8.tgz#235ba495e70cd5cab9a3462ee5d32d9fa5f08b69"
-  integrity sha512-4bo/Sp+Ob/cE5f2aCre/N42mHe6hcIWUYmTRgEqLmJyPRX0m0KBl1jflMM70Vh7qZRoh97BcS3JQGrRvK1Ga7Q==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/fontkit/-/fontkit-1.8.0.tgz#deb9351619e90ddc91707b6156a9f14c8ab11554"
+  integrity sha512-EFDRCca7khfQWYu1iFhsqeABpi87f03MBdkT93ZE6YhqCdMzb5Eojb6c4dlJikGv5liuhByyzA7ikpIPTSBWbQ==
   dependencies:
     babel-runtime "^6.11.6"
     brfs "^1.4.0"
@@ -4167,14 +4334,17 @@ fontkit@^1.0.0:
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
@@ -4186,32 +4356,38 @@ foreach@^2.0.5:
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from2@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -4219,16 +4395,19 @@ from2@^2.1.0:
 from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
+  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
 
 fs-access@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
+  integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
   dependencies:
     null-check "^1.0.0"
 
 fs-extra@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -4237,20 +4416,13 @@ fs-extra@^4.0.1:
 fs-extra@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^7.0.1:
+fs-extra@^7.0.0, fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -4262,12 +4434,14 @@ fs-extra@^7.0.1:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -4277,15 +4451,9 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
-fsevents@^1.2.7:
+fsevents@^1.2.2, fsevents@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
   integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
@@ -4296,6 +4464,7 @@ fsevents@^1.2.7:
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -4305,10 +4474,12 @@ fstream@^1.0.0, fstream@^1.0.2:
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -4322,6 +4493,7 @@ gauge@~2.7.3:
 gaze@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
@@ -4333,11 +4505,12 @@ genfun@^5.0.0:
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-caller-file@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.1.tgz#25835260d3a2b9665fcdbb08cb039a7bbf7011c0"
-  integrity sha512-SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
@@ -4353,10 +4526,12 @@ get-pkg-repo@^1.0.0:
 get-size@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/get-size/-/get-size-2.0.3.tgz#54a1d0256b20ea7ac646516756202769941ad2ef"
+  integrity sha512-lXNzT/h/dTjTxRbm9BXb+SGxxzkm97h/PCIKtlN/CBCxxmkkIVV21udumMS93MuVTDX583gqc94v3RjuHmI+2Q==
 
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stdin@^6.0.0:
   version "6.0.0"
@@ -4366,6 +4541,7 @@ get-stdin@^6.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@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
@@ -4377,10 +4553,12 @@ get-stream@^4.0.0, get-stream@^4.1.0:
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
@@ -4435,6 +4613,7 @@ gitconfiglocal@^1.0.0:
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -4442,6 +4621,7 @@ glob-parent@^3.1.0:
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 glob@7.0.x:
   version "7.0.6"
@@ -4455,9 +4635,10 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
+glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4469,6 +4650,7 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo
 glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -4499,10 +4681,12 @@ global-prefix@^1.0.1:
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -4514,6 +4698,7 @@ globby@^5.0.0:
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -4524,6 +4709,7 @@ globby@^6.1.0:
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
   dependencies:
     array-union "^1.0.1"
     dir-glob "^2.0.0"
@@ -4533,11 +4719,12 @@ globby@^7.1.1:
     slash "^1.0.0"
 
 globby@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
+  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
   dependencies:
     array-union "^1.0.1"
-    dir-glob "^2.0.0"
+    dir-glob "2.0.0"
     fast-glob "^2.0.2"
     glob "^7.1.2"
     ignore "^3.3.5"
@@ -4545,12 +4732,13 @@ globby@^8.0.1:
     slash "^1.0.0"
 
 globby@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.0.0.tgz#3800df736dc711266df39b4ce33fe0d481f94c23"
-  integrity sha512-q0qiO/p1w/yJ0hk8V9x1UXlgsXUxlGd0AHUOXZVXBO6aznDtpx7M8D1kBrCAItoPm+4l8r6ATXV1JpjY2SBQOw==
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
+  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
   dependencies:
+    "@types/glob" "^7.1.1"
     array-union "^1.0.2"
-    dir-glob "^2.2.1"
+    dir-glob "^2.2.2"
     fast-glob "^2.2.6"
     glob "^7.1.3"
     ignore "^4.0.3"
@@ -4560,22 +4748,20 @@ globby@^9.0.0:
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
+  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
     minimatch "~3.0.2"
 
 gonzales-pe@^4.2.2:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz#41091703625433285e0aee3aa47829fc1fbeb6f2"
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.4.tgz#356ae36a312c46fe0f1026dd6cb539039f8500d2"
+  integrity sha512-v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ==
   dependencies:
     minimist "1.1.x"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-graceful-fs@^4.1.15:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -4586,9 +4772,9 @@ graphql-tag@^2.10.1:
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
 
 graphql@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0"
-  integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.1.tgz#779529bf9a01e7207b977a54c20670b48ca6e95c"
+  integrity sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==
   dependencies:
     iterall "^1.2.2"
 
@@ -4603,28 +4789,19 @@ gzip-size@^5.0.0:
 hammerjs@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
+  integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=
 
 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==
 
-handlebars@^4.0.1, handlebars@^4.0.6:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
-  dependencies:
-    async "^1.4.0"
-    optimist "^0.6.1"
-    source-map "^0.4.4"
-  optionalDependencies:
-    uglify-js "^2.6"
-
-handlebars@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
-  integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
+handlebars@*, handlebars@^4.0.1, handlebars@^4.0.6, handlebars@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
+  integrity sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==
   dependencies:
-    async "^2.5.0"
+    neo-async "^2.6.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
@@ -4633,49 +4810,59 @@ handlebars@^4.1.0:
 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:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
-    ajv "^5.3.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -4684,6 +4871,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -4692,10 +4880,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -4703,48 +4893,54 @@ has-values@^1.0.0:
 has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     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=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.1.x, he@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+he@1.2.x, he@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
 highlight.js@^9.13.1:
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.14.2.tgz#efbfb22dc701406e4da406056ef8c2b70ebe5b26"
-  integrity sha512-Nc6YNECYpxyJABGYJAyw7dBAYbXEuIzwzkqoJnwbc1nIpCiN+3ioYf0XrBnLiyyG0JLuJhpPtt2iTSbXiKLoyA==
+  version "9.15.6"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.6.tgz#72d4d8d779ec066af9a17cb14360c3def0aa57c4"
+  integrity sha512-zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
 hoek@6.x.x:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
-  integrity sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
+  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
 
 homedir-polyfill@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
@@ -4756,10 +4952,12 @@ hoopy@^0.1.2:
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
   dependencies:
     inherits "^2.0.1"
     obuf "^1.0.0"
@@ -4769,15 +4967,17 @@ hpack.js@^2.1.6:
 html-entities@^1.2.0, 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=
 
 html-minifier@^3.2.3:
-  version "3.5.20"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.20.tgz#7b19fd3caa0cb79f7cde5ee5c3abdf8ecaa6bb14"
+  version "3.5.21"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
+  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
   dependencies:
     camel-case "3.0.x"
     clean-css "4.2.x"
     commander "2.17.x"
-    he "1.1.x"
+    he "1.2.x"
     param-case "2.1.x"
     relateurl "0.2.x"
     uglify-js "3.4.x"
@@ -4785,6 +4985,7 @@ html-minifier@^3.2.3:
 html-webpack-plugin@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
+  integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
   dependencies:
     html-minifier "^3.2.3"
     loader-utils "^0.2.16"
@@ -4794,25 +4995,17 @@ html-webpack-plugin@^3.2.0:
     toposort "^1.0.0"
     util.promisify "1.0.0"
 
-htmlparser2@^3.9.1:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+htmlparser2@^3.3.0, htmlparser2@^3.9.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
   dependencies:
-    domelementtype "^1.3.0"
+    domelementtype "^1.3.1"
     domhandler "^2.3.0"
     domutils "^1.5.1"
     entities "^1.1.1"
     inherits "^2.0.1"
-    readable-stream "^2.0.2"
-
-htmlparser2@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
-  dependencies:
-    domelementtype "1"
-    domhandler "2.1"
-    domutils "1.1"
-    readable-stream "1.0"
+    readable-stream "^3.1.1"
 
 http-auth@3.1.x:
   version "3.1.3"
@@ -4832,19 +5025,12 @@ http-cache-semantics@^3.8.1:
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
-  dependencies:
-    depd "1.1.1"
-    inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
+  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -4852,12 +5038,14 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.4.0:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
+  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
@@ -4874,7 +5062,8 @@ http-proxy-middleware@^0.19.1:
 
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
-  resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
   dependencies:
     http-proxy "^1.16.2"
     is-glob "^4.0.0"
@@ -4884,6 +5073,7 @@ http-proxy-middleware@~0.18.0:
 http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.17.0, http-proxy@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
   dependencies:
     eventemitter3 "^3.0.0"
     follow-redirects "^1.0.0"
@@ -4892,6 +5082,7 @@ http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.17.0, http-proxy@^1.8.1:
 http-server@^0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
+  integrity sha512-6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w==
   dependencies:
     colors "1.0.3"
     corser "~2.0.0"
@@ -4905,6 +5096,7 @@ http-server@^0.11.1:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -4913,10 +5105,12 @@ http-signature@~1.2.0:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -4931,6 +5125,7 @@ humanize-ms@^1.2.1:
 humanize-url@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/humanize-url/-/humanize-url-1.0.1.tgz#f4ab99e0d288174ca4e1e50407c55fbae464efff"
+  integrity sha1-9KuZ4NKIF0yk4eUEB8VfuuRk7/8=
   dependencies:
     normalize-url "^1.0.0"
     strip-url-auth "^1.0.0"
@@ -4952,60 +5147,64 @@ husky@^1.3.1:
     slash "^2.0.0"
 
 i18next@^15.0.4:
-  version "15.0.4"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.4.tgz#17ee253ff2cc67c5003065fef2f4196b2d6d8b04"
-  integrity sha512-msRzIP/9Vo6wMbbkFRoosVu5X55vARjfhX3H9Z2avRoDAjIBNsXfpfCVF3hbP/2aMQDNEds3NUuDxE4XhcAMnA==
+  version "15.0.9"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-15.0.9.tgz#42536407a921bb5a8535a4c090a26f16827a1884"
+  integrity sha512-IdVj7DqErUuMbGuj2dFT431T7zKlmDci63eae6pNA/bMwgBZKT74/KnwHXE0WH7ivo2EV/LNme4pP4Yw6vB79w==
   dependencies:
     "@babel/runtime" "^7.3.1"
 
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
 
-icss-utils@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.0.0.tgz#d52cf4bcdcfa1c45c2dbefb4ffdf6b00ef608098"
-  integrity sha512-bA/xGiwWM17qjllIs9X/y0EjsB7e0AV08F3OL8UPsoNkNRibIuu8f1eKTnQ8QO1DteKKTxTUAn+IEWUToIwGOA==
+icss-utils@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.0.tgz#339dbbffb9f8729a243b701e1c29d4cc58c52f0e"
+  integrity sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ==
   dependencies:
-    postcss "^7.0.5"
+    postcss "^7.0.14"
 
 ie-shim@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ie-shim/-/ie-shim-0.1.0.tgz#d329de228e7dfe656feaea3e20748ef095363c5d"
+  integrity sha1-0yneIo59/mVv6uo+IHSO8JU2PF0=
 
 ieee754@^1.1.4:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
 ignore@^4.0.3:
   version "4.0.6"
@@ -5020,6 +5219,7 @@ image-size@~0.5.0:
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
 immutable-tuple@^0.4.9:
   version "0.4.10"
@@ -5059,6 +5259,7 @@ import-local@^2.0.0:
 imports-loader@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz#030ea51b8ca05977c40a3abfd9b4088fe0be9a69"
+  integrity sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ==
   dependencies:
     loader-utils "^1.0.2"
     source-map "^0.6.1"
@@ -5066,14 +5267,17 @@ imports-loader@^0.8.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
@@ -5082,13 +5286,20 @@ indent-string@^3.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
   integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
+
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -5096,14 +5307,17 @@ inflight@^1.0.4:
 inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@1.3.5, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 inquirer@3.0.6:
   version "3.0.6"
@@ -5146,41 +5360,47 @@ inquirer@6.2.1:
 inside@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/inside/-/inside-1.0.0.tgz#db45e993573cdb3db70b9832e8285bad46424770"
+  integrity sha1-20Xpk1c82z23C5gy6ChbrUZCR3A=
 
 internal-ip@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
+  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
   dependencies:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
 internal-ip@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
-  integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    default-gateway "^4.0.1"
+    default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
 interpret@^1.0.0, interpret@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
+  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
 invariant@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  integrity sha1-nh9WrArNtr8wMwbzOL47IErmA2A=
   dependencies:
     loose-envify "^1.0.0"
 
 invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 invert-kv@^2.0.0:
   version "2.0.0"
@@ -5190,20 +5410,19 @@ invert-kv@^2.0.0:
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
 ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
 ipaddr.js@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
-ipaddr.js@^1.5.2:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
-
-ipaddr.js@^1.9.0:
+ipaddr.js@^1.5.2, 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==
@@ -5211,6 +5430,7 @@ ipaddr.js@^1.9.0:
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
     is-windows "^1.0.1"
@@ -5218,38 +5438,38 @@ is-absolute@^1.0.0:
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-callable@^1.1.1, is-callable@^1.1.3, is-callable@^1.1.4:
+is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -5261,22 +5481,26 @@ is-ci@^2.0.0:
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -5285,6 +5509,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -5293,56 +5518,67 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
 is-negated-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
@@ -5354,57 +5590,69 @@ is-obj@^1.0.0:
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+
+is-path-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.0.0.tgz#d4777a8e227a00096a31f030db3770f84b116c02"
+  integrity sha512-m5dHHzpOXEiv18JEORttBO64UgTEypx99vCxQLjbBvGhOJxnTNglYoFXxwo6AbsQb79sqqycQEHv2hWkHZAijA==
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-in-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.0.0.tgz#68e452a6eec260500cec21e029c0a44cc0dcd2ea"
+  integrity sha512-6Vz5Gc9s/sDA3JBVu0FzWufm8xaBsqy1zn8Q6gmvGP6nSDMw78aS4poBNeatWjaRpTpxxLn1WOndAiOlk+qY8A==
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
     path-is-inside "^1.0.1"
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   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:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
   dependencies:
     has "^1.0.1"
 
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
 
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
-
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-symbol@^1.0.2:
   version "1.0.2"
@@ -5423,60 +5671,73 @@ is-text-path@^1.0.0:
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-unc-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isbinaryfile@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
   dependencies:
     buffer-alloc "^1.2.0"
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-instrumenter-loader@3.0.1, istanbul-instrumenter-loader@^3.0.1:
   version "3.0.1"
@@ -5488,25 +5749,28 @@ istanbul-instrumenter-loader@3.0.1, istanbul-instrumenter-loader@^3.0.1:
     loader-utils "^1.1.0"
     schema-utils "^0.3.0"
 
-istanbul-lib-coverage@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
+istanbul-lib-coverage@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
 istanbul-lib-instrument@^1.7.3:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
     babylon "^6.18.0"
-    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-coverage "^1.2.1"
     semver "^5.3.0"
 
 istanbul@0.4.5, istanbul@^0.4.0:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
+  integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=
   dependencies:
     abbrev "1.0.x"
     async "1.x"
@@ -5529,17 +5793,19 @@ iterall@^1.2.2:
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
 jasmine-core@^3.3, jasmine-core@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
-  integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
 jasmine@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
+  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
@@ -5548,22 +5814,27 @@ jasmine@2.8.0:
 jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
+  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
 js-base64@^2.1.8:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
+  integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
 
 "js-tokens@^3.0.0 || ^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@3.x, js-yaml@^3.7.0, js-yaml@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+js-yaml@3.x, js-yaml@^3.13.0, js-yaml@^3.9.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -5571,46 +5842,57 @@ js-yaml@3.x, js-yaml@^3.7.0, js-yaml@^3.9.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-loader@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+  integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==
 
 json-parse-better-errors@^1.0.0, 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"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
 json5@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
 json5@^1.0.1:
   version "1.0.1"
@@ -5629,12 +5911,14 @@ json5@^2.1.0:
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
 jsonparse@^1.2.0:
   version "1.3.1"
@@ -5644,6 +5928,7 @@ jsonparse@^1.2.0:
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
@@ -5651,18 +5936,19 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jszip@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.1.tgz#c5d32df7274042282b157efb16e522b43435e01a"
+  integrity sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw==
   dependencies:
-    core-js "~2.3.0"
-    es6-promise "~3.0.2"
-    lie "~3.1.0"
+    lie "~3.3.0"
     pako "~1.0.2"
-    readable-stream "~2.0.6"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
 
 karma-chrome-launcher@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
+  integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
   dependencies:
     fs-access "^1.0.0"
     which "^1.2.1"
@@ -5670,6 +5956,7 @@ karma-chrome-launcher@^2.2.0:
 karma-coverage@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/karma-coverage/-/karma-coverage-1.1.2.tgz#cc09dceb589a83101aca5fe70c287645ef387689"
+  integrity sha512-eQawj4Cl3z/CjxslYy9ariU4uDh7cCNFZHNWXWRpl0pNeblY/4wHR7M7boTYXWrn9bY0z2pZmr11eKje/S/hIw==
   dependencies:
     dateformat "^1.0.6"
     istanbul "^0.4.0"
@@ -5687,6 +5974,7 @@ karma-jasmine@^2.0.1:
 karma-mocha-reporter@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz#15120095e8ed819186e47a0b012f3cd741895560"
+  integrity sha1-FRIAlejtgZGG5HoLAS8810GJVWA=
   dependencies:
     chalk "^2.1.0"
     log-symbols "^2.1.0"
@@ -5695,6 +5983,7 @@ karma-mocha-reporter@^2.2.5:
 karma-remap-coverage@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/karma-remap-coverage/-/karma-remap-coverage-0.1.5.tgz#d2e3bb2dd00adcd256603a702b08c371370fbc12"
+  integrity sha512-FM5h8eHcHbMMR+2INBUxD+4+wUbkCnobfn5uWprkLyj6Xcm2MRFQOuAJn9h2H13nNso6rk+QoNpHd5xCevlPOw==
   dependencies:
     remap-istanbul "^0.10"
 
@@ -5708,6 +5997,7 @@ karma-source-map-support@1.3.0:
 karma-sourcemap-loader@^0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
+  integrity sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=
   dependencies:
     graceful-fs "^4.1.2"
 
@@ -5756,41 +6046,44 @@ karma@^4.0.1:
     tmp "0.0.33"
     useragent "2.3.0"
 
-killable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
+killable@^1.0.0, killable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
 kind-of@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
+  integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
@@ -5829,6 +6122,7 @@ less@3.9.0:
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -5841,9 +6135,10 @@ license-webpack-plugin@2.1.0:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
 
-lie@~3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
   dependencies:
     immediate "~3.0.5"
 
@@ -5878,6 +6173,7 @@ live-server@^1.2.1:
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -5898,6 +6194,7 @@ load-json-file@^2.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -5905,10 +6202,11 @@ load-json-file@^4.0.0:
     strip-bom "^3.0.0"
 
 loader-runner@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+  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.2.1:
+loader-utils@1.2.3, loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, 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==
@@ -5920,23 +6218,17 @@ loader-utils@1.2.3, loader-utils@^1.2.1:
 loader-utils@^0.2.15, loader-utils@^0.2.16:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -5944,6 +6236,7 @@ locate-path@^2.0.0:
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
@@ -5956,31 +6249,37 @@ lodash._reinterpolate@~3.0.0:
 lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-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.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
+  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
 lodash.template@^4.0.2:
   version "4.4.0"
@@ -5997,15 +6296,7 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@4.17.4:
-  version "4.17.4"
-  resolved "http://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
-lodash@^4.17.11, lodash@^4.2.1, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -6013,44 +6304,45 @@ lodash@^4.17.11, lodash@^4.2.1, lodash@^4.3.0:
 log-symbols@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
   dependencies:
     chalk "^2.0.1"
 
 log4js@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.0.2.tgz#0c73e623ca4448669653eb0e9f629beacc7fbbe3"
-  integrity sha512-KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.1.0.tgz#57983c6a443546a8c8607e9cb045d2a117c27644"
+  integrity sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==
   dependencies:
     date-format "^2.0.0"
-    debug "^3.1.0"
+    debug "^4.1.1"
     flatted "^2.0.0"
     rfdc "^1.1.2"
-    streamroller "^1.0.1"
+    streamroller "^1.0.4"
 
-loglevel@^1.4.1:
+loglevel@^1.4.1, loglevel@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
 loglevelnext@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.5.tgz#36fc4f5996d6640f539ff203ba819641680d75a2"
+  integrity sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==
   dependencies:
     es6-symbol "^3.1.1"
     object.assign "^4.1.0"
 
-longest@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0, loud-rejection@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -6058,8 +6350,9 @@ loud-rejection@^1.0.0, loud-rejection@^1.6.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=
 
-lru-cache@4.1.x, lru-cache@^4.1.3:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -6067,13 +6360,6 @@ lru-cache@4.1.x, lru-cache@^4.1.3:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -6086,14 +6372,15 @@ lunr@^2.3.6:
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.6.tgz#f278beee7ffd56ad86e6e478ce02ab2b98c78dd5"
   integrity sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==
 
-macos-release@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
-  integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==
+macos-release@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
+  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
 magic-string@^0.16.0:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.16.0.tgz#970ebb0da7193301285fb1aa650f39bdd81eb45a"
+  integrity sha1-lw67DacZMwEoX7GqZQ85vdgetFo=
   dependencies:
     vlq "^0.2.1"
 
@@ -6114,12 +6401,22 @@ magic-string@^0.25.0:
 make-dir@^1.0.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:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 make-fetch-happen@^4.0.1:
   version "4.0.1"
@@ -6153,10 +6450,12 @@ map-age-cleaner@^0.1.1:
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^2.0.0:
   version "2.0.0"
@@ -6166,21 +6465,24 @@ map-obj@^2.0.0:
 map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
+  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 marked@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.4.0.tgz#9ad2c2a7a1791f10a852e0112f77b571dce10c66"
+  integrity sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==
 
 marked@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.1.tgz#a63addde477bca9613028de4b2bc3629e53a0562"
-  integrity sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA==
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
+  integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
 
 masonry-layout@^4.2.2:
   version "4.2.2"
@@ -6191,11 +6493,13 @@ masonry-layout@^4.2.2:
     outlayer "^2.1.0"
 
 md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
 mdi-svg@^2.2.43:
   version "2.2.43"
@@ -6210,25 +6514,28 @@ meant@^1.0.1:
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.1.0.tgz#aeb9be2d21f47e78af29e4ac5978e8afa2ca5b8a"
-  integrity sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
   dependencies:
     map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
+    mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
 memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
@@ -6236,10 +6543,12 @@ memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
 memorystream@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
 meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -6270,6 +6579,7 @@ meow@^4.0.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 merge-source-map@1.0.4:
   version "1.0.4"
@@ -6278,10 +6588,6 @@ merge-source-map@1.0.4:
   dependencies:
     source-map "^0.5.6"
 
-merge2@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34"
-
 merge2@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
@@ -6290,10 +6596,12 @@ merge2@^1.2.3:
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.3, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -6312,37 +6620,54 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.3, micromatch@^3.1.4, mic
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.34.0 < 2", mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+"mime-db@>= 1.38.0 < 2":
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
+  integrity sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==
+
+mime-db@~1.38.0:
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
+  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  version "2.1.22"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
   dependencies:
-    mime-db "~1.36.0"
+    mime-db "~1.38.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 mime@^1.4.1, mime@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.0.3, mime@^2.1.0, mime@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
+  integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+mimic-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mini-css-extract-plugin@0.5.0, mini-css-extract-plugin@^0.5.0:
+mini-css-extract-plugin@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
   integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
@@ -6351,17 +6676,30 @@ mini-css-extract-plugin@0.5.0, mini-css-extract-plugin@^0.5.0:
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
+mini-css-extract-plugin@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
+  dependencies:
+    loader-utils "^1.1.0"
+    normalize-url "^2.0.1"
+    schema-utils "^1.0.0"
+    webpack-sources "^1.1.0"
+
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -6375,28 +6713,25 @@ minimist-options@^3.0.1:
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@1.1.x:
   version "1.1.3"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
+  integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
 
 minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.3.4, minipass@^2.3.5:
+minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -6404,12 +6739,6 @@ minipass@^2.3.4, minipass@^2.3.5:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  dependencies:
-    minipass "^2.2.1"
-
 minizlib@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
@@ -6420,6 +6749,7 @@ minizlib@^1.1.1:
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -6451,6 +6781,7 @@ mississippi@^3.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -6458,13 +6789,15 @@ mixin-deep@^1.2.0:
 mixin-object@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
   dependencies:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
 mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
-  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
@@ -6487,6 +6820,7 @@ morgan@^1.9.1:
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -6498,6 +6832,7 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
@@ -6507,10 +6842,12 @@ ms@^2.0.0, ms@^2.1.1:
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
 
 multicast-dns@^6.0.1:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
   dependencies:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
@@ -6518,6 +6855,7 @@ multicast-dns@^6.0.1:
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=
   dependencies:
     array-differ "^1.0.0"
     array-union "^1.0.1"
@@ -6527,14 +6865,17 @@ multimatch@^2.1.0:
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 nan@^2.10.0, nan@^2.9.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -6549,33 +6890,40 @@ nanomatch@^1.2.9:
     to-regex "^3.0.1"
 
 needle@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.2.tgz#1120ca4c41f2fcc6976fd28a8968afe239929418"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.0.tgz#ce3fea21197267bacb310705a7bbe24f2a3a3492"
+  integrity sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==
   dependencies:
-    debug "^2.1.2"
+    debug "^4.1.0"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
-neo-async@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
+neo-async@^2.5.0, neo-async@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
-next-tick@1:
+next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 ng-lazyload-image@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ng-lazyload-image/-/ng-lazyload-image-5.0.0.tgz#b2ba9ca27eb4b8a4a3603878d8f7e289ce774156"
-  integrity sha512-3EGTO2Evd28NLFioDXfKBWqwCdtciV3klMuUW3e6r2kctvbrZ5jQV7uzwNKoK53j88mD2O2BAojoQ6Otd6Gt0A==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/ng-lazyload-image/-/ng-lazyload-image-5.1.2.tgz#7ae79ced721b17a8de9e84fd0e56414f5c82b8a3"
+  integrity sha512-kGiCYTiLEFkhqHr3ygy5+ZYB7MAcEkWIYp6MGJEXZYVJlySmDBXQxLjg+pBwAPl9VFyDcTfYlaKiKmGSfEM+ww==
+  dependencies:
+    tslib "^1.9.0"
 
 ng-router-loader@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ng-router-loader/-/ng-router-loader-2.1.0.tgz#7a253863d0d7fde804564f39762ebd7f78afc8e9"
+  integrity sha1-eiU4Y9DX/egEVk85di69f3ivyOk=
   dependencies:
     loader-utils "^0.2.16"
     recast "^0.11.20"
@@ -6583,6 +6931,7 @@ ng-router-loader@^2.1.0:
 ngc-webpack@~4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/ngc-webpack/-/ngc-webpack-4.1.2.tgz#1f28e0baab8af34d079cda4141145396d627daa0"
+  integrity sha512-ih9p0sABt/9UHsKSFuFzcmiBljcDcAEp+fVbpOP/yurE0UXWoXbBVZEzK8UGHqcGNKS4nVsz9SIErJkvesQXaQ==
   dependencies:
     "@types/minimist" "^1.2.0"
     loader-utils "^1.1.0"
@@ -6595,9 +6944,9 @@ ngc-webpack@~4.1.2:
     ts-node "^3.2.0"
 
 ngx-drag-scroll@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/ngx-drag-scroll/-/ngx-drag-scroll-7.1.3.tgz#b87b6cb0d9a1aaabe044f3522d15ed0f175557e8"
-  integrity sha512-kzz79zWREsLtnQ2DJHpzQlObmpM6BQKusj009cMgI9opW93h/PpS+Lz1/mVlDzVYpmnQVnP+AlXqku3X6WIc7Q==
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/ngx-drag-scroll/-/ngx-drag-scroll-7.1.5.tgz#bdb59ae951c94f5b4c3621ecc27e89baf17ab0b7"
+  integrity sha512-dqsQJ50InctGklxlKMvIp3p598f4uheOSHtSZxbZuPqF3qbreOKdd7tSISut6qOZT1Jm2avEggSE7o0vopsCsA==
 
 ngx-hm-carousel@^1.6.5-bata.1:
   version "1.6.5-bata.1"
@@ -6609,11 +6958,11 @@ ngx-hm-carousel@^1.6.5-bata.1:
     tslib "^1.9.0"
 
 ngx-infinite-scroll@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-7.0.1.tgz#59472108f5b6960519c269d6997fe3ae0961be07"
-  integrity sha512-be9DAAuabV7VGI06/JUnS6pXC6mcBOzA4+SBCwOcP9WwJ2r5GjdZyOa34ls9hi1MnCOj3zrXLvPKQ/UDp6csIw==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-7.1.0.tgz#87dd5e0c596cd4795d2a487f7e30a0eabbb5e442"
+  integrity sha512-uytsKxUgGcPQjYMcf7FObcducQHkEsilPHZGJ3AMhOM4mtxP+YramnXXdyp2thEcuMgfNr9fBJjYnP0YcJciEQ==
   dependencies:
-    opencollective "^1.0.3"
+    opencollective-postinstall "^2.0.2"
 
 ngx-toastr@~9.1.2:
   version "9.1.2"
@@ -6625,10 +6974,12 @@ ngx-toastr@~9.1.2:
 nice-try@^1.0.4:
   version "1.0.5"
   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==
   dependencies:
     lower-case "^1.1.1"
 
@@ -6652,10 +7003,12 @@ node-fetch@1.6.3:
 node-forge@0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
+  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
 
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -6671,8 +7024,9 @@ node-gyp@^3.8.0:
     which "1"
 
 node-libs-browser@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
+  integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -6681,7 +7035,7 @@ node-libs-browser@^2.0.0:
     constants-browserify "^1.0.0"
     crypto-browserify "^3.11.0"
     domain-browser "^1.1.1"
-    events "^1.0.0"
+    events "^3.0.0"
     https-browserify "^1.0.0"
     os-browserify "^0.3.0"
     path-browserify "0.0.0"
@@ -6695,12 +7049,13 @@ node-libs-browser@^2.0.0:
     timers-browserify "^2.0.4"
     tty-browserify "0.0.0"
     url "^0.11.0"
-    util "^0.10.3"
+    util "^0.11.0"
     vm-browserify "0.0.4"
 
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -6713,10 +7068,10 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.7.tgz#b09a10394d0ed8f7778f72bb861dde68b146303b"
-  integrity sha512-bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA==
+node-releases@^1.1.13:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
+  integrity sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==
   dependencies:
     semver "^5.3.0"
 
@@ -6748,17 +7103,19 @@ node-sass@4.11.0, node-sass@^4.11.0:
 "nopt@2 || 3", nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
+normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -6768,18 +7125,10 @@ normalize-package-data@^2.3.0, normalize-package-data@^2.3.5, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
@@ -6791,19 +7140,31 @@ normalize-path@^3.0.0:
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
 normalize-url@^1.0.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
   dependencies:
     object-assign "^4.0.1"
     prepend-http "^1.0.0"
     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"
+
 npm-bundled@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
+  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
 
 npm-package-arg@6.1.0, npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
@@ -6815,17 +7176,10 @@ npm-package-arg@6.1.0, npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.12:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.3.0.tgz#7f01e8e44408341379ca98cfd756e7b29bd2626c"
-  integrity sha512-qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
-npm-packlist@^1.1.6:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+npm-packlist@^1.1.12, npm-packlist@^1.1.6:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
+  integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -6869,12 +7223,14 @@ npm-run-all@^4.1.5:
 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"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -6882,38 +7238,46 @@ npm-run-path@^2.0.0:
     set-blocking "~2.0.0"
 
 nth-check@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
   dependencies:
     boolbase "~1.0.0"
 
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
+  integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
 
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1, object-assign@latest:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -6924,24 +7288,22 @@ object-inspect@~1.4.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
   integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
-object-keys@^1.0.11, object-keys@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
-
-object-keys@^1.0.6:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.6:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
   dependencies:
     define-properties "^1.1.2"
     function-bind "^1.1.1"
@@ -6951,6 +7313,7 @@ object.assign@^4.1.0:
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
@@ -6958,6 +7321,7 @@ object.getownpropertydescriptors@^2.0.3:
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
@@ -6974,29 +7338,46 @@ object.values@^1.0.4:
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+on-headers@~1.0.1, on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
 once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
+open@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
+  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+  dependencies:
+    is-wsl "^1.1.0"
+
+opencollective-postinstall@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89"
+  integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==
+
 opencollective@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
@@ -7017,6 +7398,7 @@ opener@^1.5.1:
 opener@~1.4.0:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
+  integrity sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=
 
 opn@4.0.2:
   version "4.0.2"
@@ -7026,16 +7408,17 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
+opn@^5.1.0, opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
   dependencies:
     is-wsl "^1.1.0"
 
-opn@^5.1.0, opn@latest:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+opn@latest:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-6.0.0.tgz#3c5b0db676d5f97da1233d1ed42d182bc5a27d2d"
+  integrity sha512-I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7049,6 +7432,7 @@ optimism@^0.6.9:
 optimist@0.6.x, optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -7056,6 +7440,7 @@ optimist@0.6.x, optimist@^0.6.1, optimist@~0.6.0:
 optimize-js-plugin@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/optimize-js-plugin/-/optimize-js-plugin-0.0.4.tgz#69e7a67e0f66c69f7fc0c7b25c5d33b2db6c2817"
+  integrity sha1-aeemfg9mxp9/wMeyXF0zsttsKBc=
   dependencies:
     optimize-js "^1.0.0"
     webpack-sources "^0.1.2"
@@ -7063,6 +7448,7 @@ optimize-js-plugin@^0.0.4:
 optimize-js@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/optimize-js/-/optimize-js-1.0.3.tgz#4326af8657c4a5ff32daf726631754f72ab7fdbc"
+  integrity sha1-QyavhlfEpf8y2vcmYxdU9yq3/bw=
   dependencies:
     acorn "^3.3.0"
     concat-stream "^1.5.1"
@@ -7073,6 +7459,7 @@ optimize-js@^1.0.0:
 optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -7091,20 +7478,24 @@ original@^1.0.0:
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
@@ -7120,20 +7511,22 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     mem "^4.0.0"
 
 os-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.0.0.tgz#e1434dbfddb8e74b44c98b56797d951b7648a5d9"
-  integrity sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
   dependencies:
-    macos-release "^2.0.0"
+    macos-release "^2.2.0"
     windows-release "^3.1.0"
 
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -7141,6 +7534,7 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5:
 outlayer@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/outlayer/-/outlayer-2.1.1.tgz#29863b6de10ea5dadfffcadfa0d728907387e9a2"
+  integrity sha1-KYY7beEOpdrf/8rfoNcokHOH6aI=
   dependencies:
     ev-emitter "^1.0.0"
     fizzy-ui-utils "^2.0.0"
@@ -7154,31 +7548,28 @@ p-defer@^1.0.0:
 p-each-series@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=
   dependencies:
     p-reduce "^1.0.0"
 
 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@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
-  integrity sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
 p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^2.1.0:
+p-limit@^2.0.0, p-limit@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
   integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
@@ -7188,30 +7579,41 @@ p-limit@^2.1.0:
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
 
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+  integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pacote@9.4.0:
   version "9.4.0"
@@ -7252,12 +7654,14 @@ pako@^0.2.5:
   integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
 pako@~1.0.2, pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
   dependencies:
     cyclist "~0.2.2"
     inherits "^2.0.3"
@@ -7266,22 +7670,26 @@ parallel-transform@^1.1.0:
 param-case@2.1.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
   dependencies:
     no-case "^2.2.0"
 
 parse-asn1@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
+  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
     create-hash "^1.1.0"
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
 
 parse-color@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz#7b748b95a83f03f16a94f535e52d7f3d94658619"
+  integrity sha1-e3SLlag/A/FqlPU15S1/PZRlhhk=
   dependencies:
     color-convert "~0.5.0"
 
@@ -7293,12 +7701,14 @@ parse-github-repo-url@^1.3.0:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -7311,6 +7721,7 @@ parse-node-version@^1.0.0:
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
 parse5@4.0.0:
   version "4.0.0"
@@ -7320,64 +7731,77 @@ parse5@4.0.0:
 parse5@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
   dependencies:
     "@types/node" "*"
 
 parse5@^5.0.0, parse5@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
+  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
 
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5, path-parse@^1.0.6:
+path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -7385,10 +7809,12 @@ path-parse@^1.0.5, path-parse@^1.0.6:
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -7404,18 +7830,21 @@ path-type@^2.0.0:
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 pause-stream@0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
+  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
   dependencies:
     through "~2.3"
 
 pbkdf2@^3.0.3:
-  version "3.0.16"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -7435,9 +7864,9 @@ pdfkit@^0.9.0:
     saslprep "1.0.1"
 
 pdfmake@^0.1.53:
-  version "0.1.53"
-  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.53.tgz#51377ad07f40c9421685df090781026ec76300b1"
-  integrity sha512-VkS4QEs2dSA0CVGscUZOnTXsSegfcUHRHFxdDs11qkJvyfCzMmeI7sWCDYMjrjXzYoPamxeXEgjY7LOmw3zT7Q==
+  version "0.1.54"
+  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.54.tgz#91a9ba862ee689f6dfd1caa07dd581c0fd770bfb"
+  integrity sha512-HO2FX+czmO+8LpWXQMFQfdUCCKnqwSvSEJExGkUKfsV34DRIV5PZjNg0xWS7ypGrnTY6RTTssWpdreX/pbyeyw==
   dependencies:
     iconv-lite "^0.4.24"
     linebreak "^0.3.0"
@@ -7446,6 +7875,7 @@ pdfmake@^0.1.53:
 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=
 
 pidtree@^0.3.0:
   version "0.3.0"
@@ -7455,10 +7885,12 @@ pidtree@^0.3.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=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pify@^4.0.1:
   version "4.0.1"
@@ -7468,16 +7900,19 @@ pify@^4.0.1:
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
   dependencies:
     find-up "^2.1.0"
 
@@ -7498,6 +7933,7 @@ please-upgrade-node@^3.1.1:
 plugin-error@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
+  integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
   dependencies:
     ansi-cyan "^0.1.1"
     ansi-red "^0.1.1"
@@ -7510,9 +7946,10 @@ png-js@>=0.1.0:
   resolved "https://registry.yarnpkg.com/png-js/-/png-js-0.1.1.tgz#1cc7c212303acabe74263ec3ac78009580242d93"
   integrity sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=
 
-portfinder@^1.0.13, portfinder@^1.0.9:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
+portfinder@^1.0.13, portfinder@^1.0.20, portfinder@^1.0.9:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
+  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -7521,6 +7958,7 @@ portfinder@^1.0.13, portfinder@^1.0.9:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-import@12.0.1:
   version "12.0.1"
@@ -7557,22 +7995,22 @@ postcss-modules-extract-imports@^2.0.0:
   dependencies:
     postcss "^7.0.5"
 
-postcss-modules-local-by-default@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.5.tgz#7f387f68f5555598068e4d6d1ea0b7d6fa984272"
-  integrity sha512-iFgxlCAVLno5wIJq+4hyuOmc4VjZEZxzpdeuZcBytLNWEK5Bx2oRF9PPcAz5TALbaFvrZm8sJYtJ3hV+tMSEIg==
+postcss-modules-local-by-default@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz#dd9953f6dd476b5fd1ef2d8830c8929760b56e63"
+  integrity sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
     postcss "^7.0.6"
+    postcss-selector-parser "^6.0.0"
     postcss-value-parser "^3.3.1"
 
-postcss-modules-scope@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.0.1.tgz#2c0f2394cde4cd09147db054c68917e38f6d43a4"
-  integrity sha512-7+6k9c3/AuZ5c596LJx9n923A/j3nF3ormewYBF1RrIQvjvjXe1xE8V8A1KFyFwXbvnshT6FBZFX0k/F1igneg==
+postcss-modules-scope@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz#ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"
+  integrity sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
     postcss "^7.0.6"
+    postcss-selector-parser "^6.0.0"
 
 postcss-modules-values@^2.0.0:
   version "2.0.0"
@@ -7582,16 +8020,21 @@ postcss-modules-values@^2.0.0:
     icss-replace-symbols "^1.1.0"
     postcss "^7.0.6"
 
-postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+postcss-selector-parser@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
+  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
 
-postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
   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@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.5, postcss@^7.0.6:
+postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -7611,10 +8054,17 @@ preload-webpack-plugin@^2.3.0:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prepend-http@^1.0.0:
   version "1.0.4"
   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@^1.16.4:
   version "1.16.4"
@@ -7624,41 +8074,50 @@ prettier@^1.16.4:
 pretty-error@^2.0.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
+  integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
   dependencies:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-format@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.0.0.tgz#cb6599fd73ac088e37ed682f61291e4678f48591"
-  integrity sha512-LszZaKG665djUcqg5ZQq+XzezHLKrxsA86ZABTozp+oNhkdqa+tG2dX4qa6ERl5c/sRDrAa3lHmwnvKoP+OG/g==
+pretty-format@^24.5.0:
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.7.0.tgz#d23106bc2edcd776079c2daa5da02bcb12ed0c10"
+  integrity sha512-apen5cjf/U4dj7tHetpC7UEFCvtAgnNZnBDkfPv3fokzIqyOJckAG9OlAPC1BlFALnqT/lGB2tl9EJjlK6eCsA==
   dependencies:
+    "@jest/types" "^24.7.0"
     ansi-regex "^4.0.0"
     ansi-styles "^3.2.0"
+    react-is "^16.8.4"
 
 private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 progress@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise-retry@^1.1.1:
   version "1.1.1"
@@ -7703,9 +8162,10 @@ protractor@^5.4.2:
     webdriver-js-extender "2.1.0"
     webdriver-manager "^12.0.6"
 
-proxy-addr@~2.0.3, proxy-addr@~2.0.4:
+proxy-addr@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
   dependencies:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
@@ -7713,32 +8173,39 @@ proxy-addr@~2.0.3, proxy-addr@~2.0.4:
 proxy-middleware@latest:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/proxy-middleware/-/proxy-middleware-0.15.0.tgz#a3fdf1befb730f951965872ac2f6074c61477a56"
+  integrity sha1-o/3xvvtzD5UZZYcqwvYHTGFHelY=
 
 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=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
 
 public-encrypt@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
     create-hash "^1.1.0"
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
 
 pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -7754,6 +8221,7 @@ pump@^3.0.0:
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
@@ -7762,69 +8230,87 @@ pumpify@^1.3.3:
 punycode@1.3.2:
   version "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:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
 
 q@^1.4.1, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qjobs@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-
-qs@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
 qs@6.5.2, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 qs@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
-  integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 qs@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404"
+  integrity sha1-6eha2+ddoLvkyOBHaghikPhjtAQ=
 
 query-ast@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/query-ast/-/query-ast-1.0.1.tgz#6bb4ea8b7731cc5e90208e79c41bc9c3f09c52aa"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/query-ast/-/query-ast-1.0.2.tgz#efc59271addc2699a1ed563be9a7cc61fed590c0"
+  integrity sha512-mg78RW1QHhW8ChuJfR3V7/8GZ+Hm0mVyuh91gCCaYlObGPaorPsOEY0LXbzjzydvfGui9seLTFW2MiuDy0MT8w==
   dependencies:
     invariant "2.2.2"
-    lodash "4.17.4"
+    lodash "^4.17.4"
 
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
+  dependencies:
+    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"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
 quick-lru@^1.0.0:
   version "1.1.0"
@@ -7841,14 +8327,16 @@ quote-stream@^1.0.1, quote-stream@~1.0.2:
     through2 "^2.0.0"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -7856,19 +8344,12 @@ randomfill@^1.0.3:
 range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
-    unpipe "1.0.0"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raw-body@2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.3"
@@ -7886,12 +8367,18 @@ raw-loader@1.0.0, raw-loader@^1.0.0:
 rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-is@^16.8.4:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
+  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
+
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -7902,6 +8389,7 @@ read-cache@^1.0.0:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -7925,6 +8413,7 @@ read-pkg-up@^3.0.0:
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -7942,6 +8431,7 @@ read-pkg@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -7956,9 +8446,10 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^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.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, 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.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -7968,27 +8459,19 @@ read-pkg@^4.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^3.0.6:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
-  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
+"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~2.0.0, readable-stream@~2.0.6:
+readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -7997,16 +8480,7 @@ readable-stream@~2.0.0, readable-stream@~2.0.6:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  dependencies:
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
-
-readdirp@^2.2.1:
+readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
   integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
@@ -8018,6 +8492,7 @@ readdirp@^2.2.1:
 recast@^0.11.20:
   version "0.11.23"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
+  integrity sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=
   dependencies:
     ast-types "0.9.6"
     esprima "~3.1.0"
@@ -8027,12 +8502,14 @@ recast@^0.11.20:
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -8045,11 +8522,7 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-reflect-metadata@^0.1.10, reflect-metadata@^0.1.2:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
-
-reflect-metadata@^0.1.13:
+reflect-metadata@^0.1.10, reflect-metadata@^0.1.13, reflect-metadata@^0.1.2:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
   integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
@@ -8057,6 +8530,7 @@ reflect-metadata@^0.1.13:
 regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
 regenerator-runtime@^0.10.0:
   version "0.10.5"
@@ -8066,15 +8540,17 @@ regenerator-runtime@^0.10.0:
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
+regenerator-runtime@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
+  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -8082,6 +8558,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -8090,20 +8567,24 @@ regexpu-core@^1.0.0:
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
   dependencies:
     jsesc "~0.5.0"
 
 relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
 remap-istanbul@^0.10:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/remap-istanbul/-/remap-istanbul-0.10.1.tgz#3aa58dd5021d499f336d3ba5bf3bbb91c1b88e37"
+  integrity sha512-gsNQXs5kJLhErICSyYhzVZ++C8LBW8dgwr874Y2QvzAUS75zBlD/juZgXs39nbYJ09fZDlX2AVLVJAY2jbFJoQ==
   dependencies:
     amdefine "^1.0.0"
     istanbul "0.4.5"
@@ -8115,34 +8596,40 @@ remap-istanbul@^0.10:
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 renderkid@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz#380179c2ff5ae1365c522bf2fcfcff01c5b74149"
+  integrity sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==
   dependencies:
     css-select "^1.1.0"
-    dom-converter "~0.1"
-    htmlparser2 "~3.3.0"
+    dom-converter "^0.2"
+    htmlparser2 "^3.3.0"
     strip-ansi "^3.0.0"
-    utila "~0.3"
+    utila "^0.4.0"
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 request@^2.83.0, 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==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -8168,6 +8655,7 @@ request@^2.83.0, request@^2.87.0, request@^2.88.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-from-string@^2.0.1:
   version "2.0.2"
@@ -8177,6 +8665,7 @@ require-from-string@^2.0.1:
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 require-main-filename@^2.0.0:
   version "2.0.0"
@@ -8186,6 +8675,7 @@ require-main-filename@^2.0.0:
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
 resize-observer-polyfill@^1.5.0:
   version "1.5.1"
@@ -8195,6 +8685,7 @@ resize-observer-polyfill@^1.5.0:
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
@@ -8209,32 +8700,29 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.7, resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.5, resolve@^1.1.7, resolve@^1.10.0:
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.1.6, resolve@^1.3.2, resolve@^1.5.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  dependencies:
-    path-parse "^1.0.5"
-
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -8249,29 +8737,19 @@ restructure@^0.5.3:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
 rfdc@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
   integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
 
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  dependencies:
-    align-text "^0.1.1"
-
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  dependencies:
-    glob "^7.0.5"
-
-rimraf@^2.6.3:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -8281,6 +8759,7 @@ rimraf@^2.6.3:
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -8288,6 +8767,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 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"
 
@@ -8299,6 +8779,7 @@ run-node@^1.0.0:
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
@@ -8329,36 +8810,29 @@ rxjs@6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.1.0:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.1.tgz#878a1a8c64b8a5da11dcf74b5033fe944cdafb84"
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.4.0:
+rxjs@^6.1.0, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 saslprep@1.0.1:
   version "1.0.1"
@@ -8368,6 +8842,7 @@ saslprep@1.0.1:
 sass-extract-loader@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/sass-extract-loader/-/sass-extract-loader-1.1.0.tgz#ad4e7123b82533f8cbbde814e342f44abcb21054"
+  integrity sha1-rU5xI7glM/jLvegU40L0SryyEFQ=
   dependencies:
     loader-utils "^1.1.0"
 
@@ -8384,6 +8859,7 @@ sass-extract@^2.1.0:
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -8403,15 +8879,16 @@ sass-loader@7.1.0, sass-loader@^7.1.0:
     semver "^5.5.0"
 
 sass@^1.17.2:
-  version "1.17.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.17.2.tgz#b5a28f2f13c6a219f28084c03623bb2c8d176323"
-  integrity sha512-TBNcwSIEXpXAIaFxQnWbHzhciwPKpHRprQ+1ww+g9eHCiY3PINJs6vQTu+LcBt1vIhrtQGRFIoxJO39TfLrptA==
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.18.0.tgz#f34371c31e268e555c2ac8e43d2b64d194e7d090"
+  integrity sha512-Mc579V+BhH693tqt+lvph+gmRqmC6BjtsEVsjkW1944DEA5a0wPuCi781hL3fY4EDuqZnEVPbu42CZRywwE97g==
   dependencies:
     chokidar "^2.0.0"
 
 saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
+  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
   dependencies:
     https-proxy-agent "^2.2.1"
 
@@ -8423,16 +8900,19 @@ sax@0.5.x:
 sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schema-utils@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
   dependencies:
     ajv "^5.0.0"
 
 schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
   dependencies:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
@@ -8440,6 +8920,7 @@ schema-utils@^0.4.4, schema-utils@^0.4.5:
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
   dependencies:
     ajv "^6.1.0"
     ajv-errors "^1.0.0"
@@ -8455,6 +8936,7 @@ script-ext-html-webpack-plugin@^2.1.3:
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -8462,19 +8944,22 @@ scss-tokenizer@^0.2.3:
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
 selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
+  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
   dependencies:
     jszip "^3.1.3"
     rimraf "^2.5.4"
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.9.1:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.3.tgz#d628ecf9e3735f84e8bafba936b3cf85bea43823"
+selfsigned@^1.10.4, selfsigned@^1.9.1:
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
+  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
   dependencies:
     node-forge "0.7.5"
 
@@ -8486,6 +8971,7 @@ semver-compare@^1.0.0:
 semver-dsl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
+  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
   dependencies:
     semver "^5.3.0"
 
@@ -8496,22 +8982,30 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.2.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-semver@5.6.0, semver@^5.2.0, semver@^5.5.1, semver@^5.6.0:
+semver@5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
 send@0.16.2, send@latest:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -8528,12 +9022,14 @@ send@0.16.2, send@latest:
     statuses "~1.4.0"
 
 serialize-javascript@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
+  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
 
 serve-index@^1.7.2, serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -8546,6 +9042,7 @@ serve-index@^1.7.2, serve-index@^1.9.1:
 serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -8555,14 +9052,17 @@ serve-static@1.13.2:
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@^1.0.1:
+set-immediate-shim@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -8572,6 +9072,7 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -8581,18 +9082,17 @@ set-value@^2.0.0:
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -8600,6 +9100,7 @@ sha.js@^2.4.0, sha.js@^2.4.8:
 shallow-clone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
+  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
   dependencies:
     is-extendable "^0.1.1"
     kind-of "^5.0.0"
@@ -8613,23 +9114,26 @@ shallow-copy@~0.0.1:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shell-quote@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
+  integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
   dependencies:
     array-filter "~0.0.0"
     array-map "~0.0.0"
     array-reduce "~0.0.0"
     jsonify "~0.0.0"
 
-shelljs@^0.8.1:
+shelljs@^0.8.1, shelljs@^0.8.2:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.3.tgz#a7f3319520ebf09ee81275b2368adb286659b097"
   integrity sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==
@@ -8638,34 +9142,30 @@ shelljs@^0.8.1:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shelljs@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 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=
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
-smart-buffer@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+smart-buffer@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
+  integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -8674,12 +9174,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -8693,6 +9195,7 @@ snapdragon@^0.8.1:
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
+  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
 
 socket.io-client@2.1.1:
   version "2.1.1"
@@ -8779,38 +9282,50 @@ sockjs-client@1.3.0:
 sockjs@0.3.19:
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
   dependencies:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
 socks-proxy-agent@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
-  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
   dependencies:
-    agent-base "~4.2.0"
-    socks "~2.2.0"
+    agent-base "~4.2.1"
+    socks "~2.3.2"
 
-socks@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
+socks@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
+  integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
   dependencies:
     ip "^1.1.5"
-    smart-buffer "^4.0.1"
+    smart-buffer "4.0.2"
 
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^2.0.0:
+sort-keys@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+  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"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-list-map@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
 
 source-map-loader@0.2.4, source-map-loader@^0.2.4:
   version "0.2.4"
@@ -8823,6 +9338,7 @@ source-map-loader@0.2.4, source-map-loader@^0.2.4:
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -8830,7 +9346,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@~0.5.9:
+source-map-support@0.5.10:
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
   integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
@@ -8841,12 +9357,14 @@ source-map-support@0.5.10, source-map-support@^0.5.5, source-map-support@~0.5.9:
 source-map-support@^0.4.0, source-map-support@~0.4.0:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.3, source-map-support@^0.5.6:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -8854,6 +9372,7 @@ source-map-support@^0.5.3, source-map-support@^0.5.6:
 source-map-url@0.4.0, source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@*, source-map@0.7.3:
   version "0.7.3"
@@ -8870,29 +9389,34 @@ source-map@0.1.x, source-map@~0.1.30:
 source-map@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.0.tgz#0fe96503ac86a5adb5de63f4e412ae4872cdbe86"
+  integrity sha1-D+llA6yGpa213mP05BKuSHLNvoY=
 
 source-map@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
   integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@^0.4.2, source-map@^0.4.4, source-map@~0.4.1:
+source-map@^0.4.2, source-map@~0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.1, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
+source-map@^0.5.1, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  integrity sha1-2rc/vPwrqBm03gO9b26qSBZLP50=
   dependencies:
     amdefine ">=0.0.4"
 
@@ -8902,26 +9426,30 @@ sourcemap-codec@^1.4.4:
   integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
 
 spdx-correct@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
 spdx-expression-parse@^3.0.0:
   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==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
+  integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -8956,6 +9484,7 @@ speed-measure-webpack-plugin@1.3.1:
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
@@ -8969,6 +9498,7 @@ split2@^2.0.0:
 split@0.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
+  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
   dependencies:
     through "2"
 
@@ -8980,31 +9510,34 @@ split@^1.0.0:
     through "2"
 
 sprintf-js@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
 ssri@^5.2.4:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
   dependencies:
     safe-buffer "^5.1.1"
 
@@ -9016,16 +9549,16 @@ ssri@^6.0.0, ssri@^6.0.1:
     figgy-pudding "^3.5.1"
 
 standard-version@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-5.0.1.tgz#b2b2e858379c75b7da25fbc1cdafe8b6f36810d3"
-  integrity sha512-nlab5/C0P1Zd5k/2Zer/Y8xDnyf9kHES8Hy82aO8owJG9TJb3KbdNNOBNAgfa/ZsiDlJE9WQTGm1yN2VM1qxTg==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-5.0.2.tgz#39fc8ce9a2850cc70868a39f9a4c9661a4439beb"
+  integrity sha512-vvdWZySinwWU9UZhtgYUGGTkYzqrwYMw3c7CFJ17E7vMbAEqVSui/bm+ZcSukAAU2WmphPTWIKFmn8ni+lk4NA==
   dependencies:
     chalk "^2.4.1"
     conventional-changelog "^3.0.6"
     conventional-recommended-bump "^4.0.4"
     detect-indent "^5.0.0"
     detect-newline "^2.1.0"
-    dotgitignore "^1.0.3"
+    dotgitignore "^2.1.0"
     figures "^2.0.0"
     fs-access "^1.0.0"
     git-semver-tags "^2.0.2"
@@ -9043,6 +9576,7 @@ static-eval@^2.0.0:
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -9074,27 +9608,32 @@ stats-webpack-plugin@0.7.0:
   dependencies:
     lodash "^4.17.4"
 
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
 
 statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
   dependencies:
     readable-stream "^2.0.1"
 
 stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -9102,12 +9641,14 @@ stream-browserify@^2.0.1:
 stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
+  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
   dependencies:
     duplexer "~0.1.1"
 
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
@@ -9115,6 +9656,7 @@ stream-each@^1.1.0:
 stream-http@^2.7.2:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -9125,11 +9667,12 @@ stream-http@^2.7.2:
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
-streamroller@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.3.tgz#cb51e7e382f799a9381a5d7490ce3053b325fba3"
-  integrity sha512-P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg==
+streamroller@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.4.tgz#d485c7624796d5e2eb34190c79afcbf006afb5e6"
+  integrity sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==
   dependencies:
     async "^2.6.1"
     date-format "^2.0.0"
@@ -9140,10 +9683,12 @@ streamroller@^1.0.1:
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
 string-replace-loader@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-2.1.1.tgz#b72e7b57b6ef04efe615aff0ad989b5c14ca63d1"
+  integrity sha512-0Nvw1LDclF45AFNuYPcD2Jvkv0mwb/dQSnJZMvhqGrT+zzmrpG3OJFD600qfQfNUd5aqfp7fCm2mQMfF7zLbyQ==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^0.4.5"
@@ -9151,6 +9696,7 @@ string-replace-loader@^2.1.1:
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -9159,34 +9705,30 @@ string-width@^1.0.1, string-width@^1.0.2:
 "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
 string-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1"
-  integrity sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
   dependencies:
     emoji-regex "^7.0.1"
     is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
 
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
+  integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string_decoder@^1.0.0, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  dependencies:
-    safe-buffer "~5.1.0"
-
-string_decoder@^1.1.1:
+string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
   integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
@@ -9196,6 +9738,14 @@ string_decoder@^1.1.1:
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
 
 stringify-package@^1.0.0:
   version "1.0.0"
@@ -9205,39 +9755,45 @@ stringify-package@^1.0.0:
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^4.1.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
@@ -9249,21 +9805,24 @@ strip-indent@^2.0.0:
 strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 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"
 
 strip-url-auth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-url-auth/-/strip-url-auth-1.0.1.tgz#22b0fa3a41385b33be3f331551bbb837fa0cd7ae"
+  integrity sha1-IrD6OkE4WzO+PzMVUbu4N/oM164=
 
 stripe@^6.25.1:
-  version "6.25.1"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.25.1.tgz#b19fce283236107bc52d4a3735d183d1c4957c4c"
-  integrity sha512-e1FCDQgVWzHcyD3HBzMzl9ilhHyl9g/IFl+YlxGIx6l/5nxa0hLPK8dcHqrFyvJDkob37JzvZBaBrn45hJM7Eg==
+  version "6.28.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.28.0.tgz#81f2bf174efe9503b50f24930a7e1d195c60f810"
+  integrity sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
@@ -9302,16 +9861,19 @@ stylus@0.54.5:
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.0:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
 supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
@@ -9327,36 +9889,21 @@ symbol-observable@1.2.0, symbol-observable@^1.0.2:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
-tapable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
-
-tapable@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
-  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
+tapable@^1.0.0, tapable@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  dependencies:
-    chownr "^1.0.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
-tar@^4.4.8:
+tar@^4, tar@^4.4.8:
   version "4.4.8"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
   integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
@@ -9369,7 +9916,7 @@ tar@^4.4.8:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-terser-webpack-plugin@1.2.2, terser-webpack-plugin@^1.1.0:
+terser-webpack-plugin@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
   integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
@@ -9383,14 +9930,28 @@ terser-webpack-plugin@1.2.2, terser-webpack-plugin@^1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+terser-webpack-plugin@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
+  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.16.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
 terser@^3.16.1:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
-  integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
   dependencies:
-    commander "~2.17.1"
+    commander "^2.19.0"
     source-map "~0.6.1"
-    source-map-support "~0.5.9"
+    source-map-support "~0.5.10"
 
 text-extensions@^1.0.0:
   version "1.9.0"
@@ -9400,18 +9961,12 @@ text-extensions@^1.0.0:
 through2@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.1.tgz#384e75314d49f32de12eebb8136b8eb6b5d59da9"
+  integrity sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=
   dependencies:
     readable-stream "~2.0.0"
     xtend "~4.0.0"
 
-through2@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-through2@^2.0.2, through2@~2.0.3:
+through2@^2.0.0, through2@^2.0.2, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -9419,21 +9974,32 @@ through2@^2.0.2, through2@~2.0.3:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
+through2@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
 through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 thunky@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
+  integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
 
 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=
 
 timers-browserify@^2.0.4:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
   dependencies:
     setimmediate "^1.0.4"
 
@@ -9445,36 +10011,43 @@ tiny-inflate@^1.0.0, tiny-inflate@^1.0.2:
 tmp@0.0.30:
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
+  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
   dependencies:
     os-tmpdir "~1.0.1"
 
 tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -9482,6 +10055,7 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -9491,16 +10065,19 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 to-string-loader@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/to-string-loader/-/to-string-loader-1.1.5.tgz#7b7aa17891b7bb4947a7a11bfb03b5fde9c6e695"
+  integrity sha1-e3qheJG3u0lHp6Eb+wO1/enG5pU=
   dependencies:
     loader-utils "^0.2.16"
 
 toposort@^1.0.0:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
+  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
 
 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"
@@ -9508,6 +10085,7 @@ tough-cookie@~2.4.3:
 traverse@^0.6.6:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
+  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
 
 tree-kill@1.2.1:
   version "1.2.1"
@@ -9517,6 +10095,7 @@ tree-kill@1.2.1:
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-newlines@^2.0.0:
   version "2.0.0"
@@ -9531,16 +10110,19 @@ trim-off-newlines@^1.0.0:
 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"
 
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
   dependencies:
     glob "^7.1.2"
 
@@ -9556,9 +10138,17 @@ ts-invariant@^0.2.1:
   dependencies:
     tslib "^1.9.3"
 
+ts-invariant@^0.3.2:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.3.tgz#b5742b1885ecf9e29c31a750307480f045ec0b16"
+  integrity sha512-UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ==
+  dependencies:
+    tslib "^1.9.3"
+
 ts-node@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.3.0.tgz#c13c6a3024e30be1180dd53038fc209289d4bf69"
+  integrity sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k=
   dependencies:
     arrify "^1.0.0"
     chalk "^2.0.0"
@@ -9572,9 +10162,9 @@ ts-node@^3.2.0:
     yn "^2.0.0"
 
 ts-node@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.2.tgz#9ecdf8d782a0ca4c80d1d641cbb236af4ac1b756"
-  integrity sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.3.tgz#aa60b836a24dafd8bf21b54766841a232fdbc641"
+  integrity sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==
   dependencies:
     arg "^4.1.0"
     diff "^3.1.0"
@@ -9585,6 +10175,7 @@ ts-node@^8.0.2:
 ts-simple-ast@12.4.0:
   version "12.4.0"
   resolved "https://registry.yarnpkg.com/ts-simple-ast/-/ts-simple-ast-12.4.0.tgz#6b53f6d6a59145da637dfe0e8c646d1e66ba278a"
+  integrity sha512-7GJFZlyTZY7uMAEhX62ZLxdwOpGDJzc/nwpi1nRPZ7N2ICcqqrMjDtRnki15IUBv2ZjIGu6KBqk/pUqJFODFsg==
   dependencies:
     "@dsherret/to-absolute-glob" "^2.0.2"
     code-block-writer "^7.2.0"
@@ -9600,6 +10191,7 @@ ts-simple-ast@12.4.0:
 tsconfig@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-6.0.0.tgz#6b0e8376003d7af1864f8df8f89dd0059ffcd032"
+  integrity sha1-aw6DdgA9evGGT434+J3QBZ/80DI=
   dependencies:
     strip-bom "^3.0.0"
     strip-json-comments "^2.0.0"
@@ -9607,10 +10199,12 @@ tsconfig@^6.0.0:
 tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tslint-loader@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/tslint-loader/-/tslint-loader-3.6.0.tgz#12ed4d5ef57d68be25cd12692fb2108b66469d76"
+  integrity sha512-Me9Qf/87BOfCY8uJJw+J7VMF4U8WiMXKLhKKKugMydF0xMhMOt9wo2mjYTNhwbF9H7SHh8PAIwRG8roisTNekQ==
   dependencies:
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
@@ -9618,10 +10212,10 @@ tslint-loader@^3.6.0:
     rimraf "^2.4.4"
     semver "^5.3.0"
 
-tslint@^5.13.1:
-  version "5.13.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.13.1.tgz#fbc0541c425647a33cd9108ce4fd4cd18d7904ed"
-  integrity sha512-fplQqb2miLbcPhyHoMV4FU9PtNRbgmm/zI5d3SZwwmJQM6V0eodju+hplpyfhLWpmwrDNfNYU57uYRb8s0zZoQ==
+tslint@^5.13.1, tslint@^5.9.1:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
+  integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -9629,60 +10223,49 @@ tslint@^5.13.1:
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     resolve "^1.3.2"
     semver "^5.3.0"
     tslib "^1.8.0"
-    tsutils "^2.27.2"
-
-tslint@^5.9.1:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.7.0"
-    minimatch "^3.0.4"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.27.2"
+    tsutils "^2.29.0"
 
-tsutils@^2.25.0, tsutils@^2.27.2:
+tsutils@^2.25.0, tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.15, type-is@~1.6.16:
+type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.18"
@@ -9690,10 +10273,12 @@ type-is@~1.6.15, type-is@~1.6.16:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typedoc-default-themes@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.5.0.tgz#6dc2433e78ed8bea8e887a3acde2f31785bd6227"
+  integrity sha1-bcJDPnjti+qOiHo6zeLzF4W9Yic=
 
 typedoc@^0.14.2:
   version "0.14.2"
@@ -9721,6 +10306,7 @@ typedoc@^0.14.2:
 typescript@2.9.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
+  integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
 typescript@3.2.4, typescript@3.2.x:
   version "3.2.4"
@@ -9730,31 +10316,28 @@ typescript@3.2.4, typescript@3.2.x:
 typescript@^2.4.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
+  integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
 typescript@~3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
   integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
 
-uglify-js@3.4.x, uglify-js@^3.0.0, uglify-js@^3.1.4:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+uglify-js@3.4.x:
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.19.0"
     source-map "~0.6.1"
 
-uglify-js@^2.6:
-  version "2.8.29"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+uglify-js@^3.0.0, uglify-js@^3.1.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.4.tgz#4a64d57f590e20a898ba057f838dcdfb67a939b9"
+  integrity sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==
   dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+    commander "~2.20.0"
+    source-map "~0.6.1"
 
 uglifyjs-webpack-plugin@^2.1.2:
   version "2.1.2"
@@ -9773,10 +10356,12 @@ uglifyjs-webpack-plugin@^2.1.2:
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
 unicode-properties@^1.0.0:
   version "1.1.0"
@@ -9797,6 +10382,7 @@ unicode-trie@^0.3.0:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
@@ -9806,16 +10392,16 @@ union-value@^1.0.0:
 union@~0.4.3:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/union/-/union-0.4.6.tgz#198fbdaeba254e788b0efcb630bc11f24a2959e0"
+  integrity sha1-GY+9rrolTniLDvy2MLwR8kopWeA=
   dependencies:
     qs "~2.3.3"
 
-unique-filename@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
-  dependencies:
-    unique-slug "^2.0.0"
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
-unique-filename@^1.1.1:
+unique-filename@^1.1.0, unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -9823,51 +10409,61 @@ unique-filename@^1.1.1:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
   dependencies:
     imurmurhash "^0.1.4"
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unix-crypt-td-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
+  integrity sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.0.5, upath@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+upath@^1.0.5, upath@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
 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"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-join@^2.0.2, url-join@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
+  integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=
 
 url-loader@^1.1.2:
   version "1.1.2"
@@ -9879,8 +10475,9 @@ url-loader@^1.1.2:
     schema-utils "^1.0.0"
 
 url-parse@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.5.tgz#04cbb6ba2be682a18e4417fa2245aa7e3dfdcc50"
+  integrity sha512-4XDvC5vZRjEpjP0L4znrWeoH8P8F0XGBlfLdABi/6oV4o8xUVbTpyrxWHxkK2bT0pSIpcjdIzSoWUhlUfawCAQ==
   dependencies:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
@@ -9888,6 +10485,7 @@ url-parse@^1.4.3:
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -9895,6 +10493,7 @@ url@^0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 useragent@2.3.0:
   version "2.3.0"
@@ -9907,10 +10506,12 @@ useragent@2.3.0:
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util.promisify@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
   dependencies:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
@@ -9918,30 +10519,31 @@ util.promisify@1.0.0:
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
-util@^0.10.3:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
   dependencies:
     inherits "2.0.3"
 
-utila@~0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
-
-utila@~0.4:
+utila@^0.4.0, utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 v8-compile-cache@^2.0.2:
   version "2.0.2"
@@ -9949,14 +10551,16 @@ v8-compile-cache@^2.0.2:
   integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==
 
 v8flags@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.1.tgz#42259a1461c08397e37fe1d4f1cfb59cad85a053"
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.2.tgz#fc5cd0c227428181e6c29b2992e4f8f1da5e0c9f"
+  integrity sha512-MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw==
   dependencies:
     homedir-polyfill "^1.0.1"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -9964,6 +10568,7 @@ validate-npm-package-license@^3.0.1:
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
   dependencies:
     builtins "^1.0.3"
 
@@ -9975,10 +10580,12 @@ validator@^10.11.0:
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -9987,29 +10594,34 @@ verror@1.10.0:
 viz.js@^1.8.0:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a"
+  integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==
 
 vlq@^0.2.1, vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
 
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
   dependencies:
     indexof "0.0.1"
 
 void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
 wait-for-expect@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.1.0.tgz#6607375c3f79d32add35cd2c87ce13f351a3d453"
-  integrity sha512-vQDokqxyMyknfX3luCDn16bSaRcOyH6gGuUXMIbxBLeTo6nWuEWYqMTT9a+44FmW8c2m6TRWBdNvBBjA1hwEKg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.1.1.tgz#9cd10e07d52810af9e0aaf509872e38f3c3d81ae"
+  integrity sha512-vd9JOqqEcBbCDhARWhW85ecjaEcfBLuXgVBqatfS3iw6oU4kzAcs+sCNjF+TC9YHPImCW7ypsuQc+htscIAQCw==
 
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
   dependencies:
     chokidar "^2.0.2"
     graceful-fs "^4.1.2"
@@ -10018,12 +10630,14 @@ watchpack@^1.5.0:
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
   dependencies:
     minimalistic-assert "^1.0.0"
 
 web-animations-js@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.3.1.tgz#3a6d9bc15196377a90f8e2803fa5262165b04510"
+  integrity sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA=
 
 webdriver-js-extender@2.1.0:
   version "2.1.0"
@@ -10034,8 +10648,9 @@ webdriver-js-extender@2.1.0:
     selenium-webdriver "^3.0.1"
 
 webdriver-manager@^12.0.6:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.0.tgz#f6601e52de5f0c97fc7024c889eeb2416f2f1d9d"
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.1.tgz#66c3271f69cefdaa9fdfca617ae95afae41c3c62"
+  integrity sha512-L9TEQmZs6JbMMRQI1w60mfps265/NCr0toYJl7p/R2OAk6oXAfwI6jqYP7EWae+d7Ad2S2Aj4+rzxoSjqk3ZuA==
   dependencies:
     adm-zip "^0.4.9"
     chalk "^1.1.1"
@@ -10050,9 +10665,9 @@ webdriver-manager@^12.0.6:
     xml2js "^0.4.17"
 
 webpack-bundle-analyzer@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz#2f19cbb87bb6d4f3cb4e59cb67c837bd9436e89d"
-  integrity sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz#3da733a900f515914e729fcebcd4c40dde71fc6f"
+  integrity sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==
   dependencies:
     acorn "^6.0.7"
     acorn-walk "^6.1.1"
@@ -10069,9 +10684,9 @@ webpack-bundle-analyzer@^3.1.0:
     ws "^6.0.0"
 
 webpack-cli@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.2.3.tgz#13653549adfd8ccd920ad7be1ef868bacc22e346"
-  integrity sha512-Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.0.tgz#55c8a74cae1e88117f9dda3a801c7272e93ca318"
+  integrity sha512-t1M7G4z5FhHKJ92WRKwZ1rtvi7rHc0NZoZRbSkol0YKl4HvcC8+DsmGDmK7MmZxHSAetHagiOsjOB6MmzC2TUw==
   dependencies:
     chalk "^2.4.1"
     cross-spawn "^6.0.5"
@@ -10083,7 +10698,7 @@ webpack-cli@^3.2.3:
     loader-utils "^1.1.0"
     supports-color "^5.5.0"
     v8-compile-cache "^2.0.2"
-    yargs "^12.0.4"
+    yargs "^12.0.5"
 
 webpack-core@^0.6.8:
   version "0.6.9"
@@ -10116,6 +10731,7 @@ webpack-dev-middleware@3.5.1:
 webpack-dev-middleware@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz#a51692801e8310844ef3e3790e1eacfe52326fd4"
+  integrity sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==
   dependencies:
     loud-rejection "^1.6.0"
     memory-fs "~0.4.1"
@@ -10125,10 +10741,10 @@ webpack-dev-middleware@^2.0.6:
     url-join "^2.0.2"
     webpack-log "^1.0.1"
 
-webpack-dev-middleware@^3.5.1, webpack-dev-middleware@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz#71f1b04e52ff8d442757af2be3a658237d53a3e5"
-  integrity sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==
+webpack-dev-middleware@^3.6.0, webpack-dev-middleware@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
+  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
   dependencies:
     memory-fs "^0.4.1"
     mime "^2.3.1"
@@ -10172,50 +10788,52 @@ webpack-dev-server@3.1.14:
     yargs "12.0.2"
 
 webpack-dev-server@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
-  integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
+  integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
+    chokidar "^2.1.5"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
     debug "^4.1.1"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
+    del "^4.1.0"
+    express "^4.16.4"
+    html-entities "^1.2.1"
     http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
     internal-ip "^4.2.0"
     ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
+    killable "^1.0.1"
+    loglevel "^1.6.1"
+    opn "^5.5.0"
+    portfinder "^1.0.20"
     schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
+    selfsigned "^1.10.4"
+    semver "^6.0.0"
+    serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
     spdy "^4.0.0"
-    strip-ansi "^3.0.0"
+    strip-ansi "^3.0.1"
     supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "^3.5.1"
+    webpack-dev-middleware "^3.6.2"
     webpack-log "^2.0.0"
-    yargs "12.0.2"
+    yargs "12.0.5"
 
 webpack-inline-manifest-plugin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/webpack-inline-manifest-plugin/-/webpack-inline-manifest-plugin-4.0.1.tgz#4fc843fcf076e8512f167dc705108b3eacafc098"
+  integrity sha512-A6VRqhSDEUsqf6bJmrfNDmlVr+nkI2gfPsRC2/VorUeRMqyrSVvT7ltOjUcIG0VIigTNAcN2LbE83YwFH8VTHg==
   dependencies:
     source-map-url "0.4.0"
 
 webpack-log@^1.0.1, webpack-log@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d"
+  integrity sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==
   dependencies:
     chalk "^2.1.0"
     log-symbols "^2.1.0"
@@ -10225,6 +10843,7 @@ webpack-log@^1.0.1, webpack-log@^1.2.0:
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
   dependencies:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
@@ -10236,7 +10855,7 @@ webpack-merge@4.2.1, webpack-merge@^4.2.1:
   dependencies:
     lodash "^4.17.5"
 
-webpack-sources@1.3.0, webpack-sources@^1.3.0:
+webpack-sources@1.3.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
   integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
@@ -10247,17 +10866,11 @@ webpack-sources@1.3.0, webpack-sources@^1.3.0:
 webpack-sources@^0.1.2:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
+  integrity sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=
   dependencies:
     source-list-map "~0.1.7"
     source-map "~0.5.3"
 
-webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
 webpack-subresource-integrity@1.1.0-rc.6:
   version "1.1.0-rc.6"
   resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
@@ -10328,6 +10941,7 @@ webpack@^4.29.6:
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
   dependencies:
     http-parser-js ">=0.4.0"
     websocket-extensions ">=0.1.1"
@@ -10335,6 +10949,7 @@ websocket-driver@>=0.5.1:
 websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
 when@~3.6.x:
   version "3.6.4"
@@ -10344,59 +10959,60 @@ when@~3.6.x:
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@1, which@^1.1.1, which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
 window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
+  integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=
 
 windows-release@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e"
-  integrity sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
   dependencies:
-    execa "^0.10.0"
-
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+    execa "^1.0.0"
 
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 worker-farm@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
   dependencies:
     errno "~0.1.7"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -10404,36 +11020,40 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 ws@^6.0.0:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.3.tgz#d2d2e5f0e3c700ef2de89080ebc0ac6e1bf3a72d"
-  integrity sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
 ws@~6.1.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
-  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
+  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
   dependencies:
     async-limiter "~1.0.0"
 
 xhr2@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
+  integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8=
 
 xml2js@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
   dependencies:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
@@ -10441,38 +11061,47 @@ xml2js@^0.4.17:
 xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
 xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
 yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
   dependencies:
     camelcase "^4.1.0"
 
@@ -10495,6 +11124,7 @@ yargs-parser@^13.0.0:
 yargs-parser@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
+  integrity sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=
   dependencies:
     camelcase "^3.0.0"
     lodash.assign "^4.0.6"
@@ -10502,6 +11132,7 @@ yargs-parser@^2.4.1:
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
   dependencies:
     camelcase "^3.0.0"
 
@@ -10530,6 +11161,24 @@ yargs@12.0.2:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
+yargs@12.0.5, yargs@^12.0.2, yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
+
 yargs@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
@@ -10549,28 +11198,10 @@ yargs@9.0.1:
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
 
-yargs@^12.0.2, yargs@^12.0.4:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
-
 yargs@^13.2.1:
-  version "13.2.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.1.tgz#c8888bcf24424bd4e5a834348366f6fcc37bb8d9"
-  integrity sha512-HgY0xHGmPPakg6kEDufqxZuXVtvPZcipORC8O7S44iEnwsUmP+qnhReHc6d1dyeIZkrPmYFblh45Z2oeDn++fQ==
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
+  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
   dependencies:
     cliui "^4.0.0"
     find-up "^3.0.0"
@@ -10587,6 +11218,7 @@ yargs@^13.2.1:
 yargs@^4.8.1:
   version "4.8.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
+  integrity sha1-wMQpJMpKqmsObaFznfshZDn53cA=
   dependencies:
     cliui "^3.2.0"
     decamelize "^1.1.1"
@@ -10606,6 +11238,7 @@ yargs@^4.8.1:
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -10621,39 +11254,33 @@ yargs@^7.0.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"
-
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
+  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
 yn@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.0.0.tgz#0073c6b56e92aed652fbdfd62431f2d6b9a7a091"
-  integrity sha512-+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.0.tgz#fcbe2db63610361afcc5eb9e0ac91e976d046114"
+  integrity sha512-kKfnnYkbTfrAdd0xICNFw7Atm8nKpLcLv9AZGEt+kczL/WQVai4e2V6ZN8U/O+iI6WrNuJjNNOyu4zfhl9D3Hg==
 
-zen-observable-ts@^0.8.15:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz#6cf7df6aa619076e4af2f707ccf8a6290d26699b"
-  integrity sha512-sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w==
+zen-observable-ts@^0.8.18:
+  version "0.8.18"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz#ade44b1060cc4a800627856ec10b9c67f5f639c8"
+  integrity sha512-q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A==
   dependencies:
+    tslib "^1.9.3"
     zen-observable "^0.8.0"
 
 zen-observable@^0.8.0:
-  version "0.8.13"
-  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.13.tgz#a9f1b9dbdfd2d60a08761ceac6a861427d44ae2e"
-  integrity sha512-fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g==
+  version "0.8.14"
+  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
+  integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
 zone.js@^0.8.29:
   version "0.8.29"

From d52fad8c916d3d68413527e79c8774b340d8311d Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 12 Apr 2019 20:24:00 +0300
Subject: [PATCH 188/382] docs: tiny fixes in README

---
 README.md | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index f807a68f9..6e3d65442 100644
--- a/README.md
+++ b/README.md
@@ -13,16 +13,16 @@
 -   Modern & Open Platform for **On-Demand Economy**
 -   Supports Single-Store and Multi-Store / Multi-Vendor / Peer-to-Peer Marketplaces
 -   Everything Reactive, Real-Time and Blazing Fast!
--   Headless Commerce framework, which allows different implementations of store-fronts, Admin UIs and client apps. Exposes rich GraphQL, REST and WS APIs.
+-   Headless Commerce framework, which allows different implementations of store-fronts, Admin UIs and client apps. It exposes rich GraphQL, REST and WS APIs.
 -   Mobile ordering App for customers to make On-Demand orders (Hybrid / PWA, iOS and Android using Ionic / Ionic Native)
 -   Carrier (Driver) Mobile App for deliveries by carriers, drivers or service providers (iOS and Android using Ionic / Ionic Native)
 -   Customizing Shopping e-commerce Website for customers to make in-browser On-Demand purchases of food, goods or services
 -   Merchant Tablet App for Stores/Merchants/Warehouses to manage & track orders, organize deliveries, etc.
 -   Admin Website used to manage all platform features and settings in the single Web-based interface
--   Multi-language and culture settings accross Platform (i18N)
+-   Multi-language and culture settings across Platform (i18N)
 -   Products Catalogs (global and per Merchant) with Multiple Product Images
--   Inventory/Stock Management and Real-time Order Management/Processing accross the Platform
--   Deliveries/Shipping management and processing accross Platform (shipping with real-time location tracking for On-Demand orders)
+-   Inventory/Stock Management and Real-time Order Management/Processing across the Platform
+-   Deliveries/Shipping management and processing across Platform (shipping with real-time location tracking for On-Demand orders)
 -   Real-Time discounts, promotions and products/services availability updates
 -   Customers registration, Guest Checkouts, Invitations (optional)
 -   Gateway and Payment Processing (currently supported Payments Gateway - [Stripe](https://stripe.com))
@@ -32,7 +32,7 @@
 
 -   Tax Calculations
 -   Third-party Shipping providers integrations
--   Users Roles / Permissions accross Platform
+-   Users Roles / Permissions across Platform
 -   Large products catalogs with products variants, facets and full-text search
 
 You can also track feature requests from the community in the [separate repo](https://github.com/ever-co/feature-requests/issues).
@@ -62,11 +62,11 @@ Expect _lots_ of changes and some :bug: and please be nice! :stuck_out_tongue_wi
 
 Please refer to our official [Platform Documentation](https://docs.ever.co) and to our [Wiki](https://github.com/ever-co/ever/wiki) (WIP).
 
-For quick overview of each project in the Platform (Server, Admin, Shops, etc), you can search for README.md file in the root of the projects folders. For example, see [./backend/api/README.md](backend/api/README.md) for Server (Backend) related overview.
+For a quick overview of each project in the Platform (Server, Admin, Shops, etc.), you can search for README.md file in the root of the projects folders. For example, see [./backend/api/README.md](backend/api/README.md) for Server (Backend) related overview.
 
 ## Getting Started
 
-We follow [Gitflow Workflow](https://nvie.com/posts/a-successful-git-branching-model) so the [`develop` branch](https://github.com/ever-co/ever/tree/develop) may be in an unstable or even broken state during development. Please use [releases](https://github.com/ever-co/ever/releases) or [`master` branch](https://github.com/ever-co/ever/tree/master) instead of the `develop` branch in order to get more stable code.
+We follow [Gitflow Workflow](https://nvie.com/posts/a-successful-git-branching-model), so the [`develop` branch](https://github.com/ever-co/ever/tree/develop) may be in an unstable or even broken state during development. Please use [releases](https://github.com/ever-co/ever/releases) or [`master` branch](https://github.com/ever-co/ever/tree/master) instead of the `develop` branch in order to get more stable code.
 
 ### Clone Repo
 
@@ -76,12 +76,13 @@ Clone the Ever Platform Git repo:
 git clone -c core.symlinks=true --recursive https://github.com/ever-co/ever.git
 ```
 
-Notes: 
+Notes:
 
 -   if you want to use development branch (unstable, but latest development) clone using `--branch develop`
--   it's important to enable Git symlinks because they are used for shared modules (every project have symlinks to common shared modules in the /shared folder)
+-   it's necessary to enable Git symlinks because they used for shared modules (every project has symlinks to shared modules in the /shared folder)
+-   because of symlinks, you may need to clone from an elevated command prompt (on Windows)
 
-If you use Git >= v2.14, it probably make sense to setup following globally:
+If you use Git >= v2.14, it probably makes sense to setup following globally:
 
 ```
 git config --global core.symlinks true
@@ -96,7 +97,7 @@ Notes:
 
 ### Yarn
 
-Currently we are using `Yarn` (instead of `npm`), so make sure you have latest Yarn version installed before running Ever Platform:
+Currently, we are using `Yarn` (instead of `npm`), so make sure you have latest Yarn version installed before running Ever Platform:
 
 ```
 npm install -g yarn@latest
@@ -104,20 +105,20 @@ npm install -g yarn@latest
 
 ### Quick installation
 
-After git repo is cloned, just run following command to install/bootstrap all dependencies:
+After git repo cloned, just run following command to install/bootstrap all dependencies:
 
 ```
 yarn bootstrap
 ```
 
-This will install required packages in all Platform projects using Lerna
+Above command install required packages in all Platform projects using Lerna.
 
 Note: if above command fails for any reason, you can try to install required packages manually by running `yarn` inside every sub-folder with 'package.json' file
 
 ### Lerna (manual installation)
 
 We are using [Lerna](https://github.com/lerna/lerna) for mono-repo management.
-You need to run the following command from working folder where you cloned Ever git repo, which will install Lerna together with other packages:
+You need to run the following command from the working folder where you cloned Ever git repo, which install Lerna together with other packages:
 
 ```
 yarn
@@ -135,11 +136,11 @@ Now, after Lerna installed (locally or globally), you need to Bootstrap all depe
 yarn lerna bootstrap
 ```
 
-The command above will install all required packages for every sub-project of the Ever Platform.
+The command above install all required packages for every sub-project of the Ever Platform.
 
 ### MongoDB
 
-Ever platform configured to use MongoDB by default and assume you have MongoDB service running and accepting connections on default `localhost:27017`. Please see relevant section in our [documentation](https://github.com/ever-co/ever/wiki/MongoDB).
+Ever platform configured to use MongoDB by default and assume you have MongoDB service running and accepting connections on the default `localhost:27017`. Please see relevant section in our [documentation](https://github.com/ever-co/ever/wiki/MongoDB).
 
 ### Platform Configuration
 
@@ -147,7 +148,7 @@ See relevant section in our [documentation](https://github.com/ever-co/ever/wiki
 
 ### Run Platform Projects
 
-Finally, each project from Ever Platform can be started by single command from this list:
+Finally, each project from Ever Platform could start by single command from this list:
 
 ```
  yarn run:server # Run API server
@@ -158,7 +159,7 @@ Finally, each project from Ever Platform can be started by single command from t
  yarn run:carrier # Run Carrier Mobile app
 ```
 
-Note: on the first run, API Server (Backend) will create MongoDB local database `ever_development` with the following (default) Admin user
+Note: on the first run, API Server (Backend) creates MongoDB local database `ever_development` with the following (default) Admin user
 
 -   email: `admin@ever.co`
 -   password: `admin`
@@ -167,11 +168,11 @@ You can use credentials above to login into Platform Admin App, which available
 
 ## Metrics
 
-According to [cloc](https://github.com/AlDanial/cloc) project, Ever Platform today has more than 120K lines of TypeScript, GraphQL, HTML / CSS and other code files. You can get more details at the relevant section of our [documentation](https://github.com/ever-co/ever/wiki/Metrics).
+According to [cloc](https://github.com/AlDanial/cloc) project, Ever Platform today has more than 120K lines of TypeScript, GraphQL, HTML / CSS and other code files. You can get more details in the relevant section of our [documentation](https://github.com/ever-co/ever/wiki/Metrics).
 
 ## Contribute
 
--   Please give us :star: on Github, it **really** helps!
+-   Please give us :star: on Github, it **helps**!
 -   You are more than welcome to submit feature requests in the [separate repo](https://github.com/ever-co/feature-requests/issues)
 -   Pull requests are always welcome! Please base pull requests against the _develop_ branch and follow the [contributing guide](.github/CONTRIBUTING.md).
 
@@ -218,11 +219,11 @@ Ever Platform follows good security practices, but 100% security cannot be guara
 Ever Platform is provided AS IS without any warranty. Use at your own risk!  
 See more details in the [LICENSE.md](LICENSE.md).
 
-In production setup, all client-side to server-side (backend, APIs) communications should be encrypted using HTTPS/WSS/SSL (REST APIs, GraphQL endpoint, Socket.io WebSockets, etc).
+In a production setup, all client-side to server-side (backend, APIs) communications should be encrypted using HTTPS/WSS/SSL (REST APIs, GraphQL endpoint, Socket.io WebSockets, etc.).
 
 ## License
 
-This software is available under different licenses
+This software is available under different licenses.
 
 ### _Ever Platform Community Edition_ License
 
@@ -243,9 +244,9 @@ You should have received a copy of the relevant GNU Licenses along with this pro
 
 ### _Ever Platform Enterprise_ License
 
-Alternatively, commercial versions of the software must be used in accordance with the terms and conditions of separate written agreement between you and Ever Co. LTD.
+Alternatively, commercial versions of the software must be used in accordance with the terms and conditions of a separate written agreement between you and Ever Co. LTD.
 
-For more information about Ever® Platform Enterprise™ License please contact <mailto:ever@ever.co>.
+For more information about Ever® Platform Enterprise™ License, please contact <mailto:ever@ever.co>.
 
 #### The default Ever® Platform™ license, without a valid Ever® Platform Enterprise™ License agreement, is the Ever® Platform Community™ Edition License.
 

From cf57a2fee513132ee372243558a7695e62c3f740 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 12 Apr 2019 21:05:51 +0300
Subject: [PATCH 189/382] fix(ever-shop-web): switch to TS lib to es7

---
 shop/website-angular/tsconfig.json         | 2 +-
 shop/website-angular/tsconfig.webpack.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shop/website-angular/tsconfig.json b/shop/website-angular/tsconfig.json
index a3af7478b..24e427e70 100644
--- a/shop/website-angular/tsconfig.json
+++ b/shop/website-angular/tsconfig.json
@@ -13,7 +13,7 @@
 		"importHelpers": true,
 		"strictNullChecks": false,
 		"noStrictGenericChecks": true,
-		"lib": ["dom", "es6"],
+		"lib": ["dom", "es7"],
 		"baseUrl": "./src",
 		"paths": {
 			"@angular/*": ["node_modules/@angular/*"],
diff --git a/shop/website-angular/tsconfig.webpack.json b/shop/website-angular/tsconfig.webpack.json
index 6d52b112b..441919505 100644
--- a/shop/website-angular/tsconfig.webpack.json
+++ b/shop/website-angular/tsconfig.webpack.json
@@ -12,7 +12,7 @@
 		"importHelpers": true,
 		"strictNullChecks": false,
 		"noStrictGenericChecks": true,
-		"lib": ["es2015", "dom"],
+		"lib": ["es7", "dom"],
 		"baseUrl": "./src",
 		"paths": {
 			"@angular/*": ["../node_modules/@angular/*"],

From 0aeae725c7e9a80d29cd9dc5fd7f81e01c83b3ec Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Thu, 18 Apr 2019 13:15:35 +0300
Subject: [PATCH 190/382] feat(ever-admin): log out redirects to '/server-down'
 page EV-1217

---
 .../src/app/@core/auth/admin-auth-strategy.service.ts           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts
index 4d5a142c0..94ca7e493 100644
--- a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts
+++ b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts
@@ -289,6 +289,8 @@ export class AdminAuthStrategy extends NbAuthStrategy {
 	private async _logout(): Promise<NbAuthResult> {
 		this.store.clear();
 
+		localStorage.setItem('serverConnection', '200');
+
 		await this.apollo.getClient().resetStore();
 
 		return new NbAuthResult(

From 7c9b395e36b1470e303b83cf005f6059e780afdb Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Thu, 18 Apr 2019 13:36:04 +0300
Subject: [PATCH 191/382] feat(ever-admin): using store service EV-1217

---
 .../src/app/@core/auth/admin-auth-strategy.service.ts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts
index 94ca7e493..8847ebd73 100644
--- a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts
+++ b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts
@@ -289,7 +289,7 @@ export class AdminAuthStrategy extends NbAuthStrategy {
 	private async _logout(): Promise<NbAuthResult> {
 		this.store.clear();
 
-		localStorage.setItem('serverConnection', '200');
+		this.store.serverConnection = '200';
 
 		await this.apollo.getClient().resetStore();
 

From 9c5c15f4881fd2abcf43800bc3cd628dd380ea61 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 18 Apr 2019 18:13:40 +0300
Subject: [PATCH 192/382] fix(ever-api): fixed bug with start on SocketIO
 server

---
 backend/api/src/services/services.app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/api/src/services/services.app.ts b/backend/api/src/services/services.app.ts
index 81dc6fafd..1d6a76c26 100644
--- a/backend/api/src/services/services.app.ts
+++ b/backend/api/src/services/services.app.ts
@@ -203,7 +203,7 @@ export class ServicesApp {
 		await this._registerModels();
 		await this._registerEntityAdministrator();
 		this._passportSetup();
-		this._startExpress();
+		await this._startExpress();
 		this._startSocketIO();
 	}
 

From f875deb83ab1b36b862c404a733d7d941091c059 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Thu, 18 Apr 2019 21:24:07 +0300
Subject: [PATCH 193/382] Update README.md

---
 README.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6e3d65442..b71f8648b 100644
--- a/README.md
+++ b/README.md
@@ -150,21 +150,19 @@ See relevant section in our [documentation](https://github.com/ever-co/ever/wiki
 
 Finally, each project from Ever Platform could start by single command from this list:
 
-```
- yarn run:server # Run API server
- yarn run:admin # Run Admin Website
- yarn run:merchant # Run Merchant Ionic Tablet App
- yarn run:shopmobile # Run Shopping Mobile App
- yarn run:shopweb # Run Shopping Website
- yarn run:carrier # Run Carrier Mobile app
-```
+* Run API server `yarn run:server`
+* Run Admin Website `yarn run:admin` and open http://localhost:4200
+* Run Shopping Mobile App `yarn run:shopmobile` and open http://localhost:4201
+* Run Merchant Ionic Tablet App `yarn run:merchant` and open http://localhost:4202
+* Run Carrier Mobile app `yarn run:carrier` and open http://localhost:4203
+* Run Shopping Website `yarn run:shopweb` and open http://localhost:3000
 
 Note: on the first run, API Server (Backend) creates MongoDB local database `ever_development` with the following (default) Admin user
 
 -   email: `admin@ever.co`
 -   password: `admin`
 
-You can use credentials above to login into Platform Admin App, which available locally at http://localhost:4200 (by default)
+You can use credentials above to login into Platform Admin App.
 
 ## Metrics
 

From 7db43002c9c3c7db5b684d6a60e007b3b8baa393 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Thu, 18 Apr 2019 21:30:01 +0300
Subject: [PATCH 194/382] fix: switch carrier default port to 4203

---
 carrier/mobile-ionic/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 7ac9ba73c..e418f1787 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -35,8 +35,8 @@
 		"config": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn ts-node ./scripts/configure.ts",
 		"config:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=dev",
 		"config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=prod",
-		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn run build && yarn ng serve --port 4201",
-		"start:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn run build:prod && yarn ng serve --port 4201 --prod",
+		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn run build && yarn ng serve --port 4203",
+		"start:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn run build:prod && yarn ng serve --port 4203 --prod",
 		"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn ng build",
 		"build:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ng build --prod --stats-json",
 		"test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn ng test",

From 926046552a7207367fa28e0a39ed1256a947ce3e Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Fri, 19 Apr 2019 17:06:53 +0300
Subject: [PATCH 195/382] feat(ever-admin): added new page and track button

---
 .../warehouse-track.component.html            |  1 +
 .../warehouse-track.component.scss            |  0
 .../warehouse-track.component.ts              |  9 +++++++
 .../warehouse-track.module.ts                 | 27 +++++++++++++++++++
 .../+warehouses/warehouses-routing.module.ts  |  5 ++++
 .../+warehouses/warehouses.component.html     |  7 +++++
 .../pages/+warehouses/warehouses.module.ts    |  2 ++
 7 files changed, 51 insertions(+)
 create mode 100644 admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
 create mode 100644 admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.scss
 create mode 100644 admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
 create mode 100644 admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.module.ts

diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
new file mode 100644
index 000000000..94e71347b
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
@@ -0,0 +1 @@
+Hello I'm a tracker
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
new file mode 100644
index 000000000..aa490e8ea
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+	templateUrl: './warehouse-track.component.html',
+	styleUrls: ['./warehouse-track.component.scss']
+})
+export class WarehouseTrackComponent {
+	constructor() {}
+}
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.module.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.module.ts
new file mode 100644
index 000000000..5de4f540f
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { FormWizardModule } from 'angular2-wizard';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { FileUploadModule } from 'ng2-file-upload';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+import { ThemeModule } from 'app/@theme';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { WarehouseTrackComponent } from './warehouse-track.component';
+
+@NgModule({
+	imports: [
+		FormWizardModule,
+		Ng2SmartTableModule,
+		FileUploadModule,
+		FormsModule,
+		ReactiveFormsModule,
+		TranslateModule.forChild(),
+		ThemeModule,
+		NgSelectModule
+	],
+	entryComponents: [WarehouseTrackComponent],
+	declarations: [WarehouseTrackComponent],
+	providers: [NgbActiveModal]
+})
+export class WarehouseTrackModule {}
diff --git a/admin/website-angular/src/app/pages/+warehouses/warehouses-routing.module.ts b/admin/website-angular/src/app/pages/+warehouses/warehouses-routing.module.ts
index 10384602b..04990a5f5 100644
--- a/admin/website-angular/src/app/pages/+warehouses/warehouses-routing.module.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/warehouses-routing.module.ts
@@ -1,12 +1,17 @@
 import { RouterModule, Routes } from '@angular/router';
 import { WarehousesComponent } from './warehouses.component';
 import { NgModule } from '@angular/core';
+import { WarehouseTrackComponent } from './+warehouse-track/warehouse-track.component';
 
 const routes: Routes = [
 	{
 		path: '',
 		component: WarehousesComponent
 	},
+	{
+		path: 'track',
+		component: WarehouseTrackComponent
+	},
 	{
 		path: ':id',
 		loadChildren: './+warehouse/warehouse.module#WarehouseModule'
diff --git a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
index dcb068e58..03a562748 100644
--- a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
@@ -21,6 +21,13 @@
 				'WAREHOUSES_VIEW.DELETE' | translate
 			}}</small>
 		</button>
+		<button
+			class="btn btn-warning btn-sm mr-2 d-inline-block"
+			routerLink="track"
+		>
+			<i class="ion-md-trash button-icon"></i>
+			<small _ngcontent-c55="">Show on Map</small>
+		</button>
 	</nb-card-header>
 
 	<nb-card-body>
diff --git a/admin/website-angular/src/app/pages/+warehouses/warehouses.module.ts b/admin/website-angular/src/app/pages/+warehouses/warehouses.module.ts
index 13ef6a23b..b51efd133 100644
--- a/admin/website-angular/src/app/pages/+warehouses/warehouses.module.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/warehouses.module.ts
@@ -15,6 +15,7 @@ import { RenderComponentsModule } from '../../@shared/render-component/render-co
 import { WarehouseTableModule } from '../../@shared/render-component/warehouse-table/warehouse-table.module';
 import { NbSpinnerModule } from '@nebular/theme';
 import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
+import { WarehouseTrackModule } from './+warehouse-track/warehouse-track.module';
 
 @NgModule({
 	imports: [
@@ -25,6 +26,7 @@ import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirma
 		Ng2SmartTableModule,
 		FormWizardModule,
 		ConfirmationModalModule,
+		WarehouseTrackModule,
 		ToasterModule.forRoot(),
 		TranslateModule.forChild({
 			loader: {

From 378466ef1ddf67dbf20d52fea16693e5fc52f96e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 20 Apr 2019 23:52:25 +0000
Subject: [PATCH 196/382] fix(package): update @ionic-native/google-maps to
 version 5.5.0

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 7ac9ba73c..fdf663c2d 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -71,7 +71,7 @@
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
-		"@ionic-native/google-maps": "~5.0.0-beta.26",
+		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",

From 687b94bc36d2ef4188530ebdf355353bc6357e81 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 20 Apr 2019 23:52:28 +0000
Subject: [PATCH 197/382] fix(package): update @ionic-native/google-maps to
 version 5.5.0

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 8edeeb93d..6217ef2fe 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -76,7 +76,7 @@
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
-		"@ionic-native/google-maps": "~5.0.0-beta.26",
+		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",

From e460e6990c9b17f2195c057630ac505fe0e7c6ed Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 20 Apr 2019 23:52:32 +0000
Subject: [PATCH 198/382] fix(package): update @ionic-native/google-maps to
 version 5.5.0

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 2bbfd8b21..3913c6725 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -71,7 +71,7 @@
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
-		"@ionic-native/google-maps": "~5.0.0-beta.26",
+		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",

From 5433731471ebb10e2daf2836c310088ab2f6e4fb Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 20 Apr 2019 23:52:36 +0000
Subject: [PATCH 199/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 685 ++++++----------------------
 1 file changed, 133 insertions(+), 552 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 21d28cb18..606848824 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -20,12 +20,12 @@
 			"dev": true
 		},
 		"@angular-devkit/architect": {
-			"version": "0.13.7",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.7.tgz",
-			"integrity": "sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==",
+			"version": "0.13.8",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.8.tgz",
+			"integrity": "sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/core": "7.3.8",
 				"rxjs": "6.3.3"
 			},
 			"dependencies": {
@@ -41,16 +41,16 @@
 			}
 		},
 		"@angular-devkit/build-angular": {
-			"version": "0.13.7",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.7.tgz",
-			"integrity": "sha512-GVYZyLvFXH87loz7GaSt2/JMXeAQrnOFxrx0e82eLtjMjj2ncrTj8FkbCp3WVhUivID1GoDhbgXwcBOHYlzHRg==",
+			"version": "0.13.8",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz",
+			"integrity": "sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/architect": "0.13.7",
-				"@angular-devkit/build-optimizer": "0.13.7",
-				"@angular-devkit/build-webpack": "0.13.7",
-				"@angular-devkit/core": "7.3.7",
-				"@ngtools/webpack": "7.3.7",
+				"@angular-devkit/architect": "0.13.8",
+				"@angular-devkit/build-optimizer": "0.13.8",
+				"@angular-devkit/build-webpack": "0.13.8",
+				"@angular-devkit/core": "7.3.8",
+				"@ngtools/webpack": "7.3.8",
 				"ajv": "6.9.1",
 				"autoprefixer": "9.4.6",
 				"circular-dependency-plugin": "5.0.2",
@@ -67,7 +67,7 @@
 				"mini-css-extract-plugin": "0.5.0",
 				"minimatch": "3.0.4",
 				"node-sass": "4.11.0",
-				"opn": "5.4.0",
+				"open": "6.0.0",
 				"parse5": "4.0.0",
 				"postcss": "7.0.14",
 				"postcss-import": "12.0.1",
@@ -245,9 +245,9 @@
 			}
 		},
 		"@angular-devkit/build-optimizer": {
-			"version": "0.13.7",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.7.tgz",
-			"integrity": "sha512-NXW75v0lS0cGI1ri058vlaLA4D4Z+CsGYbuHYfmZeoyY0Ub9K4PPI+MZnAUT3D3dCes/dcZTmCNru4prOXR43w==",
+			"version": "0.13.8",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz",
+			"integrity": "sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==",
 			"dev": true,
 			"requires": {
 				"loader-utils": "1.2.3",
@@ -257,13 +257,13 @@
 			}
 		},
 		"@angular-devkit/build-webpack": {
-			"version": "0.13.7",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.7.tgz",
-			"integrity": "sha512-JXlgO0EzlSY90gbw3Cofr02HrZ24Wxgl6ysd6rFuTlXLqlTkjrUn0VdMeoQE33IvfXoaRzXqIH+EQtJvThjUFw==",
+			"version": "0.13.8",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz",
+			"integrity": "sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/architect": "0.13.7",
-				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/architect": "0.13.8",
+				"@angular-devkit/core": "7.3.8",
 				"rxjs": "6.3.3"
 			},
 			"dependencies": {
@@ -279,9 +279,9 @@
 			}
 		},
 		"@angular-devkit/core": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
-			"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.8.tgz",
+			"integrity": "sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==",
 			"dev": true,
 			"requires": {
 				"ajv": "6.9.1",
@@ -321,12 +321,12 @@
 			}
 		},
 		"@angular-devkit/schematics": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
-			"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.8.tgz",
+			"integrity": "sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/core": "7.3.8",
 				"rxjs": "6.3.3"
 			},
 			"dependencies": {
@@ -350,21 +350,21 @@
 			}
 		},
 		"@angular/cli": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.7.tgz",
-			"integrity": "sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==",
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.8.tgz",
+			"integrity": "sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/architect": "0.13.7",
-				"@angular-devkit/core": "7.3.7",
-				"@angular-devkit/schematics": "7.3.7",
-				"@schematics/angular": "7.3.7",
-				"@schematics/update": "0.13.7",
+				"@angular-devkit/architect": "0.13.8",
+				"@angular-devkit/core": "7.3.8",
+				"@angular-devkit/schematics": "7.3.8",
+				"@schematics/angular": "7.3.8",
+				"@schematics/update": "0.13.8",
 				"@yarnpkg/lockfile": "1.1.0",
 				"ini": "1.3.5",
 				"inquirer": "6.2.1",
 				"npm-package-arg": "6.1.0",
-				"opn": "5.4.0",
+				"open": "6.0.0",
 				"pacote": "9.4.0",
 				"semver": "5.6.0",
 				"symbol-observable": "1.2.0"
@@ -379,18 +379,18 @@
 			}
 		},
 		"@angular/compiler": {
-			"version": "7.2.11",
-			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.11.tgz",
-			"integrity": "sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==",
+			"version": "7.2.13",
+			"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.13.tgz",
+			"integrity": "sha512-k0IvaozNIlrPKUNF3M/NXMb/jfHBCDO9uRYA6h+84FFY4Y9po40c7YXfsfUxGKwouTWyemaxy9iXlLEnd3ELSQ==",
 			"dev": true,
 			"requires": {
 				"tslib": "^1.9.0"
 			}
 		},
 		"@angular/compiler-cli": {
-			"version": "7.2.11",
-			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz",
-			"integrity": "sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==",
+			"version": "7.2.13",
+			"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.13.tgz",
+			"integrity": "sha512-UpA6V+GCY9qKj5j6tvzun2DJNjqRKjCrQgJqD5BIf4FTAKjVgqOvh++d23tbdltdjXlbHqUVRgfeXltbO91fWg==",
 			"dev": true,
 			"requires": {
 				"canonical-path": "1.0.0",
@@ -595,9 +595,9 @@
 			}
 		},
 		"@angular/language-service": {
-			"version": "7.2.11",
-			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.11.tgz",
-			"integrity": "sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==",
+			"version": "7.2.13",
+			"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.13.tgz",
+			"integrity": "sha512-1bNWJpwH9wB0JybkbjdQp9J4bGmGxJX6BG7Mz3188Wc4J+aNy696Gc6IaJs7tFK8VXAdJrTJ5jGr9Oiu+ATe8w==",
 			"dev": true
 		},
 		"@angular/platform-browser": {
@@ -617,21 +617,21 @@
 			}
 		},
 		"@angular/pwa": {
-			"version": "0.13.7",
-			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.7.tgz",
-			"integrity": "sha512-Rr+/YksuPM7ykdA9n7AON1ENEUrNeyrHZohZzNkiBWHLx9lWrKeQdZ48+oVCyb8whgTkf95hu0BZXUDi0GpofQ==",
+			"version": "0.13.8",
+			"resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-0.13.8.tgz",
+			"integrity": "sha512-Yu9bFh/9Vq2Wi3X4foki2qM3kLRs/GTROaI2Na+OfCpACMn6vNTHgJdqyjzSW9DpFTbW/4Fsb2NMmPf8CgAScw==",
 			"requires": {
-				"@angular-devkit/core": "7.3.7",
-				"@angular-devkit/schematics": "7.3.7",
-				"@schematics/angular": "7.3.7",
+				"@angular-devkit/core": "7.3.8",
+				"@angular-devkit/schematics": "7.3.8",
+				"@schematics/angular": "7.3.8",
 				"parse5-html-rewriting-stream": "5.1.0",
 				"rxjs": "6.3.3"
 			},
 			"dependencies": {
 				"@angular-devkit/core": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
-					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.8.tgz",
+					"integrity": "sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==",
 					"requires": {
 						"ajv": "6.9.1",
 						"chokidar": "2.0.4",
@@ -641,11 +641,11 @@
 					}
 				},
 				"@angular-devkit/schematics": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
-					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.8.tgz",
+					"integrity": "sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==",
 					"requires": {
-						"@angular-devkit/core": "7.3.7",
+						"@angular-devkit/core": "7.3.8",
 						"rxjs": "6.3.3"
 					}
 				},
@@ -1153,12 +1153,9 @@
 			}
 		},
 		"@ionic-native/google-maps": {
-			"version": "5.0.0-beta.26",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.0.0-beta.26.tgz",
-			"integrity": "sha512-NU/XlqUC2Ks4WG+5khlcEvwBQXnAh0LfePRoy59i54IEinRtt4tT1YKC9uD7k7nNIKgAirxvHVcaWvgpBRwZqw==",
-			"requires": {
-				"@types/cordova": "^0.0.34"
-			}
+			"version": "5.5.0",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-maps/-/google-maps-5.5.0.tgz",
+			"integrity": "sha512-+sCaB7cLR35ApsOyYSfwDX2ZTO2ItOI6FHkgTQ2rzOA1DVJ9rlU8HDL6jYBUhq+aDe3lhCPexSOryeBynaSvpQ=="
 		},
 		"@ionic-native/in-app-browser": {
 			"version": "5.3.0",
@@ -1305,9 +1302,9 @@
 			}
 		},
 		"@ionic/angular-toolkit": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.5.0.tgz",
-			"integrity": "sha512-KHUu7MHi+s1LKox+EBOSN6HO6Sk79qOmBIMGHQMboPbqHGzb5aqCbTmtwa/BJZ1kytZ+yQ8kEejv8YwvrJIZEQ==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.5.1.tgz",
+			"integrity": "sha512-B5LHuzEv/lgFP7yxfOA3/wggDM/X1mDkWFX8rZtaBRZBbC0vtZwdwDu73RnkfFZ0jTFyIgtoBW8qTrrCyd5MLA==",
 			"dev": true,
 			"requires": {
 				"@schematics/angular": "^7.0.3",
@@ -1884,439 +1881,11 @@
 				"tslib": "^1.9.0"
 			}
 		},
-		"@ionic/ng-toolkit": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@ionic/ng-toolkit/-/ng-toolkit-1.1.0.tgz",
-			"integrity": "sha512-0G6p4NreQcd70xIqZzYxLYUAcPwVaorXk0egDisBf9SP50E8XVGhopxB9tjmKZyylbfz5579KumtDhvUij+RRw==",
-			"dev": true,
-			"requires": {
-				"@ionic/cli-framework": "1.1.0",
-				"chalk": "^2.3.0",
-				"debug": "^4.0.0",
-				"rxjs": "~6.2.0",
-				"tslib": "^1.9.0"
-			},
-			"dependencies": {
-				"@ionic/cli-framework": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.0.tgz",
-					"integrity": "sha512-OFCUzCWfQn1jmIx4kE3UPiUySQO5Q3PX9qiX6m5Im+MPCTmY8j1WiF8OkmuuWO7oa6YBn0G83flEInkhKTsBig==",
-					"dev": true,
-					"requires": {
-						"@ionic/utils-fs": "0.0.2",
-						"chalk": "^2.3.0",
-						"debug": "^4.0.0",
-						"inquirer": "^6.0.0",
-						"lodash": "^4.17.5",
-						"minimist": "^1.2.0",
-						"rimraf": "^2.6.2",
-						"slice-ansi": "^1.0.0",
-						"stream-combiner2": "^1.1.1",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^5.0.0",
-						"tree-kill": "1.2.0",
-						"tslib": "^1.9.0",
-						"untildify": "^3.0.2",
-						"wrap-ansi": "^4.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"@ionic/utils-fs": {
-					"version": "0.0.2",
-					"resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.2.tgz",
-					"integrity": "sha512-iNHjnbOG+4g6jx1z7PmjTxkef5kueH3bva2lr9cy3i/GRBSk7WDjT1syXIvjRIKDL/py4ETQwapXztZJ5Fx8WA==",
-					"dev": true,
-					"requires": {
-						"debug": "^4.0.0",
-						"ncp": "^2.0.0",
-						"through2": "^2.0.3",
-						"tslib": "^1.9.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-					"integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-					"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"slice-ansi": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-					"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-					"integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.0.0"
-					}
-				},
-				"tree-kill": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
-					"integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
-					"dev": true
-				},
-				"wrap-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz",
-					"integrity": "sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-							"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-							"dev": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				}
-			}
-		},
 		"@ionic/pro": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/@ionic/pro/-/pro-2.0.4.tgz",
 			"integrity": "sha512-8/tLniY1A2VUgphWvNzebm5hqZoaJTdQlPIReQHxFAAuwGyY+8aakLM1EhvXTC8a68J0mWSs2/wgepSWq1wNlw=="
 		},
-		"@ionic/schematics-angular": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/@ionic/schematics-angular/-/schematics-angular-1.0.7.tgz",
-			"integrity": "sha512-fWHTZ1uByPYXmKbiabnCe+c2bWYKFFKCW7xDcP8EZVC+lcy9tSJhsS8HOPBB3EvUcUO5LPmxoWFDoCs/1utBhQ==",
-			"dev": true,
-			"requires": {
-				"@schematics/angular": "0.9.0-beta.3",
-				"lodash": "^4.17.5",
-				"tslib": "^1.9.0",
-				"typescript": "3.0.1"
-			},
-			"dependencies": {
-				"@angular-devkit/core": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.9.0-beta.3.tgz",
-					"integrity": "sha512-DKd4u3zzLxacgM/hrPB0dCk9aFL8UriH9u6suNHaLQnAft8hrLCZIvzetgTbufMKvU4jClgOtdeHTpt/0+fgaw==",
-					"dev": true,
-					"requires": {
-						"ajv": "6.5.3",
-						"chokidar": "2.0.4",
-						"fast-json-stable-stringify": "2.0.0",
-						"rxjs": "6.2.2",
-						"source-map": "0.7.3"
-					}
-				},
-				"@angular-devkit/schematics": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.9.0-beta.3.tgz",
-					"integrity": "sha512-TC3OP/u1LQpngAU/g6DHmA8yoLbV6ml19x4cNjFeOhmADOvGV/e6fKni+rePORw+iIlOLvgmp0FhJd17uxT1Bw==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"rxjs": "6.2.2"
-					}
-				},
-				"@schematics/angular": {
-					"version": "0.9.0-beta.3",
-					"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.9.0-beta.3.tgz",
-					"integrity": "sha512-4IRfPJqElpx+0/K1S4dlP7x0dO0DgT2/jpgsstrq710k2B3mCqbPUYk2gjvLl9ByJAQ4+PED4xoUmlHXAMbdTg==",
-					"dev": true,
-					"requires": {
-						"@angular-devkit/core": "0.9.0-beta.3",
-						"@angular-devkit/schematics": "0.9.0-beta.3",
-						"typescript": "3.0.1"
-					}
-				},
-				"ajv": {
-					"version": "6.5.3",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
-					"integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^2.0.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"base": {
-					"version": "0.11.2",
-					"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-					"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-					"dev": true,
-					"requires": {
-						"cache-base": "^1.0.1",
-						"class-utils": "^0.3.5",
-						"component-emitter": "^1.2.1",
-						"define-property": "^1.0.0",
-						"isobject": "^3.0.1",
-						"mixin-deep": "^1.2.0",
-						"pascalcase": "^0.1.1"
-					},
-					"dependencies": {
-						"define-property": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-							"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-							"dev": true,
-							"requires": {
-								"is-descriptor": "^1.0.0"
-							}
-						}
-					}
-				},
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-					"integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-					"dev": true,
-					"requires": {
-						"anymatch": "^2.0.0",
-						"async-each": "^1.0.0",
-						"braces": "^2.3.0",
-						"fsevents": "^1.2.2",
-						"glob-parent": "^3.1.0",
-						"inherits": "^2.0.1",
-						"is-binary-path": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"lodash.debounce": "^4.0.8",
-						"normalize-path": "^2.1.1",
-						"path-is-absolute": "^1.0.0",
-						"readdirp": "^2.0.0",
-						"upath": "^1.0.5"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					},
-					"dependencies": {
-						"is-accessor-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-data-descriptor": {
-							"version": "0.1.4",
-							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-							"dev": true,
-							"requires": {
-								"kind-of": "^3.0.2"
-							},
-							"dependencies": {
-								"kind-of": {
-									"version": "3.2.2",
-									"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-									"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-									"dev": true,
-									"requires": {
-										"is-buffer": "^1.1.5"
-									}
-								}
-							}
-						},
-						"is-descriptor": {
-							"version": "0.1.6",
-							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-							"dev": true,
-							"requires": {
-								"is-accessor-descriptor": "^0.1.6",
-								"is-data-descriptor": "^0.1.4",
-								"kind-of": "^5.0.0"
-							}
-						},
-						"kind-of": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-							"dev": true
-						}
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-					"dev": true
-				},
-				"rxjs": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz",
-					"integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==",
-					"dev": true,
-					"requires": {
-						"tslib": "^1.9.0"
-					}
-				},
-				"snapdragon": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-					"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-					"dev": true,
-					"requires": {
-						"base": "^0.11.1",
-						"debug": "^2.2.0",
-						"define-property": "^0.2.5",
-						"extend-shallow": "^2.0.1",
-						"map-cache": "^0.2.2",
-						"source-map": "^0.5.6",
-						"source-map-resolve": "^0.5.0",
-						"use": "^3.1.0"
-					},
-					"dependencies": {
-						"source-map": {
-							"version": "0.5.7",
-							"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-							"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-							"dev": true
-						}
-					}
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				},
-				"source-map-resolve": {
-					"version": "0.5.2",
-					"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-					"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-					"dev": true,
-					"requires": {
-						"atob": "^2.1.1",
-						"decode-uri-component": "^0.2.0",
-						"resolve-url": "^0.2.1",
-						"source-map-url": "^0.4.0",
-						"urix": "^0.1.0"
-					}
-				},
-				"typescript": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
-					"integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
-					"dev": true
-				}
-			}
-		},
 		"@ionic/storage": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
@@ -2575,12 +2144,12 @@
 			}
 		},
 		"@ngtools/webpack": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.7.tgz",
-			"integrity": "sha512-u14/poGhv0aSQ3vwgX6DpIFN+TWviqOv4+uM4/AUnLGwvNS+p02BMIr3m+biX9dsLH+7EfATEuWOLkSkhaCjnA==",
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.8.tgz",
+			"integrity": "sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.7",
+				"@angular-devkit/core": "7.3.8",
 				"enhanced-resolve": "4.1.0",
 				"rxjs": "6.3.3",
 				"tree-kill": "1.2.1",
@@ -2629,19 +2198,19 @@
 			"dev": true
 		},
 		"@schematics/angular": {
-			"version": "7.3.7",
-			"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.7.tgz",
-			"integrity": "sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==",
+			"version": "7.3.8",
+			"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.8.tgz",
+			"integrity": "sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==",
 			"requires": {
-				"@angular-devkit/core": "7.3.7",
-				"@angular-devkit/schematics": "7.3.7",
+				"@angular-devkit/core": "7.3.8",
+				"@angular-devkit/schematics": "7.3.8",
 				"typescript": "3.2.4"
 			},
 			"dependencies": {
 				"@angular-devkit/core": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
-					"integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.8.tgz",
+					"integrity": "sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==",
 					"requires": {
 						"ajv": "6.9.1",
 						"chokidar": "2.0.4",
@@ -2651,11 +2220,11 @@
 					}
 				},
 				"@angular-devkit/schematics": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
-					"integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.8.tgz",
+					"integrity": "sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==",
 					"requires": {
-						"@angular-devkit/core": "7.3.7",
+						"@angular-devkit/core": "7.3.8",
 						"rxjs": "6.3.3"
 					}
 				},
@@ -2686,13 +2255,13 @@
 			}
 		},
 		"@schematics/update": {
-			"version": "0.13.7",
-			"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.7.tgz",
-			"integrity": "sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==",
+			"version": "0.13.8",
+			"resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.8.tgz",
+			"integrity": "sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==",
 			"dev": true,
 			"requires": {
-				"@angular-devkit/core": "7.3.7",
-				"@angular-devkit/schematics": "7.3.7",
+				"@angular-devkit/core": "7.3.8",
+				"@angular-devkit/schematics": "7.3.8",
 				"@yarnpkg/lockfile": "1.1.0",
 				"ini": "1.3.5",
 				"pacote": "9.4.0",
@@ -2721,11 +2290,6 @@
 				"@types/node": "*"
 			}
 		},
-		"@types/cordova": {
-			"version": "0.0.34",
-			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",
@@ -4683,14 +4247,28 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.5.3",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.3.tgz",
-			"integrity": "sha512-Tx/Jtrmh6vFg24AelzLwCaCq1IUJiMDM1x/LPzqbmbktF8Zo7F9ONUpOWsFK6TtdON95mSMaQUWqi0ilc8xM6g==",
+			"version": "4.5.5",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.5.tgz",
+			"integrity": "sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30000955",
-				"electron-to-chromium": "^1.3.122",
-				"node-releases": "^1.1.12"
+				"caniuse-lite": "^1.0.30000960",
+				"electron-to-chromium": "^1.3.124",
+				"node-releases": "^1.1.14"
+			},
+			"dependencies": {
+				"caniuse-lite": {
+					"version": "1.0.30000962",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000962.tgz",
+					"integrity": "sha512-WXYsW38HK+6eaj5IZR16Rn91TGhU3OhbwjKZvJ4HN/XBIABLKfbij9Mnd3pM0VEwZSlltWjoWg3I8FQ0DGgNOA==",
+					"dev": true
+				},
+				"electron-to-chromium": {
+					"version": "1.3.125",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.125.tgz",
+					"integrity": "sha512-XxowpqQxJ4nDwUXHtVtmEhRqBpm2OnjBomZmZtHD0d2Eo0244+Ojezhk3sD/MBSSe2nxCdGQFRXHIsf/LUTL9A==",
+					"dev": true
+				}
 			}
 		},
 		"browserstack": {
@@ -11286,12 +10864,6 @@
 				}
 			}
 		},
-		"ncp": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-			"integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
-			"dev": true
-		},
 		"negotiator": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -11378,9 +10950,9 @@
 			}
 		},
 		"node-releases": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.12.tgz",
-			"integrity": "sha512-Y+AQ1xdjcgaEzpL65PBEF3fnl1FNKnDh9Zm+AUQLIlyyqtSc4u93jyMN4zrjMzdwKQ10RTr3tgY1x7qpsfF/xg==",
+			"version": "1.1.15",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.15.tgz",
+			"integrity": "sha512-cKV097BQaZr8LTSRUa2+oc/aX5L8UkZtPQrMSTgiJEeaW7ymTDCoRaGCoaTqk0lqnalcoSHu4wjSl0Cmj2+bMw==",
 			"dev": true,
 			"requires": {
 				"semver": "^5.3.0"
@@ -11809,6 +11381,15 @@
 				"mimic-fn": "^1.0.0"
 			}
 		},
+		"open": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/open/-/open-6.0.0.tgz",
+			"integrity": "sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==",
+			"dev": true,
+			"requires": {
+				"is-wsl": "^1.1.0"
+			}
+		},
 		"opencollective": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz",
@@ -15027,9 +14608,9 @@
 					"dev": true
 				},
 				"readable-stream": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
-					"integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
+					"integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
 					"dev": true,
 					"requires": {
 						"inherits": "^2.0.3",
@@ -15644,9 +15225,9 @@
 			"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
 		},
 		"tapable": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
-			"integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+			"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
 			"dev": true
 		},
 		"tape": {
@@ -16603,9 +16184,9 @@
 			}
 		},
 		"url-parse": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-			"integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+			"version": "1.4.6",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.6.tgz",
+			"integrity": "sha512-/B8AD9iQ01seoXmXf9z/MjLZQIdOoYl/+gvsQF6+mpnxaTfG9P7srYaiqaDMyKkR36XMXfhqSHss5MyFAO8lew==",
 			"dev": true,
 			"requires": {
 				"querystringify": "^2.0.0",
@@ -16935,9 +16516,9 @@
 			},
 			"dependencies": {
 				"mime": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+					"integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
 					"dev": true
 				}
 			}
@@ -16999,9 +16580,9 @@
 					}
 				},
 				"mime": {
-					"version": "2.4.0",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-					"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+					"integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
 					"dev": true
 				},
 				"ms": {

From 6ae4e550e29a31e75b2f72bf92e0cb61c80eaf73 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Tue, 23 Apr 2019 22:44:55 +0300
Subject: [PATCH 200/382] chore: enable TS watch, updates lock files

---
 admin/website-angular/yarn.lock | 102 +-------------
 backend/api/nodemon-debug.json  |   6 +
 backend/api/nodemon.json        |   5 +
 backend/api/package.json        |  26 ++--
 backend/api/tsconfig.build.json |   4 +
 backend/api/tsconfig.json       |   6 +-
 backend/api/yarn.lock           | 234 +++++++++++++++++++-------------
 carrier/mobile-ionic/yarn.lock  |  40 +++---
 merchant/tablet-ionic/yarn.lock |  40 +++---
 shop/mobile-ionic/yarn.lock     |  40 +++---
 10 files changed, 232 insertions(+), 271 deletions(-)
 create mode 100644 backend/api/nodemon-debug.json
 create mode 100644 backend/api/nodemon.json
 create mode 100644 backend/api/tsconfig.build.json

diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index fc2b5167f..3adbadc9f 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -363,18 +363,6 @@
     "@babel/types" "^7.2.2"
     lodash "^4.17.11"
 
-"@babel/helper-module-transforms@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.3.tgz#b1e357a1c49e58a47211a6853abb8e2aaefeb064"
-  integrity sha512-H88T9IySZW25anu5uqyaC1DaQre7ofM+joZtAaO2F8NBdFfupH0SZ4gKjgSFVcvtx/aAirqA9L9Clio2heYbZA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/template" "^7.2.2"
-    "@babel/types" "^7.2.2"
-    lodash "^4.17.11"
-
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
@@ -394,13 +382,6 @@
   dependencies:
     lodash "^4.17.11"
 
-"@babel/helper-regex@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.3.tgz#9d6e5428bfd638ab53b37ae4ec8caf0477495147"
-  integrity sha512-hnoq5u96pLCfgjXuj8ZLX3QQ+6nAulS+zSgi6HulUwFbEruRAKwbGLU5OvXkE14L8XW6XsQEKsIDfgthKLRAyA==
-  dependencies:
-    lodash "^4.17.11"
-
 "@babel/helper-remap-async-to-generator@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
@@ -422,16 +403,6 @@
     "@babel/traverse" "^7.4.0"
     "@babel/types" "^7.4.0"
 
-"@babel/helper-replace-supers@^7.4.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.0.tgz#4f56adb6aedcd449d2da9399c2dcf0545463b64c"
-  integrity sha512-PVwCVnWWAgnal+kJ+ZSAphzyl58XrFeSKSAJRiqg5QToTsjL+Xu1f9+RJ+d+Q0aPhPfBGaYfkox66k86thxNSg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.0.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.4.0"
-    "@babel/types" "^7.4.0"
-
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
@@ -2653,18 +2624,6 @@ autoprefixer@^9.0.0, autoprefixer@^9.4.7:
     postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
-autoprefixer@^9.4.7:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
-  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
-  dependencies:
-    browserslist "^4.5.4"
-    caniuse-lite "^1.0.30000957"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.14"
-    postcss-value-parser "^3.3.1"
-
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -3542,11 +3501,6 @@ camelcase@^5.0.0, camelcase@^5.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^5.2.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
 can-promise@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/can-promise/-/can-promise-0.0.1.tgz#7a7597ad801fb14c8b22341dfec314b6bd6ad8d3"
@@ -3559,11 +3513,6 @@ caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.300009
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
   integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
-caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.30000957:
-  version "1.0.30000957"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
-  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
-
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -4110,7 +4059,7 @@ conventional-changelog-atom@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-cli@^2.0.11:
+conventional-changelog-cli@^2.0.12:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-2.0.12.tgz#ffe04f5430fbc339dc7fa28634c2e0de5dd76e2e"
   integrity sha512-6wh9W5Gpr9DM40E8cFi0qa6JotVm4Jq+suksuqgKnm544H8ZXsRhgGNXShDASOteY9brv9fX8/+fE/QL1wHqbA==
@@ -5424,16 +5373,6 @@ editorconfig@^0.15.2:
     semver "^5.6.0"
     sigmund "^1.0.1"
 
-editorconfig@^0.15.2:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
-  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
-  dependencies:
-    commander "^2.19.0"
-    lru-cache "^4.1.5"
-    semver "^5.6.0"
-    sigmund "^1.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -5449,11 +5388,6 @@ electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.122:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
-electron-to-chromium@^1.3.122:
-  version "1.3.124"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
-  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
-
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -6915,23 +6849,6 @@ history@^4.7.2:
     tiny-warning "^1.0.0"
     value-equal "^0.4.0"
 
-highlight.js@~9.12.0:
-  version "9.12.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
-  integrity sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=
-
-history@^4.7.2:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz#84587c2068039ead8af769e9d6a6860a14fa1bca"
-  integrity sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    loose-envify "^1.2.0"
-    resolve-pathname "^2.2.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-    value-equal "^0.4.0"
-
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -8494,6 +8411,11 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
+lodash.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
+
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -9987,18 +9909,6 @@ parse-entities@^1.0.2, parse-entities@^1.1.0, parse-entities@^1.1.2:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-entities@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.1.tgz#2c761ced065ba7dc68148580b5a225e4918cdd69"
-  integrity sha512-NBWYLQm1KSoDKk7GAHyioLTvCZ5QjdH/ASBBQTD3iLiAWJXS5bg1jEWI8nIJ+vgVvsceBVBcDGRWSo0KVQBvvg==
-  dependencies:
-    character-entities "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    character-reference-invalid "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-hexadecimal "^1.0.0"
-
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
diff --git a/backend/api/nodemon-debug.json b/backend/api/nodemon-debug.json
new file mode 100644
index 000000000..c6dc34700
--- /dev/null
+++ b/backend/api/nodemon-debug.json
@@ -0,0 +1,6 @@
+{
+	"watch": ["src"],
+	"ext": "ts",
+	"ignore": ["src/**/*.spec.ts"],
+	"exec": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register src/main.ts"
+}
diff --git a/backend/api/nodemon.json b/backend/api/nodemon.json
new file mode 100644
index 000000000..3c4ebfd8c
--- /dev/null
+++ b/backend/api/nodemon.json
@@ -0,0 +1,5 @@
+{
+	"watch": ["build"],
+	"ext": "js",
+	"exec": "node build/main"
+}
diff --git a/backend/api/package.json b/backend/api/package.json
index c3834d9ad..5f59f9d15 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -33,6 +33,7 @@
 		"coverage": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 nyc report --reporter=text-lcov | coveralls",
 		"precommit": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 lint-staged",
 		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node build/main.js",
+		"start:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 concurrently \"wait-on build/main.js && nodemon\" \"tsc -w -p tsconfig.build.json\" ",
 		"start:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node ./build/pm2bootstrap.js",
 		"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && yarn webpack",
 		"dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node ./build/main.js",
@@ -46,18 +47,17 @@
 	},
 	"dependencies": {
 		"@captemulation/get-parameter-names": "^1.2.0",
-		"@nestjs/common": "^6.0.2",
-		"@nestjs/core": "^6.0.2",
+		"@nestjs/common": "^6.0.4",
+		"@nestjs/core": "^6.0.4",
 		"@nestjs/cqrs": "^6.0.0",
-		"@nestjs/graphql": "^6.0.2",
-		"@nestjs/microservices": "^6.0.2",
+		"@nestjs/graphql": "^6.0.4",
+		"@nestjs/microservices": "^6.0.4",
 		"@nestjs/passport": "^6.0.0",
-		"@nestjs/platform-express": "^6.0.2",
-		"@nestjs/platform-socket.io": "^6.0.2",
+		"@nestjs/platform-express": "^6.0.4",
+		"@nestjs/platform-socket.io": "^6.0.4",
 		"@nestjs/swagger": "^3.0.2",
-		"@nestjs/testing": "^6.0.2",
 		"@nestjs/typeorm": "^6.0.0",
-		"@nestjs/websockets": "^6.0.2",
+		"@nestjs/websockets": "^6.0.4",
 		"apollo-server-express": "^2.4.8",
 		"axios": "^0.18.0",
 		"bcrypt": "^3.0.4",
@@ -139,6 +139,7 @@
 		"ws": "^6.2.0"
 	},
 	"devDependencies": {
+		"@nestjs/testing": "^6.0.4",
 		"@commitlint/cli": "^7.5.2",
 		"@commitlint/config-conventional": "^7.5.0",
 		"@commitlint/config-lerna-scopes": "^7.5.1",
@@ -187,7 +188,7 @@
 		"cz-conventional-changelog": "^2.1.0",
 		"husky": "^1.3.1",
 		"jest": "^24.5.0",
-		"nodemon": "^1.18.10",
+		"nodemon": "^1.18.11",
 		"nyc": "^13.3.0",
 		"prettier": "^1.16.4",
 		"prettier-tslint": "^0.4.2",
@@ -197,11 +198,12 @@
 		"supertest": "^4.0.2",
 		"ts-jest": "^24.0.0",
 		"ts-loader": "^5.3.3",
-		"ts-node": "^8.0.3",
-		"tslint": "^5.14.0",
+		"ts-node": "^8.1.0",
+		"tslint": "^5.16.0",
 		"typedoc": "^0.14.2",
 		"typemoq": "^2.1.0",
-		"typescript": "~3.1.6",
+		"typescript": "~3.4.3",
+		"wait-on": "^3.2.0",
 		"webpack": "^4.29.6",
 		"webpack-cli": "^3.3.0",
 		"webpack-command": "^0.4.2",
diff --git a/backend/api/tsconfig.build.json b/backend/api/tsconfig.build.json
new file mode 100644
index 000000000..354337445
--- /dev/null
+++ b/backend/api/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./tsconfig.json",
+	"exclude": ["node_modules", "build", "test", "**/*spec.ts"]
+}
diff --git a/backend/api/tsconfig.json b/backend/api/tsconfig.json
index d48413172..62215b424 100644
--- a/backend/api/tsconfig.json
+++ b/backend/api/tsconfig.json
@@ -3,7 +3,9 @@
 		"module": "commonjs",
 		"lib": ["dom", "esnext", "es2017.object"],
 		"baseUrl": "./src",
-		"outDir": "build",
+		"incremental": true,
+		"removeComments": true,
+		"outDir": "./build",
 		"target": "es6",
 		"moduleResolution": "node",
 		"preserveConstEnums": true,
@@ -21,5 +23,5 @@
 		}
 	},
 	"include": ["src/**/*.ts", "./*.ts"],
-	"exclude": ["backup", "backup/TrackingService", "node_modules"]
+	"exclude": ["backup", "build", "backup/TrackingService", "node_modules"]
 }
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 305f77bc3..638f31a5a 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -510,19 +510,19 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nestjs/common@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@nestjs/common/-/common-6.0.2.tgz#7776360b52807485681aa5ee727215a35f8515eb"
-  integrity sha512-bPZl4zfv9tk0PbRdn9RftsdUftAEV47brcpXg/e9rGQiZNGeSSc7y0T1pQJFN3HO4Lxx8HdvC2f0ebswc90vaQ==
+"@nestjs/common@^6.0.4":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/common/-/common-6.1.1.tgz#6f7f0aa0ff45285f9d2b0a66acde1ebeb0c99060"
+  integrity sha512-hwAjk0RUMRFWJktTYovW0LWVRy2oLBwdb4mDcomYUoSGrCYZ9xGS+eeB9B7Lby4xoz01E2NTRmdrIh9gQYAEFA==
   dependencies:
     axios "0.18.0"
     cli-color "1.4.0"
     uuid "3.3.2"
 
-"@nestjs/core@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@nestjs/core/-/core-6.0.2.tgz#a5103ac48a2e10581928ce4af82260b06e6fb597"
-  integrity sha512-kNBiVrMdv9+hf+lOkPP2UgiKXAb0/2l3zgzSTP3vdnlV5YhCVEveW4ZVo8U1vIpLzZtzXn8ZzETupicBzLocTA==
+"@nestjs/core@^6.0.4":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/core/-/core-6.1.1.tgz#10494e8e1a4bcf55059fd114c0934186c2130930"
+  integrity sha512-qIDe+dr+iCuntoewwJgsDBay3JWcCozXKZZLjKwIK5VxWTxT83KHm+1LRR8hSAMCPgQFgRq4639oOSRtceEzNg==
   dependencies:
     "@nuxtjs/opencollective" "0.2.1"
     fast-safe-stringify "2.0.6"
@@ -536,25 +536,25 @@
   resolved "https://registry.yarnpkg.com/@nestjs/cqrs/-/cqrs-6.0.0.tgz#a9dc850e04f8bed40cad3a13106f6cb085b2b985"
   integrity sha512-d2jKfVRJsq14VU7w8sELhROVok3X9hxeYhRkOLX8OQtD18E6PhMWsVvIY/HE0G0YHYBQmyvHpusz3iPmDmlJow==
 
-"@nestjs/graphql@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@nestjs/graphql/-/graphql-6.0.2.tgz#a86a5c9fd8d5a67fa936b2b3b4b148f420bc44c6"
-  integrity sha512-8PUBD8nswd86FFn9wcCXvtm6ffnSkmTpBQbREqybRXoQ8O3fe1lGeOW4N9lpRwjdoJ8XiOtlH8jjr5+um1eY2Q==
+"@nestjs/graphql@^6.0.4":
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/@nestjs/graphql/-/graphql-6.0.5.tgz#3eac35cf669c5dc9860ca262f5d7dd6d66b742c0"
+  integrity sha512-TxTPgb1uXkmIjx0pVkHDZ5QyPCiJUjZnTPdLe1l/KE6hNd0/8TXpWelh/dNylFUFrPCI2N3k96GEibcT4uT6+Q==
   dependencies:
-    "@types/graphql" "14.0.7"
-    chokidar "2.1.2"
+    "@types/graphql" "14.2.0"
+    chokidar "2.1.5"
     fast-glob "2.2.6"
     graphql-tools "4.0.4"
     lodash "4.17.11"
     merge-graphql-schemas "1.5.8"
     optional "0.1.4"
-    ts-morph "1.3.1"
+    ts-morph "1.3.2"
     uuid "3.3.2"
 
-"@nestjs/microservices@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@nestjs/microservices/-/microservices-6.0.2.tgz#9ce11025b44b5c433392150453ecb1aa7409dee0"
-  integrity sha512-5urNSWXivJxKjPLstu3AOJwha6uHbc0QGOeo+niqficg5wzG032mi9kdiEZqDFbDKoT8wP1sYNuLZcoxJFUrNw==
+"@nestjs/microservices@^6.0.4":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/microservices/-/microservices-6.1.1.tgz#e3ceeeab61d256d4a2d35721489cc443862e3bbf"
+  integrity sha512-dqEhSh0+9dIdb4aXWsuMnoGjiyhKE6mm2f/IKAIbWwwfmGzeFGcEd1TdqLXVzDgCXxTaUZlO7TY0PRU0Muwlfw==
   dependencies:
     iterare "1.1.2"
     json-socket "0.3.0"
@@ -565,20 +565,20 @@
   resolved "https://registry.yarnpkg.com/@nestjs/passport/-/passport-6.0.0.tgz#b92fdf90e055eece02c0378fce98e6f60a864c54"
   integrity sha512-+82YJTQpmDrcqS65Jgtdv6+n5lWCZtANw7Cy3KWdSKPBbNheIYBWtKMV2uXZXXtVqxgGaCnrJ03XpHc22RX4xA==
 
-"@nestjs/platform-express@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-6.0.2.tgz#35810b3f59f1ac517102efd8c62a485072cad026"
-  integrity sha512-Y+Cc4q8uSSAEfrxawzADCaeqr/F9Ilbunbruha87cJyrM/f9H/P8vq1ueNRV5fgx5IYzziS8vbwWowo4qOYgGA==
+"@nestjs/platform-express@^6.0.4":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-6.1.1.tgz#4d4d4774a65b14c81646d10da9768f4cb6b922d6"
+  integrity sha512-vA1JhKnZp9Ks0hSznzrRZL0neAGDAOpwJz97ttyxc/F0u6thsk7HmXKPziskqnf9diiY7mXeP57nPcDWPt9W0w==
   dependencies:
     body-parser "1.18.3"
     cors "2.8.5"
     express "4.16.4"
     multer "1.4.1"
 
-"@nestjs/platform-socket.io@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@nestjs/platform-socket.io/-/platform-socket.io-6.0.2.tgz#52b453a220e11736140dac97d5a059b64c59e116"
-  integrity sha512-Dv8rd6i0XP6m2SIIcq2jGfTkaPQFCYomjRWauCYtafkTP91fDNW7Q47H9+fnz+Tdp4rKPz9MjTNFHbK3KSLZzQ==
+"@nestjs/platform-socket.io@^6.0.4":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/platform-socket.io/-/platform-socket.io-6.1.1.tgz#ffc24c240870f2b17984a265b30ec5d793e2bdb3"
+  integrity sha512-u7hkGtAWlBmuonFWQwxhOLo+4LDBC2EPjhEAqI3vcQNpuclQNH8gFQLLzm4MyktYnfe6qzXxdchlB1aVTRswEg==
   dependencies:
     socket.io "2.2.0"
 
@@ -590,10 +590,10 @@
     lodash "4.17.11"
     path-to-regexp "3.0.0"
 
-"@nestjs/testing@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@nestjs/testing/-/testing-6.0.2.tgz#4bea74d3e16f24e4ddfcf7e4e087f57ab8f71e5f"
-  integrity sha512-tAdhib/lJn4caK3fzBvyf40oK3p9thkkCcBaF0Zd2sPOTI8tqVNYtdNwEF1pq6u3D6beLDSttyIIbM0yXA52FQ==
+"@nestjs/testing@^6.0.4":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/testing/-/testing-6.1.1.tgz#cc871867f9bd053069467a5a2f1b429945413313"
+  integrity sha512-EQLRES20n8zWkFRXgwFKjCE0s/WsHvqv3v22umqq2XHiep7WiJub0hNG/FcC00WltXPDPAaEDu0XDPr56UWZhQ==
   dependencies:
     optional "0.1.4"
 
@@ -604,10 +604,10 @@
   dependencies:
     uuid "3.3.2"
 
-"@nestjs/websockets@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@nestjs/websockets/-/websockets-6.0.2.tgz#ce350453ccdba1d67e09d1783f41665ef0ed2cb3"
-  integrity sha512-jSa1Ig9Vu0VEBde1rpgQvkqh+y/cU0kNcTvVnFMABk8TBV5FIgHBb/iXUbyT4xQ/17weAsv7L1TmxjJJy7j9uA==
+"@nestjs/websockets@^6.0.4":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/websockets/-/websockets-6.1.1.tgz#99202e4ebe1310337926b5b32b264921ae957247"
+  integrity sha512-iPdp9ipM8cx2Entak4oI6eg1QPhNFH81kx9on44mQ8oAGRdZVcbiS2wQ+ERbwQyNIUsWSR390kObOlXKqelaxw==
   dependencies:
     iterare "1.1.2"
 
@@ -933,10 +933,10 @@
   version "3.30.13"
   resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.13.tgz#71220c6a0ec0b39044de71ae59d696379acebcb6"
 
-"@types/graphql@14.0.7":
-  version "14.0.7"
-  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-14.0.7.tgz#daa09397220a68ce1cbb3f76a315ff3cd92312f6"
-  integrity sha512-BoLDjdvLQsXPZLJux3lEZANwGr3Xag56Ngy0U3y8uoRSDdeLcn43H3oBcgZlnd++iOQElBpaRVDHPzEDekyvXQ==
+"@types/graphql@14.2.0":
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-14.2.0.tgz#74e1da5f2a4a744ac6eb3ed57b48242ea9367202"
+  integrity sha512-lELg5m6eBOmATWyCZl8qULEOvnPIUG6B443yXKj930glXIgwQirIBPp5rthP2amJW0YSzUg2s5sfgba4mRRCNw==
 
 "@types/handlebars@^4.0.38":
   version "4.0.39"
@@ -2588,10 +2588,10 @@ charm@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
 
-chokidar@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
-  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
+chokidar@2.1.5, chokidar@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -2603,7 +2603,7 @@ chokidar@2.1.2:
     normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
     readdirp "^2.2.1"
-    upath "^1.1.0"
+    upath "^1.1.1"
   optionalDependencies:
     fsevents "^1.2.7"
 
@@ -2626,25 +2626,6 @@ chokidar@^2.0.2, chokidar@^2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.1.tgz#adc39ad55a2adf26548bd2afa048f611091f9184"
-  integrity sha512-gfw3p2oQV2wEt+8VuMlNsPjCxDxvvgnm/kz+uATu805mWVF8IJN7uz9DN7iBz+RMJISmiVbCOBFs9qBGMjtPfQ==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.0"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
 chownr@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
@@ -3197,6 +3178,11 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.3:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
 
+core-js@^2.5.7:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
+  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
+
 core-js@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957"
@@ -5157,6 +5143,11 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
+hoek@5.x.x:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.4.tgz#0f7fa270a1cafeb364a4b2ddfaa33f864e4157da"
+  integrity sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==
+
 hoek@6.x.x:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.2.tgz#99e6d070561839de74ee427b61aa476bd6bddfd6"
@@ -5698,6 +5689,13 @@ isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
 
+isemail@3.x.x:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c"
+  integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==
+  dependencies:
+    punycode "2.x.x"
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -6174,6 +6172,15 @@ jmespath@0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
 
+joi@^13.0.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-13.7.0.tgz#cfd85ebfe67e8a1900432400b4d03bbd93fb879f"
+  integrity sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q==
+  dependencies:
+    hoek "5.x.x"
+    isemail "3.x.x"
+    topo "3.x.x"
+
 js-base64@^2.1.8:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.0.tgz#42255ba183ab67ce59a0dee640afdc00ab5ae93e"
@@ -6219,6 +6226,14 @@ js-yaml@^3.12.2:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.13.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -7507,12 +7522,12 @@ node-sass@^4.11.0:
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
-nodemon@^1.18.10:
-  version "1.18.10"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.10.tgz#3ba63f64eb4c283cf3e4f75f30817e9d4f393afe"
-  integrity sha512-we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ==
+nodemon@^1.18.11:
+  version "1.18.11"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.11.tgz#d836ab663776e7995570b963da5bfc807e53f6b8"
+  integrity sha512-KdN3tm1zkarlqNo4+W9raU3ihM4H15MVMSE/f9rYDZmFgDHAfAJsomYrHhApAkuUemYjFyEeXlpCOQ2v5gtBEw==
   dependencies:
-    chokidar "^2.1.0"
+    chokidar "^2.1.5"
     debug "^3.1.0"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"
@@ -8536,15 +8551,15 @@ punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
-punycode@^1.2.4, punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@2.x.x, punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
 q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -9041,6 +9056,11 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
+rx@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
+  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
+
 rxjs-compat@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.4.0.tgz#800923c15697948e1f30f18c531b12b49451c75c"
@@ -10132,6 +10152,13 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+topo@3.x.x:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c"
+  integrity sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ==
+  dependencies:
+    hoek "6.x.x"
+
 touch@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
@@ -10224,10 +10251,10 @@ ts-loader@^5.3.3:
     micromatch "^3.1.4"
     semver "^5.0.1"
 
-ts-morph@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-1.3.1.tgz#70795b7d54489c419b50911273675151b7bab8af"
-  integrity sha512-zWjy62PNOeX7LP6Q1h5UM7uBetEHKu9P2EoRQn0CZwqANxU/ZXvEiOtKeQJwKihRfslES+pLNCfIG7R0WS4ZbQ==
+ts-morph@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-1.3.2.tgz#7cca879159291a031db6ca7a06c39c36a97307f0"
+  integrity sha512-NaPUD0NY1nfRfdWnGaYMFsIAcQyuS0teCOjZ+v5nvBYziuKZaJ7z5JLkHkhrBkffqR9DLnn2Zx1vdW5Ub1doxg==
   dependencies:
     "@dsherret/to-absolute-glob" "^2.0.2"
     code-block-writer "7.2.2"
@@ -10237,12 +10264,12 @@ ts-morph@1.3.1:
     is-negated-glob "^1.0.0"
     multimatch "^2.1.0"
     tslib "^1.9.0"
-    typescript "^3.0.1"
+    typescript ">=3.0.1 <3.4.0"
 
-ts-node@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.3.tgz#aa60b836a24dafd8bf21b54766841a232fdbc641"
-  integrity sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==
+ts-node@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.1.0.tgz#8c4b37036abd448577db22a061fd7a67d47e658e"
+  integrity sha512-34jpuOrxDuf+O6iW1JpgTRDFynUZ1iEqtYruBqh35gICNjN8x+LpVcPAcwzLPi9VU6mdA3ym+x233nZmZp445A==
   dependencies:
     arg "^4.1.0"
     diff "^3.1.0"
@@ -10254,18 +10281,18 @@ tslib@1.9.3, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
 
-tslint@^5.14.0:
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e"
-  integrity sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==
+tslint@^5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.16.0.tgz#ae61f9c5a98d295b9a4f4553b1b1e831c1984d67"
+  integrity sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==
   dependencies:
-    babel-code-frame "^6.22.0"
+    "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
     chalk "^2.3.0"
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     resolve "^1.3.2"
@@ -10396,15 +10423,15 @@ typescript@3.2.x:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
   integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==
 
-typescript@^3.0.1:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
-  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+"typescript@>=3.0.1 <3.4.0":
+  version "3.3.4000"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
+  integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
 
-typescript@~3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
-  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
+typescript@~3.4.3:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
 
 uglify-js@^3.1.4:
   version "3.4.9"
@@ -10493,11 +10520,11 @@ unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
-upath@^1.0.5, upath@^1.1.0:
+upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
 
-upath@^1.1.2:
+upath@^1.1.1, upath@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
@@ -10649,6 +10676,17 @@ w3c-hr-time@^1.0.1:
   dependencies:
     browser-process-hrtime "^0.1.2"
 
+wait-on@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-3.2.0.tgz#c83924df0fc42a675c678324c49c769d378bcb85"
+  integrity sha512-QUGNKlKLDyY6W/qHdxaRlXUAgLPe+3mLL/tRByHpRNcHs/c7dZXbu+OnJWGNux6tU1WFh/Z8aEwvbuzSAu79Zg==
+  dependencies:
+    core-js "^2.5.7"
+    joi "^13.0.0"
+    minimist "^1.2.0"
+    request "^2.88.0"
+    rx "^4.1.0"
+
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 538f836bd..821c647a2 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -463,12 +463,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/google-maps@~5.0.0-beta.26":
-  version "5.0.0-beta.27"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.0.0-beta.27.tgz#215116c69ca6b949044a9882ba04d6efa30eff4d"
-  integrity sha512-ifVuI3fPt1D9+Fqu6vYyCYdNEI45/S6BRUM1PB0qhs26MbfEXwQvt2tTdw1CITLoBxqzgQcGgh/PadzdeA1xhg==
-  dependencies:
-    "@types/cordova" latest
+"@ionic-native/google-maps@~5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.5.0.tgz#02537e04bb0d01d5580f936d8ccce6745188d90a"
+  integrity sha512-+sCaB7cLR35ApsOyYSfwDX2ZTO2ItOI6FHkgTQ2rzOA1DVJ9rlU8HDL6jYBUhq+aDe3lhCPexSOryeBynaSvpQ==
 
 "@ionic-native/in-app-browser@^5.3.0":
   version "5.4.0"
@@ -1112,7 +1110,7 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@*, abbrev@1:
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -1320,7 +1318,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
-ansi@*, ansi@^0.3.1:
+ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
   integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
@@ -1798,7 +1796,7 @@ backo2@1.0.2:
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
   integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
-balanced-match@*, balanced-match@^1.0.0:
+balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
@@ -1999,14 +1997,14 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@*, bplist-parser@^0.1.0:
+bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
   integrity sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@*, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
@@ -2713,7 +2711,7 @@ compression@^1.5.2, compression@^1.6.0:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@*, concat-map@0.0.1:
+concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
@@ -3031,7 +3029,7 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
   integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw=
@@ -5400,7 +5398,7 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
-inflight@*, inflight@^1.0.4:
+inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
@@ -5408,7 +5406,7 @@ inflight@*, inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -6922,7 +6920,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -7521,7 +7519,7 @@ on-headers@~1.0.1, on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -10470,7 +10468,7 @@ unc-path-regex@^0.1.2:
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
-underscore@*, underscore@^1.8.3:
+underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
   integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
@@ -10532,7 +10530,7 @@ unix-crypt-td-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
   integrity sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
 
-unorm@*, unorm@^1.3.3:
+unorm@^1.3.3:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
   integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
@@ -11051,7 +11049,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@*, wrappy@1:
+wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
@@ -11120,7 +11118,7 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmldom@*, xmldom@0.1.x:
+xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
   integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index eebd8612c..c97c0bde4 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -389,12 +389,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/google-maps@~5.0.0-beta.26":
-  version "5.0.0-beta.27"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.0.0-beta.27.tgz#215116c69ca6b949044a9882ba04d6efa30eff4d"
-  integrity sha512-ifVuI3fPt1D9+Fqu6vYyCYdNEI45/S6BRUM1PB0qhs26MbfEXwQvt2tTdw1CITLoBxqzgQcGgh/PadzdeA1xhg==
-  dependencies:
-    "@types/cordova" latest
+"@ionic-native/google-maps@~5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.5.0.tgz#02537e04bb0d01d5580f936d8ccce6745188d90a"
+  integrity sha512-+sCaB7cLR35ApsOyYSfwDX2ZTO2ItOI6FHkgTQ2rzOA1DVJ9rlU8HDL6jYBUhq+aDe3lhCPexSOryeBynaSvpQ==
 
 "@ionic-native/in-app-browser@^5.3.0":
   version "5.4.0"
@@ -1115,7 +1113,7 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@*, abbrev@1:
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -1337,7 +1335,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
-ansi@*, ansi@^0.3.1:
+ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
   integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
@@ -1824,7 +1822,7 @@ backo2@1.0.2, backo2@^1.0.2:
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
   integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
-balanced-match@*, balanced-match@^1.0.0:
+balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
@@ -2028,14 +2026,14 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@*, bplist-parser@^0.1.0:
+bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
   integrity sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@*, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
@@ -2724,7 +2722,7 @@ compression@^1.5.2, compression@^1.6.0:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@*, concat-map@0.0.1:
+concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
@@ -3060,7 +3058,7 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
   integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw=
@@ -5380,7 +5378,7 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
-inflight@*, inflight@^1.0.4:
+inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
@@ -5388,7 +5386,7 @@ inflight@*, inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -6747,7 +6745,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -7409,7 +7407,7 @@ on-headers@~1.0.1, on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -10325,7 +10323,7 @@ unc-path-regex@^0.1.2:
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
-underscore@*, underscore@^1.8.3:
+underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
   integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
@@ -10387,7 +10385,7 @@ unix-crypt-td-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
   integrity sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
 
-unorm@*, unorm@^1.3.3:
+unorm@^1.3.3:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
   integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
@@ -10882,7 +10880,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@*, wrappy@1:
+wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
@@ -10958,7 +10956,7 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmldom@*, xmldom@0.1.x:
+xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
   integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 7c7999c38..ffc64d324 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -463,12 +463,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/google-maps@~5.0.0-beta.26":
-  version "5.0.0-beta.27"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.0.0-beta.27.tgz#215116c69ca6b949044a9882ba04d6efa30eff4d"
-  integrity sha512-ifVuI3fPt1D9+Fqu6vYyCYdNEI45/S6BRUM1PB0qhs26MbfEXwQvt2tTdw1CITLoBxqzgQcGgh/PadzdeA1xhg==
-  dependencies:
-    "@types/cordova" latest
+"@ionic-native/google-maps@~5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.5.0.tgz#02537e04bb0d01d5580f936d8ccce6745188d90a"
+  integrity sha512-+sCaB7cLR35ApsOyYSfwDX2ZTO2ItOI6FHkgTQ2rzOA1DVJ9rlU8HDL6jYBUhq+aDe3lhCPexSOryeBynaSvpQ==
 
 "@ionic-native/in-app-browser@^5.3.0":
   version "5.4.0"
@@ -1112,7 +1110,7 @@ JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@*, abbrev@1:
+abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -1320,7 +1318,7 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
-ansi@*, ansi@^0.3.1:
+ansi@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
   integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
@@ -1791,7 +1789,7 @@ backo2@1.0.2, backo2@^1.0.2:
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
   integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
-balanced-match@*, balanced-match@^1.0.0:
+balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
@@ -1992,14 +1990,14 @@ boxen@^1.2.1:
     term-size "^1.2.0"
     widest-line "^2.0.0"
 
-bplist-parser@*, bplist-parser@^0.1.0:
+bplist-parser@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
   integrity sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=
   dependencies:
     big-integer "^1.6.7"
 
-brace-expansion@*, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
@@ -2701,7 +2699,7 @@ compression@^1.5.2, compression@^1.6.0:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-concat-map@*, concat-map@0.0.1:
+concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
@@ -2984,7 +2982,7 @@ cordova-plugin-whitelist@^1.3.3:
   resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz#b5e85ecdbbfe5aeded40a1bf4ee2372e67d96fb4"
   integrity sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q=
 
-cordova-registry-mapper@*, cordova-registry-mapper@^1.1.8:
+cordova-registry-mapper@^1.1.8:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
   integrity sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw=
@@ -5343,7 +5341,7 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
-inflight@*, inflight@^1.0.4:
+inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
@@ -5351,7 +5349,7 @@ inflight@*, inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@*, inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -6868,7 +6866,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@*, "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -7408,7 +7406,7 @@ on-headers@~1.0.1, on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@*, once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -10306,7 +10304,7 @@ unc-path-regex@^0.1.2:
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
-underscore@*, underscore@^1.8.3:
+underscore@^1.8.3:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
   integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
@@ -10368,7 +10366,7 @@ unix-crypt-td-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
   integrity sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
 
-unorm@*, unorm@^1.3.3:
+unorm@^1.3.3:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
   integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
@@ -10882,7 +10880,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrappy@*, wrappy@1:
+wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
@@ -10958,7 +10956,7 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmldom@*, xmldom@0.1.x:
+xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
   integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=

From e67d56378c9a1696b472474b35a77df0d2ff494b Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Tue, 23 Apr 2019 22:48:46 +0300
Subject: [PATCH 201/382] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b71f8648b..30b88f1b4 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,9 @@ Finally, each project from Ever Platform could start by single command from this
 * Run Carrier Mobile app `yarn run:carrier` and open http://localhost:4203
 * Run Shopping Website `yarn run:shopweb` and open http://localhost:3000
 
-Note: on the first run, API Server (Backend) creates MongoDB local database `ever_development` with the following (default) Admin user
+Note 1: during development you can run server with `yarn run:server:dev` to enable watch on TS files changes
+
+Note 2: on the first run, API Server (Backend) creates MongoDB local database `ever_development` with the following (default) Admin user
 
 -   email: `admin@ever.co`
 -   password: `admin`

From d61abe45206e882e680fca5b34c625bc39af37a3 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Tue, 23 Apr 2019 22:50:43 +0300
Subject: [PATCH 202/382] chore: add start for server with watch for changes

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index f60212346..af8e56d77 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
 		"bootstrap": "yarn install && yarn lerna bootstrap",
 		"run:ncu": "yarn ncu --configFileName=.ncurc.json --configFilePath=./",
 		"run:server": "yarn --cwd ./backend/api start",
+		"run:server:dev": "yarn --cwd ./backend/api start:dev",
 		"run:admin": "yarn --cwd ./admin/website-angular start",
 		"run:merchant": "yarn --cwd ./merchant/tablet-ionic start",
 		"run:shopmobile": "yarn --cwd ./shop/mobile-ionic start",

From 1ad160b46df9b9170e7a70719c51e7d139b01af5 Mon Sep 17 00:00:00 2001
From: Deepak Chandwani <deepaksslibra@gmail.com>
Date: Fri, 26 Apr 2019 11:16:38 +0530
Subject: [PATCH 203/382] Draft Storybook Integration (#462)

---
 admin/website-angular/.storybook/addons.js    |   3 +
 admin/website-angular/.storybook/config.js    |   4 +-
 .../website-angular/.storybook/tsconfig.json  |  13 +-
 admin/website-angular/package.json            |  16 +-
 .../src/app/@core/utils/i18n.module.ts        |  34 +
 .../categories-table.component.ts             |   5 +-
 .../categories-table.stories.ts               | 110 +++
 .../category-create.component.html            |   2 +
 .../category-create.component.ts              |   9 +-
 .../category-create.stories.ts                | 112 +++
 admin/website-angular/src/app/app.module.ts   |   3 +-
 .../ea-customer-info.stories.ts               | 140 ++++
 .../dashboard-select-store.stories.ts         | 625 +++++++++++++++
 .../pages/+dashboard/dashboard.component.ts   |   5 +-
 .../app/pages/+dashboard/dashboard.stories.ts | 743 ++++++++++++++++++
 .../src/app/pages/+device/device.component.ts |   2 +
 .../src/app/pages/+device/device.stories.ts   |  74 ++
 .../app/pages/+profile/profile.component.html |  20 +-
 admin/website-angular/src/stories/index.ts    |  15 -
 admin/website-angular/yarn.lock               | 469 ++++++++---
 package.json                                  |   2 +
 yarn.lock                                     |  14 +
 22 files changed, 2283 insertions(+), 137 deletions(-)
 create mode 100644 admin/website-angular/.storybook/addons.js
 create mode 100644 admin/website-angular/src/app/@core/utils/i18n.module.ts
 create mode 100644 admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
 create mode 100644 admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
 create mode 100644 admin/website-angular/src/app/pages/+customers/+customer/ea-customer-info/ea-customer-info.stories.ts
 create mode 100644 admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.stories.ts
 create mode 100644 admin/website-angular/src/app/pages/+dashboard/dashboard.stories.ts
 create mode 100644 admin/website-angular/src/app/pages/+device/device.stories.ts
 delete mode 100644 admin/website-angular/src/stories/index.ts

diff --git a/admin/website-angular/.storybook/addons.js b/admin/website-angular/.storybook/addons.js
new file mode 100644
index 000000000..47eabe0ce
--- /dev/null
+++ b/admin/website-angular/.storybook/addons.js
@@ -0,0 +1,3 @@
+import '@storybook/addon-actions/register';
+import '@storybook/addon-links/register';
+import '@storybook/addon-notes/register';
diff --git a/admin/website-angular/.storybook/config.js b/admin/website-angular/.storybook/config.js
index 074ef4a77..6f78a798a 100644
--- a/admin/website-angular/.storybook/config.js
+++ b/admin/website-angular/.storybook/config.js
@@ -1,7 +1,9 @@
 import { configure } from '@storybook/angular';
 
+// automatically import all files ending in *.stories.ts
+const req = require.context('../src/', true, /\.stories\.ts$/);
 function loadStories() {
-	require('../src/stories/index.ts');
+	req.keys().forEach((filename) => req(filename));
 }
 
 configure(loadStories, module);
diff --git a/admin/website-angular/.storybook/tsconfig.json b/admin/website-angular/.storybook/tsconfig.json
index c786924b6..042a8b7ea 100644
--- a/admin/website-angular/.storybook/tsconfig.json
+++ b/admin/website-angular/.storybook/tsconfig.json
@@ -1,5 +1,12 @@
 {
-	"extends": "../tsconfig.json",
-	"exclude": ["../src/test.ts", "../src/**/*.spec.ts"],
-	"include": ["../src/**/*"]
+	"extends": "../src/tsconfig.app.json",
+	"compilerOptions": {
+		"types": ["node", "googlemaps"]
+	},
+	"exclude": [
+		"../src/test.ts",
+		"../src/**/*.spec.ts",
+		"../projects/**/*.spec.ts"
+	],
+	"include": ["../src/**/*", "../projects/**/*"]
 }
diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index e5f71ddfb..93f87f6e3 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -54,7 +54,8 @@
 		"docs": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs",
 		"docs:serve": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs -s",
 		"release:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn run conventional-changelog -- -p angular -i CHANGELOG.md -s",
-		"storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && start-storybook -p 9001 -c .storybook"
+		"storybook": "start-storybook -p 6006",
+		"build-storybook": "build-storybook"
 	},
 	"dependencies": {
 		"@agm/core": "^1.0.0-beta.5",
@@ -126,6 +127,7 @@
 		"ngx-echarts": "^4.1.0",
 		"ngx-highlightjs": "^2.1.4",
 		"ngx-moment": "^3.3.0",
+		"ngx-translate-multi-http-loader": "^3.0.0",
 		"node-sass": "^4.11.0",
 		"normalize.css": "^8.0.1",
 		"pace-js": "1.0.2",
@@ -148,10 +150,9 @@
 		"zone.js": "^0.8.29"
 	},
 	"devDependencies": {
-		"conventional-changelog-cli": "^2.0.12",
+		"@angular-devkit/architect": "^0.13.8",
 		"@angular-devkit/build-angular": "^0.13.8",
 		"@angular-devkit/build-webpack": "^0.13.8",
-		"@angular-devkit/architect": "^0.13.8",
 		"@angular-devkit/core": "^7.3.8",
 		"@angular-devkit/schematics": "^7.3.8",
 		"@angular/cli": "^7.3.8",
@@ -159,8 +160,12 @@
 		"@angular/language-service": "^7.2.11",
 		"@babel/core": "^7.4.0",
 		"@compodoc/compodoc": "^1.1.9",
-		"@storybook/addon-actions": "^5.0.6",
-		"@storybook/angular": "^5.0.6",
+		"@storybook/addon-actions": "^5.0.10",
+		"@storybook/addon-knobs": "^5.0.10",
+		"@storybook/addon-links": "^5.0.10",
+		"@storybook/addon-notes": "^5.0.10",
+		"@storybook/addons": "^5.0.10",
+		"@storybook/angular": "^5.0.10",
 		"@types/async": "^2.4.1",
 		"@types/d3-color": "^1.2.2",
 		"@types/faker": "^4.1.5",
@@ -178,6 +183,7 @@
 		"@types/yargs": "^13.0.0",
 		"babel-loader": "^8.0.5",
 		"codelyzer": "^4.5.0",
+		"conventional-changelog-cli": "^2.0.12",
 		"cross-env": "^5.2.0",
 		"dotenv": "^6.2.0",
 		"envalid": "^4.2.2",
diff --git a/admin/website-angular/src/app/@core/utils/i18n.module.ts b/admin/website-angular/src/app/@core/utils/i18n.module.ts
new file mode 100644
index 000000000..a1455e0f5
--- /dev/null
+++ b/admin/website-angular/src/app/@core/utils/i18n.module.ts
@@ -0,0 +1,34 @@
+import { NgModule } from '@angular/core';
+import { HttpClientModule, HttpClient } from '@angular/common/http';
+import {
+	TranslateModule,
+	TranslateLoader,
+	TranslateService
+} from '@ngx-translate/core';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+
+// AoT requires an exported function for factories
+export function HttpLoaderFactory(http: HttpClient) {
+	return new TranslateHttpLoader(http);
+}
+
+@NgModule({
+	declarations: [],
+	imports: [
+		HttpClientModule,
+		TranslateModule.forRoot({
+			loader: {
+				provide: TranslateLoader,
+				useFactory: HttpLoaderFactory,
+				deps: [HttpClient]
+			}
+		})
+	],
+	exports: [TranslateModule]
+})
+export class I18nModule {
+	constructor(translate: TranslateService) {
+		translate.setDefaultLang('en');
+		translate.use('en');
+	}
+}
diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
index 49e80e59a..895b7ff79 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
@@ -65,7 +65,10 @@ export class CategoriesTableComponent implements OnInit, OnDestroy {
 		private readonly _modalService: NgbModal,
 		private readonly _notifyService: NotifyService,
 		private readonly modalService: NgbModal
-	) {}
+	) {
+		this._translateService.setDefaultLang('en');
+		this._translateService.use('en');
+	}
 
 	get hasSelectedCategories(): boolean {
 		return this._selectedCategories.length > 0;
diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
new file mode 100644
index 000000000..3c580db6f
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
@@ -0,0 +1,110 @@
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+
+import { of } from 'rxjs';
+import { withKnobs, boolean } from '@storybook/addon-knobs';
+import { ThemeModule } from 'app/@theme';
+import { CommonModule } from '@angular/common';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { NbSpinnerModule } from '@nebular/theme';
+import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
+import { ToasterModule } from 'angular2-toaster';
+import {
+	TranslateModule,
+	TranslateStore,
+	TranslateLoader,
+	MissingTranslationHandler,
+	FakeMissingTranslationHandler,
+	TranslateService,
+	TranslatePipe
+} from '@ngx-translate/core';
+import { RouterModule } from '@angular/router';
+import { routes, NbAuthModule } from '@nebular/auth';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
+import { DeviceService } from 'app/@core/data/device.service';
+import { ApolloModule, APOLLO_OPTIONS } from 'apollo-angular';
+import { HttpLink, HttpLinkModule } from 'apollo-angular-link-http';
+import { InMemoryCache } from 'apollo-cache-inmemory';
+import { PipesModule } from '@modules/client.common.angular2/pipes/pipes.module';
+import { HttpClientModule } from '@angular/common/http';
+import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
+import { FormsModule } from '@angular/forms';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
+import { LocaleModule } from '@modules/client.common.angular2/locale/locale.module';
+import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { CategoriesTableComponent } from './categories-table.component';
+
+const stories = storiesOf('Categories Table Component', module);
+
+export function createApollo(httpLink: HttpLink) {
+	return {
+		link: httpLink.create({ uri: 'https://api.example.com/graphql' }),
+		cache: new InMemoryCache()
+	};
+}
+
+export const staticTranslateLoader: TranslateLoader = {
+	getTranslation(lang: string) {
+		return of(require('../../../../../assets/i18n/en.json'));
+	}
+};
+
+stories.addDecorator(withKnobs);
+stories.addDecorator(
+	moduleMetadata({
+		declarations: [],
+		imports: [
+			CommonModule,
+			ThemeModule,
+			Ng2SmartTableModule,
+			NbSpinnerModule,
+			ConfirmationModalModule,
+			BrowserAnimationsModule,
+			ToasterModule.forRoot(),
+			TranslateModule.forChild({
+				loader: {
+					provide: TranslateLoader,
+					useValue: staticTranslateLoader
+				},
+				missingTranslationHandler: {
+					provide: MissingTranslationHandler,
+					useClass: FakeMissingTranslationHandler
+				}
+			}),
+			RouterModule.forChild(routes),
+			NbAuthModule,
+			ApolloModule,
+			HttpLinkModule,
+			PipesModule,
+			FileUploaderModule,
+			Ng2SmartTableModule,
+			NbSpinnerModule,
+			FormsModule,
+			LocaleModule,
+			HttpClientModule
+		],
+		providers: [
+			DeviceService,
+			{
+				provide: APOLLO_OPTIONS,
+				useFactory: createApollo,
+				deps: [HttpLink]
+			},
+			TranslateStore,
+			NotifyService,
+			NgbActiveModal,
+			ProductLocalesService,
+			TranslateService,
+			ProductsCategoryService,
+			TranslatePipe
+		]
+	})
+);
+
+stories.add('Category Table', () => ({
+	component: CategoriesTableComponent,
+	props: {
+		storybookVersion: boolean('Storybook-Version', true)
+	}
+}));
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
index 20d1b4cfc..032f28adf 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
@@ -24,3 +24,5 @@
 		</button>
 	</div>
 </div>
+
+<toaster-container *ngIf="storybookVersion"></toaster-container>
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
index fb87b15a6..9bb4abe9f 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
@@ -18,6 +18,7 @@ export class CategoryCreateComponent implements OnDestroy {
 	productId: any;
 	userId: any;
 	loading: boolean;
+	storybookVersion: boolean;
 
 	private _ngDestroy$ = new Subject<void>();
 
@@ -27,7 +28,9 @@ export class CategoryCreateComponent implements OnDestroy {
 		private readonly _langTranslateService: TranslateService,
 		private readonly _notifyService: NotifyService,
 		private readonly _productsCategoryService: ProductsCategoryService
-	) {}
+	) {
+		this._langTranslateService.use('en');
+	}
 
 	ngOnDestroy() {
 		this._ngDestroy$.next();
@@ -39,6 +42,10 @@ export class CategoryCreateComponent implements OnDestroy {
 	}
 
 	async createCategory(createObject) {
+		if (this.storybookVersion) {
+			this._notifyService.success('Success Message');
+			return true;
+		}
 		try {
 			this.loading = true;
 			await this._productsCategoryService
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
new file mode 100644
index 000000000..233e5ea0c
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
@@ -0,0 +1,112 @@
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+
+import { of } from 'rxjs';
+import { withKnobs, boolean } from '@storybook/addon-knobs';
+import { ThemeModule } from 'app/@theme';
+import { CommonModule } from '@angular/common';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { NbSpinnerModule } from '@nebular/theme';
+import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
+import { ToasterModule } from 'angular2-toaster';
+import {
+	TranslateModule,
+	TranslateStore,
+	TranslateLoader,
+	MissingTranslationHandler,
+	FakeMissingTranslationHandler,
+	TranslateService,
+	TranslatePipe
+} from '@ngx-translate/core';
+import { RouterModule } from '@angular/router';
+import { routes, NbAuthModule } from '@nebular/auth';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
+import { DeviceService } from 'app/@core/data/device.service';
+import { ApolloModule, APOLLO_OPTIONS } from 'apollo-angular';
+import { HttpLink, HttpLinkModule } from 'apollo-angular-link-http';
+import { InMemoryCache } from 'apollo-cache-inmemory';
+import { PipesModule } from '@modules/client.common.angular2/pipes/pipes.module';
+import { HttpClientModule } from '@angular/common/http';
+import { CategoryCreateComponent } from './category-create.component';
+import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
+import { FormsModule } from '@angular/forms';
+import { ProductCategoriesFormsModule } from '../forms/product-categories-forms.module';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
+import { LocaleModule } from '@modules/client.common.angular2/locale/locale.module';
+import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+
+const stories = storiesOf('Categories Create Component', module);
+
+export function createApollo(httpLink: HttpLink) {
+	return {
+		link: httpLink.create({ uri: 'https://api.example.com/graphql' }),
+		cache: new InMemoryCache()
+	};
+}
+
+export const staticTranslateLoader: TranslateLoader = {
+	getTranslation(lang: string) {
+		return of(require('../../../../../assets/i18n/en.json'));
+	}
+};
+
+stories.addDecorator(withKnobs);
+stories.addDecorator(
+	moduleMetadata({
+		declarations: [CategoryCreateComponent],
+		imports: [
+			CommonModule,
+			ThemeModule,
+			Ng2SmartTableModule,
+			NbSpinnerModule,
+			ConfirmationModalModule,
+			BrowserAnimationsModule,
+			ToasterModule.forRoot(),
+			TranslateModule.forChild({
+				loader: {
+					provide: TranslateLoader,
+					useValue: staticTranslateLoader
+				},
+				missingTranslationHandler: {
+					provide: MissingTranslationHandler,
+					useClass: FakeMissingTranslationHandler
+				}
+			}),
+			RouterModule.forChild(routes),
+			NbAuthModule,
+			ApolloModule,
+			HttpLinkModule,
+			PipesModule,
+			FileUploaderModule,
+			Ng2SmartTableModule,
+			NbSpinnerModule,
+			FormsModule,
+			ProductCategoriesFormsModule,
+			LocaleModule,
+			HttpClientModule
+		],
+		providers: [
+			DeviceService,
+			{
+				provide: APOLLO_OPTIONS,
+				useFactory: createApollo,
+				deps: [HttpLink]
+			},
+			TranslateStore,
+			NotifyService,
+			NgbActiveModal,
+			ProductLocalesService,
+			TranslateService,
+			ProductsCategoryService,
+			TranslatePipe
+		]
+	})
+);
+
+stories.add('Category Create', () => ({
+	component: CategoryCreateComponent,
+	props: {
+		storybookVersion: boolean('Storybook-Version', true)
+	}
+}));
diff --git a/admin/website-angular/src/app/app.module.ts b/admin/website-angular/src/app/app.module.ts
index 57f246bd8..3a5e29e35 100644
--- a/admin/website-angular/src/app/app.module.ts
+++ b/admin/website-angular/src/app/app.module.ts
@@ -88,8 +88,7 @@ import { ServerConnectionService } from '@modules/client.common.angular2/service
 		Logger,
 		AppModuleGuard,
 		MaintenanceModuleGuard
-	],
-	exports: []
+	]
 })
 export class AppModule {
 	constructor(apollo: Apollo, httpLink: HttpLink, private store: Store) {
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-info/ea-customer-info.stories.ts b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-info/ea-customer-info.stories.ts
new file mode 100644
index 000000000..fba474552
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-info/ea-customer-info.stories.ts
@@ -0,0 +1,140 @@
+var user = {
+	_id: '5cc0925e8979b91ee93c86a1',
+	firstName: 'Maxwell',
+	lastName: 'Mante',
+	image: 'https://s3.amazonaws.com/uifaces/faces/twitter/jm_denis/128.jpg',
+	email: 'Mason.Kutch33@hotmail.com',
+	apartment: '138',
+	phone: '1-566-610-8055 x749',
+	geoLocation: {
+		streetAddress: '139 Lebsack Parks',
+		city: 'Angelineland',
+		house: '150',
+		loc: {
+			type: 'Point',
+			coordinates: [23.3332736, 42.6459136],
+			__typename: 'Loc'
+		},
+		__typename: 'GeoLocation'
+	},
+	__typename: 'User'
+};
+
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+
+import { withKnobs, object } from '@storybook/addon-knobs';
+import { ThemeModule } from 'app/@theme';
+import { CommonModule, APP_BASE_HREF } from '@angular/common';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { NbSpinnerModule } from '@nebular/theme';
+import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
+import { ToasterModule } from 'angular2-toaster';
+import {
+	TranslateModule,
+	TranslateStore,
+	TranslateService
+} from '@ngx-translate/core';
+import { RouterModule } from '@angular/router';
+import { NbAuthModule } from '@nebular/auth';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
+import { ApolloModule, APOLLO_OPTIONS } from 'apollo-angular';
+import { HttpLink } from 'apollo-angular-link-http';
+import { InMemoryCache } from 'apollo-cache-inmemory';
+import { PipesModule } from '@modules/client.common.angular2/pipes/pipes.module';
+import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { I18nModule } from 'app/@core/utils/i18n.module';
+import { CustomerInfoComponent } from './ea-customer-info.component';
+import { HighlightModule } from 'ngx-highlightjs';
+import { RenderComponentsModule } from 'app/@shared/render-component/render-components.module';
+import { WarehouseMutationModule } from 'app/@shared/warehouse/warehouse-mutation';
+import { CustomerOrdersTableModule } from 'app/@shared/render-component/customer-orders-table/customer-orders-table.module';
+import { CustomerProductsTableModule } from 'app/@shared/render-component/customer-products-table/customer-products-table.module';
+import { CustomerWarehousesTableModule } from 'app/@shared/warehouse/customer-warehouses-table/customer-warehouses-table.module';
+import { WarehouseOrderModalModule } from 'app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.module';
+import { CustomerOrdersModule } from '../ea-customer-orders/ea-customer-orders.module';
+import { FormsModule } from '@angular/forms';
+import { CustomerComponent } from '../customer.component';
+import { CustomerLocationComponent } from '../ea-customer-location/ea-customer-location.component';
+import { CustomerProductsComponent } from '../ea-customer-products/ea-customer-products/ea-customer-products.component';
+import { CustomerStoresComponent } from '../ea-customer-stores/ea-customer-stores.component';
+import { CustomerMetricsComponent } from '../ea-customer-metrics/ea-customer-metrics.component';
+import { UsersService } from 'app/@core/data/users.service';
+
+const stories = storiesOf('Customer Info', module);
+
+export function createApollo(httpLink: HttpLink) {
+	return {
+		link: httpLink.create({ uri: 'https://api.example.com/graphql' }),
+		cache: new InMemoryCache()
+	};
+}
+
+export function createTranslateLoader(http: HttpClient) {
+	return new TranslateHttpLoader(http, '/i18n/', '.json');
+}
+
+stories.addDecorator(withKnobs);
+stories.addDecorator(
+	moduleMetadata({
+		declarations: [
+			CustomerComponent,
+			CustomerLocationComponent,
+			CustomerInfoComponent,
+			CustomerProductsComponent,
+			CustomerStoresComponent,
+			CustomerMetricsComponent
+		],
+		imports: [
+			NgSelectModule,
+			CommonModule,
+			ThemeModule,
+			Ng2SmartTableModule,
+			NbSpinnerModule,
+			ConfirmationModalModule,
+			ToasterModule.forRoot(),
+			HttpClientModule,
+			I18nModule,
+			NbAuthModule,
+			ApolloModule,
+			PipesModule,
+			CommonModule,
+			Ng2SmartTableModule,
+			ThemeModule,
+			ToasterModule.forRoot(),
+			RouterModule.forRoot([]),
+			TranslateModule.forChild(),
+			HighlightModule.forRoot({ theme: 'github' }),
+			RenderComponentsModule,
+			WarehouseMutationModule,
+			CustomerOrdersTableModule,
+			CustomerProductsTableModule,
+			CustomerWarehousesTableModule,
+			WarehouseOrderModalModule,
+			CustomerOrdersModule,
+			NgSelectModule,
+			FormsModule
+		],
+		providers: [
+			{
+				provide: APOLLO_OPTIONS,
+				useFactory: createApollo,
+				deps: [HttpLink]
+			},
+			TranslateStore,
+			NotifyService,
+			TranslateService,
+			HttpLink,
+			UsersService,
+			{ provide: APP_BASE_HREF, useValue: '/' }
+		]
+	})
+);
+
+stories.add('Customer Info', () => ({
+	component: CustomerInfoComponent,
+	props: {
+		user: object('User', user)
+	}
+}));
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.stories.ts b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.stories.ts
new file mode 100644
index 000000000..d41562748
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.stories.ts
@@ -0,0 +1,625 @@
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+
+import { text, withKnobs, object } from '@storybook/addon-knobs';
+import { action } from '@storybook/addon-actions';
+import { ThemeModule } from 'app/@theme';
+import { CommonModule } from '@angular/common';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { NbSpinnerModule } from '@nebular/theme';
+import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
+import { ToasterModule } from 'angular2-toaster';
+import { TranslateStore, TranslateService } from '@ngx-translate/core';
+import { RouterModule } from '@angular/router';
+import { routes, NbAuthModule } from '@nebular/auth';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
+import { ApolloModule, APOLLO_OPTIONS } from 'apollo-angular';
+import { HttpLink } from 'apollo-angular-link-http';
+import { InMemoryCache } from 'apollo-cache-inmemory';
+import { PipesModule } from '@modules/client.common.angular2/pipes/pipes.module';
+import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+import { DashboardSelectStoreComponent } from './dashboard-select-store.component';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { I18nModule } from 'app/@core/utils/i18n.module';
+
+const stories = storiesOf('Dashboard', module);
+
+export function createApollo(httpLink: HttpLink) {
+	return {
+		link: httpLink.create({ uri: 'https://api.example.com/graphql' }),
+		cache: new InMemoryCache()
+	};
+}
+
+export function createTranslateLoader(http: HttpClient) {
+	return new TranslateHttpLoader(http, '/i18n/', '.json');
+}
+
+stories.addDecorator(withKnobs);
+stories.addDecorator(
+	moduleMetadata({
+		declarations: [DashboardSelectStoreComponent],
+		imports: [
+			NgSelectModule,
+			CommonModule,
+			ThemeModule,
+			Ng2SmartTableModule,
+			NbSpinnerModule,
+			ConfirmationModalModule,
+			ToasterModule.forRoot(),
+			HttpClientModule,
+			I18nModule,
+			RouterModule.forChild(routes),
+			NbAuthModule,
+			ApolloModule,
+			PipesModule
+		],
+		providers: [
+			{
+				provide: APOLLO_OPTIONS,
+				useFactory: createApollo,
+				deps: [HttpLink]
+			},
+			TranslateStore,
+			NotifyService,
+			TranslateService,
+			HttpLink
+		]
+	})
+);
+
+stories.add('Dashboard Select Store', () => ({
+	component: DashboardSelectStoreComponent,
+	props: {
+		stores: object('Stores', stores),
+		text: text('Hello', ''),
+		selectedStoreEmitter: action('Selected Data')
+	}
+}));
+
+const stores = [
+	{
+		id: '5cb1494208d4970a8444d97d',
+		_createdAt: '2018-06-28T08:05:00.000Z',
+		name: 'Pizza Dan',
+		contactEmail: 'Daija_Bernier8@gmail.com',
+		contactPhone: '(667) 017-1190 x99049',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Pizza Dan&font_size=75',
+		username: 'restaurant_pizza',
+		usedCarriersIds: [
+			'5cb1492408d4970a8444d8b5',
+			'5cb1492408d4970a8444d8b7',
+			'5cb1492408d4970a8444d8b9',
+			'5cb1492508d4970a8444d8bb',
+			'5cb1492508d4970a8444d8bd',
+			'5cb1492508d4970a8444d8bf',
+			'5cb1492508d4970a8444d8c1',
+			'5cb1492608d4970a8444d8c3',
+			'5cb1492608d4970a8444d8c5',
+			'5cb1492608d4970a8444d8c7',
+			'5cb1492708d4970a8444d8c9',
+			'5cb1492708d4970a8444d8cb',
+			'5cb1492708d4970a8444d8cd',
+			'5cb1492708d4970a8444d8cf',
+			'5cb1492808d4970a8444d8d1',
+			'5cb1492808d4970a8444d8d3',
+			'5cb1492808d4970a8444d8d5',
+			'5cb1492808d4970a8444d8d7',
+			'5cb1492908d4970a8444d8d9',
+			'5cb1492908d4970a8444d8db',
+			'5cb1492908d4970a8444d8dd',
+			'5cb1492a08d4970a8444d8df',
+			'5cb1492a08d4970a8444d8e1',
+			'5cb1492a08d4970a8444d8e3',
+			'5cb1492a08d4970a8444d8e5',
+			'5cb1492b08d4970a8444d8e7',
+			'5cb1492b08d4970a8444d8e9',
+			'5cb1492b08d4970a8444d8eb',
+			'5cb1492b08d4970a8444d8ed',
+			'5cb1492c08d4970a8444d8ef',
+			'5cb1492c08d4970a8444d8f1',
+			'5cb1492c08d4970a8444d8f3',
+			'5cb1492d08d4970a8444d8f5',
+			'5cb1492d08d4970a8444d8f7',
+			'5cb1492d08d4970a8444d8f9',
+			'5cb1492d08d4970a8444d8fb',
+			'5cb1492e08d4970a8444d8fd',
+			'5cb1492e08d4970a8444d8ff',
+			'5cb1492e08d4970a8444d901',
+			'5cb1492f08d4970a8444d903',
+			'5cb1492f08d4970a8444d905',
+			'5cb1492f08d4970a8444d907',
+			'5cb1492f08d4970a8444d909',
+			'5cb1493008d4970a8444d90b',
+			'5cb1493008d4970a8444d90d',
+			'5cb1493008d4970a8444d90f',
+			'5cb1493008d4970a8444d911',
+			'5cb1493108d4970a8444d913',
+			'5cb1493108d4970a8444d915',
+			'5cb1493108d4970a8444d917',
+			'5cb1493208d4970a8444d919',
+			'5cb1493208d4970a8444d91b',
+			'5cb1493208d4970a8444d91d',
+			'5cb1493208d4970a8444d91f',
+			'5cb1493308d4970a8444d921',
+			'5cb1493308d4970a8444d923',
+			'5cb1493308d4970a8444d925',
+			'5cb1493308d4970a8444d927',
+			'5cb1493408d4970a8444d929',
+			'5cb1493408d4970a8444d92b',
+			'5cb1493408d4970a8444d92d',
+			'5cb1493508d4970a8444d92f',
+			'5cb1493508d4970a8444d931',
+			'5cb1493508d4970a8444d933',
+			'5cb1493508d4970a8444d935',
+			'5cb1493608d4970a8444d937',
+			'5cb1493608d4970a8444d939',
+			'5cb1493608d4970a8444d93b',
+			'5cb1493708d4970a8444d93d',
+			'5cb1493708d4970a8444d93f',
+			'5cb1493708d4970a8444d941',
+			'5cb1493708d4970a8444d943',
+			'5cb1493808d4970a8444d945',
+			'5cb1493808d4970a8444d947',
+			'5cb1493808d4970a8444d949',
+			'5cb1493808d4970a8444d94b',
+			'5cb1493908d4970a8444d94d',
+			'5cb1493908d4970a8444d94f',
+			'5cb1493908d4970a8444d951',
+			'5cb1493a08d4970a8444d953',
+			'5cb1493a08d4970a8444d955',
+			'5cb1493a08d4970a8444d957',
+			'5cb1493a08d4970a8444d959',
+			'5cb1493b08d4970a8444d95b',
+			'5cb1493b08d4970a8444d95d',
+			'5cb1493b08d4970a8444d95f',
+			'5cb1493c08d4970a8444d961',
+			'5cb1493c08d4970a8444d963',
+			'5cb1493c08d4970a8444d965',
+			'5cb1493c08d4970a8444d967',
+			'5cb1493d08d4970a8444d969',
+			'5cb1493d08d4970a8444d96b',
+			'5cb1493d08d4970a8444d96d',
+			'5cb1493e08d4970a8444d96f',
+			'5cb1493f08d4970a8444d971',
+			'5cb1493f08d4970a8444d973',
+			'5cb1494008d4970a8444d975',
+			'5cb1494108d4970a8444d977',
+			'5cb1494108d4970a8444d979',
+			'5cb1494208d4970a8444d97b'
+		],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ashdod',
+			streetAddress: 'HaAtsmaut',
+			house: '125',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1494208d4970a8444d97d'
+	},
+	{
+		id: '5cb1494408d4970a8444d983',
+		_createdAt: '2018-05-13T19:26:00.000Z',
+		name: 'Dominex Pizza',
+		contactEmail: 'Lori_Morar@yahoo.com',
+		contactPhone: '990.782.8808',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Pizza Pizza&font_size=75',
+		username: 'dominex_pizza',
+		usedCarriersIds: [
+			'5cb1492408d4970a8444d8b5',
+			'5cb1492408d4970a8444d8b7',
+			'5cb1492408d4970a8444d8b9',
+			'5cb1492508d4970a8444d8bb',
+			'5cb1492508d4970a8444d8bd',
+			'5cb1492508d4970a8444d8bf',
+			'5cb1492508d4970a8444d8c1',
+			'5cb1492608d4970a8444d8c3',
+			'5cb1492608d4970a8444d8c5',
+			'5cb1492608d4970a8444d8c7',
+			'5cb1492708d4970a8444d8c9',
+			'5cb1492708d4970a8444d8cb',
+			'5cb1492708d4970a8444d8cd',
+			'5cb1492708d4970a8444d8cf',
+			'5cb1492808d4970a8444d8d1',
+			'5cb1492808d4970a8444d8d3',
+			'5cb1492808d4970a8444d8d5',
+			'5cb1492808d4970a8444d8d7',
+			'5cb1492908d4970a8444d8d9',
+			'5cb1492908d4970a8444d8db',
+			'5cb1492908d4970a8444d8dd',
+			'5cb1492a08d4970a8444d8df',
+			'5cb1492a08d4970a8444d8e1',
+			'5cb1492a08d4970a8444d8e3',
+			'5cb1492a08d4970a8444d8e5',
+			'5cb1492b08d4970a8444d8e7',
+			'5cb1492b08d4970a8444d8e9',
+			'5cb1492b08d4970a8444d8eb',
+			'5cb1492b08d4970a8444d8ed',
+			'5cb1492c08d4970a8444d8ef',
+			'5cb1492c08d4970a8444d8f1',
+			'5cb1492c08d4970a8444d8f3',
+			'5cb1492d08d4970a8444d8f5',
+			'5cb1492d08d4970a8444d8f7',
+			'5cb1492d08d4970a8444d8f9',
+			'5cb1492d08d4970a8444d8fb',
+			'5cb1492e08d4970a8444d8fd',
+			'5cb1492e08d4970a8444d8ff',
+			'5cb1492e08d4970a8444d901',
+			'5cb1492f08d4970a8444d903',
+			'5cb1492f08d4970a8444d905',
+			'5cb1492f08d4970a8444d907',
+			'5cb1492f08d4970a8444d909',
+			'5cb1493008d4970a8444d90b',
+			'5cb1493008d4970a8444d90d',
+			'5cb1493008d4970a8444d90f',
+			'5cb1493008d4970a8444d911',
+			'5cb1493108d4970a8444d913',
+			'5cb1493108d4970a8444d915',
+			'5cb1493108d4970a8444d917',
+			'5cb1493208d4970a8444d919',
+			'5cb1493208d4970a8444d91b',
+			'5cb1493208d4970a8444d91d',
+			'5cb1493208d4970a8444d91f',
+			'5cb1493308d4970a8444d921',
+			'5cb1493308d4970a8444d923',
+			'5cb1493308d4970a8444d925',
+			'5cb1493308d4970a8444d927',
+			'5cb1493408d4970a8444d929',
+			'5cb1493408d4970a8444d92b',
+			'5cb1493408d4970a8444d92d',
+			'5cb1493508d4970a8444d92f',
+			'5cb1493508d4970a8444d931',
+			'5cb1493508d4970a8444d933',
+			'5cb1493508d4970a8444d935',
+			'5cb1493608d4970a8444d937',
+			'5cb1493608d4970a8444d939',
+			'5cb1493608d4970a8444d93b',
+			'5cb1493708d4970a8444d93d',
+			'5cb1493708d4970a8444d93f',
+			'5cb1493708d4970a8444d941',
+			'5cb1493708d4970a8444d943',
+			'5cb1493808d4970a8444d945',
+			'5cb1493808d4970a8444d947',
+			'5cb1493808d4970a8444d949',
+			'5cb1493808d4970a8444d94b',
+			'5cb1493908d4970a8444d94d',
+			'5cb1493908d4970a8444d94f',
+			'5cb1493908d4970a8444d951',
+			'5cb1493a08d4970a8444d953',
+			'5cb1493a08d4970a8444d955',
+			'5cb1493a08d4970a8444d957',
+			'5cb1493a08d4970a8444d959',
+			'5cb1493b08d4970a8444d95b',
+			'5cb1493b08d4970a8444d95d',
+			'5cb1493b08d4970a8444d95f',
+			'5cb1493c08d4970a8444d961',
+			'5cb1493c08d4970a8444d963',
+			'5cb1493c08d4970a8444d965',
+			'5cb1493c08d4970a8444d967',
+			'5cb1493d08d4970a8444d969',
+			'5cb1493d08d4970a8444d96b',
+			'5cb1493d08d4970a8444d96d',
+			'5cb1493e08d4970a8444d96f',
+			'5cb1493f08d4970a8444d971',
+			'5cb1493f08d4970a8444d973',
+			'5cb1494008d4970a8444d975',
+			'5cb1494108d4970a8444d977',
+			'5cb1494108d4970a8444d979',
+			'5cb1494208d4970a8444d97b'
+		],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ashdod',
+			streetAddress: 'HaAtsmaut',
+			house: '125',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1494408d4970a8444d983'
+	},
+	{
+		id: '5cb1494308d4970a8444d97f',
+		_createdAt: '2017-04-01T04:12:00.000Z',
+		name: 'Pizza Hit',
+		contactEmail: 'Wilburn_Konopelski80@yahoo.com',
+		contactPhone: '641.266.1153 x733',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Pizza Hit&font_size=75',
+		username: 'hut_pizza',
+		usedCarriersIds: [
+			'5cb1492408d4970a8444d8b5',
+			'5cb1492408d4970a8444d8b7',
+			'5cb1492408d4970a8444d8b9',
+			'5cb1492508d4970a8444d8bb',
+			'5cb1492508d4970a8444d8bd',
+			'5cb1492508d4970a8444d8bf',
+			'5cb1492508d4970a8444d8c1',
+			'5cb1492608d4970a8444d8c3',
+			'5cb1492608d4970a8444d8c5',
+			'5cb1492608d4970a8444d8c7',
+			'5cb1492708d4970a8444d8c9',
+			'5cb1492708d4970a8444d8cb',
+			'5cb1492708d4970a8444d8cd',
+			'5cb1492708d4970a8444d8cf',
+			'5cb1492808d4970a8444d8d1',
+			'5cb1492808d4970a8444d8d3',
+			'5cb1492808d4970a8444d8d5',
+			'5cb1492808d4970a8444d8d7',
+			'5cb1492908d4970a8444d8d9',
+			'5cb1492908d4970a8444d8db',
+			'5cb1492908d4970a8444d8dd',
+			'5cb1492a08d4970a8444d8df',
+			'5cb1492a08d4970a8444d8e1',
+			'5cb1492a08d4970a8444d8e3',
+			'5cb1492a08d4970a8444d8e5',
+			'5cb1492b08d4970a8444d8e7',
+			'5cb1492b08d4970a8444d8e9',
+			'5cb1492b08d4970a8444d8eb',
+			'5cb1492b08d4970a8444d8ed',
+			'5cb1492c08d4970a8444d8ef',
+			'5cb1492c08d4970a8444d8f1',
+			'5cb1492c08d4970a8444d8f3',
+			'5cb1492d08d4970a8444d8f5',
+			'5cb1492d08d4970a8444d8f7',
+			'5cb1492d08d4970a8444d8f9',
+			'5cb1492d08d4970a8444d8fb',
+			'5cb1492e08d4970a8444d8fd',
+			'5cb1492e08d4970a8444d8ff',
+			'5cb1492e08d4970a8444d901',
+			'5cb1492f08d4970a8444d903',
+			'5cb1492f08d4970a8444d905',
+			'5cb1492f08d4970a8444d907',
+			'5cb1492f08d4970a8444d909',
+			'5cb1493008d4970a8444d90b',
+			'5cb1493008d4970a8444d90d',
+			'5cb1493008d4970a8444d90f',
+			'5cb1493008d4970a8444d911',
+			'5cb1493108d4970a8444d913',
+			'5cb1493108d4970a8444d915',
+			'5cb1493108d4970a8444d917',
+			'5cb1493208d4970a8444d919',
+			'5cb1493208d4970a8444d91b',
+			'5cb1493208d4970a8444d91d',
+			'5cb1493208d4970a8444d91f',
+			'5cb1493308d4970a8444d921',
+			'5cb1493308d4970a8444d923',
+			'5cb1493308d4970a8444d925',
+			'5cb1493308d4970a8444d927',
+			'5cb1493408d4970a8444d929',
+			'5cb1493408d4970a8444d92b',
+			'5cb1493408d4970a8444d92d',
+			'5cb1493508d4970a8444d92f',
+			'5cb1493508d4970a8444d931',
+			'5cb1493508d4970a8444d933',
+			'5cb1493508d4970a8444d935',
+			'5cb1493608d4970a8444d937',
+			'5cb1493608d4970a8444d939',
+			'5cb1493608d4970a8444d93b',
+			'5cb1493708d4970a8444d93d',
+			'5cb1493708d4970a8444d93f',
+			'5cb1493708d4970a8444d941',
+			'5cb1493708d4970a8444d943',
+			'5cb1493808d4970a8444d945',
+			'5cb1493808d4970a8444d947',
+			'5cb1493808d4970a8444d949',
+			'5cb1493808d4970a8444d94b',
+			'5cb1493908d4970a8444d94d',
+			'5cb1493908d4970a8444d94f',
+			'5cb1493908d4970a8444d951',
+			'5cb1493a08d4970a8444d953',
+			'5cb1493a08d4970a8444d955',
+			'5cb1493a08d4970a8444d957',
+			'5cb1493a08d4970a8444d959',
+			'5cb1493b08d4970a8444d95b',
+			'5cb1493b08d4970a8444d95d',
+			'5cb1493b08d4970a8444d95f',
+			'5cb1493c08d4970a8444d961',
+			'5cb1493c08d4970a8444d963',
+			'5cb1493c08d4970a8444d965',
+			'5cb1493c08d4970a8444d967',
+			'5cb1493d08d4970a8444d969',
+			'5cb1493d08d4970a8444d96b',
+			'5cb1493d08d4970a8444d96d',
+			'5cb1493e08d4970a8444d96f',
+			'5cb1493f08d4970a8444d971',
+			'5cb1493f08d4970a8444d973',
+			'5cb1494008d4970a8444d975',
+			'5cb1494108d4970a8444d977',
+			'5cb1494108d4970a8444d979',
+			'5cb1494208d4970a8444d97b'
+		],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ashdod',
+			streetAddress: 'HaAtsmaut',
+			house: '125',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1494308d4970a8444d97f'
+	},
+	{
+		id: '5cb1492108d4970a8444b566',
+		_createdAt: '2016-12-23T00:21:00.000Z',
+		name: 'Restaurant Leffler, Gislason and Williamson',
+		contactEmail: 'Elinor.Abernathy69@gmail.com',
+		contactPhone: '1-547-018-6580 x973',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Leffler, Gislason and Williamson&font_size=75',
+		username: 'Wava_Kub',
+		usedCarriersIds: ['5cb1492108d4970a8444b564'],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Violafurt',
+			streetAddress: '4642 Rempel Valleys',
+			house: '43',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1492108d4970a8444b566'
+	},
+	{
+		id: '5cb1492108d4970a8444b56a',
+		_createdAt: '2014-08-16T20:08:00.000Z',
+		name: 'Restaurant Lynch, Mann and Roberts',
+		contactEmail: 'Gisselle91@yahoo.com',
+		contactPhone: '384.622.9808 x399',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Lynch, Mann and Roberts&font_size=75',
+		username: 'Emmett80',
+		usedCarriersIds: ['5cb1492108d4970a8444b568'],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Deckowmouth',
+			streetAddress: '0687 Salma Inlet',
+			house: '55',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1492108d4970a8444b56a'
+	},
+	{
+		id: '5cb1492008d4970a8444b562',
+		_createdAt: '2013-06-30T10:02:00.000Z',
+		name: 'Restaurant Goyette, Ankunding and Hansen',
+		contactEmail: 'Demetrius_Barrows16@hotmail.com',
+		contactPhone: '(407) 305-1598 x4226',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Goyette, Ankunding and Hansen&font_size=75',
+		username: 'Brisa.Runolfsdottir',
+		usedCarriersIds: ['5cb1492008d4970a8444b560'],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ritchieside',
+			streetAddress: '668 Bridie Islands',
+			house: '197',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1492008d4970a8444b562'
+	},
+	{
+		id: '5cb1494408d4970a8444d981',
+		_createdAt: '2013-05-14T12:06:00.000Z',
+		name: 'Pizza Troya',
+		contactEmail: 'Corine11@hotmail.com',
+		contactPhone: '(769) 437-3162 x6846',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Pizza Troya&font_size=75',
+		username: 'trova_pizza',
+		usedCarriersIds: [
+			'5cb1492408d4970a8444d8b5',
+			'5cb1492408d4970a8444d8b7',
+			'5cb1492408d4970a8444d8b9',
+			'5cb1492508d4970a8444d8bb',
+			'5cb1492508d4970a8444d8bd',
+			'5cb1492508d4970a8444d8bf',
+			'5cb1492508d4970a8444d8c1',
+			'5cb1492608d4970a8444d8c3',
+			'5cb1492608d4970a8444d8c5',
+			'5cb1492608d4970a8444d8c7',
+			'5cb1492708d4970a8444d8c9',
+			'5cb1492708d4970a8444d8cb',
+			'5cb1492708d4970a8444d8cd',
+			'5cb1492708d4970a8444d8cf',
+			'5cb1492808d4970a8444d8d1',
+			'5cb1492808d4970a8444d8d3',
+			'5cb1492808d4970a8444d8d5',
+			'5cb1492808d4970a8444d8d7',
+			'5cb1492908d4970a8444d8d9',
+			'5cb1492908d4970a8444d8db',
+			'5cb1492908d4970a8444d8dd',
+			'5cb1492a08d4970a8444d8df',
+			'5cb1492a08d4970a8444d8e1',
+			'5cb1492a08d4970a8444d8e3',
+			'5cb1492a08d4970a8444d8e5',
+			'5cb1492b08d4970a8444d8e7',
+			'5cb1492b08d4970a8444d8e9',
+			'5cb1492b08d4970a8444d8eb',
+			'5cb1492b08d4970a8444d8ed',
+			'5cb1492c08d4970a8444d8ef',
+			'5cb1492c08d4970a8444d8f1',
+			'5cb1492c08d4970a8444d8f3',
+			'5cb1492d08d4970a8444d8f5',
+			'5cb1492d08d4970a8444d8f7',
+			'5cb1492d08d4970a8444d8f9',
+			'5cb1492d08d4970a8444d8fb',
+			'5cb1492e08d4970a8444d8fd',
+			'5cb1492e08d4970a8444d8ff',
+			'5cb1492e08d4970a8444d901',
+			'5cb1492f08d4970a8444d903',
+			'5cb1492f08d4970a8444d905',
+			'5cb1492f08d4970a8444d907',
+			'5cb1492f08d4970a8444d909',
+			'5cb1493008d4970a8444d90b',
+			'5cb1493008d4970a8444d90d',
+			'5cb1493008d4970a8444d90f',
+			'5cb1493008d4970a8444d911',
+			'5cb1493108d4970a8444d913',
+			'5cb1493108d4970a8444d915',
+			'5cb1493108d4970a8444d917',
+			'5cb1493208d4970a8444d919',
+			'5cb1493208d4970a8444d91b',
+			'5cb1493208d4970a8444d91d',
+			'5cb1493208d4970a8444d91f',
+			'5cb1493308d4970a8444d921',
+			'5cb1493308d4970a8444d923',
+			'5cb1493308d4970a8444d925',
+			'5cb1493308d4970a8444d927',
+			'5cb1493408d4970a8444d929',
+			'5cb1493408d4970a8444d92b',
+			'5cb1493408d4970a8444d92d',
+			'5cb1493508d4970a8444d92f',
+			'5cb1493508d4970a8444d931',
+			'5cb1493508d4970a8444d933',
+			'5cb1493508d4970a8444d935',
+			'5cb1493608d4970a8444d937',
+			'5cb1493608d4970a8444d939',
+			'5cb1493608d4970a8444d93b',
+			'5cb1493708d4970a8444d93d',
+			'5cb1493708d4970a8444d93f',
+			'5cb1493708d4970a8444d941',
+			'5cb1493708d4970a8444d943',
+			'5cb1493808d4970a8444d945',
+			'5cb1493808d4970a8444d947',
+			'5cb1493808d4970a8444d949',
+			'5cb1493808d4970a8444d94b',
+			'5cb1493908d4970a8444d94d',
+			'5cb1493908d4970a8444d94f',
+			'5cb1493908d4970a8444d951',
+			'5cb1493a08d4970a8444d953',
+			'5cb1493a08d4970a8444d955',
+			'5cb1493a08d4970a8444d957',
+			'5cb1493a08d4970a8444d959',
+			'5cb1493b08d4970a8444d95b',
+			'5cb1493b08d4970a8444d95d',
+			'5cb1493b08d4970a8444d95f',
+			'5cb1493c08d4970a8444d961',
+			'5cb1493c08d4970a8444d963',
+			'5cb1493c08d4970a8444d965',
+			'5cb1493c08d4970a8444d967',
+			'5cb1493d08d4970a8444d969',
+			'5cb1493d08d4970a8444d96b',
+			'5cb1493d08d4970a8444d96d',
+			'5cb1493e08d4970a8444d96f',
+			'5cb1493f08d4970a8444d971',
+			'5cb1493f08d4970a8444d973',
+			'5cb1494008d4970a8444d975',
+			'5cb1494108d4970a8444d977',
+			'5cb1494108d4970a8444d979',
+			'5cb1494208d4970a8444d97b'
+		],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ashdod',
+			streetAddress: 'HaAtsmaut',
+			house: '128',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1494408d4970a8444d981'
+	}
+];
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.ts b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.ts
index 62ba48187..180556a98 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.ts
@@ -57,7 +57,10 @@ export class DashboardComponent implements OnInit, OnDestroy {
 		private readonly _storeOrdersService: WarehouseOrdersService,
 		private readonly _ordersService: OrdersService,
 		private readonly _translateService: TranslateService
-	) {}
+	) {
+		this._translateService.setDefaultLang('en');
+		this._translateService.use('en');
+	}
 
 	get labelAvgPercent() {
 		const maxPercentRate = 100;
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard.stories.ts b/admin/website-angular/src/app/pages/+dashboard/dashboard.stories.ts
new file mode 100644
index 000000000..d4b506368
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard.stories.ts
@@ -0,0 +1,743 @@
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+
+import { text, withKnobs, object } from '@storybook/addon-knobs';
+import { action } from '@storybook/addon-actions';
+import { ThemeModule } from 'app/@theme';
+import { CommonModule, APP_BASE_HREF, DOCUMENT } from '@angular/common';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import {
+	NbSpinnerModule,
+	NbThemeService,
+	NbThemeModule,
+	NB_THEME_OPTIONS,
+	NbMediaBreakpointsService,
+	NB_MEDIA_BREAKPOINTS,
+	NB_BUILT_IN_JS_THEMES,
+	NB_JS_THEMES,
+	DEFAULT_MEDIA_BREAKPOINTS,
+	NB_WINDOW,
+	nbWindowFactory,
+	NB_DOCUMENT,
+	NbSpinnerService,
+	NB_LAYOUT_DIRECTION,
+	NbLayoutDirection,
+	NbLayoutDirectionService,
+	NbLayoutScrollService,
+	NbLayoutRulerService,
+	NbOverlayModule
+} from '@nebular/theme';
+import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
+import { ToasterModule } from 'angular2-toaster';
+import { TranslateStore, TranslateService } from '@ngx-translate/core';
+import { RouterModule } from '@angular/router';
+import { NbAuthModule, NbAuthService } from '@nebular/auth';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
+import { ApolloModule, APOLLO_OPTIONS } from 'apollo-angular';
+import { HttpLink } from 'apollo-angular-link-http';
+import { InMemoryCache } from 'apollo-cache-inmemory';
+import { PipesModule } from '@modules/client.common.angular2/pipes/pipes.module';
+import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { I18nModule } from 'app/@core/utils/i18n.module';
+import { DashboardComponent } from './dashboard.component';
+import { NgxEchartsModule } from 'ngx-echarts';
+import { ChartsPanelComponent } from './charts-panel/charts-panel.component';
+import { ChartPanelHeaderComponent } from './charts-panel/chart-panel-header/chart-panel-header.component';
+import { ChartPanelSummaryComponent } from './charts-panel/chart-panel-summary/chart-panel-summary.component';
+import { OrdersChartComponent } from './charts-panel/charts/orders-chart/orders-chart.component';
+import { ProfitChartComponent } from './charts-panel/charts/profit-chart/profit-chart.component';
+import { LegendChartComponent } from './charts-panel/legend-chart/legend-chart.component';
+import { DashboardSelectStoreComponent } from './dashboard-select-store/dashboard-select-store.component';
+import { WarehousesService } from 'app/@core/data/warehouses.service';
+import { WarehouseModule } from '../+warehouses/+warehouse';
+import { WarehouseOrdersService } from 'app/@core/data/warehouseOrders.service';
+import { WarehouseProductCreateModule } from 'app/@shared/warehouse-product/warehouse-product-create';
+import { WarehouseOrderModule } from '../+warehouses/+warehouse/+warehouse-order/warehouse-order.module';
+import { WarehouseProductsViewModule } from '../+warehouses/+warehouse/+warehouse-products-view/warehouse-products-view.module';
+import { WarehouseMainInfoViewModule } from '../+warehouses/+warehouse/warehouse-main-info/warehouse-main-info.module';
+import { WarehouseSelectViewModule } from '../+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.module';
+import { WarehouseOrderViewModule } from '../+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.module';
+import { WarehouseOrdersTableModule } from '../+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.module';
+import { OrdersService } from 'app/@core/data/orders.service';
+import { OrdersProfitChartService } from 'app/@core/services/dashboard/orders-profit-chart.service';
+import { OrdersChartService } from 'app/@core/services/dashboard/orders-chart.service';
+import { PeriodsService } from 'app/@core/services/dashboard/periods.service';
+import { ProfitChartService } from 'app/@core/services/dashboard/profit-chart.service';
+import { LayoutService } from 'app/@core/services/dashboard/layout.service';
+import {
+	BUILT_IN_THEMES,
+	NbJSThemesRegistry
+} from '@nebular/theme/services/js-themes-registry.service';
+
+const stories = storiesOf('Dashboard', module);
+
+export function createApollo(httpLink: HttpLink) {
+	return {
+		link: httpLink.create({ uri: 'https://api.example.com/graphql' }),
+		cache: new InMemoryCache()
+	};
+}
+
+export function createTranslateLoader(http: HttpClient) {
+	return new TranslateHttpLoader(http, '/i18n/', '.json');
+}
+
+stories.addDecorator(withKnobs);
+stories.addDecorator(
+	moduleMetadata({
+		declarations: [
+			DashboardComponent,
+			ChartsPanelComponent,
+			ChartPanelHeaderComponent,
+			ChartPanelSummaryComponent,
+			OrdersChartComponent,
+			ProfitChartComponent,
+			LegendChartComponent,
+			DashboardSelectStoreComponent
+		],
+		imports: [
+			NgSelectModule,
+			CommonModule,
+			ThemeModule,
+			Ng2SmartTableModule,
+			NbSpinnerModule,
+			ConfirmationModalModule,
+			ToasterModule.forRoot(),
+			HttpClientModule,
+			I18nModule,
+			RouterModule.forRoot([]),
+			NbAuthModule,
+			ApolloModule,
+			PipesModule,
+			NgxEchartsModule,
+			WarehouseModule,
+			WarehouseProductCreateModule,
+			WarehouseOrderModule,
+			WarehouseProductsViewModule,
+			WarehouseMainInfoViewModule,
+			WarehouseSelectViewModule,
+			WarehouseOrderViewModule,
+			WarehouseOrdersTableModule,
+			NbThemeModule
+		],
+		entryComponents: [
+			ChartsPanelComponent,
+			ChartPanelHeaderComponent,
+			ChartPanelSummaryComponent,
+			OrdersChartComponent,
+			ProfitChartComponent,
+			LegendChartComponent
+		],
+		providers: [
+			{
+				provide: APOLLO_OPTIONS,
+				useFactory: createApollo,
+				deps: [HttpLink]
+			},
+			TranslateStore,
+			NotifyService,
+			TranslateService,
+			HttpLink,
+			WarehousesService,
+			WarehouseOrdersService,
+			OrdersService,
+			OrdersProfitChartService,
+			OrdersChartService,
+			PeriodsService,
+			ProfitChartService,
+			{ provide: APP_BASE_HREF, useValue: '/' },
+			{ provide: NB_THEME_OPTIONS, useValue: {} },
+			{
+				provide: NB_MEDIA_BREAKPOINTS,
+				useValue: {
+					name: 'sm',
+					width: 576
+				}
+			},
+			LayoutService,
+			OrdersProfitChartService,
+			OrdersChartService,
+			ProfitChartService,
+			PeriodsService,
+			NbThemeModule,
+			NbThemeService,
+			NbAuthService,
+			NbMediaBreakpointsService,
+			{ provide: NB_THEME_OPTIONS, useValue: {} },
+			{ provide: NB_BUILT_IN_JS_THEMES, useValue: BUILT_IN_THEMES },
+			{ provide: NB_JS_THEMES, useValue: [] },
+			{
+				provide: NB_MEDIA_BREAKPOINTS,
+				useValue: DEFAULT_MEDIA_BREAKPOINTS
+			},
+			{ provide: NB_WINDOW, useFactory: nbWindowFactory },
+			{ provide: NB_DOCUMENT, useExisting: DOCUMENT },
+			NbJSThemesRegistry,
+			NbThemeService,
+			NbMediaBreakpointsService,
+			NbSpinnerService,
+			{ provide: NB_LAYOUT_DIRECTION, useValue: NbLayoutDirection.LTR },
+			NbLayoutDirectionService,
+			NbLayoutScrollService,
+			NbLayoutRulerService,
+			...NbOverlayModule.forRoot().providers
+		]
+	})
+);
+
+stories.add('Dashboard', () => ({
+	component: DashboardComponent,
+	props: {
+		stores: object('Stores', stores),
+		text: text('Hello', ''),
+		selectedStoreEmitter: action('Selected Data')
+	}
+}));
+
+const stores = [
+	{
+		id: '5cb1494208d4970a8444d97d',
+		_createdAt: '2018-06-28T08:05:00.000Z',
+		name: 'Pizza Dan',
+		contactEmail: 'Daija_Bernier8@gmail.com',
+		contactPhone: '(667) 017-1190 x99049',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Pizza Dan&font_size=75',
+		username: 'restaurant_pizza',
+		usedCarriersIds: [
+			'5cb1492408d4970a8444d8b5',
+			'5cb1492408d4970a8444d8b7',
+			'5cb1492408d4970a8444d8b9',
+			'5cb1492508d4970a8444d8bb',
+			'5cb1492508d4970a8444d8bd',
+			'5cb1492508d4970a8444d8bf',
+			'5cb1492508d4970a8444d8c1',
+			'5cb1492608d4970a8444d8c3',
+			'5cb1492608d4970a8444d8c5',
+			'5cb1492608d4970a8444d8c7',
+			'5cb1492708d4970a8444d8c9',
+			'5cb1492708d4970a8444d8cb',
+			'5cb1492708d4970a8444d8cd',
+			'5cb1492708d4970a8444d8cf',
+			'5cb1492808d4970a8444d8d1',
+			'5cb1492808d4970a8444d8d3',
+			'5cb1492808d4970a8444d8d5',
+			'5cb1492808d4970a8444d8d7',
+			'5cb1492908d4970a8444d8d9',
+			'5cb1492908d4970a8444d8db',
+			'5cb1492908d4970a8444d8dd',
+			'5cb1492a08d4970a8444d8df',
+			'5cb1492a08d4970a8444d8e1',
+			'5cb1492a08d4970a8444d8e3',
+			'5cb1492a08d4970a8444d8e5',
+			'5cb1492b08d4970a8444d8e7',
+			'5cb1492b08d4970a8444d8e9',
+			'5cb1492b08d4970a8444d8eb',
+			'5cb1492b08d4970a8444d8ed',
+			'5cb1492c08d4970a8444d8ef',
+			'5cb1492c08d4970a8444d8f1',
+			'5cb1492c08d4970a8444d8f3',
+			'5cb1492d08d4970a8444d8f5',
+			'5cb1492d08d4970a8444d8f7',
+			'5cb1492d08d4970a8444d8f9',
+			'5cb1492d08d4970a8444d8fb',
+			'5cb1492e08d4970a8444d8fd',
+			'5cb1492e08d4970a8444d8ff',
+			'5cb1492e08d4970a8444d901',
+			'5cb1492f08d4970a8444d903',
+			'5cb1492f08d4970a8444d905',
+			'5cb1492f08d4970a8444d907',
+			'5cb1492f08d4970a8444d909',
+			'5cb1493008d4970a8444d90b',
+			'5cb1493008d4970a8444d90d',
+			'5cb1493008d4970a8444d90f',
+			'5cb1493008d4970a8444d911',
+			'5cb1493108d4970a8444d913',
+			'5cb1493108d4970a8444d915',
+			'5cb1493108d4970a8444d917',
+			'5cb1493208d4970a8444d919',
+			'5cb1493208d4970a8444d91b',
+			'5cb1493208d4970a8444d91d',
+			'5cb1493208d4970a8444d91f',
+			'5cb1493308d4970a8444d921',
+			'5cb1493308d4970a8444d923',
+			'5cb1493308d4970a8444d925',
+			'5cb1493308d4970a8444d927',
+			'5cb1493408d4970a8444d929',
+			'5cb1493408d4970a8444d92b',
+			'5cb1493408d4970a8444d92d',
+			'5cb1493508d4970a8444d92f',
+			'5cb1493508d4970a8444d931',
+			'5cb1493508d4970a8444d933',
+			'5cb1493508d4970a8444d935',
+			'5cb1493608d4970a8444d937',
+			'5cb1493608d4970a8444d939',
+			'5cb1493608d4970a8444d93b',
+			'5cb1493708d4970a8444d93d',
+			'5cb1493708d4970a8444d93f',
+			'5cb1493708d4970a8444d941',
+			'5cb1493708d4970a8444d943',
+			'5cb1493808d4970a8444d945',
+			'5cb1493808d4970a8444d947',
+			'5cb1493808d4970a8444d949',
+			'5cb1493808d4970a8444d94b',
+			'5cb1493908d4970a8444d94d',
+			'5cb1493908d4970a8444d94f',
+			'5cb1493908d4970a8444d951',
+			'5cb1493a08d4970a8444d953',
+			'5cb1493a08d4970a8444d955',
+			'5cb1493a08d4970a8444d957',
+			'5cb1493a08d4970a8444d959',
+			'5cb1493b08d4970a8444d95b',
+			'5cb1493b08d4970a8444d95d',
+			'5cb1493b08d4970a8444d95f',
+			'5cb1493c08d4970a8444d961',
+			'5cb1493c08d4970a8444d963',
+			'5cb1493c08d4970a8444d965',
+			'5cb1493c08d4970a8444d967',
+			'5cb1493d08d4970a8444d969',
+			'5cb1493d08d4970a8444d96b',
+			'5cb1493d08d4970a8444d96d',
+			'5cb1493e08d4970a8444d96f',
+			'5cb1493f08d4970a8444d971',
+			'5cb1493f08d4970a8444d973',
+			'5cb1494008d4970a8444d975',
+			'5cb1494108d4970a8444d977',
+			'5cb1494108d4970a8444d979',
+			'5cb1494208d4970a8444d97b'
+		],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ashdod',
+			streetAddress: 'HaAtsmaut',
+			house: '125',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1494208d4970a8444d97d'
+	},
+	{
+		id: '5cb1494408d4970a8444d983',
+		_createdAt: '2018-05-13T19:26:00.000Z',
+		name: 'Dominex Pizza',
+		contactEmail: 'Lori_Morar@yahoo.com',
+		contactPhone: '990.782.8808',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Pizza Pizza&font_size=75',
+		username: 'dominex_pizza',
+		usedCarriersIds: [
+			'5cb1492408d4970a8444d8b5',
+			'5cb1492408d4970a8444d8b7',
+			'5cb1492408d4970a8444d8b9',
+			'5cb1492508d4970a8444d8bb',
+			'5cb1492508d4970a8444d8bd',
+			'5cb1492508d4970a8444d8bf',
+			'5cb1492508d4970a8444d8c1',
+			'5cb1492608d4970a8444d8c3',
+			'5cb1492608d4970a8444d8c5',
+			'5cb1492608d4970a8444d8c7',
+			'5cb1492708d4970a8444d8c9',
+			'5cb1492708d4970a8444d8cb',
+			'5cb1492708d4970a8444d8cd',
+			'5cb1492708d4970a8444d8cf',
+			'5cb1492808d4970a8444d8d1',
+			'5cb1492808d4970a8444d8d3',
+			'5cb1492808d4970a8444d8d5',
+			'5cb1492808d4970a8444d8d7',
+			'5cb1492908d4970a8444d8d9',
+			'5cb1492908d4970a8444d8db',
+			'5cb1492908d4970a8444d8dd',
+			'5cb1492a08d4970a8444d8df',
+			'5cb1492a08d4970a8444d8e1',
+			'5cb1492a08d4970a8444d8e3',
+			'5cb1492a08d4970a8444d8e5',
+			'5cb1492b08d4970a8444d8e7',
+			'5cb1492b08d4970a8444d8e9',
+			'5cb1492b08d4970a8444d8eb',
+			'5cb1492b08d4970a8444d8ed',
+			'5cb1492c08d4970a8444d8ef',
+			'5cb1492c08d4970a8444d8f1',
+			'5cb1492c08d4970a8444d8f3',
+			'5cb1492d08d4970a8444d8f5',
+			'5cb1492d08d4970a8444d8f7',
+			'5cb1492d08d4970a8444d8f9',
+			'5cb1492d08d4970a8444d8fb',
+			'5cb1492e08d4970a8444d8fd',
+			'5cb1492e08d4970a8444d8ff',
+			'5cb1492e08d4970a8444d901',
+			'5cb1492f08d4970a8444d903',
+			'5cb1492f08d4970a8444d905',
+			'5cb1492f08d4970a8444d907',
+			'5cb1492f08d4970a8444d909',
+			'5cb1493008d4970a8444d90b',
+			'5cb1493008d4970a8444d90d',
+			'5cb1493008d4970a8444d90f',
+			'5cb1493008d4970a8444d911',
+			'5cb1493108d4970a8444d913',
+			'5cb1493108d4970a8444d915',
+			'5cb1493108d4970a8444d917',
+			'5cb1493208d4970a8444d919',
+			'5cb1493208d4970a8444d91b',
+			'5cb1493208d4970a8444d91d',
+			'5cb1493208d4970a8444d91f',
+			'5cb1493308d4970a8444d921',
+			'5cb1493308d4970a8444d923',
+			'5cb1493308d4970a8444d925',
+			'5cb1493308d4970a8444d927',
+			'5cb1493408d4970a8444d929',
+			'5cb1493408d4970a8444d92b',
+			'5cb1493408d4970a8444d92d',
+			'5cb1493508d4970a8444d92f',
+			'5cb1493508d4970a8444d931',
+			'5cb1493508d4970a8444d933',
+			'5cb1493508d4970a8444d935',
+			'5cb1493608d4970a8444d937',
+			'5cb1493608d4970a8444d939',
+			'5cb1493608d4970a8444d93b',
+			'5cb1493708d4970a8444d93d',
+			'5cb1493708d4970a8444d93f',
+			'5cb1493708d4970a8444d941',
+			'5cb1493708d4970a8444d943',
+			'5cb1493808d4970a8444d945',
+			'5cb1493808d4970a8444d947',
+			'5cb1493808d4970a8444d949',
+			'5cb1493808d4970a8444d94b',
+			'5cb1493908d4970a8444d94d',
+			'5cb1493908d4970a8444d94f',
+			'5cb1493908d4970a8444d951',
+			'5cb1493a08d4970a8444d953',
+			'5cb1493a08d4970a8444d955',
+			'5cb1493a08d4970a8444d957',
+			'5cb1493a08d4970a8444d959',
+			'5cb1493b08d4970a8444d95b',
+			'5cb1493b08d4970a8444d95d',
+			'5cb1493b08d4970a8444d95f',
+			'5cb1493c08d4970a8444d961',
+			'5cb1493c08d4970a8444d963',
+			'5cb1493c08d4970a8444d965',
+			'5cb1493c08d4970a8444d967',
+			'5cb1493d08d4970a8444d969',
+			'5cb1493d08d4970a8444d96b',
+			'5cb1493d08d4970a8444d96d',
+			'5cb1493e08d4970a8444d96f',
+			'5cb1493f08d4970a8444d971',
+			'5cb1493f08d4970a8444d973',
+			'5cb1494008d4970a8444d975',
+			'5cb1494108d4970a8444d977',
+			'5cb1494108d4970a8444d979',
+			'5cb1494208d4970a8444d97b'
+		],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ashdod',
+			streetAddress: 'HaAtsmaut',
+			house: '125',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1494408d4970a8444d983'
+	},
+	{
+		id: '5cb1494308d4970a8444d97f',
+		_createdAt: '2017-04-01T04:12:00.000Z',
+		name: 'Pizza Hit',
+		contactEmail: 'Wilburn_Konopelski80@yahoo.com',
+		contactPhone: '641.266.1153 x733',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Pizza Hit&font_size=75',
+		username: 'hut_pizza',
+		usedCarriersIds: [
+			'5cb1492408d4970a8444d8b5',
+			'5cb1492408d4970a8444d8b7',
+			'5cb1492408d4970a8444d8b9',
+			'5cb1492508d4970a8444d8bb',
+			'5cb1492508d4970a8444d8bd',
+			'5cb1492508d4970a8444d8bf',
+			'5cb1492508d4970a8444d8c1',
+			'5cb1492608d4970a8444d8c3',
+			'5cb1492608d4970a8444d8c5',
+			'5cb1492608d4970a8444d8c7',
+			'5cb1492708d4970a8444d8c9',
+			'5cb1492708d4970a8444d8cb',
+			'5cb1492708d4970a8444d8cd',
+			'5cb1492708d4970a8444d8cf',
+			'5cb1492808d4970a8444d8d1',
+			'5cb1492808d4970a8444d8d3',
+			'5cb1492808d4970a8444d8d5',
+			'5cb1492808d4970a8444d8d7',
+			'5cb1492908d4970a8444d8d9',
+			'5cb1492908d4970a8444d8db',
+			'5cb1492908d4970a8444d8dd',
+			'5cb1492a08d4970a8444d8df',
+			'5cb1492a08d4970a8444d8e1',
+			'5cb1492a08d4970a8444d8e3',
+			'5cb1492a08d4970a8444d8e5',
+			'5cb1492b08d4970a8444d8e7',
+			'5cb1492b08d4970a8444d8e9',
+			'5cb1492b08d4970a8444d8eb',
+			'5cb1492b08d4970a8444d8ed',
+			'5cb1492c08d4970a8444d8ef',
+			'5cb1492c08d4970a8444d8f1',
+			'5cb1492c08d4970a8444d8f3',
+			'5cb1492d08d4970a8444d8f5',
+			'5cb1492d08d4970a8444d8f7',
+			'5cb1492d08d4970a8444d8f9',
+			'5cb1492d08d4970a8444d8fb',
+			'5cb1492e08d4970a8444d8fd',
+			'5cb1492e08d4970a8444d8ff',
+			'5cb1492e08d4970a8444d901',
+			'5cb1492f08d4970a8444d903',
+			'5cb1492f08d4970a8444d905',
+			'5cb1492f08d4970a8444d907',
+			'5cb1492f08d4970a8444d909',
+			'5cb1493008d4970a8444d90b',
+			'5cb1493008d4970a8444d90d',
+			'5cb1493008d4970a8444d90f',
+			'5cb1493008d4970a8444d911',
+			'5cb1493108d4970a8444d913',
+			'5cb1493108d4970a8444d915',
+			'5cb1493108d4970a8444d917',
+			'5cb1493208d4970a8444d919',
+			'5cb1493208d4970a8444d91b',
+			'5cb1493208d4970a8444d91d',
+			'5cb1493208d4970a8444d91f',
+			'5cb1493308d4970a8444d921',
+			'5cb1493308d4970a8444d923',
+			'5cb1493308d4970a8444d925',
+			'5cb1493308d4970a8444d927',
+			'5cb1493408d4970a8444d929',
+			'5cb1493408d4970a8444d92b',
+			'5cb1493408d4970a8444d92d',
+			'5cb1493508d4970a8444d92f',
+			'5cb1493508d4970a8444d931',
+			'5cb1493508d4970a8444d933',
+			'5cb1493508d4970a8444d935',
+			'5cb1493608d4970a8444d937',
+			'5cb1493608d4970a8444d939',
+			'5cb1493608d4970a8444d93b',
+			'5cb1493708d4970a8444d93d',
+			'5cb1493708d4970a8444d93f',
+			'5cb1493708d4970a8444d941',
+			'5cb1493708d4970a8444d943',
+			'5cb1493808d4970a8444d945',
+			'5cb1493808d4970a8444d947',
+			'5cb1493808d4970a8444d949',
+			'5cb1493808d4970a8444d94b',
+			'5cb1493908d4970a8444d94d',
+			'5cb1493908d4970a8444d94f',
+			'5cb1493908d4970a8444d951',
+			'5cb1493a08d4970a8444d953',
+			'5cb1493a08d4970a8444d955',
+			'5cb1493a08d4970a8444d957',
+			'5cb1493a08d4970a8444d959',
+			'5cb1493b08d4970a8444d95b',
+			'5cb1493b08d4970a8444d95d',
+			'5cb1493b08d4970a8444d95f',
+			'5cb1493c08d4970a8444d961',
+			'5cb1493c08d4970a8444d963',
+			'5cb1493c08d4970a8444d965',
+			'5cb1493c08d4970a8444d967',
+			'5cb1493d08d4970a8444d969',
+			'5cb1493d08d4970a8444d96b',
+			'5cb1493d08d4970a8444d96d',
+			'5cb1493e08d4970a8444d96f',
+			'5cb1493f08d4970a8444d971',
+			'5cb1493f08d4970a8444d973',
+			'5cb1494008d4970a8444d975',
+			'5cb1494108d4970a8444d977',
+			'5cb1494108d4970a8444d979',
+			'5cb1494208d4970a8444d97b'
+		],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ashdod',
+			streetAddress: 'HaAtsmaut',
+			house: '125',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1494308d4970a8444d97f'
+	},
+	{
+		id: '5cb1492108d4970a8444b566',
+		_createdAt: '2016-12-23T00:21:00.000Z',
+		name: 'Restaurant Leffler, Gislason and Williamson',
+		contactEmail: 'Elinor.Abernathy69@gmail.com',
+		contactPhone: '1-547-018-6580 x973',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Leffler, Gislason and Williamson&font_size=75',
+		username: 'Wava_Kub',
+		usedCarriersIds: ['5cb1492108d4970a8444b564'],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Violafurt',
+			streetAddress: '4642 Rempel Valleys',
+			house: '43',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1492108d4970a8444b566'
+	},
+	{
+		id: '5cb1492108d4970a8444b56a',
+		_createdAt: '2014-08-16T20:08:00.000Z',
+		name: 'Restaurant Lynch, Mann and Roberts',
+		contactEmail: 'Gisselle91@yahoo.com',
+		contactPhone: '384.622.9808 x399',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Lynch, Mann and Roberts&font_size=75',
+		username: 'Emmett80',
+		usedCarriersIds: ['5cb1492108d4970a8444b568'],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Deckowmouth',
+			streetAddress: '0687 Salma Inlet',
+			house: '55',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1492108d4970a8444b56a'
+	},
+	{
+		id: '5cb1492008d4970a8444b562',
+		_createdAt: '2013-06-30T10:02:00.000Z',
+		name: 'Restaurant Goyette, Ankunding and Hansen',
+		contactEmail: 'Demetrius_Barrows16@hotmail.com',
+		contactPhone: '(407) 305-1598 x4226',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Goyette, Ankunding and Hansen&font_size=75',
+		username: 'Brisa.Runolfsdottir',
+		usedCarriersIds: ['5cb1492008d4970a8444b560'],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ritchieside',
+			streetAddress: '668 Bridie Islands',
+			house: '197',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1492008d4970a8444b562'
+	},
+	{
+		id: '5cb1494408d4970a8444d981',
+		_createdAt: '2013-05-14T12:06:00.000Z',
+		name: 'Pizza Troya',
+		contactEmail: 'Corine11@hotmail.com',
+		contactPhone: '(769) 437-3162 x6846',
+		logo:
+			'https://fakeimg.pl/200x200/FFD890%2C128/000/?text=Pizza Troya&font_size=75',
+		username: 'trova_pizza',
+		usedCarriersIds: [
+			'5cb1492408d4970a8444d8b5',
+			'5cb1492408d4970a8444d8b7',
+			'5cb1492408d4970a8444d8b9',
+			'5cb1492508d4970a8444d8bb',
+			'5cb1492508d4970a8444d8bd',
+			'5cb1492508d4970a8444d8bf',
+			'5cb1492508d4970a8444d8c1',
+			'5cb1492608d4970a8444d8c3',
+			'5cb1492608d4970a8444d8c5',
+			'5cb1492608d4970a8444d8c7',
+			'5cb1492708d4970a8444d8c9',
+			'5cb1492708d4970a8444d8cb',
+			'5cb1492708d4970a8444d8cd',
+			'5cb1492708d4970a8444d8cf',
+			'5cb1492808d4970a8444d8d1',
+			'5cb1492808d4970a8444d8d3',
+			'5cb1492808d4970a8444d8d5',
+			'5cb1492808d4970a8444d8d7',
+			'5cb1492908d4970a8444d8d9',
+			'5cb1492908d4970a8444d8db',
+			'5cb1492908d4970a8444d8dd',
+			'5cb1492a08d4970a8444d8df',
+			'5cb1492a08d4970a8444d8e1',
+			'5cb1492a08d4970a8444d8e3',
+			'5cb1492a08d4970a8444d8e5',
+			'5cb1492b08d4970a8444d8e7',
+			'5cb1492b08d4970a8444d8e9',
+			'5cb1492b08d4970a8444d8eb',
+			'5cb1492b08d4970a8444d8ed',
+			'5cb1492c08d4970a8444d8ef',
+			'5cb1492c08d4970a8444d8f1',
+			'5cb1492c08d4970a8444d8f3',
+			'5cb1492d08d4970a8444d8f5',
+			'5cb1492d08d4970a8444d8f7',
+			'5cb1492d08d4970a8444d8f9',
+			'5cb1492d08d4970a8444d8fb',
+			'5cb1492e08d4970a8444d8fd',
+			'5cb1492e08d4970a8444d8ff',
+			'5cb1492e08d4970a8444d901',
+			'5cb1492f08d4970a8444d903',
+			'5cb1492f08d4970a8444d905',
+			'5cb1492f08d4970a8444d907',
+			'5cb1492f08d4970a8444d909',
+			'5cb1493008d4970a8444d90b',
+			'5cb1493008d4970a8444d90d',
+			'5cb1493008d4970a8444d90f',
+			'5cb1493008d4970a8444d911',
+			'5cb1493108d4970a8444d913',
+			'5cb1493108d4970a8444d915',
+			'5cb1493108d4970a8444d917',
+			'5cb1493208d4970a8444d919',
+			'5cb1493208d4970a8444d91b',
+			'5cb1493208d4970a8444d91d',
+			'5cb1493208d4970a8444d91f',
+			'5cb1493308d4970a8444d921',
+			'5cb1493308d4970a8444d923',
+			'5cb1493308d4970a8444d925',
+			'5cb1493308d4970a8444d927',
+			'5cb1493408d4970a8444d929',
+			'5cb1493408d4970a8444d92b',
+			'5cb1493408d4970a8444d92d',
+			'5cb1493508d4970a8444d92f',
+			'5cb1493508d4970a8444d931',
+			'5cb1493508d4970a8444d933',
+			'5cb1493508d4970a8444d935',
+			'5cb1493608d4970a8444d937',
+			'5cb1493608d4970a8444d939',
+			'5cb1493608d4970a8444d93b',
+			'5cb1493708d4970a8444d93d',
+			'5cb1493708d4970a8444d93f',
+			'5cb1493708d4970a8444d941',
+			'5cb1493708d4970a8444d943',
+			'5cb1493808d4970a8444d945',
+			'5cb1493808d4970a8444d947',
+			'5cb1493808d4970a8444d949',
+			'5cb1493808d4970a8444d94b',
+			'5cb1493908d4970a8444d94d',
+			'5cb1493908d4970a8444d94f',
+			'5cb1493908d4970a8444d951',
+			'5cb1493a08d4970a8444d953',
+			'5cb1493a08d4970a8444d955',
+			'5cb1493a08d4970a8444d957',
+			'5cb1493a08d4970a8444d959',
+			'5cb1493b08d4970a8444d95b',
+			'5cb1493b08d4970a8444d95d',
+			'5cb1493b08d4970a8444d95f',
+			'5cb1493c08d4970a8444d961',
+			'5cb1493c08d4970a8444d963',
+			'5cb1493c08d4970a8444d965',
+			'5cb1493c08d4970a8444d967',
+			'5cb1493d08d4970a8444d969',
+			'5cb1493d08d4970a8444d96b',
+			'5cb1493d08d4970a8444d96d',
+			'5cb1493e08d4970a8444d96f',
+			'5cb1493f08d4970a8444d971',
+			'5cb1493f08d4970a8444d973',
+			'5cb1494008d4970a8444d975',
+			'5cb1494108d4970a8444d977',
+			'5cb1494108d4970a8444d979',
+			'5cb1494208d4970a8444d97b'
+		],
+		carriersIds: [],
+		geoLocation: {
+			city: 'Ashdod',
+			streetAddress: 'HaAtsmaut',
+			house: '128',
+			__typename: 'GeoLocation'
+		},
+		__typename: 'Warehouse',
+		barcodeData: '5cb1494408d4970a8444d981'
+	}
+];
diff --git a/admin/website-angular/src/app/pages/+device/device.component.ts b/admin/website-angular/src/app/pages/+device/device.component.ts
index d2b68d379..384636be6 100644
--- a/admin/website-angular/src/app/pages/+device/device.component.ts
+++ b/admin/website-angular/src/app/pages/+device/device.component.ts
@@ -40,6 +40,8 @@ export class DeviceComponent implements OnDestroy, OnInit {
 		this._setupDataForSmartTable();
 		this._listenForEntityLocaleTranslate();
 		this._applyTranslationOnSmartTable();
+		this._translateService.setDefaultLang('en');
+		this._translateService.use('en');
 	}
 
 	// Maybe "updateDevice" this function is not in use?!
diff --git a/admin/website-angular/src/app/pages/+device/device.stories.ts b/admin/website-angular/src/app/pages/+device/device.stories.ts
new file mode 100644
index 000000000..7f1a6f837
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+device/device.stories.ts
@@ -0,0 +1,74 @@
+import { storiesOf, moduleMetadata } from '@storybook/angular';
+
+import { withKnobs } from '@storybook/addon-knobs';
+import { DeviceComponent } from './device.component';
+import { ThemeModule } from 'app/@theme';
+import { CommonModule } from '@angular/common';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { NbSpinnerModule } from '@nebular/theme';
+import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
+import { ToasterModule } from 'angular2-toaster';
+import { TranslateStore, TranslateService } from '@ngx-translate/core';
+import { RouterModule } from '@angular/router';
+import { routes, NbAuthModule } from '@nebular/auth';
+import { NotifyService } from 'app/@core/services/notify/notify.service';
+import { DeviceMutationComponent } from './device-mutation/device-mutation.component';
+import { DeviceService } from 'app/@core/data/device.service';
+import { ApolloModule, APOLLO_OPTIONS } from 'apollo-angular';
+import { HttpLink } from 'apollo-angular-link-http';
+import { InMemoryCache } from 'apollo-cache-inmemory';
+import { PipesModule } from '@modules/client.common.angular2/pipes/pipes.module';
+import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+import { I18nModule } from 'app/@core/utils/i18n.module';
+
+const stories = storiesOf('Device Component', module);
+
+export function createApollo(httpLink: HttpLink) {
+	return {
+		link: httpLink.create({ uri: 'https://api.example.com/graphql' }),
+		cache: new InMemoryCache()
+	};
+}
+
+export function createTranslateLoader(http: HttpClient) {
+	return new TranslateHttpLoader(http, '/i18n/', '.json');
+}
+
+stories.addDecorator(withKnobs);
+stories.addDecorator(
+	moduleMetadata({
+		declarations: [DeviceComponent, DeviceMutationComponent],
+		imports: [
+			CommonModule,
+			ThemeModule,
+			Ng2SmartTableModule,
+			NbSpinnerModule,
+			ConfirmationModalModule,
+			ToasterModule.forRoot(),
+			HttpClientModule,
+			I18nModule,
+			RouterModule.forChild(routes),
+			NbAuthModule,
+			ApolloModule,
+			PipesModule
+		],
+		providers: [
+			DeviceService,
+			{
+				provide: APOLLO_OPTIONS,
+				useFactory: createApollo,
+				deps: [HttpLink]
+			},
+			TranslateStore,
+			NotifyService,
+			TranslateService,
+			HttpLink
+		]
+	})
+);
+
+stories.add('Device', () => ({
+	component: DeviceComponent,
+	props: {}
+}));
diff --git a/admin/website-angular/src/app/pages/+profile/profile.component.html b/admin/website-angular/src/app/pages/+profile/profile.component.html
index 09e2d70c6..8ffde17df 100644
--- a/admin/website-angular/src/app/pages/+profile/profile.component.html
+++ b/admin/website-angular/src/app/pages/+profile/profile.component.html
@@ -1,36 +1,36 @@
 <toaster-container></toaster-container>
 
-<nb-card *ngIf="admin$ | async; let admin">
+<nb-card *ngIf="(admin$ | async); let admin">
 	<nb-card-header>
 		<header class="text-center border-bottom">
 			<h1>
-				{{"PROFILE_VIEW.PROFILE_PAGE" | translate}}</h1>
+				{{ 'PROFILE_VIEW.PROFILE_PAGE' | translate }}
+			</h1>
 		</header>
 
 		<body class="row">
 			<div class="col-md-2 profile-image text-center">
 				<div class="row text-center">
 					<div class="col-md-8 offset-md-1">
-						<img src={{admin.pictureUrl}} alt="Admin image">
+						<img src="{{ admin.pictureUrl }}" alt="Admin image" />
 					</div>
 				</div>
 			</div>
 			<div class="col-md-10">
-				<h2>{{admin.name}}</h2>
-				<h4>{{admin.email}}</h4>
+				<h2>{{ admin.name }}</h2>
+				<h4>{{ admin.email }}</h4>
 			</div>
 		</body>
 	</nb-card-header>
 
 	<nb-card-body>
-
 		<nb-tabset fullWidth>
-			<nb-tab tabTitle="{{'PROFILE_VIEW.BASIC_INFO' | translate}}">
-				<ea-basic-info [admin]='admin'></ea-basic-info>
+			<nb-tab tabTitle="{{ 'PROFILE_VIEW.BASIC_INFO' | translate }}">
+				<ea-basic-info [admin]="admin"></ea-basic-info>
 			</nb-tab>
-			<nb-tab tabTitle='{{"PROFILE_VIEW.ACCOUNT" | translate}}'>
+			<nb-tab tabTitle="{{ 'PROFILE_VIEW.ACCOUNT' | translate }}">
 				<ea-account [admin]="admin"></ea-account>
 			</nb-tab>
 		</nb-tabset>
 	</nb-card-body>
-</nb-card>
\ No newline at end of file
+</nb-card>
diff --git a/admin/website-angular/src/stories/index.ts b/admin/website-angular/src/stories/index.ts
deleted file mode 100644
index c50e0b731..000000000
--- a/admin/website-angular/src/stories/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { storiesOf } from '@storybook/angular';
-import { action } from '@storybook/addon-actions';
-import { DeviceComponent } from '../app/pages/+device/device.component';
-
-storiesOf('Devices', module)
-	.add('with default data', () => ({
-		component: DeviceComponent,
-		props: {}
-	}))
-	.add('with default data and action', () => ({
-		component: DeviceComponent,
-		props: {
-			click: action('clicked')
-		}
-	}));
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 3adbadc9f..9d52d6809 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -942,6 +942,18 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
+"@emotion/babel-utils@^0.6.4":
+  version "0.6.10"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz#83dbf3dfa933fae9fc566e54fbb45f14674c6ccc"
+  integrity sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow==
+  dependencies:
+    "@emotion/hash" "^0.6.6"
+    "@emotion/memoize" "^0.6.6"
+    "@emotion/serialize" "^0.9.1"
+    convert-source-map "^1.5.1"
+    find-root "^1.1.0"
+    source-map "^0.7.2"
+
 "@emotion/cache@^10.0.9":
   version "10.0.9"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.9.tgz#e0c7b7a289f7530edcfad4dcf3858bd2e5700a6f"
@@ -977,6 +989,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.1.tgz#9833722341379fb7d67f06a4b00ab3c37913da53"
   integrity sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA==
 
+"@emotion/hash@^0.6.2", "@emotion/hash@^0.6.6":
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44"
+  integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ==
+
 "@emotion/is-prop-valid@0.7.3":
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.7.3.tgz#a6bf4fa5387cbba59d44e698a4680f481a8da6cc"
@@ -989,6 +1006,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.1.tgz#e93c13942592cf5ef01aa8297444dc192beee52f"
   integrity sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg==
 
+"@emotion/memoize@^0.6.1", "@emotion/memoize@^0.6.6":
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b"
+  integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ==
+
 "@emotion/serialize@^0.11.6":
   version "0.11.6"
   resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.6.tgz#78be8b9ee9ff49e0196233ba6ec1c1768ba1e1fc"
@@ -1000,6 +1022,16 @@
     "@emotion/utils" "0.11.1"
     csstype "^2.5.7"
 
+"@emotion/serialize@^0.9.1":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145"
+  integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ==
+  dependencies:
+    "@emotion/hash" "^0.6.6"
+    "@emotion/memoize" "^0.6.6"
+    "@emotion/unitless" "^0.6.7"
+    "@emotion/utils" "^0.8.2"
+
 "@emotion/sheet@0.9.2":
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.2.tgz#74e5c6b5e489a1ba30ab246ab5eedd96916487c4"
@@ -1028,16 +1060,31 @@
   resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.3.tgz#3ca7e9bcb31b3cb4afbaeb66156d86ee85e23246"
   integrity sha512-M3nMfJ6ndJMYloSIbYEBq6G3eqoYD41BpDOxreE8j0cb4fzz/5qvmqU9Mb2hzsXcCnIlGlWhS03PCzVGvTAe0Q==
 
+"@emotion/stylis@^0.7.0":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5"
+  integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ==
+
 "@emotion/unitless@0.7.3":
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.3.tgz#6310a047f12d21a1036fb031317219892440416f"
   integrity sha512-4zAPlpDEh2VwXswwr/t8xGNDGg8RQiPxtxZ3qQEXyQsBV39ptTdESCjuBvGze1nLMVrxmTIKmnO/nAV8Tqjjzg==
 
+"@emotion/unitless@^0.6.2", "@emotion/unitless@^0.6.7":
+  version "0.6.7"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397"
+  integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg==
+
 "@emotion/utils@0.11.1":
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.1.tgz#8529b7412a6eb4b48bdf6e720cc1b8e6e1e17628"
   integrity sha512-8M3VN0hetwhsJ8dH8VkVy7xo5/1VoBsDOk/T4SJOeXwTO1c4uIqVNx2qyecLFnnUWD5vvUqHQ1gASSeUN6zcTg==
 
+"@emotion/utils@^0.8.2":
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc"
+  integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw==
+
 "@emotion/weak-memoize@0.2.2":
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e"
@@ -1048,6 +1095,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz#cbafbfe8894c4e3e3c3a9da6774e249ac1f2da8b"
   integrity sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA==
 
+"@icons/material@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
+  integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -1156,15 +1208,15 @@
     semver "5.6.0"
     semver-intersect "1.4.0"
 
-"@storybook/addon-actions@^5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.0.6.tgz#78cf9c05b8b6cde1d5d46961ffb95d92be16bf46"
-  integrity sha512-Qbenp6Dv8uphDKsIemtW8bSu3PNYIDSB5av7bW9GieYex8QL6ntv7dja0DaD6NmIfjOZdO0Q0U3Nc9CAgHGOBQ==
+"@storybook/addon-actions@^5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.0.10.tgz#7791ee26c41c63f6d2f36ec0b41108ba9b138171"
+  integrity sha512-zPwGMsS11uoKu/gBkBdcdXMtAle2u04O7B1rWFoHFtbQRX+ZDgtkjtSRldpn9t6MYEqJmZ4s3TUxbwv6hKeBOQ==
   dependencies:
-    "@storybook/addons" "5.0.6"
-    "@storybook/components" "5.0.6"
-    "@storybook/core-events" "5.0.6"
-    "@storybook/theming" "5.0.6"
+    "@storybook/addons" "5.0.10"
+    "@storybook/components" "5.0.10"
+    "@storybook/core-events" "5.0.10"
+    "@storybook/theming" "5.0.10"
     core-js "^2.6.5"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"
@@ -1176,24 +1228,74 @@
     react-inspector "^2.3.0"
     uuid "^3.3.2"
 
-"@storybook/addons@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.0.6.tgz#3ecb7fd8421e6557b1abc71ebede905e8decfebc"
-  integrity sha512-VZFYnckWRErkOTZG3a3y7jvnPUjOsTCbWSxvJVMM5SfPzlZbcUz16wJDCJ/pQWI0VzhHFEAVfae9DcuiF031Ow==
+"@storybook/addon-knobs@^5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-5.0.10.tgz#6c8828ee188572ce7ba2430846e875318b049cbf"
+  integrity sha512-5HIncloKy/cj/q2RoW2b9Xe5Ew41v9wDSN3XLiOgsr1TA1uZslStoIfvhuHT4I0rBFTYEgjWebBGgnuY7vvZoA==
   dependencies:
-    "@storybook/channels" "5.0.6"
-    "@storybook/client-logger" "5.0.6"
+    "@storybook/addons" "5.0.10"
+    "@storybook/components" "5.0.10"
+    "@storybook/core-events" "5.0.10"
+    "@storybook/theming" "5.0.10"
+    copy-to-clipboard "^3.0.8"
     core-js "^2.6.5"
+    escape-html "^1.0.3"
+    fast-deep-equal "^2.0.1"
     global "^4.3.2"
+    lodash.debounce "^4.0.8"
+    prop-types "^15.6.2"
+    qs "^6.5.2"
+    react-color "^2.17.0"
+    react-lifecycles-compat "^3.0.4"
+    react-select "^2.3.0"
     util-deprecate "^1.0.2"
 
-"@storybook/angular@^5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/angular/-/angular-5.0.6.tgz#b177cb5e0409a1d86ca434e3d5c20125dea7fc09"
-  integrity sha512-fY1mZ5rQSua8LTjMpU+heSE5h3ygzUcDj9fkIclfBk8V2/E9p+FilPXM3TfaZtAEtsw6VMzRLGZXnA+yc535/w==
+"@storybook/addon-links@^5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-5.0.10.tgz#abf97d9d336a76ea773e71781a0bc1808ff1dd42"
+  integrity sha512-dDiwtHtJydN0fAGKWlWIFQUA8wAiMEepWfKf3Fi7a7gW5syZf9HczlqKqJW9R0oUshPJ+GBTr5Ua49Yan6+9RQ==
+  dependencies:
+    "@storybook/addons" "5.0.10"
+    "@storybook/core-events" "5.0.10"
+    common-tags "^1.8.0"
+    core-js "^2.6.5"
+    global "^4.3.2"
+    prop-types "^15.6.2"
+    qs "^6.5.2"
+
+"@storybook/addon-notes@^5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.0.10.tgz#67875b85402cf07c7b56717c35ba6bdde69bdc78"
+  integrity sha512-x1s2Ihyv3Qkowok/rqPxp2IAYEyhqJOBSqRWgBzch3uKqumzDS2a9bRbasvghuVyV/gubPNzyRTdd3Fhy/tmxg==
   dependencies:
-    "@storybook/core" "5.0.6"
-    "@storybook/node-logger" "5.0.6"
+    "@storybook/addons" "5.0.10"
+    "@storybook/client-logger" "5.0.10"
+    "@storybook/components" "5.0.10"
+    "@storybook/core-events" "5.0.10"
+    "@storybook/theming" "5.0.10"
+    core-js "^2.6.5"
+    markdown-to-jsx "^6.9.1"
+    prop-types "^15.6.2"
+    util-deprecate "^1.0.2"
+
+"@storybook/addons@5.0.10", "@storybook/addons@^5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.0.10.tgz#8911e6e7797185327f0117035a4bc451a57e62d7"
+  integrity sha512-plpLh17dt8KWhs8dRQlleClc7sibE1Plq7QQWyAsZjblRHfpNnv82Ax9ArmMeGFx2TRTTbCOcw9PiaKkt5/E7Q==
+  dependencies:
+    "@storybook/channels" "5.0.10"
+    "@storybook/client-logger" "5.0.10"
+    core-js "^2.6.5"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
+"@storybook/angular@^5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/angular/-/angular-5.0.10.tgz#e443dd29128a6e613dc17114e0284045e8b73f2d"
+  integrity sha512-26C5T5UL9RKx3osOG5Oci6TkZ4m2w9zNLViyTQlzkUjqqUD/VqVYznhCnbTOsrv9b4idr5RXl72JDIR2WqSmJQ==
+  dependencies:
+    "@storybook/core" "5.0.10"
+    "@storybook/node-logger" "5.0.10"
     angular2-template-loader "^0.6.2"
     core-js "^2.6.5"
     fork-ts-checker-webpack-plugin "^0.5.2"
@@ -1206,33 +1308,33 @@
     tsconfig-paths-webpack-plugin "^3.2.0"
     webpack "^4.29.0"
 
-"@storybook/channel-postmessage@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.0.6.tgz#a774cd548d9f229456a56915754db7fd9da7429a"
-  integrity sha512-62gAChPQSnmmdcsCgeU+g/tSqOHLX/nNzmKEsP20v57NqhFwTNfKLMTbQxrl8ttigTafxQZZjQA4EecN0eu16g==
+"@storybook/channel-postmessage@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.0.10.tgz#ade24994e57d7c684d334c2dac3dd049e36c08ff"
+  integrity sha512-5qM6JhgO0eXUcos+CNckq1gOVYJNi9LUBBT0yniO3PdEf7CzwQicv0pTyoFXfUwVNdRobXNPihErqceScXxcFQ==
   dependencies:
-    "@storybook/channels" "5.0.6"
-    "@storybook/client-logger" "5.0.6"
+    "@storybook/channels" "5.0.10"
+    "@storybook/client-logger" "5.0.10"
     core-js "^2.6.5"
     global "^4.3.2"
     telejson "^2.1.0"
 
-"@storybook/channels@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.0.6.tgz#bf056194d633cae873875d6e238c1abadb301dbe"
-  integrity sha512-3Q3uKP5R8q8Q0w6us0f/rlS864ySwl/dN1MZsRg1EaFU+YCy09Mx+3IQDF3FlxseXaQ6UtHcBnMcST4j6FO0ew==
+"@storybook/channels@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.0.10.tgz#b1ae31784359a3d12403a53a5be8eb2327c4a467"
+  integrity sha512-5WWSHEI6uFkzv3E5UaqMH2H0BFCI1CyPrJRUZyhsrBcnJctUQ+4J74IMCP9FQhaBCc6yLQlKWLpllaIHB5kPbA==
   dependencies:
     core-js "^2.6.5"
 
-"@storybook/client-api@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.0.6.tgz#a1622c46abaf1417fcfbbfab4fa8f032b564cd00"
-  integrity sha512-GtqHP5JrWmPOs9VcUdcLi40WLFKw8PdOnM+zMajm+vucyAr/wkc81VtnPjRAOVlZ4TdzGmsSWgFUOewniXlw6g==
+"@storybook/client-api@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.0.10.tgz#c9cae5e35369658415a3f41d9a65418605664ad1"
+  integrity sha512-AfzSvXKfnQQQQUs3U+AecIJx0aNW0NT+pb8OcQLsO47gKdSTE2ursRiii7+YbjSG96/cL4mpdD/AmFoWJ+ubow==
   dependencies:
-    "@storybook/addons" "5.0.6"
-    "@storybook/client-logger" "5.0.6"
-    "@storybook/core-events" "5.0.6"
-    "@storybook/router" "5.0.6"
+    "@storybook/addons" "5.0.10"
+    "@storybook/client-logger" "5.0.10"
+    "@storybook/core-events" "5.0.10"
+    "@storybook/router" "5.0.10"
     common-tags "^1.8.0"
     core-js "^2.6.5"
     eventemitter3 "^3.1.0"
@@ -1244,23 +1346,23 @@
     memoizerific "^1.11.3"
     qs "^6.5.2"
 
-"@storybook/client-logger@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.0.6.tgz#d183534ccc8c864039113dcc33407e7f1f5d7594"
-  integrity sha512-WYF3E2A5UzAPcCVs3A2xqbdrDfGi/g6zByDZYnmgW46U7NkvmGRPLGMt/lTXBQNwB3LVNlg7SRQO/AJwgqIJ0Q==
+"@storybook/client-logger@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.0.10.tgz#710b249c30aa320a0aef7da464d7e621a390bf92"
+  integrity sha512-Nh4dJ8rTPtOT1/Bef39+4HZVYX6EJthMpjjV04AWxT5ngxBa2MzhmcbnoYc3NOBSRh9fhJ6jm14/skQmLAO/jQ==
   dependencies:
     core-js "^2.6.5"
 
-"@storybook/components@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.0.6.tgz#de77af3443f771d94a692edb719bc0d8c0149daf"
-  integrity sha512-C++A39n9O09PU2e4Y8x/zbZ+Tf0t/mfPw83Mkh8d8OHS4rHdVKEhq6QC8oDuqT9YBNhJOohtg5d9n+7s8sqZyQ==
-  dependencies:
-    "@storybook/addons" "5.0.6"
-    "@storybook/client-logger" "5.0.6"
-    "@storybook/core-events" "5.0.6"
-    "@storybook/router" "5.0.6"
-    "@storybook/theming" "5.0.6"
+"@storybook/components@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.0.10.tgz#e0e7eed0e42160a8143fb7e57e7b45bb1ed71841"
+  integrity sha512-G2+2+8y3vFBvOqbaqOLDAjWFM9iO3TNnWadqkS5t6jAsl/pCVozKecPihR8S7Qr4Joy3PpdVSXGjFNFDWVJT4g==
+  dependencies:
+    "@storybook/addons" "5.0.10"
+    "@storybook/client-logger" "5.0.10"
+    "@storybook/core-events" "5.0.10"
+    "@storybook/router" "5.0.10"
+    "@storybook/theming" "5.0.10"
     core-js "^2.6.5"
     global "^4.3.2"
     immer "^1.12.0"
@@ -1282,32 +1384,32 @@
     recompose "^0.30.0"
     render-fragment "^0.1.1"
 
-"@storybook/core-events@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.0.6.tgz#ead92a1e463d53fa57151b62192e74f8e3f45b3b"
-  integrity sha512-OpNHSAxgaok1JYbF5AOML23rIyIyTxir7Ou/s4McN2k0Z2huLaIBA3aeu7vSMygOvN+q6VGMc4uC7f6WQ6kwUg==
+"@storybook/core-events@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.0.10.tgz#6437f8b6a6c3c902fa2fbad8de992c5104115332"
+  integrity sha512-Hp8PleSXAbVNr/yi58JIQb/tjZVpRcjEe8ztIp4JT5qhpz+xHTiVnS7mo8gCdyMw5cr38ANgdlZGnLshJY29lQ==
   dependencies:
     core-js "^2.6.5"
 
-"@storybook/core@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.0.6.tgz#142b4d98888dce6e4e6d1b235d09777954cee2de"
-  integrity sha512-Uzl0CzM2Th24T47TLImis0sFiCzDy2tExDt24p/ojMy2HYA/aT+kTGUN5OMXBZTKDbRFQgv0P2vzHCWyS//Zmw==
+"@storybook/core@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.0.10.tgz#fa9632a97fa97fd86c75c9fbeb02a54c34c7e903"
+  integrity sha512-b87JULxcvZxyM3w8JwdW5iJAt9aVqohfFA3v6dTGSq+H6q8do2rGD3nBCG/iaLsy1NnSskLw6Cd2BNuLDvvWOA==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.3.0"
     "@babel/plugin-proposal-object-rest-spread" "^7.3.2"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
     "@babel/plugin-transform-react-constant-elements" "^7.2.0"
     "@babel/preset-env" "^7.4.1"
-    "@storybook/addons" "5.0.6"
-    "@storybook/channel-postmessage" "5.0.6"
-    "@storybook/client-api" "5.0.6"
-    "@storybook/client-logger" "5.0.6"
-    "@storybook/core-events" "5.0.6"
-    "@storybook/node-logger" "5.0.6"
-    "@storybook/router" "5.0.6"
-    "@storybook/theming" "5.0.6"
-    "@storybook/ui" "5.0.6"
+    "@storybook/addons" "5.0.10"
+    "@storybook/channel-postmessage" "5.0.10"
+    "@storybook/client-api" "5.0.10"
+    "@storybook/client-logger" "5.0.10"
+    "@storybook/core-events" "5.0.10"
+    "@storybook/node-logger" "5.0.10"
+    "@storybook/router" "5.0.10"
+    "@storybook/theming" "5.0.10"
+    "@storybook/ui" "5.0.10"
     airbnb-js-shims "^1 || ^2"
     autoprefixer "^9.4.7"
     babel-plugin-add-react-displayname "^0.0.5"
@@ -1363,10 +1465,10 @@
     webpack-dev-middleware "^3.5.1"
     webpack-hot-middleware "^2.24.3"
 
-"@storybook/node-logger@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.0.6.tgz#80044c2b9d278c9c191ee5bc9e15e93247146b3a"
-  integrity sha512-8KKhhsftxjpew1VOXHZDudylzF7y3SUHxvChykK3V4yjZlbtR5a5U8EGE5Bx5HW0aoInFk08uYTMqsHDRvccfw==
+"@storybook/node-logger@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.0.10.tgz#ee1908c30d5fd0262e3b01c13cfd92b07dbbb083"
+  integrity sha512-+ais31IeGdbJ1AyZ0MRoNdWnIjZmqrp7SBgwyj37EKn1isgTsN/iP6xqEgmAdWlxMTPRFExYMD3pkxip1WtwaQ==
   dependencies:
     chalk "^2.4.2"
     core-js "^2.6.5"
@@ -1374,26 +1476,26 @@
     pretty-hrtime "^1.0.3"
     regenerator-runtime "^0.12.1"
 
-"@storybook/router@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.0.6.tgz#1856aaa2771145a7ace804d893fa92bc73418039"
-  integrity sha512-mK+chRfpoINrDEWXQ7P2Gff179hl3q0bPfDo4DwbGO0wf0yOKDGXf+S/vlIF29+5weyhrMe4Si9PALq4ibsl6Q==
+"@storybook/router@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.0.10.tgz#a756dc521fc4df19a090fcc23eed0a5de5fedc87"
+  integrity sha512-mHxMynnsbUNcr1GoXXunRVI+JvDTBE/lAAdqzMUduI4E6eUv8MHXw2KfeNQcZaNAf0PLynvbqJd2qpfMpKo/zA==
   dependencies:
     "@reach/router" "^1.2.1"
-    "@storybook/theming" "5.0.6"
+    "@storybook/theming" "5.0.10"
     core-js "^2.6.5"
     global "^4.3.2"
     memoizerific "^1.11.3"
     qs "^6.5.2"
 
-"@storybook/theming@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.0.6.tgz#5827d780eb45a031ad27cd19bd87cd70a818546f"
-  integrity sha512-Kz0/ujHknhan7DHApLIdSzfLAMbpo7AEKmi+R060ZV0ImGmAP9O7Ytqws7u1O25fgA4AgCDyeDpT4N9i83la+w==
+"@storybook/theming@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.0.10.tgz#6e2b00f879678419e2297ed8a31c357ae7976801"
+  integrity sha512-4IUtWglyAQCPHKMqPZkTWc/8FbfGHwtRSbaNxbv5S6PEcfWPIiMVWWRYMBNyETvYoYbCOHORH1w7iwJs75sRmA==
   dependencies:
     "@emotion/core" "^10.0.7"
     "@emotion/styled" "^10.0.7"
-    "@storybook/client-logger" "5.0.6"
+    "@storybook/client-logger" "5.0.10"
     common-tags "^1.8.0"
     core-js "^2.6.5"
     deep-object-diff "^1.1.0"
@@ -1406,17 +1508,17 @@
     prop-types "^15.6.2"
     react-inspector "^2.3.1"
 
-"@storybook/ui@5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.0.6.tgz#954b1284d0a21e8c0154e56c2f76e58e66fe09fe"
-  integrity sha512-XmyJokPE7gWKmZXAVXnlRZgU3vQKyUMt6KJrg8Q6GqbvyaPN6p5OlLVDZMgPA/5DpCGfMUEp3BMbJpl9SI97tA==
-  dependencies:
-    "@storybook/addons" "5.0.6"
-    "@storybook/client-logger" "5.0.6"
-    "@storybook/components" "5.0.6"
-    "@storybook/core-events" "5.0.6"
-    "@storybook/router" "5.0.6"
-    "@storybook/theming" "5.0.6"
+"@storybook/ui@5.0.10":
+  version "5.0.10"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.0.10.tgz#58b7d8c706776eb9c048d3dc69bedc8a198b0609"
+  integrity sha512-iKMmfY5MCJ3hVrWxqlN0t1sldJhnx9t0cXp91yI8Y+cV190Yw3KI5nE8kHF2ETInhHLfSRSl4Ssz/Xi2s4AsKg==
+  dependencies:
+    "@storybook/addons" "5.0.10"
+    "@storybook/client-logger" "5.0.10"
+    "@storybook/components" "5.0.10"
+    "@storybook/core-events" "5.0.10"
+    "@storybook/router" "5.0.10"
+    "@storybook/theming" "5.0.10"
     core-js "^2.6.5"
     fast-deep-equal "^2.0.1"
     fuzzy-search "^3.0.1"
@@ -2730,6 +2832,24 @@ babel-plugin-emotion@^10.0.7, babel-plugin-emotion@^10.0.9:
     find-root "^1.1.0"
     source-map "^0.5.7"
 
+babel-plugin-emotion@^9.2.11:
+  version "9.2.11"
+  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz#319c005a9ee1d15bb447f59fe504c35fd5807728"
+  integrity sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@emotion/babel-utils" "^0.6.4"
+    "@emotion/hash" "^0.6.2"
+    "@emotion/memoize" "^0.6.1"
+    "@emotion/stylis" "^0.7.0"
+    babel-plugin-macros "^2.0.0"
+    babel-plugin-syntax-jsx "^6.18.0"
+    convert-source-map "^1.5.0"
+    find-root "^1.1.0"
+    mkdirp "^0.5.1"
+    source-map "^0.5.7"
+    touch "^2.0.1"
+
 babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.4.5:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.5.1.tgz#4a119ac2c2e19b458c259b9accd7ee34fd57ec6f"
@@ -4233,6 +4353,13 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
+copy-to-clipboard@^3.0.8:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.1.0.tgz#0a28141899e6bd217b9dc13fd1689b3b38820b44"
+  integrity sha512-+RNyDq266tv5aGhfRsL6lxgj8Y6sCvTrVJnFUVvuxuqkcSMaLISt1wd4JkdQSphbcLTIQ9kEpTULNnoCXAFdng==
+  dependencies:
+    toggle-selection "^1.0.6"
+
 copy-webpack-plugin@4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
@@ -4318,6 +4445,19 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
+create-emotion@^9.2.12:
+  version "9.2.12"
+  resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz#0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f"
+  integrity sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA==
+  dependencies:
+    "@emotion/hash" "^0.6.2"
+    "@emotion/memoize" "^0.6.1"
+    "@emotion/stylis" "^0.7.0"
+    "@emotion/unitless" "^0.6.2"
+    csstype "^2.5.2"
+    stylis "^3.5.0"
+    stylis-rule-sheet "^0.0.10"
+
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -4493,6 +4633,11 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+csstype@^2.5.2:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.4.tgz#d585a6062096e324e7187f80e04f92bd0f00e37f"
+  integrity sha512-lAJUJP3M6HxFXbqtGRc0iZrdyeN+WzOWeY0q/VnFzI+kqVrYIzC7bWlKqCW7oCIdzoPkvfp82EVvrTlQ8zsWQg==
+
 csstype@^2.5.7:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.3.tgz#b701e5968245bf9b08d54ac83d00b624e622a9fa"
@@ -4989,6 +5134,11 @@ deep-object-diff@^1.1.0:
   resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
   integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
 
+deepmerge@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"
+  integrity sha512-urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w==
+
 deepmerge@^2.0.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
@@ -5227,6 +5377,13 @@ dom-converter@^0.2:
   dependencies:
     utila "~0.4"
 
+dom-helpers@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
+  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -5420,6 +5577,14 @@ emotion-theming@^10.0.7:
     hoist-non-react-statics "^3.3.0"
     object-assign "^4.1.1"
 
+emotion@^9.1.2:
+  version "9.2.12"
+  resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz#53925aaa005614e65c6e43db8243c843574d1ea9"
+  integrity sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ==
+  dependencies:
+    babel-plugin-emotion "^9.2.11"
+    create-emotion "^9.2.12"
+
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -5587,7 +5752,7 @@ es6-shim@^0.35.3:
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.5.tgz#46f59dc0a84a1c5029e8ff1166ca0a902077a9ab"
   integrity sha512-E9kK/bjtCQRpN1K28Xh4BlmP8egvZBGJJ+9GtnzOwt7mdqtrjHFuVGr7QJfdjBIKqrlU5duPf3pCBoDrkjVYFg==
 
-escape-html@~1.0.3:
+escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
@@ -8466,7 +8631,7 @@ lodash.throttle@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
-lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
+lodash@>4.17.4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -8670,6 +8835,11 @@ marked@^0.6.1:
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
   integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
 
+material-colors@^1.2.1:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
+  integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
+
 mathml-tag-names@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz#490b70e062ee24636536e3d9481e333733d00f2c"
@@ -8717,6 +8887,11 @@ mem@^4.0.0:
     mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
+memoize-one@^5.0.0:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.0.4.tgz#005928aced5c43d890a4dfab18ca908b0ec92cbc"
+  integrity sha512-P0z5IeAH6qHHGkJIXWw0xC2HNEgkx/9uWWBQw64FJj3/ol14VYdfVGWWr0fXfjhhv3TKVIqUq65os6O4GUNksA==
+
 memoizerific@^1.11.3:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
@@ -9199,6 +9374,14 @@ ngx-moment@^3.3.0:
   dependencies:
     tslib "^1.9.0"
 
+ngx-translate-multi-http-loader@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-translate-multi-http-loader/-/ngx-translate-multi-http-loader-3.0.0.tgz#dcec774fe5ad8d180845a571a8f6d15b0b5bd946"
+  integrity sha512-tN9a97sdXkqGZIeQhnl14l+7+xFwqpYMTkbrW7K/1f16q3+OFC++1uPfrKs7rACQ7ZBmTJ86JB729PTUIVi3xA==
+  dependencies:
+    deepmerge "2.1.1"
+    tslib "^1.9.0"
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -9361,6 +9544,13 @@ nopt@^4.0.1, nopt@~4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
+nopt@~1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
+  integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
+  dependencies:
+    abbrev "1"
+
 normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -10438,7 +10628,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
+prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -10632,6 +10822,13 @@ quote-stream@^1.0.1, quote-stream@~1.0.2:
     minimist "^1.1.3"
     through2 "^2.0.0"
 
+raf@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
+  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
+  dependencies:
+    performance-now "^2.1.0"
+
 ramda@^0.21.0:
   version "0.21.0"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.21.0.tgz#a001abedb3ff61077d4ff1d577d44de77e8d0a35"
@@ -10693,6 +10890,18 @@ react-clientside-effect@^1.2.0:
     "@babel/runtime" "^7.0.0"
     shallowequal "^1.1.0"
 
+react-color@^2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.17.0.tgz#e14b8a11f4e89163f65a34c8b43faf93f7f02aaa"
+  integrity sha512-kJfE5tSaFe6GzalXOHksVjqwCPAsTl+nzS9/BWfP7j3EXbQ4IiLAF9sZGNzk3uq7HfofGYgjmcUgh0JP7xAQ0w==
+  dependencies:
+    "@icons/material" "^0.2.4"
+    lodash ">4.17.4"
+    material-colors "^1.2.1"
+    prop-types "^15.5.10"
+    reactcss "^1.2.0"
+    tinycolor2 "^1.4.1"
+
 react-dev-utils@^7.0.0:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-7.0.5.tgz#cb95375d01ae71ca27b3c7616006ef7a77d14e8e"
@@ -10778,6 +10987,13 @@ react-hotkeys@2.0.0-pre4:
   dependencies:
     prop-types "^15.6.1"
 
+react-input-autosize@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8"
+  integrity sha512-3+K4CD13iE4lQQ2WlF8PuV5htfmTRLH6MDnfndHM6LuBRszuXnuyIfE7nhSKt8AzRBZ50bu0sAhkNMeS5pxQQA==
+  dependencies:
+    prop-types "^15.5.8"
+
 react-inspector@^2.3.0, react-inspector@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-2.3.1.tgz#f0eb7f520669b545b441af9d38ec6d706e5f649c"
@@ -10837,6 +11053,19 @@ react-resize-detector@^3.2.1:
     prop-types "^15.6.2"
     resize-observer-polyfill "^1.5.1"
 
+react-select@^2.3.0:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-2.4.3.tgz#62efdf76d7e33e9bde22d907a0cc8abd0aeab656"
+  integrity sha512-cmxNaiHpviRYkojeW9rGEUJ4jpX7QTmPe2wcscwA4d1lStzw/cJtr4ft5H2O/YhfpkrcwaLghu3XmEYdXhBo8Q==
+  dependencies:
+    classnames "^2.2.5"
+    emotion "^9.1.2"
+    memoize-one "^5.0.0"
+    prop-types "^15.6.0"
+    raf "^3.4.0"
+    react-input-autosize "^2.2.1"
+    react-transition-group "^2.2.1"
+
 react-syntax-highlighter@^8.0.1:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-8.1.0.tgz#59103ff17a828a27ed7c8f035ae2558f09b6b78c"
@@ -10856,6 +11085,16 @@ react-textarea-autosize@^7.0.4:
     "@babel/runtime" "^7.1.2"
     prop-types "^15.6.0"
 
+react-transition-group@^2.2.1:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
+  integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
+  dependencies:
+    dom-helpers "^3.4.0"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+    react-lifecycles-compat "^3.0.4"
+
 react@^16.8.1:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
@@ -10866,6 +11105,13 @@ react@^16.8.1:
     prop-types "^15.6.2"
     scheduler "^0.13.6"
 
+reactcss@^1.2.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
+  integrity sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==
+  dependencies:
+    lodash "^4.0.1"
+
 reactjs-popup@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/reactjs-popup/-/reactjs-popup-1.3.2.tgz#7f7861443fc5edfb0184da1d01838dbd5db690cd"
@@ -12012,7 +12258,7 @@ source-map@0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
   integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@0.7.3:
+source-map@0.7.3, source-map@^0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -12522,6 +12768,16 @@ stylelint@^9.10.1:
     svg-tags "^1.0.0"
     table "^5.0.0"
 
+stylis-rule-sheet@^0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"
+  integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==
+
+stylis@^3.5.0:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
+  integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
+
 stylus-loader@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
@@ -12775,6 +13031,11 @@ tiny-warning@^1.0.0:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28"
   integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==
 
+tinycolor2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
+  integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
+
 tinymce@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.0.3.tgz#40fa8658b5bdf58e7f04c816b38e1b06f96f6cfe"
@@ -12839,6 +13100,18 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toggle-selection@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
+  integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
+
+touch@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz#ca0b2a3ae3211246a61b16ba9e6cbf1596287164"
+  integrity sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A==
+  dependencies:
+    nopt "~1.0.10"
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
diff --git a/package.json b/package.json
index af8e56d77..f05825b14 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,8 @@
 		"@angular/core": "^7.2.4",
 		"@angular/platform-browser": "^7.2.4",
 		"@angular/platform-browser-dynamic": "^7.2.4",
+		"@ngx-translate/core": "^11.0.1",
+		"@ngx-translate/http-loader": "^4.0.0",
 		"@captemulation/get-parameter-names": "^1.2.0",
 		"@nestjs/typeorm": "^5.3.0",
 		"angular2-logger": "^0.7.0",
diff --git a/yarn.lock b/yarn.lock
index 7162e7691..6f382d26a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -921,6 +921,20 @@
   dependencies:
     uuid "3.3.2"
 
+"@ngx-translate/core@^11.0.1":
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-11.0.1.tgz#cecefad41f06368f5859dac48fec8fcc4485615f"
+  integrity sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==
+  dependencies:
+    tslib "^1.9.0"
+
+"@ngx-translate/http-loader@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz#8a555248ad4b7d513460fcec9da25b0447962f1d"
+  integrity sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==
+  dependencies:
+    tslib "^1.9.0"
+
 "@nodelib/fs.stat@^1.0.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.1.tgz#53f349bb986ab273d601175aa1b25a655ab90ee3"

From a3cd84636c74a2bac9cf98a9838d620381922394 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 26 Apr 2019 18:41:34 +0300
Subject: [PATCH 204/382] chore: lots of packages updates

---
 admin/website-angular/.gitignore    |    4 +
 admin/website-angular/package.json  |  150 +-
 admin/website-angular/tsconfig.json |   12 +-
 admin/website-angular/yarn.lock     |  721 ++++++----
 backend/api/package.json            |   93 +-
 backend/api/yarn.lock               | 1370 ++++++++++--------
 carrier/mobile-ionic/package.json   |    6 +-
 carrier/mobile-ionic/yarn.lock      |   74 +-
 merchant/tablet-ionic/package.json  |    6 +-
 merchant/tablet-ionic/yarn.lock     |   74 +-
 package.json                        |   62 +-
 shop/mobile-ionic/package.json      |    6 +-
 shop/mobile-ionic/yarn.lock         |   74 +-
 shop/website-angular/package.json   |    6 +-
 shop/website-angular/yarn.lock      |  112 +-
 yarn.lock                           | 1986 +++++++++++++++------------
 16 files changed, 2789 insertions(+), 1967 deletions(-)

diff --git a/admin/website-angular/.gitignore b/admin/website-angular/.gitignore
index 596206f89..fff12b76a 100644
--- a/admin/website-angular/.gitignore
+++ b/admin/website-angular/.gitignore
@@ -57,3 +57,7 @@ Thumbs.db
 .env.prod
 /src/environments/environment.ts
 /src/environments/environment.prod.ts
+
+# storybook builds
+
+/storybook-static
diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 93f87f6e3..b91b408df 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -40,7 +40,7 @@
 		"config": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn ts-node ./scripts/configure.ts",
 		"config:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=dev",
 		"config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=prod",
-		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn build && ng serve",
+		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng serve",
 		"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng build",
 		"build:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn run build -- --prod --aot",
 		"test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng test",
@@ -54,100 +54,100 @@
 		"docs": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs",
 		"docs:serve": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs -s",
 		"release:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn run conventional-changelog -- -p angular -i CHANGELOG.md -s",
-		"storybook": "start-storybook -p 6006",
-		"build-storybook": "build-storybook"
+		"storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && start-storybook -p 9001 -c .storybook",
+		"build-storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && build-storybook -c .storybook"
 	},
 	"dependencies": {
 		"@agm/core": "^1.0.0-beta.5",
-		"@angular/animations": "^7.2.11",
-		"@angular/cdk": "^7.3.6",
-		"@angular/common": "^7.2.11",
-		"@angular/compiler": "^7.2.11",
-		"@angular/core": "^7.2.11",
-		"@angular/forms": "^7.2.11",
-		"@angular/http": "^7.2.11",
-		"@angular/platform-browser": "^7.2.11",
-		"@angular/platform-browser-dynamic": "^7.2.11",
-		"@angular/router": "^7.2.11",
-		"@asymmetrik/ngx-leaflet": "^5.0.1",
-		"@fortawesome/fontawesome-free": "^5.7.2",
-		"@nebular/auth": "^3.2.1",
-		"@nebular/bootstrap": "^3.2.1",
-		"@nebular/security": "^3.2.1",
-		"@nebular/theme": "^3.2.1",
-		"@ng-bootstrap/ng-bootstrap": "^4.0.3",
-		"@ng-select/ng-select": "^2.15.3",
+		"@angular/animations": "^7.2.14",
+		"@angular/cdk": "^7.3.7",
+		"@angular/common": "^7.2.14",
+		"@angular/compiler": "^7.2.14",
+		"@angular/core": "^7.2.14",
+		"@angular/forms": "^7.2.14",
+		"@angular/http": "^7.2.14",
+		"@angular/platform-browser": "^7.2.14",
+		"@angular/platform-browser-dynamic": "^7.2.14",
+		"@angular/router": "^7.2.14",
+		"@asymmetrik/ngx-leaflet": "^5.0.2",
+		"@fortawesome/fontawesome-free": "^5.8.1",
+		"@nebular/auth": "^3.5.0",
+		"@nebular/bootstrap": "^3.5.0",
+		"@nebular/security": "^3.5.0",
+		"@nebular/theme": "^3.5.0",
+		"@ng-bootstrap/ng-bootstrap": "^4.1.1",
+		"@ng-select/ng-select": "^2.18.0",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
-		"@swimlane/ngx-charts": "^10.0.0",
+		"@swimlane/ngx-charts": "^10.1.0",
 		"angular-2-dropdown-multiselect": "^1.9.0",
-		"angular-tree-component": "^8.2.0",
+		"angular-tree-component": "^8.3.0",
 		"angular2-chartjs": "^0.5.1",
 		"angular2-logger": "^0.7.0",
 		"angular2-toaster": "^7.0.0",
 		"angular2-wizard": "github:maiyaporn/angular2-wizard#pull/56/head",
 		"apollo-angular": "^1.5.0",
-		"apollo-angular-link-http": "^1.4.0",
-		"apollo-cache-inmemory": "^1.4.3",
-		"apollo-client": "^2.4.13",
-		"apollo-link": "^1.2.8",
-		"apollo-link-context": "^1.0.14",
-		"apollo-link-ws": "^1.0.14",
+		"apollo-angular-link-http": "^1.6.0",
+		"apollo-cache-inmemory": "^1.5.1",
+		"apollo-client": "^2.5.1",
+		"apollo-link": "^1.2.11",
+		"apollo-link-context": "^1.0.17",
+		"apollo-link-ws": "^1.0.17",
 		"apollo-upload-client": "^10.0.0",
 		"bootstrap": "^4.3.1",
 		"buffer": "^5.2.1",
-		"chart.js": "^2.7.3",
-		"ckeditor": "^4.11.2",
+		"chart.js": "^2.8.0",
+		"ckeditor": "^4.11.4",
 		"classlist.js": "1.1.20150312",
-		"core-js": "^2.6.4",
+		"core-js": "^3.0.1",
 		"cryptiles": "^4.1.3",
-		"echarts": "^4.2.1-rc.1",
+		"echarts": "^4.2.1",
 		"eva-icons": "^1.1.1",
 		"faker": "^4.1.0",
 		"fingerprintjs2": "^2.0.6",
 		"global": "^4.3.2",
-		"graphql": "^14.1.1",
+		"graphql": "^14.2.1",
 		"graphql-tag": "^2.10.1",
 		"highlight.js": "^9.14.2",
-		"intl": "1.2.5",
-		"ionicons": "^4.5.5",
+		"intl": "^1.2.5",
+		"ionicons": "^4.5.6",
 		"is-url": "^1.2.4",
-		"jquery": "^3.3.1",
+		"jquery": "^3.4.0",
 		"jsbarcode": "^3.11.0",
 		"leaflet": "^1.4.0",
 		"moment": "^2.24.0",
 		"nebular-icons": "1.1.0",
-		"ng-simple-slideshow": "^1.2.8",
+		"ng-simple-slideshow": "^1.2.9",
 		"ng2-ckeditor": "^1.2.2",
 		"ng2-completer": "2.0.8",
 		"ng2-file-upload": "^1.3.0",
 		"ng2-simple-timer": "^6.0.0",
-		"ng2-smart-table": "1.3.5",
+		"ng2-smart-table": "^1.4.0",
 		"ng2-tree": "^2.0.0-rc.11",
-		"ngx-echarts": "^4.1.0",
+		"ngx-echarts": "^4.1.1",
 		"ngx-highlightjs": "^2.1.4",
-		"ngx-moment": "^3.3.0",
+		"ngx-moment": "^3.4.0",
 		"ngx-translate-multi-http-loader": "^3.0.0",
 		"node-sass": "^4.11.0",
 		"normalize.css": "^8.0.1",
 		"pace-js": "1.0.2",
-		"popper.js": "^1.14.7",
+		"popper.js": "^1.15.0",
 		"qrcode": "^1.3.3",
 		"reflect-metadata": "^0.1.13",
 		"roboto-fontface": "^0.10.0",
-		"rxjs": "^6.4.0",
-		"rxjs-compat": "^6.4.0",
-		"socicon": "3.0.5",
+		"rxjs": "^6.5.1",
+		"rxjs-compat": "^6.5.1",
+		"socicon": "^3.0.5",
 		"socket.io-client": "^2.2.0",
-		"stripe": "^6.25.0",
-		"subscriptions-transport-ws": "^0.9.15",
-		"tinymce": "^5.0.0",
+		"stripe": "^6.31.0",
+		"subscriptions-transport-ws": "^0.9.16",
+		"tinymce": "^5.0.4",
 		"tslib": "^1.9.3",
 		"typeface-exo": "^0.0.61",
 		"uuid": "^3.3.2",
 		"web-animations-js": "^2.3.1",
-		"zen-observable": "^0.8.13",
-		"zone.js": "^0.8.29"
+		"zen-observable": "^0.8.14",
+		"zone.js": "^0.9.0"
 	},
 	"devDependencies": {
 		"@angular-devkit/architect": "^0.13.8",
@@ -156,9 +156,9 @@
 		"@angular-devkit/core": "^7.3.8",
 		"@angular-devkit/schematics": "^7.3.8",
 		"@angular/cli": "^7.3.8",
-		"@angular/compiler-cli": "^7.2.11",
-		"@angular/language-service": "^7.2.11",
-		"@babel/core": "^7.4.0",
+		"@angular/compiler-cli": "^7.2.14",
+		"@angular/language-service": "^7.2.14",
+		"@babel/core": "^7.4.3",
 		"@compodoc/compodoc": "^1.1.9",
 		"@storybook/addon-actions": "^5.0.10",
 		"@storybook/addon-knobs": "^5.0.10",
@@ -169,44 +169,44 @@
 		"@types/async": "^2.4.1",
 		"@types/d3-color": "^1.2.2",
 		"@types/faker": "^4.1.5",
-		"@types/googlemaps": "^3.30.16",
+		"@types/googlemaps": "^3.30.19",
 		"@types/highlight.js": "^9.12.3",
-		"@types/jasmine": "^3.3.9",
+		"@types/jasmine": "^3.3.12",
 		"@types/jasminewd2": "^2.0.6",
-		"@types/leaflet": "^1.4.2",
-		"@types/mongodb": "^3.1.19",
-		"@types/mongoose": "^5.3.16",
+		"@types/leaflet": "^1.4.4",
+		"@types/mongodb": "^3.1.25",
+		"@types/mongoose": "^5.3.26",
 		"@types/node": "^11.9.3",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.25.7",
+		"@types/stripe": "^6.25.12",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
 		"babel-loader": "^8.0.5",
-		"codelyzer": "^4.5.0",
-		"conventional-changelog-cli": "^2.0.12",
+		"codelyzer": "^5.0.1",
+		"conventional-changelog-cli": "^2.0.17",
 		"cross-env": "^5.2.0",
-		"dotenv": "^6.2.0",
-		"envalid": "^4.2.2",
-		"husky": "^1.3.1",
-		"jasmine-core": "^3.3.0",
+		"dotenv": "^7.0.0",
+		"envalid": "^5.0.0",
+		"husky": "^2.1.0",
+		"jasmine-core": "^3.4.0",
 		"jasmine-spec-reporter": "^4.2.1",
-		"karma": "^4.0.0",
+		"karma": "^4.1.0",
 		"karma-chrome-launcher": "^2.2.0",
 		"karma-cli": "^2.0.0",
-		"karma-coverage-istanbul-reporter": "^2.0.4",
+		"karma-coverage-istanbul-reporter": "^2.0.5",
 		"karma-jasmine": "^2.0.1",
-		"karma-jasmine-html-reporter": "^1.4.0",
+		"karma-jasmine-html-reporter": "^1.4.2",
 		"npm-run-all": "^4.1.5",
 		"protractor": "^5.4.2",
 		"rimraf": "^2.6.3",
 		"rxjs-tslint": "0.1.5",
-		"stylelint": "^9.10.1",
-		"ts-node": "^8.0.2",
-		"tslint": "^5.12.1",
-		"tslint-language-service": "^0.9.9",
-		"typescript": "~3.1.6",
-		"webpack-dev-server": "^3.2.1",
-		"yargs": "^13.1.0"
+		"stylelint": "^10.0.1",
+		"ts-node": "^8.1.0",
+		"tslint": "^5.16.0",
+		"typescript-tslint-plugin": "^0.3.1",
+		"typescript": "~3.2.4",
+		"webpack-dev-server": "^3.3.1",
+		"yargs": "^13.2.2"
 	},
 	"engines": {
 		"node": ">=10.15.0",
diff --git a/admin/website-angular/tsconfig.json b/admin/website-angular/tsconfig.json
index a5485a907..18c6b09d4 100644
--- a/admin/website-angular/tsconfig.json
+++ b/admin/website-angular/tsconfig.json
@@ -27,12 +27,12 @@
 		},
 		"lib": ["es2017", "dom", "esnext"],
 		"noUnusedLocals": false,
-		"types": ["node", "reflect-metadata", "googlemaps", "jasmine"]
-		/*"plugins": [
-		      {
-		        "name": "tslint-language-service"
-		      }
-		]*/
+		"types": ["node", "reflect-metadata", "googlemaps", "jasmine"],
+		"plugins": [
+			{
+				/* "name": "typescript-tslint-plugin" */
+			}
+		]
 	},
 	"include": [
 		"src/**/*.ts",
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 9d52d6809..57f9b2bfc 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -105,14 +105,14 @@
     "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular/animations@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
-  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
+"@angular/animations@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.14.tgz#06ec2feac31e58f53429e673bc4c7f780a9d0710"
+  integrity sha512-K+wdq7TslmvDhrbwy65x7owE8wezI0fDdO+8SO9RU4m/w6R6vo4QS3uSdc5I2pxwm4QSXSc5eKhoWJkq0muTbQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.3.6":
+"@angular/cdk@^7.3.7":
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.7.tgz#ce1ad53ba04beb9c8e950acc5691ea0143753764"
   integrity sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==
@@ -140,17 +140,17 @@
     semver "5.6.0"
     symbol-observable "1.2.0"
 
-"@angular/common@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
-  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
+"@angular/common@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.14.tgz#6477b87a203af918e6a00b8238c29198322456f2"
+  integrity sha512-c2QBhVpbQhg1FDhOQkyVdFvU11mfvYHW5ZaXzxdCpq2rZXCureYiCSnlv++EsIAKqi22+2a6GACHF9Gh8kBmSg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
-  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
+"@angular/compiler-cli@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.14.tgz#6deba7f804d1c6d423f1db135ac77204389021ef"
+  integrity sha512-w5qn1nIPjiCP3WdbqicofpKpiRlh6NMYjWhe6mJysSBnVd34aSuGisYW/gVPQrmD46E1gmfpWTnWPeABVnjj6w==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -164,64 +164,64 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
-  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
+"@angular/compiler@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.14.tgz#39abf41a0250a43c6a00e3501088ecee83c536e6"
+  integrity sha512-Idhs+5HIzx+1+hrXIDaRpSqobMB7UvSvPlvCvtb3EDYjmltTNG68TtwMzGM8W2jdayliYuFOjFrnw1wCTkK3Ag==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
-  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
+"@angular/core@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.14.tgz#b78c936d284223c1c5a4c4b02cd0d5fd6d03ec91"
+  integrity sha512-XeZZJCyBKSKo0E/7Ef0SfJejmn+E7uBXa5cR1QapafS0Hnrq/hZu/NI039IDU/51NoycMDH2vTV19SmKu9Mkow==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
-  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
+"@angular/forms@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.14.tgz#7df70df357b9e1ae4aa8a0d008bf7ec753ccc03d"
+  integrity sha512-jL5YbTk7VZmz4l0++iFVUNa1vGM+nnALjHKi1Ub8VWioRDRboYUsHyxzlgWW9gZRbHpnLEXFiUz1td+v7TouJw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.12.tgz#0ec28f6dc7814c85761833b1fd4b53b397b5e882"
-  integrity sha512-cceU+SWIQFOL3gRKqm5SYHQM3VoKbXne2XQRSY2Fdoc3XsipOzTEvJQPLm5ZcTEXdmRFlfianDoDaWEIvGbXkw==
+"@angular/http@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.14.tgz#13a0e71133296e2bb1c0b68d48281a70a5f233b5"
+  integrity sha512-rSdH2JojApDU83qVm7RabIlNo3Ni3yr2gwsmQWs4XZ7SC8jLNnDkzdUbQ6T0vfuVX3v/FtAuMJl0yaVcG3EUJg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
-  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
+"@angular/language-service@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.14.tgz#f0c90e030fbb3777293a2946c2cb4b79c152856f"
+  integrity sha512-YTU4ePAKikbIxNae9Qta8qaDArPgek7nhLEW9QfvrUAnpF7BkVboEI+7yLX5+NTfGf9cQ9cUfQ0TEreV+tMs7A==
 
-"@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
-  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
+"@angular/platform-browser-dynamic@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.14.tgz#ae055ab0d3246c0f2d27d40a46cd99c012aa199d"
+  integrity sha512-lmTCBiDRbOPtniIqBjm1n5jl1TdyQM0qWQdBcoCsKpMNS/6/RacRcQsJZApAMdWm6gIVuLgmRQzaCLkSoekfYA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
-  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
+"@angular/platform-browser@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.14.tgz#9b259c335eb0dda64bc79409fa8dbb8fbb6bd818"
+  integrity sha512-yAq2+3W4J4B48HEmZYQucdEb9AHwRnv72q9CC/SxU7g59vaLhl1nv7cAWGJ4XFaJTbB7aB4Y4rLffuR+Gxkn7A==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/router@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
-  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
+"@angular/router@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.14.tgz#c8994ce10e6df3d5ada06e409a6a0b00ae9536d4"
+  integrity sha512-uqg0SKy79voEOIOvzVbCzFDD9XOAfZWkYt01ca2qLFXMx+6jWeVQIDuXc8Dmz5udIXNK5Ae//9R+nt5UZUZrSA==
   dependencies:
     tslib "^1.9.0"
 
-"@asymmetrik/ngx-leaflet@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@asymmetrik/ngx-leaflet/-/ngx-leaflet-5.0.1.tgz#6efe7113a96941936b7eb906a2c17e36466884b4"
-  integrity sha512-0C/C1seJvXeOYp//yPrgi55v3yQ42JCFkMSAc/CuJCwMXlkGSfJ0Sd/yb/zY2ElhOknfIMJg68jVTbNxMqlz2Q==
+"@asymmetrik/ngx-leaflet@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@asymmetrik/ngx-leaflet/-/ngx-leaflet-5.0.2.tgz#307d7e99b6fd0e27f23601213aa5e696ab23a8da"
+  integrity sha512-y4+U9nUnukdTTO2Z6fCt0V85U605bveERNIzrovjKELkHbxz70TvJSvCU7iSSc5ZwS5ZJI1a24SiBJ5sGt9WMQ==
 
 "@babel/code-frame@7.0.0", "@babel/code-frame@^7.0.0":
   version "7.0.0"
@@ -230,7 +230,7 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@>=7.1.0", "@babel/core@^7.4.0":
+"@babel/core@>=7.1.0", "@babel/core@^7.4.3":
   version "7.4.3"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.3.tgz#198d6d3af4567be3989550d97e068de94503074f"
   integrity sha512-oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA==
@@ -1090,7 +1090,7 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e"
   integrity sha512-n/VQ4mbfr81aqkx/XmVicOLjviMuy02eenSdJY33SVA7S2J42EU0P1H0mOogfYedb3wXA0d/LVtBrgTSm04WEA==
 
-"@fortawesome/fontawesome-free@^5.7.2":
+"@fortawesome/fontawesome-free@^5.8.1":
   version "5.8.1"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz#cbafbfe8894c4e3e3c3a9da6774e249ac1f2da8b"
   integrity sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA==
@@ -1108,39 +1108,39 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nebular/auth@^3.2.1":
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/@nebular/auth/-/auth-3.4.2.tgz#35cf828202a9b1ca5d386d97772985386ec77551"
-  integrity sha512-GiU4Su0LWNQsOggHAMYKdkAbXNJVW+jlQre1hGjUeMRqKTXqvn8BkVqrt4q3dz4onBv8z1uxxw4Fegpw93po6w==
+"@nebular/auth@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@nebular/auth/-/auth-3.5.0.tgz#b6ac219bb46a0ae942ca60b02db06a467c688d75"
+  integrity sha512-dDrQuijLD/HsdYPQocdmNN7XU3Hukj3Diy6HMDS7vH9Twb3TByFkESH+s0Y0IpNugwJraZlYroiwP0/1IXG2SQ==
 
-"@nebular/bootstrap@^3.2.1":
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/@nebular/bootstrap/-/bootstrap-3.4.2.tgz#ebd4bed91ae21b390493e39319c2aa58296f9ee1"
-  integrity sha512-W/U9XPPk4dIdyg8ohZP114JGh8Fxjh9HwlgpsCkp8PLvUhaZS4u2Zs9bjbFo/Z38+NX/5U5eqmWgC/VigLA5XA==
+"@nebular/bootstrap@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@nebular/bootstrap/-/bootstrap-3.5.0.tgz#33ba3426c01f5764685c4a5e8ded2db53ffd83db"
+  integrity sha512-GbiqPBpgDIiwxy9tHapf4RTydzY5W6E+PAN+afhNvmSGu2R2iovTzVXhoEmNNzvZsB85jJ9+OBxLhq1PLmkLCA==
 
-"@nebular/security@^3.2.1":
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/@nebular/security/-/security-3.4.2.tgz#bf6baacbb85d261fc9783f2e3b4313208a2d1e11"
-  integrity sha512-xsR/4X3IQBL1atU6ABAg2nUnPdid1OvaFsTop/stoLxqV3hbwfdV/wxKSkL5DIBljY3c8L9vz5cw+IXcpXDMuQ==
+"@nebular/security@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@nebular/security/-/security-3.5.0.tgz#4598956dcfcb696c80038eee88280e8813f4e196"
+  integrity sha512-FySytmzIJXpa8aHLlcq+RM1YPnophKyv46Erm6Wkswfs6rIkunCAz5/nolQGf29nbyyeV4wp+HvDIOLf2o/ApQ==
 
-"@nebular/theme@^3.2.1":
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/@nebular/theme/-/theme-3.4.2.tgz#070bbccad92878d1cce49d172548d2fd38b35973"
-  integrity sha512-PB17tkTdITYMvRrch0M0o8nQiKa2ULEsk0CaV1FVysyiSANwR4VIYGlDb4JkZPTyK4SlPZ1mwVMImWAK7jlzLw==
+"@nebular/theme@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@nebular/theme/-/theme-3.5.0.tgz#7b3d34daed6efde13238cd3efef638f5f3dbd7c6"
+  integrity sha512-FE6cj3uB/0uhwz760o2/pfKHAGj9CMflCC4+lHymq3EVpoJua7//7+0VFMloMckAGqCMWDoZ04TDzAOf5lT44w==
   dependencies:
     intersection-observer "0.5.0"
 
-"@ng-bootstrap/ng-bootstrap@^4.0.3":
+"@ng-bootstrap/ng-bootstrap@^4.1.1":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.1.1.tgz#5e9c477ed9cc19114b56a0abc87e9c8483fb6bbf"
   integrity sha512-OgbmPVhbDdNpIwogEXsycUJG0caNtb2+wCABfLUClgi9YcfNXhZ9Phu2GQq7Pk/LO66okth6s77RBQnbTJuysg==
   dependencies:
     tslib "^1.9.0"
 
-"@ng-select/ng-select@^2.15.3":
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/@ng-select/ng-select/-/ng-select-2.17.0.tgz#e39efbcdcaae53d649e25e8ea5b5139a2f7e28d0"
-  integrity sha512-hCZIcg4tACYp8tKRLZnD9CEZJcVJbKWkVrS++8dh0cJv580SCiKTQ10CJ1qzWWvmC4tIbCRyLzrUuKQRdkRWpA==
+"@ng-select/ng-select@^2.18.0":
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/@ng-select/ng-select/-/ng-select-2.18.0.tgz#3296f698dd2d06dc81cf4fe0529b09e36f7e1a55"
+  integrity sha512-LK9htwdljl/e4cPmgV25WU3B0v43p5gGAwDl+yNoUY6Afm7SUoyS1+y2lKMKkdWQySJ6pWjMuIDs96Ekv0NJcQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -1549,7 +1549,7 @@
     telejson "^2.1.1"
     util-deprecate "^1.0.2"
 
-"@swimlane/ngx-charts@^10.0.0":
+"@swimlane/ngx-charts@^10.1.0":
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/@swimlane/ngx-charts/-/ngx-charts-10.1.0.tgz#be139b770b85eda609961cc08dba815c4a0d0b32"
   integrity sha512-0nZ3ub5o/qQfFMz+av89u/VKqsqiVhPFBDDOOPq2qimP83i+pcb0i3MEao7PSxIbKAEkL/pwRcEJw4KDZ8B67w==
@@ -1608,7 +1608,7 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/googlemaps@^3.30.16":
+"@types/googlemaps@^3.30.19":
   version "3.30.19"
   resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.19.tgz#359c025e244490b0775826fb216bed093fd66b16"
   integrity sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==
@@ -1618,7 +1618,7 @@
   resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.3.tgz#b672cfaac25cbbc634a0fd92c515f66faa18dbca"
   integrity sha512-pGF/zvYOACZ/gLGWdQH8zSwteQS1epp68yRcVLJMgUck/MjEn/FBYmPub9pXT8C1e4a8YZfHo1CKyV8q1vKUnQ==
 
-"@types/jasmine@*", "@types/jasmine@^3.3.9":
+"@types/jasmine@*", "@types/jasmine@^3.3.12":
   version "3.3.12"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.12.tgz#bf282cb540e9ad7a0a04b742082c073b655eab39"
   integrity sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==
@@ -1635,10 +1635,10 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
-"@types/leaflet@^1.4.2":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.4.3.tgz#62638cb73770eeaed40222042afbcc7b495f0cc4"
-  integrity sha512-jFRBSsPHi1EwQSwrN0cOJLdPhwOZsRl4IMxvm/2ShLh0YM5GfCtQXCzsrv8RE7DWL+AykXdYSAd9bFLWbZT4CQ==
+"@types/leaflet@^1.4.4":
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.4.4.tgz#4a3d9815fe6c32a04ac3a230fe23772be8e0de83"
+  integrity sha512-CROxHvsRDFyR1OQKZv/WJsCVFv8Wj6wFF/FOI/yiGwX7GMivyvF8Ks5AT3/JYk269pGiE43wP9JOgcr7EK2eUw==
   dependencies:
     "@types/geojson" "*"
 
@@ -1647,7 +1647,7 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/mongodb@*", "@types/mongodb@^3.1.19":
+"@types/mongodb@*":
   version "3.1.23"
   resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.23.tgz#9aaa105f448427036cb6cd3aa042ab77b2ab8a7a"
   integrity sha512-TNwS1HPh1nnaYorcQoWi+bH5kJ1Q/WqCjiD9XkU3oBeCZFYXXPafVUuFmoYFbzQ061ojhtsndRLzwNklRhU+4w==
@@ -1655,7 +1655,15 @@
     "@types/bson" "*"
     "@types/node" "*"
 
-"@types/mongoose@^5.3.16":
+"@types/mongodb@^3.1.25":
+  version "3.1.25"
+  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.25.tgz#1da0219b7d8c08859f811774673c803f906e5e05"
+  integrity sha512-BSrjY1J8Nf9hin6p0Tv8b8PIfpTq+Xp4TVSRxZbO3jhvIeu1EKZ4xk0t8tms5vA/qMIkfNX2iciOThFhXPL93g==
+  dependencies:
+    "@types/bson" "*"
+    "@types/node" "*"
+
+"@types/mongoose@^5.3.26":
   version "5.3.26"
   resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.26.tgz#a979014c7fc9395e484695d4cc5647e7686251db"
   integrity sha512-7NPdpUGU/1ZztTICcP3GxwWBAHTDyOLW0XJxrxlTl5i7R7XbT2Ucq33JussSLkWHKjbxpAmJnDwlYKcjwG7agg==
@@ -1668,6 +1676,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -1688,10 +1701,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stripe@^6.25.7":
-  version "6.25.10"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
-  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
+"@types/stripe@^6.25.12":
+  version "6.25.12"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.12.tgz#7d2299262968556de2b5d4854efccbc7acb49184"
+  integrity sha512-xnNajYeTdibtUfyedTv91QljDsRD+BYFI8aQKxRRU51OUBKef6Zg50kIWotgLjd4q5WHFn9fTfwPnyW2fB1xAQ==
   dependencies:
     "@types/node" "*"
 
@@ -2202,7 +2215,7 @@ angular-2-dropdown-multiselect@^1.9.0:
   dependencies:
     tslib "^1.9.0"
 
-angular-tree-component@^8.2.0:
+angular-tree-component@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/angular-tree-component/-/angular-tree-component-8.3.0.tgz#e74975e66fd366470f13733737cf6b585776eafd"
   integrity sha512-nxi0RE34o+akjkBQeVpUYwgmZ84eFvIsYcz2YfB8E7bMw+7miUk4sQEZxAKFAfl7qewInQyVyyN0EreF5LmaHg==
@@ -2346,7 +2359,7 @@ apollo-angular-link-http-common@~1.6.0:
   dependencies:
     tslib "^1.9.0"
 
-apollo-angular-link-http@^1.4.0:
+apollo-angular-link-http@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
   integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
@@ -2363,7 +2376,7 @@ apollo-angular@^1.5.0:
     semver "^5.5.1"
     tslib "^1.9.0"
 
-apollo-cache-inmemory@^1.4.3:
+apollo-cache-inmemory@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz#265d1ee67b0bf0aca9c37629d410bfae44e62953"
   integrity sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==
@@ -2382,7 +2395,7 @@ apollo-cache@1.2.1, apollo-cache@^1.2.1:
     apollo-utilities "^1.2.1"
     tslib "^1.9.3"
 
-apollo-client@^2.4.13:
+apollo-client@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz#36126ed1d32edd79c3713c6684546a3bea80e6d1"
   integrity sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==
@@ -2397,7 +2410,7 @@ apollo-client@^2.4.13:
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
-apollo-link-context@^1.0.14:
+apollo-link-context@^1.0.17:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.17.tgz#439272cfb43ec1891506dd175ed907845b7de36c"
   integrity sha512-W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q==
@@ -2422,7 +2435,7 @@ apollo-link-http-common@^0.2.8:
     ts-invariant "^0.3.2"
     tslib "^1.9.3"
 
-apollo-link-ws@^1.0.14:
+apollo-link-ws@^1.0.17:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz#a7ec3f90d2651b77d6be9bb6e63deff2efac56d4"
   integrity sha512-0PKgahM2BOcUiI3QSJMYXOoUylWKzar5NTZLgMLEW4K/CczOTzC4CTXvKMjh/cx57Jto/U2xzKRy9BEoNfnK5Q==
@@ -2430,7 +2443,7 @@ apollo-link-ws@^1.0.14:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.6, apollo-link@^1.2.8:
+apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.6:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
   integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
@@ -2500,6 +2513,14 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+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=
+  dependencies:
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -2655,6 +2676,11 @@ ast-transform@0.0.0:
     esprima "~1.0.4"
     through "~2.3.4"
 
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+
 ast-types@^0.7.0:
   version "0.7.8"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz#902d2e0d60d071bdcd46dc115e1809ed11c138a9"
@@ -2714,7 +2740,7 @@ autoprefixer@9.4.6:
     postcss "^7.0.13"
     postcss-value-parser "^3.3.1"
 
-autoprefixer@^9.0.0, autoprefixer@^9.4.7:
+autoprefixer@^9.4.7, autoprefixer@^9.5.1:
   version "9.5.1"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
   integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
@@ -2736,6 +2762,13 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
+axobject-query@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
+  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
+  dependencies:
+    ast-types-flow "0.0.7"
+
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -3289,6 +3322,13 @@ braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 brfs@^1.3.0, brfs@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
@@ -3552,13 +3592,6 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
-caller-id@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-id/-/caller-id-0.1.0.tgz#59bdac0893d12c3871408279231f97458364f07b"
-  integrity sha1-Wb2sCJPRLDhxQIJ5Ix+XRYNk8Hs=
-  dependencies:
-    stack-trace "~0.0.7"
-
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
@@ -3708,7 +3741,7 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chart.js@^2.3.0, chart.js@^2.7.3:
+chart.js@^2.3.0, chart.js@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.8.0.tgz#b703b10d0f4ec5079eaefdcd6ca32dc8f826e0e9"
   integrity sha512-Di3wUL4BFvqI5FB5K26aQ+hvWh8wnP9A3DWGvXHVkO13D3DSnaSsdZx29cXlEsYKVkn1E2az+ZYFS4t0zi8x0w==
@@ -3821,7 +3854,7 @@ circular-dependency-plugin@5.0.2:
   resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
   integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
 
-ckeditor@^4.11.2:
+ckeditor@^4.11.4:
   version "4.11.4"
   resolved "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.11.4.tgz#5edbc235808f9e0f562e8e642eeb04fa1b01b633"
   integrity sha512-h1EymdwFDdQuDO1vEisUagZ/WYiDnvvvtftYmbmqbbUf9vk21ovXb7mXnQimvTYJfRQBgJCoqfjFDfcQIfw9ig==
@@ -3950,17 +3983,20 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.5.0.tgz#a65ddeeeca2894653253a89bfa229118ff9f59b1"
-  integrity sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==
+codelyzer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.1.tgz#c52a593368269b791594603968eb82cbecae3cda"
+  integrity sha512-UVV76+/y1RwaxzCeGPFE3G4GFtfV42r3x8EmRd7XMNFLlLC0ewdtCqWTbvhwPQMxFZZ+OTLEOJNWfyPPn3QFWg==
   dependencies:
     app-root-path "^2.1.0"
-    css-selector-tokenizer "^0.7.0"
+    aria-query "^3.0.0"
+    axobject-query "^2.0.2"
+    css-selector-tokenizer "^0.7.1"
     cssauron "^1.4.0"
+    damerau-levenshtein "^1.0.4"
     semver-dsl "^1.0.1"
     source-map "^0.5.7"
-    sprintf-js "^1.1.1"
+    sprintf-js "^1.1.2"
 
 collapse-white-space@^1.0.2:
   version "1.0.4"
@@ -4026,7 +4062,7 @@ comma-separated-tokens@^1.0.0:
   dependencies:
     trim "0.0.1"
 
-commander@2, commander@^2.12.1, commander@^2.19.0, commander@~2.20.0:
+commander@2, commander@^2.11.0, commander@^2.12.1, commander@^2.19.0, commander@~2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@@ -4179,13 +4215,13 @@ conventional-changelog-atom@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-cli@^2.0.12:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-2.0.12.tgz#ffe04f5430fbc339dc7fa28634c2e0de5dd76e2e"
-  integrity sha512-6wh9W5Gpr9DM40E8cFi0qa6JotVm4Jq+suksuqgKnm544H8ZXsRhgGNXShDASOteY9brv9fX8/+fE/QL1wHqbA==
+conventional-changelog-cli@^2.0.17:
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-2.0.17.tgz#ec3f149dfc918903ae925b7a375d5b638fb45741"
+  integrity sha512-IQUS08TTrLxAd0Le3THPz8xFFe1kVmSBOcnfe8RGpi+io3ALnMT4uw0snmP3Cb9lgnHXg0NcjQyVsE+jJmHtrw==
   dependencies:
     add-stream "^1.0.0"
-    conventional-changelog "^3.0.6"
+    conventional-changelog "^3.1.4"
     lodash "^4.2.1"
     meow "^4.0.0"
     tempfile "^1.1.1"
@@ -4197,10 +4233,10 @@ conventional-changelog-codemirror@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-conventionalcommits@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-1.1.1.tgz#322351f6a0422876d89ec54491365695b073a709"
-  integrity sha512-21BcbiSfvYIon7sF80Rwn6vnfhaiuZUyHHFYr9Zz8H2B+O/3grud5TbEYpU1/SFXD5aD48IdSme/KkJl9wCsCw==
+conventional-changelog-conventionalcommits@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-1.1.2.tgz#bb30c8d40dbd13ba9ec4e9bc6a025578b31b17bd"
+  integrity sha512-t8VyibJHGrtsDwSHjgpW9v7oBbqDGQooCMo/a2rc0z5cousV5O11palcSPpyshEVWVijxPtzBNG02EQkMDJ8CA==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -4281,15 +4317,15 @@ conventional-changelog-writer@^4.0.5:
     split "^1.0.0"
     through2 "^3.0.0"
 
-conventional-changelog@^3.0.6:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.3.tgz#decb10d89c46c838e74eb5160bcf4987992f7534"
-  integrity sha512-JBfdDSdSGasTNaBRZbOeFn8CJTIpP/sB/kiawmWAiLapLZ+wCDVDZR6Q+Hh9rjh3dxNAFR03bWTeqjKajXvPYA==
+conventional-changelog@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.4.tgz#66db29830a799be9afcbfd67a366c1e2cbc21417"
+  integrity sha512-uMeTSzEb2oKFlL00Oh9j3+00PFq1MNneLzyy0TBftxo4PFrs7OiaRJXmXtEgSvJDdkc0RSd6ch2N+yTxPagZ0A==
   dependencies:
     conventional-changelog-angular "^5.0.3"
     conventional-changelog-atom "^2.0.1"
     conventional-changelog-codemirror "^2.0.1"
-    conventional-changelog-conventionalcommits "^1.1.1"
+    conventional-changelog-conventionalcommits "^1.1.2"
     conventional-changelog-core "^3.2.2"
     conventional-changelog-ember "^2.0.2"
     conventional-changelog-eslint "^3.0.2"
@@ -4389,7 +4425,7 @@ core-js-pure@3.0.1:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.0.1.tgz#37358fb0d024e6b86d443d794f4e37e949098cbe"
   integrity sha512-mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g==
 
-core-js@3.0.1:
+core-js@3.0.1, core-js@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
   integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
@@ -4399,7 +4435,7 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.4, core-js@^2.6.5:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.5:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
@@ -4427,7 +4463,7 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.0, cosmiconfig@^5.0.7, cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
+cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
   integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
@@ -4602,7 +4638,7 @@ css-select@^1.1.0, css-select@~1.2.0:
     domutils "1.5.1"
     nth-check "~1.0.1"
 
-css-selector-tokenizer@^0.7.0:
+css-selector-tokenizer@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
   integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
@@ -5032,6 +5068,11 @@ d3@^4.10.2:
     d3-voronoi "1.1.2"
     d3-zoom "1.7.1"
 
+damerau-levenshtein@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
+  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
+
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
@@ -5061,7 +5102,7 @@ dateformat@^3.0.0:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-debug@*, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1:
+debug@*, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -5483,6 +5524,11 @@ dotenv@^6.0.0, dotenv@^6.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
   integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
+dotenv@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
+  integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
+
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -5513,7 +5559,7 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^4.2.1-rc.1:
+echarts@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.2.1.tgz#9a8ea3b03354f86f824d97625c334cf16965ef03"
   integrity sha512-pw4xScRPsLegD/cqEcoXRKeA2SD4+s+Kyo0Na166NamOWhzNl2yI5RZ2rE97tBlAopNmhyMeBVpAeD5qb+ee1A==
@@ -5563,6 +5609,11 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -5680,10 +5731,10 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-envalid@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/envalid/-/envalid-4.2.2.tgz#3ed23b3e42c987b4105b43789d8eb526538c025d"
-  integrity sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==
+envalid@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/envalid/-/envalid-5.0.0.tgz#0dff9302c645977b8a620278620c67a939c9ee6f"
+  integrity sha512-cLyEXc/9meYtQ+KcTsh2S8GGvQ/ZGqlUyFfQrTZqVKy3/o/CQ6waLtgf6X7QmFbW0qAFAptQ8r17LYqKTxHIgw==
   dependencies:
     chalk "^2.4.1"
     dotenv "^6.2.0"
@@ -6175,10 +6226,10 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-4.0.0.tgz#633567d15364aefe0b299e1e217735e8f3a9f6e8"
-  integrity sha512-AVSwsnbV8vH/UVbvgEhf3saVQXORNv0ZzSkvkhQIaia5Tia+JhGTaa/ePUSVoPHQyGayQNmYfkzFi3WZV5zcpA==
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
   dependencies:
     flat-cache "^2.0.1"
 
@@ -6230,6 +6281,13 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
@@ -6575,7 +6633,7 @@ genfun@^5.0.0:
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
   integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
-get-caller-file@^1.0.1:
+get-caller-file@^1.0.1, get-caller-file@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
@@ -6601,10 +6659,10 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
 
 get-stream@^3.0.0:
   version "3.0.0"
@@ -6783,7 +6841,7 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globby@^9.0.0:
+globby@^9.2.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
   integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
@@ -6835,7 +6893,7 @@ graphql-tag@^2.10.1:
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02"
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
 
-graphql@^14.1.1:
+graphql@^14.2.1:
   version "14.2.1"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.1.tgz#779529bf9a01e7207b977a54c20670b48ca6e95c"
   integrity sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==
@@ -7203,19 +7261,19 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+husky@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
+  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
   dependencies:
-    cosmiconfig "^5.0.7"
+    cosmiconfig "^5.2.0"
     execa "^1.0.0"
     find-up "^3.0.0"
-    get-stdin "^6.0.0"
+    get-stdin "^7.0.0"
     is-ci "^2.0.0"
-    pkg-dir "^3.0.0"
+    pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^4.0.1"
+    read-pkg "^5.0.0"
     run-node "^1.0.0"
     slash "^2.0.0"
 
@@ -7279,10 +7337,10 @@ ignore@^4.0.3:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.0.4:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.6.tgz#562dacc7ec27d672dde433aa683c543b24c17694"
-  integrity sha512-/+hp3kUf/Csa32ktIaj0OlRqQxrgs30n62M90UBpNd9k+ENEch5S+hmbW3DtcJGz3sYFTh4F3A6fQ0q7KWsp4w==
+ignore@^5.0.6:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.1.tgz#2fc6b8f518aff48fef65a7f348ed85632448e4a5"
+  integrity sha512-DWjnQIFLenVrwyRCKZT+7a7/U4Cqgar4WG8V++K3hw+lrW1hc/SIwdiGmtxKCVACmHULTuGeBbHJmbwW7/sAvA==
 
 image-size@~0.5.0:
   version "0.5.5"
@@ -7487,7 +7545,7 @@ intersection-observer@0.5.0:
   resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.5.0.tgz#9fe8bee3953c755b1485c38efd9633d535775ea6"
   integrity sha512-8Zgt4ijlyvIrQVTA7MPb2W9+KhoetrAbxlh0RmTGxpx0+ZsAXvy7IsbNnZIrqZ6TddAdWeQj49x7Ph7Ir6KRkA==
 
-intl@1.2.5:
+intl@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
   integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
@@ -7509,7 +7567,7 @@ invert-kv@^2.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
-ionicons@^4.5.5:
+ionicons@^4.5.6:
   version "4.5.6"
   resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.6.tgz#f3b5d2446e7e1b30e67ddcd1fc563271acc60f3c"
   integrity sha512-/F3U/rxdLPGl8eUW5dMouhBBoJuUPrlFO6rkoz4VNuw1lxP6l+bFtsDA8MaVM1dHABp+gIHxtpt+IhwmB3oIfA==
@@ -7696,6 +7754,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-function@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
@@ -7732,6 +7795,11 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^7.0.0:
+  version "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:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -8036,7 +8104,7 @@ iterall@^1.2.1, iterall@^1.2.2:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
-jasmine-core@^3.3, jasmine-core@^3.3.0:
+jasmine-core@^3.3, jasmine-core@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
   integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
@@ -8067,7 +8135,7 @@ jasminewd2@^2.1.0:
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
   integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
-jquery@^3.3.1:
+jquery@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"
   integrity sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ==
@@ -8244,7 +8312,7 @@ karma-cli@^2.0.0:
   dependencies:
     resolve "^1.3.3"
 
-karma-coverage-istanbul-reporter@^2.0.4:
+karma-coverage-istanbul-reporter@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz#ca5899d4905e44a5984dd4f963adfc1a74dce767"
   integrity sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==
@@ -8252,10 +8320,10 @@ karma-coverage-istanbul-reporter@^2.0.4:
     istanbul-api "^2.1.1"
     minimatch "^3.0.4"
 
-karma-jasmine-html-reporter@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.0.tgz#1abbd30d4509a8c82b96707ae7d2fa4da459ca19"
-  integrity sha512-0wxhwA8PLPpICZ4o2GRnPi67hf3JhfQm5WCB8nElh4qsE6wRNOTtrqooyBPNqI087Xr2SBhxLg5fU+BJ/qxRrw==
+karma-jasmine-html-reporter@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz#16d100fd701271192d27fd28ddc90b710ad36fff"
+  integrity sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==
 
 karma-jasmine@^2.0.1:
   version "2.0.1"
@@ -8271,10 +8339,10 @@ karma-source-map-support@1.3.0:
   dependencies:
     source-map-support "^0.5.5"
 
-karma@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
-  integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
+karma@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.1.0.tgz#d07387c9743a575b40faf73e8a3eb5421c2193e1"
+  integrity sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -8345,10 +8413,10 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-known-css-properties@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.11.0.tgz#0da784f115ea77c76b81536d7052e90ee6c86a8a"
-  integrity sha512-bEZlJzXo5V/ApNNa5z375mJC6Nrz4vG43UgcSCrg2OHC+yuB6j0iDSrY7RQ/+PRofFB03wNIIt9iXIVLr4wc7w==
+known-css-properties@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.13.0.tgz#2750fde566cbf542a9876d4acd6bb0257ebadd2c"
+  integrity sha512-6VWDxNr7cQXPDtMdCWLZMK3E8hdLrpyPPRdx6RbyvqklqgM6/XNFsVopv8QOZ+hRB6iHG/urEDwzlWbmMCv/kw==
 
 lazy-universal-dotenv@^2.0.0:
   version "2.0.0"
@@ -8405,10 +8473,10 @@ less@3.9.0:
     request "^2.83.0"
     source-map "~0.6.0"
 
-leven@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
-  integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
 levn@~0.3.0:
   version "0.3.0"
@@ -8636,7 +8704,7 @@ lodash@>4.17.4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.10, l
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-log-symbols@^2.0.0, log-symbols@^2.2.0:
+log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
@@ -8840,7 +8908,7 @@ material-colors@^1.2.1:
   resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
   integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
 
-mathml-tag-names@^2.0.1:
+mathml-tag-names@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz#490b70e062ee24636536e3d9481e333733d00f2c"
   integrity sha512-3Zs9P/0zzwTob2pdgT0CHZuMbnSUSp8MB1bddfm+HDmnFWHGT4jvEZRf+2RuPoa+cjdn/z25SEt5gFTqdhvJAg==
@@ -8999,6 +9067,14 @@ micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -9190,12 +9266,13 @@ mobx@^3.6.2:
   resolved "https://registry.yarnpkg.com/mobx/-/mobx-3.6.2.tgz#fb9f5ff5090539a1ad54e75dc4c098b602693320"
   integrity sha512-Dq3boJFLpZEvuh5a/MbHLUIyN9XobKWIb0dBfkNOJffNkE3vtuY0C9kSDVpfH8BB0BPkVw8g22qCv7d05LEhKg==
 
-mock-require@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-2.0.2.tgz#1eaa71aad23013773d127dc7e91a3fbb4837d60d"
-  integrity sha1-HqpxqtIwE3c9En3H6Ro/u0g31g0=
+mock-require@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946"
+  integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==
   dependencies:
-    caller-id "^0.1.0"
+    get-caller-file "^1.0.2"
+    normalize-path "^2.1.1"
 
 modify-values@^1.0.0:
   version "1.0.1"
@@ -9314,7 +9391,7 @@ neo-async@^2.5.0, neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
-ng-simple-slideshow@^1.2.8:
+ng-simple-slideshow@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/ng-simple-slideshow/-/ng-simple-slideshow-1.2.9.tgz#384706ea76ed859c77927fd3b0585aba20d9a034"
   integrity sha512-05bLd9pWFAIhlOuScO1FOhCubNm9oZ3HK7fJ0oZgn9m9kl257yxXQv/1fBsVrCu0v/25zQRGRS9EgkX5UXhJdQ==
@@ -9341,10 +9418,10 @@ ng2-simple-timer@^6.0.0:
   dependencies:
     angular2-uuid "*"
 
-ng2-smart-table@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ng2-smart-table/-/ng2-smart-table-1.3.5.tgz#141b0b71f89273dfda414c4ded2d59390f8238ea"
-  integrity sha512-ZKrldgq9HxhXk1CATEDtcgpwXgrWkX0l3Quc+rFba+esQniiS3daIHZV5yTc77LNBrw7N1MzIPudqTrTWslAPw==
+ng2-smart-table@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ng2-smart-table/-/ng2-smart-table-1.4.0.tgz#f9aa6b7ae1d42b1607fa7d5fb9ad9beca1316766"
+  integrity sha512-5acg+v1L6mUUdvrddPRXCYiJ6dYHIRQA/efXj06Am20Gf7wxtCGAy6fCLA1ww8qJB8scR1qRDpzPQhMMuGRZhQ==
   dependencies:
     lodash "^4.17.10"
 
@@ -9353,10 +9430,10 @@ ng2-tree@^2.0.0-rc.11:
   resolved "https://registry.yarnpkg.com/ng2-tree/-/ng2-tree-2.0.0-rc.11.tgz#0fed58bd204646326d0cbcc0c84e3b0622d52cf8"
   integrity sha512-COGMatd+YrwJb3LSobagDC+t2PlSh4GkgG75Akh9QbXOSdFFPkbGmZvILg2xO4Hc+xicacvHp+6GINvjIeJwkA==
 
-ngx-echarts@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ngx-echarts/-/ngx-echarts-4.1.0.tgz#27c9ac1ad69bb3507d0971259f89e568cc2cad3d"
-  integrity sha512-N0mb8/A3fhFxTPLFHw6TGcn+Aumrt/ltUhhJIjMtzAFYoJ3NQdiECCtq53keT1gsA5M8zReYp2HkZQfM0TmZmg==
+ngx-echarts@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ngx-echarts/-/ngx-echarts-4.1.1.tgz#9fed672816a39fd114602685c0e451ffada80639"
+  integrity sha512-/lg/M8Vulx/amyAEX0U7xTTMW7THp0x8eBccbFFezapxzJzlzdszg8Bq4XM21+7Tw0HO+yR8VWoLkmywBZb0Gg==
   dependencies:
     tslib "^1.9.0"
 
@@ -9367,7 +9444,7 @@ ngx-highlightjs@^2.1.4:
   dependencies:
     tslib "^1.9.0"
 
-ngx-moment@^3.3.0:
+ngx-moment@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/ngx-moment/-/ngx-moment-3.4.0.tgz#53bd64557e552c612b0f68b975d1c7ed34f28dfc"
   integrity sha512-GEqzSsu12VsXXP35aerlQpuZ1ienEYQZxHmp+RH7EuJD7hWamKgLOpmbiDI9Ij3KLW/UApvonYzZvyRSv3ea/w==
@@ -9551,7 +9628,7 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
+normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -10278,6 +10355,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+picomatch@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.5.tgz#067456ff321d6447ca3dc32273d7bbf19ab2face"
+  integrity sha512-Zisqgaq/4P05ZclrU/g5XrzFqVo7YiJx+EP4haeVI9S7kvtZmZgmQMZfcvjEus9JcMhqZfQZObimT5ZydvKJGA==
+
 pidtree@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
@@ -10293,7 +10375,7 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
-pify@^4.0.0, pify@^4.0.1:
+pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
@@ -10324,6 +10406,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-dir@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.1.0.tgz#aaeb91c0d3b9c4f74a44ad849f4de34781ae01de"
+  integrity sha512-55k9QN4saZ8q518lE6EFgYiu95u3BWkSajCifhdQjvLvmr8IpnRbhI+UGpWJQfa0KzDguHeeWT1ccO1PmkOi3A==
+  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"
@@ -10355,7 +10444,7 @@ polished@^2.3.3:
   dependencies:
     "@babel/runtime" "^7.2.0"
 
-popper.js@^1.14.4, popper.js@^1.14.7:
+popper.js@^1.14.4, popper.js@^1.15.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
   integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
@@ -10405,7 +10494,7 @@ postcss-jsx@^0.36.0:
   dependencies:
     "@babel/core" ">=7.1.0"
 
-postcss-less@^3.1.0:
+postcss-less@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
   integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
@@ -10475,7 +10564,7 @@ postcss-modules-values@^2.0.0:
     icss-replace-symbols "^1.1.0"
     postcss "^7.0.6"
 
-postcss-reporter@^6.0.0:
+postcss-reporter@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-6.0.1.tgz#7c055120060a97c8837b4e48215661aafb74245f"
   integrity sha512-LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==
@@ -10490,7 +10579,7 @@ postcss-resolve-nested-selector@^0.1.1:
   resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
   integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
 
-postcss-safe-parser@^4.0.0:
+postcss-safe-parser@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz#8756d9e4c36fdce2c72b091bbc8ca176ab1fcdea"
   integrity sha512-xZsFA3uX8MO3yAda03QrG3/Eg1LN3EPfjjf07vke/46HERLZyHrTsQ9E1r1w1W//fWEhtYNndo2hQplN2cVpCQ==
@@ -11175,14 +11264,15 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+read-pkg@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
+  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
   dependencies:
-    normalize-package-data "^2.3.2"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
     parse-json "^4.0.0"
-    pify "^3.0.0"
+    type-fest "^0.4.1"
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
@@ -11546,6 +11636,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-pathname@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
@@ -11647,10 +11742,10 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs-compat@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.4.0.tgz#800923c15697948e1f30f18c531b12b49451c75c"
-  integrity sha512-eo/O8RS83hJdJukCtA+IF6qnqa8FPOuVo+OPCzgVi+dbTle9KCdNv97IcQO0WwNVik7DJLKmf0F8uwzc0q40vw==
+rxjs-compat@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.1.tgz#de928292c633a9a5f2f54a4431e6f9c468001c68"
+  integrity sha512-k0aaMAYFg+DCIUxo3yJcUamFRenWLR23e/VJCQvKOxwSd9DQlwcSn2ov+7b23rKaX4weKG7OrzEBWGqQPkQ07A==
 
 rxjs-tslint@0.1.5:
   version "0.1.5"
@@ -11676,6 +11771,13 @@ rxjs@^6.1.0, rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
+  integrity sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -12073,7 +12175,7 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socicon@3.0.5:
+socicon@^3.0.5:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/socicon/-/socicon-3.0.5.tgz#bfa06fcf7f2b6f3cdc3944337742358e9e050b6d"
   integrity sha1-v6Bvz38rbzzcOUQzd0I1jp4FC20=
@@ -12388,7 +12490,7 @@ split@^1.0.0:
   dependencies:
     through "2"
 
-sprintf-js@^1.1.1:
+sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
@@ -12427,11 +12529,6 @@ ssri@^6.0.0, ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-stack-trace@~0.0.7:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
-
 state-toggle@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz#c3cb0974f40a6a0f8e905b96789eb41afa1cde3a"
@@ -12577,6 +12674,15 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
+  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^5.2.0"
+
 string.prototype.matchall@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-3.0.1.tgz#5a9e0b64bcbeb336aa4814820237c2006985646d"
@@ -12651,7 +12757,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -12692,10 +12798,10 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-stripe@^6.25.0:
-  version "6.28.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.28.0.tgz#81f2bf174efe9503b50f24930a7e1d195c60f810"
-  integrity sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==
+stripe@^6.31.0:
+  version "6.31.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.31.0.tgz#524ef6997a4473c5bf9ce684b5c39e3bc307a445"
+  integrity sha512-VHVGyfrnzKdqraRHKQ42LJysQdg2iUL8pFES3dsN9yZOiEY+kxBetL7Zq2WiA24Y5PnVIO9gB5VbvmYPhEOhyA==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
@@ -12715,58 +12821,58 @@ style-search@^0.1.0:
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
   integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=
 
-stylelint@^9.10.1:
-  version "9.10.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.10.1.tgz#5f0ee3701461dff1d68284e1386efe8f0677a75d"
-  integrity sha512-9UiHxZhOAHEgeQ7oLGwrwoDR8vclBKlSX7r4fH0iuu0SfPwFaLkb1c7Q2j1cqg9P7IDXeAV2TvQML/fRQzGBBQ==
+stylelint@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-10.0.1.tgz#f85cd9755e905d826023d67df62b32716fa6dfb4"
+  integrity sha512-NbpD9BvQRmPe7QfaLB2OqhhDr5g6SAn43AAH2XLyqtQ9ZcioQECgadkIbormfhzxLhccAQWBZbVNiZz1oqEf8g==
   dependencies:
-    autoprefixer "^9.0.0"
+    autoprefixer "^9.5.1"
     balanced-match "^1.0.0"
-    chalk "^2.4.1"
-    cosmiconfig "^5.0.0"
-    debug "^4.0.0"
+    chalk "^2.4.2"
+    cosmiconfig "^5.2.0"
+    debug "^4.1.1"
     execall "^1.0.0"
-    file-entry-cache "^4.0.0"
-    get-stdin "^6.0.0"
+    file-entry-cache "^5.0.1"
+    get-stdin "^7.0.0"
     global-modules "^2.0.0"
-    globby "^9.0.0"
+    globby "^9.2.0"
     globjoin "^0.1.4"
     html-tags "^2.0.0"
-    ignore "^5.0.4"
+    ignore "^5.0.6"
     import-lazy "^3.1.0"
     imurmurhash "^0.1.4"
-    known-css-properties "^0.11.0"
-    leven "^2.1.0"
-    lodash "^4.17.4"
-    log-symbols "^2.0.0"
-    mathml-tag-names "^2.0.1"
+    known-css-properties "^0.13.0"
+    leven "^3.1.0"
+    lodash "^4.17.11"
+    log-symbols "^2.2.0"
+    mathml-tag-names "^2.1.0"
     meow "^5.0.0"
-    micromatch "^3.1.10"
+    micromatch "^4.0.0"
     normalize-selector "^0.2.0"
-    pify "^4.0.0"
-    postcss "^7.0.13"
+    pify "^4.0.1"
+    postcss "^7.0.14"
     postcss-html "^0.36.0"
     postcss-jsx "^0.36.0"
-    postcss-less "^3.1.0"
+    postcss-less "^3.1.4"
     postcss-markdown "^0.36.0"
     postcss-media-query-parser "^0.2.3"
-    postcss-reporter "^6.0.0"
+    postcss-reporter "^6.0.1"
     postcss-resolve-nested-selector "^0.1.1"
-    postcss-safe-parser "^4.0.0"
+    postcss-safe-parser "^4.0.1"
     postcss-sass "^0.3.5"
     postcss-scss "^2.0.0"
     postcss-selector-parser "^3.1.0"
     postcss-syntax "^0.36.2"
-    postcss-value-parser "^3.3.0"
-    resolve-from "^4.0.0"
+    postcss-value-parser "^3.3.1"
+    resolve-from "^5.0.0"
     signal-exit "^3.0.2"
     slash "^2.0.0"
     specificity "^0.4.1"
-    string-width "^3.0.0"
+    string-width "^4.1.0"
     style-search "^0.1.0"
     sugarss "^2.0.0"
     svg-tags "^1.0.0"
-    table "^5.0.0"
+    table "^5.2.3"
 
 stylis-rule-sheet@^0.0.10:
   version "0.0.10"
@@ -12799,7 +12905,7 @@ stylus@0.54.5:
     sax "0.5.x"
     source-map "0.1.x"
 
-subscriptions-transport-ws@^0.9.15:
+subscriptions-transport-ws@^0.9.16:
   version "0.9.16"
   resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz#90a422f0771d9c32069294c08608af2d47f596ec"
   integrity sha512-pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw==
@@ -12861,7 +12967,7 @@ symbol.prototype.description@^1.0.0:
   dependencies:
     has-symbols "^1.0.0"
 
-table@^5.0.0:
+table@^5.2.3:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/table/-/table-5.2.3.tgz#cde0cc6eb06751c009efab27e8c820ca5b67b7f2"
   integrity sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==
@@ -13036,10 +13142,10 @@ tinycolor2@^1.4.1:
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
   integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
 
-tinymce@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.0.3.tgz#40fa8658b5bdf58e7f04c816b38e1b06f96f6cfe"
-  integrity sha512-x7D0ttqn176Z4CWQIITMjcEtMGUjiaK0Y2FN2vO8DiyUeIHCdr70jJDSoGhuXtXX70Sw4Bd5UFfqIn/bG3HXcg==
+tinymce@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.0.4.tgz#4f398ee977b487ef16aeda188b0d981bae536eb6"
+  integrity sha512-H5ogFjgpYSCSgHMMJtR1nPfSICEPtuMW6d/0jR/p4R2eajO0aY8e04Exq6C77JQy6Do3NkJlIZNl1D1ejCn+Jw==
 
 tmp@0.0.30:
   version "0.0.30"
@@ -13090,6 +13196,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -13197,10 +13310,10 @@ ts-loader@^5.3.2:
     micromatch "^3.1.4"
     semver "^5.0.1"
 
-ts-node@^8.0.2:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.3.tgz#aa60b836a24dafd8bf21b54766841a232fdbc641"
-  integrity sha512-2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA==
+ts-node@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.1.0.tgz#8c4b37036abd448577db22a061fd7a67d47e658e"
+  integrity sha512-34jpuOrxDuf+O6iW1JpgTRDFynUZ1iEqtYruBqh35gICNjN8x+LpVcPAcwzLPi9VU6mdA3ym+x233nZmZp445A==
   dependencies:
     arg "^4.1.0"
     diff "^3.1.0"
@@ -13249,14 +13362,26 @@ tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
-tslint-language-service@^0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/tslint-language-service/-/tslint-language-service-0.9.9.tgz#f546dc38483979e6fb3cfa59584ad8525b3ad4da"
-  integrity sha1-9UbcOEg5eeb7PPpZWErYUls61No=
+tslint@^5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.16.0.tgz#ae61f9c5a98d295b9a4f4553b1b1e831c1984d67"
+  integrity sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==
   dependencies:
-    mock-require "^2.0.2"
+    "@babel/code-frame" "^7.0.0"
+    builtin-modules "^1.1.1"
+    chalk "^2.3.0"
+    commander "^2.12.1"
+    diff "^3.2.0"
+    glob "^7.1.1"
+    js-yaml "^3.13.0"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.8.0"
+    tsutils "^2.29.0"
 
-tslint@^5.12.1, tslint@^5.9.1:
+tslint@^5.9.1:
   version "5.15.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
   integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
@@ -13306,6 +13431,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -13329,12 +13459,21 @@ typeface-exo@^0.0.61:
   resolved "https://registry.yarnpkg.com/typeface-exo/-/typeface-exo-0.0.61.tgz#10c6113292da354cb9f26ee9d0b0c996f1a7a3bd"
   integrity sha512-AH3bMVYnVpg2G+CJbgtogTuJpWGS0zspHJzzVR8cCgTtkbUI0pj8WBB+RFo14CHbF5MmZgYe7TVoWz+j4Yo6Jg==
 
+typescript-tslint-plugin@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.3.1.tgz#d86ae0342c9e8f9ecfcbcc47f7a7c2b5ab0e86f9"
+  integrity sha512-h8HEPBm36UEs901ld1x6m5eY/UFb4mF+A0nvERr4BWMww5wnV5nfcm9ZFt18foYL0GQ5NVMt1Tb3466WUU8dRQ==
+  dependencies:
+    minimatch "^3.0.4"
+    mock-require "^3.0.2"
+    vscode-languageserver "^5.1.0"
+
 typescript@2.9.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
   integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
-typescript@3.2.4:
+typescript@3.2.4, typescript@~3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
   integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
@@ -13344,11 +13483,6 @@ typescript@^2.4.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
   integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
-typescript@~3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
-  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
-
 ua-parser-js@^0.7.18:
   version "0.7.19"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
@@ -13726,6 +13860,37 @@ void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
+vscode-jsonrpc@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
+  integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==
+
+vscode-languageserver-protocol@3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f"
+  integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==
+  dependencies:
+    vscode-jsonrpc "^4.0.0"
+    vscode-languageserver-types "3.14.0"
+
+vscode-languageserver-types@3.14.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
+  integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
+
+vscode-languageserver@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb"
+  integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==
+  dependencies:
+    vscode-languageserver-protocol "3.14.1"
+    vscode-uri "^1.0.6"
+
+vscode-uri@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
+  integrity sha512-sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww==
+
 warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
@@ -13860,7 +14025,7 @@ webpack-dev-server@3.1.14:
     webpack-log "^2.0.0"
     yargs "12.0.2"
 
-webpack-dev-server@^3.2.1:
+webpack-dev-server@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
   integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
@@ -14272,7 +14437,7 @@ yargs@9.0.1:
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
 
-yargs@^13.1.0:
+yargs@^13.2.2:
   version "13.2.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
   integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
@@ -14326,15 +14491,15 @@ zen-observable-ts@^0.8.18:
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
-zen-observable@^0.8.0, zen-observable@^0.8.13:
+zen-observable@^0.8.0, zen-observable@^0.8.14:
   version "0.8.14"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
   integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
-zone.js@^0.8.29:
-  version "0.8.29"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.29.tgz#8dce92aa0dd553b50bc5bfbb90af9986ad845a12"
-  integrity sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==
+zone.js@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.0.tgz#f42319d657f7616724ed40c5907d4614b4c683fa"
+  integrity sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q==
 
 zrender@4.0.7:
   version "4.0.7"
diff --git a/backend/api/package.json b/backend/api/package.json
index 5f59f9d15..bdd6f6edd 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -47,22 +47,22 @@
 	},
 	"dependencies": {
 		"@captemulation/get-parameter-names": "^1.2.0",
-		"@nestjs/common": "^6.0.4",
-		"@nestjs/core": "^6.0.4",
+		"@nestjs/common": "^6.1.1",
+		"@nestjs/core": "^6.1.1",
 		"@nestjs/cqrs": "^6.0.0",
-		"@nestjs/graphql": "^6.0.4",
-		"@nestjs/microservices": "^6.0.4",
+		"@nestjs/graphql": "^6.0.5",
+		"@nestjs/microservices": "^6.1.1",
 		"@nestjs/passport": "^6.0.0",
-		"@nestjs/platform-express": "^6.0.4",
-		"@nestjs/platform-socket.io": "^6.0.4",
+		"@nestjs/platform-express": "^6.1.1",
+		"@nestjs/platform-socket.io": "^6.1.1",
 		"@nestjs/swagger": "^3.0.2",
 		"@nestjs/typeorm": "^6.0.0",
-		"@nestjs/websockets": "^6.0.4",
+		"@nestjs/websockets": "^6.1.1",
 		"apollo-server-express": "^2.4.8",
 		"axios": "^0.18.0",
 		"bcrypt": "^3.0.4",
-		"bluebird": "^3.5.3",
-		"body-parser": "^1.18.3",
+		"bluebird": "^3.5.4",
+		"body-parser": "^1.19.0",
 		"bunyan": "^1.8.12",
 		"bunyan-cloudwatch": "^2.2.0",
 		"bunyan-prettystream": "^0.1.3",
@@ -75,32 +75,32 @@
 		"cryptiles": "^4.1.3",
 		"destroy": "^1.0.4",
 		"dotenv": "^7.0.0",
-		"envalid": "^4.2.2",
+		"envalid": "^5.0.0",
 		"errorhandler": "^1.5.0",
 		"etag": "^1.8.1",
 		"event-stream": "3.3.4",
 		"express": "^4.16.4",
 		"express-handlebars": "^3.0.2",
 		"faker": "^4.1.0",
-		"graphql": "^14.1.1",
+		"graphql": "^14.2.1",
 		"graphql-playground-middleware-express": "^1.7.12",
-		"graphql-subscriptions": "^1.0.0",
+		"graphql-subscriptions": "^1.1.0",
 		"graphql-tools": "^4.0.4",
-		"handlebars": "^4.1.1",
-		"image-size": "^0.7.2",
+		"handlebars": "^4.1.2",
+		"image-size": "^0.7.4",
 		"install": "^0.12.2",
 		"inversify": "^5.0.1",
 		"ipstack": "^0.1.1",
 		"jsonwebtoken": "^8.5.1",
-		"kafka-node": "^4.0.4",
+		"kafka-node": "^4.1.1",
 		"lodash": "^4.17.11",
 		"method-override": "^3.0.0",
 		"mkdirp": "^0.5.1",
 		"module-alias": "^2.2.0",
 		"moment": "^2.24.0",
-		"mongodb": "^3.2.1",
-		"mongodb-memory-server": "^5.0.2",
-		"mongoose": "^5.5.0",
+		"mongodb": "^3.2.3",
+		"mongodb-memory-server": "^5.1.0",
+		"mongoose": "^5.5.4",
 		"morgan": "^1.9.1",
 		"ms": "^2.1.1",
 		"node-sass": "^4.11.0",
@@ -113,43 +113,44 @@
 		"passport-local": "^1.0.0",
 		"passport-url": "^1.0.4",
 		"pem": "^1.14.2",
-		"pm2": "^3.4.0",
+		"pm2": "^3.5.0",
 		"redis": "^2.8.0",
 		"reflect-metadata": "^0.1.13",
 		"request": "^2.88.0",
 		"request-ip": "^2.1.3",
 		"request-promise": "^4.2.4",
-		"rxjs": "^6.4.0",
-		"rxjs-compat": "^6.4.0",
+		"rxjs": "^6.5.1",
+		"rxjs-compat": "^6.5.1",
 		"serve-favicon": "^2.5.0",
+		"snappy": "^6.1.2",
 		"socket.io": "^2.2.0",
 		"socket.io-client": "^2.2.0",
-		"source-map-support": "^0.5.11",
-		"stripe": "^6.28.0",
+		"source-map-support": "^0.5.12",
+		"stripe": "^6.31.0",
 		"subscriptions-transport-ws": "^0.9.16",
 		"swagger-ui-express": "^4.0.2",
 		"symbol": "^0.3.1",
 		"symbol-observable": "^1.2.0",
-		"typeorm": "^0.2.15",
+		"typeorm": "^0.2.16",
 		"typescript-collections": "^1.3.2",
 		"underscore.string": "^3.3.5",
 		"upath": "^1.1.2",
 		"uuid": "^3.3.2",
 		"validator": "^10.11.0",
-		"ws": "^6.2.0"
+		"ws": "^6.2.1"
 	},
 	"devDependencies": {
-		"@nestjs/testing": "^6.0.4",
 		"@commitlint/cli": "^7.5.2",
 		"@commitlint/config-conventional": "^7.5.0",
 		"@commitlint/config-lerna-scopes": "^7.5.1",
 		"@commitlint/travis-cli": "^7.5.2",
+		"@nestjs/testing": "^6.1.1",
 		"@types/bcrypt": "^3.0.0",
 		"@types/bluebird": "^3.5.26",
 		"@types/body-parser": "^1.17.0",
 		"@types/bunyan": "^1.8.6",
 		"@types/core-decorators": "^0.20.0",
-		"@types/cors": "^2.8.4",
+		"@types/cors": "^2.8.5",
 		"@types/errorhandler": "^0.0.32",
 		"@types/express": "^4.16.1",
 		"@types/faker": "^4.1.5",
@@ -164,50 +165,50 @@
 		"@types/method-override": "^0.0.31",
 		"@types/mkdirp": "^0.5.2",
 		"@types/moment": "^2.13.0",
-		"@types/mongodb": "^3.1.22",
-		"@types/mongoose": "^5.3.23",
+		"@types/mongodb": "^3.1.25",
+		"@types/mongoose": "^5.3.26",
 		"@types/node": "^11.9.3",
 		"@types/passport": "^1.0.0",
 		"@types/passport-jwt": "^3.0.1",
-		"@types/redis": "^2.8.11",
+		"@types/redis": "^2.8.12",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/request": "^2.48.1",
-		"@types/request-promise": "^4.1.42",
-		"@types/sinon": "^7.0.10",
+		"@types/request-promise": "^4.1.43",
+		"@types/sinon": "^7.0.11",
 		"@types/socket.io": "^2.1.2",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/source-map-support": "^0.5.0",
-		"@types/stripe": "^6.25.7",
+		"@types/stripe": "^6.25.12",
 		"@types/uuid": "^3.4.4",
 		"@types/ws": "^6.0.1",
 		"concurrently": "^4.1.0",
-		"conventional-changelog": "^3.0.6",
-		"core-js": "^3.0.0",
+		"conventional-changelog": "^3.1.4",
+		"cz-conventional-changelog": "^2.1.0",
+		"core-js": "^3.0.1",
 		"coveralls": "^3.0.3",
 		"cross-env": "^5.2.0",
-		"cz-conventional-changelog": "^2.1.0",
-		"husky": "^1.3.1",
-		"jest": "^24.5.0",
+		"husky": "^2.1.0",
+		"jest": "^24.7.1",
 		"nodemon": "^1.18.11",
-		"nyc": "^13.3.0",
-		"prettier": "^1.16.4",
+		"nyc": "^14.0.0",
+		"prettier": "^1.17.0",
 		"prettier-tslint": "^0.4.2",
 		"pretty-quick": "^1.10.0",
 		"require-directory": "^2.1.1",
 		"rxjs-tslint": "0.1.5",
 		"supertest": "^4.0.2",
-		"ts-jest": "^24.0.0",
-		"ts-loader": "^5.3.3",
+		"ts-jest": "^24.0.2",
+		"ts-loader": "^5.4.3",
 		"ts-node": "^8.1.0",
 		"tslint": "^5.16.0",
 		"typedoc": "^0.14.2",
 		"typemoq": "^2.1.0",
-		"typescript": "~3.4.3",
+		"typescript": "~3.4.5",
 		"wait-on": "^3.2.0",
-		"webpack": "^4.29.6",
-		"webpack-cli": "^3.3.0",
+		"webpack": "^4.30.0",
+		"webpack-cli": "^3.3.1",
 		"webpack-command": "^0.4.2",
-		"webpack-graphql-loader": "^1.0.0",
+		"webpack-graphql-loader": "^1.0.2",
 		"webpack-node-externals": "^1.7.2"
 	},
 	"nyc": {
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 638f31a5a..cc698aa51 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -357,42 +357,41 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
-"@jest/console@^24.3.0":
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.3.0.tgz#7bd920d250988ba0bf1352c4493a48e1cb97671e"
-  integrity sha512-NaCty/OOei6rSDcbPdMiCbYCI0KGFGPgGO6B09lwWt5QTxnkuhKYET9El5u5z1GAcSxkQmSMtM63e24YabCWqA==
+"@jest/console@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
+  integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==
   dependencies:
     "@jest/source-map" "^24.3.0"
-    "@types/node" "*"
     chalk "^2.0.1"
     slash "^2.0.0"
 
-"@jest/core@^24.5.0":
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.5.0.tgz#2cefc6a69e9ebcae1da8f7c75f8a257152ba1ec0"
-  integrity sha512-RDZArRzAs51YS7dXG1pbXbWGxK53rvUu8mCDYsgqqqQ6uSOaTjcVyBl2Jce0exT2rSLk38ca7az7t2f3b0/oYQ==
+"@jest/core@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.7.1.tgz#6707f50db238d0c5988860680e2e414df0032024"
+  integrity sha512-ivlZ8HX/FOASfHcb5DJpSPFps8ydfUYzLZfgFFqjkLijYysnIEOieg72YRhO4ZUB32xu40hsSMmaw+IGYeKONA==
   dependencies:
-    "@jest/console" "^24.3.0"
-    "@jest/reporters" "^24.5.0"
-    "@jest/test-result" "^24.5.0"
-    "@jest/transform" "^24.5.0"
-    "@jest/types" "^24.5.0"
+    "@jest/console" "^24.7.1"
+    "@jest/reporters" "^24.7.1"
+    "@jest/test-result" "^24.7.1"
+    "@jest/transform" "^24.7.1"
+    "@jest/types" "^24.7.0"
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
     exit "^0.1.2"
     graceful-fs "^4.1.15"
-    jest-changed-files "^24.5.0"
-    jest-config "^24.5.0"
-    jest-haste-map "^24.5.0"
-    jest-message-util "^24.5.0"
+    jest-changed-files "^24.7.0"
+    jest-config "^24.7.1"
+    jest-haste-map "^24.7.1"
+    jest-message-util "^24.7.1"
     jest-regex-util "^24.3.0"
-    jest-resolve-dependencies "^24.5.0"
-    jest-runner "^24.5.0"
-    jest-runtime "^24.5.0"
-    jest-snapshot "^24.5.0"
-    jest-util "^24.5.0"
-    jest-validate "^24.5.0"
-    jest-watcher "^24.5.0"
+    jest-resolve-dependencies "^24.7.1"
+    jest-runner "^24.7.1"
+    jest-runtime "^24.7.1"
+    jest-snapshot "^24.7.1"
+    jest-util "^24.7.1"
+    jest-validate "^24.7.0"
+    jest-watcher "^24.7.1"
     micromatch "^3.1.10"
     p-each-series "^1.0.0"
     pirates "^4.0.1"
@@ -400,36 +399,34 @@
     rimraf "^2.5.4"
     strip-ansi "^5.0.0"
 
-"@jest/environment@^24.5.0":
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.5.0.tgz#a2557f7808767abea3f9e4cc43a172122a63aca8"
-  integrity sha512-tzUHR9SHjMXwM8QmfHb/EJNbF0fjbH4ieefJBvtwO8YErLTrecc1ROj0uo2VnIT6SlpEGZnvdCK6VgKYBo8LsA==
-  dependencies:
-    "@jest/fake-timers" "^24.5.0"
-    "@jest/transform" "^24.5.0"
-    "@jest/types" "^24.5.0"
-    "@types/node" "*"
-    jest-mock "^24.5.0"
-
-"@jest/fake-timers@^24.5.0":
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.5.0.tgz#4a29678b91fd0876144a58f8d46e6c62de0266f0"
-  integrity sha512-i59KVt3QBz9d+4Qr4QxsKgsIg+NjfuCjSOWj3RQhjF5JNy+eVJDhANQ4WzulzNCHd72srMAykwtRn5NYDGVraw==
-  dependencies:
-    "@jest/types" "^24.5.0"
-    "@types/node" "*"
-    jest-message-util "^24.5.0"
-    jest-mock "^24.5.0"
-
-"@jest/reporters@^24.5.0":
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.5.0.tgz#9363a210d0daa74696886d9cb294eb8b3ad9b4d9"
-  integrity sha512-vfpceiaKtGgnuC3ss5czWOihKOUSyjJA4M4udm6nH8xgqsuQYcyDCi4nMMcBKsHXWgz9/V5G7iisnZGfOh1w6Q==
-  dependencies:
-    "@jest/environment" "^24.5.0"
-    "@jest/test-result" "^24.5.0"
-    "@jest/transform" "^24.5.0"
-    "@jest/types" "^24.5.0"
+"@jest/environment@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.7.1.tgz#9b9196bc737561f67ac07817d4c5ece772e33135"
+  integrity sha512-wmcTTYc4/KqA+U5h1zQd5FXXynfa7VGP2NfF+c6QeGJ7c+2nStgh65RQWNX62SC716dTtqheTRrZl0j+54oGHw==
+  dependencies:
+    "@jest/fake-timers" "^24.7.1"
+    "@jest/transform" "^24.7.1"
+    "@jest/types" "^24.7.0"
+    jest-mock "^24.7.0"
+
+"@jest/fake-timers@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.7.1.tgz#56e5d09bdec09ee81050eaff2794b26c71d19db2"
+  integrity sha512-4vSQJDKfR2jScOe12L9282uiwuwQv9Lk7mgrCSZHA9evB9efB/qx8i0KJxsAKtp8fgJYBJdYY7ZU6u3F4/pyjA==
+  dependencies:
+    "@jest/types" "^24.7.0"
+    jest-message-util "^24.7.1"
+    jest-mock "^24.7.0"
+
+"@jest/reporters@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.7.1.tgz#38ac0b096cd691bbbe3051ddc25988d42e37773a"
+  integrity sha512-bO+WYNwHLNhrjB9EbPL4kX/mCCG4ZhhfWmO3m4FSpbgr7N83MFejayz30kKjgqr7smLyeaRFCBQMbXpUgnhAJw==
+  dependencies:
+    "@jest/environment" "^24.7.1"
+    "@jest/test-result" "^24.7.1"
+    "@jest/transform" "^24.7.1"
+    "@jest/types" "^24.7.0"
     chalk "^2.0.1"
     exit "^0.1.2"
     glob "^7.1.2"
@@ -437,11 +434,11 @@
     istanbul-lib-coverage "^2.0.2"
     istanbul-lib-instrument "^3.0.1"
     istanbul-lib-source-maps "^3.0.1"
-    jest-haste-map "^24.5.0"
-    jest-resolve "^24.5.0"
-    jest-runtime "^24.5.0"
-    jest-util "^24.5.0"
-    jest-worker "^24.4.0"
+    jest-haste-map "^24.7.1"
+    jest-resolve "^24.7.1"
+    jest-runtime "^24.7.1"
+    jest-util "^24.7.1"
+    jest-worker "^24.6.0"
     node-notifier "^5.2.1"
     slash "^2.0.0"
     source-map "^0.6.0"
@@ -456,42 +453,52 @@
     graceful-fs "^4.1.15"
     source-map "^0.6.0"
 
-"@jest/test-result@^24.5.0":
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.5.0.tgz#ab66fb7741a04af3363443084e72ea84861a53f2"
-  integrity sha512-u66j2vBfa8Bli1+o3rCaVnVYa9O8CAFZeqiqLVhnarXtreSXG33YQ6vNYBogT7+nYiFNOohTU21BKiHlgmxD5A==
+"@jest/test-result@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.7.1.tgz#19eacdb29a114300aed24db651e5d975f08b6bbe"
+  integrity sha512-3U7wITxstdEc2HMfBX7Yx3JZgiNBubwDqQMh+BXmZXHa3G13YWF3p6cK+5g0hGkN3iufg/vGPl3hLxQXD74Npg==
   dependencies:
-    "@jest/console" "^24.3.0"
-    "@jest/types" "^24.5.0"
-    "@types/istanbul-lib-coverage" "^1.1.0"
+    "@jest/console" "^24.7.1"
+    "@jest/types" "^24.7.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
 
-"@jest/transform@^24.5.0":
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.5.0.tgz#6709fc26db918e6af63a985f2cc3c464b4cf99d9"
-  integrity sha512-XSsDz1gdR/QMmB8UCKlweAReQsZrD/DK7FuDlNo/pE8EcKMrfi2kqLRk8h8Gy/PDzgqJj64jNEzOce9pR8oj1w==
+"@jest/test-sequencer@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.7.1.tgz#9c18e428e1ad945fa74f6233a9d35745ca0e63e0"
+  integrity sha512-84HQkCpVZI/G1zq53gHJvSmhUer4aMYp9tTaffW28Ih5OxfCg8hGr3nTSbL1OhVDRrFZwvF+/R9gY6JRkDUpUA==
+  dependencies:
+    "@jest/test-result" "^24.7.1"
+    jest-haste-map "^24.7.1"
+    jest-runner "^24.7.1"
+    jest-runtime "^24.7.1"
+
+"@jest/transform@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.7.1.tgz#872318f125bcfab2de11f53b465ab1aa780789c2"
+  integrity sha512-EsOUqP9ULuJ66IkZQhI5LufCHlTbi7hrcllRMUEV/tOgqBVQi93+9qEvkX0n8mYpVXQ8VjwmICeRgg58mrtIEw==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
     babel-plugin-istanbul "^5.1.0"
     chalk "^2.0.1"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.1.15"
-    jest-haste-map "^24.5.0"
+    jest-haste-map "^24.7.1"
     jest-regex-util "^24.3.0"
-    jest-util "^24.5.0"
+    jest-util "^24.7.1"
     micromatch "^3.1.10"
     realpath-native "^1.1.0"
     slash "^2.0.0"
     source-map "^0.6.1"
     write-file-atomic "2.4.1"
 
-"@jest/types@^24.5.0":
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.5.0.tgz#feee214a4d0167b0ca447284e95a57aa10b3ee95"
-  integrity sha512-kN7RFzNMf2R8UDadPOl6ReyI+MT8xfqRuAnuVL+i4gwjv/zubdDK+EDeLHYwq1j0CSSR2W/MmgaRlMZJzXdmVA==
+"@jest/types@^24.7.0":
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.7.0.tgz#c4ec8d1828cdf23234d9b4ee31f5482a3f04f48b"
+  integrity sha512-ipJUa2rFWiKoBqMKP63Myb6h9+iT3FHRTF2M8OR6irxWzItisa8i4dcSg14IbvmXUnBlHBlUQPYUHWyX3UPpYA==
   dependencies:
-    "@types/istanbul-lib-coverage" "^1.1.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/yargs" "^12.0.9"
 
 "@marionebl/sander@^0.6.0":
@@ -510,7 +517,7 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nestjs/common@^6.0.4":
+"@nestjs/common@^6.1.1":
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/@nestjs/common/-/common-6.1.1.tgz#6f7f0aa0ff45285f9d2b0a66acde1ebeb0c99060"
   integrity sha512-hwAjk0RUMRFWJktTYovW0LWVRy2oLBwdb4mDcomYUoSGrCYZ9xGS+eeB9B7Lby4xoz01E2NTRmdrIh9gQYAEFA==
@@ -519,7 +526,7 @@
     cli-color "1.4.0"
     uuid "3.3.2"
 
-"@nestjs/core@^6.0.4":
+"@nestjs/core@^6.1.1":
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/@nestjs/core/-/core-6.1.1.tgz#10494e8e1a4bcf55059fd114c0934186c2130930"
   integrity sha512-qIDe+dr+iCuntoewwJgsDBay3JWcCozXKZZLjKwIK5VxWTxT83KHm+1LRR8hSAMCPgQFgRq4639oOSRtceEzNg==
@@ -536,7 +543,7 @@
   resolved "https://registry.yarnpkg.com/@nestjs/cqrs/-/cqrs-6.0.0.tgz#a9dc850e04f8bed40cad3a13106f6cb085b2b985"
   integrity sha512-d2jKfVRJsq14VU7w8sELhROVok3X9hxeYhRkOLX8OQtD18E6PhMWsVvIY/HE0G0YHYBQmyvHpusz3iPmDmlJow==
 
-"@nestjs/graphql@^6.0.4":
+"@nestjs/graphql@^6.0.5":
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/@nestjs/graphql/-/graphql-6.0.5.tgz#3eac35cf669c5dc9860ca262f5d7dd6d66b742c0"
   integrity sha512-TxTPgb1uXkmIjx0pVkHDZ5QyPCiJUjZnTPdLe1l/KE6hNd0/8TXpWelh/dNylFUFrPCI2N3k96GEibcT4uT6+Q==
@@ -551,7 +558,7 @@
     ts-morph "1.3.2"
     uuid "3.3.2"
 
-"@nestjs/microservices@^6.0.4":
+"@nestjs/microservices@^6.1.1":
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/@nestjs/microservices/-/microservices-6.1.1.tgz#e3ceeeab61d256d4a2d35721489cc443862e3bbf"
   integrity sha512-dqEhSh0+9dIdb4aXWsuMnoGjiyhKE6mm2f/IKAIbWwwfmGzeFGcEd1TdqLXVzDgCXxTaUZlO7TY0PRU0Muwlfw==
@@ -565,7 +572,7 @@
   resolved "https://registry.yarnpkg.com/@nestjs/passport/-/passport-6.0.0.tgz#b92fdf90e055eece02c0378fce98e6f60a864c54"
   integrity sha512-+82YJTQpmDrcqS65Jgtdv6+n5lWCZtANw7Cy3KWdSKPBbNheIYBWtKMV2uXZXXtVqxgGaCnrJ03XpHc22RX4xA==
 
-"@nestjs/platform-express@^6.0.4":
+"@nestjs/platform-express@^6.1.1":
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-6.1.1.tgz#4d4d4774a65b14c81646d10da9768f4cb6b922d6"
   integrity sha512-vA1JhKnZp9Ks0hSznzrRZL0neAGDAOpwJz97ttyxc/F0u6thsk7HmXKPziskqnf9diiY7mXeP57nPcDWPt9W0w==
@@ -575,7 +582,7 @@
     express "4.16.4"
     multer "1.4.1"
 
-"@nestjs/platform-socket.io@^6.0.4":
+"@nestjs/platform-socket.io@^6.1.1":
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/@nestjs/platform-socket.io/-/platform-socket.io-6.1.1.tgz#ffc24c240870f2b17984a265b30ec5d793e2bdb3"
   integrity sha512-u7hkGtAWlBmuonFWQwxhOLo+4LDBC2EPjhEAqI3vcQNpuclQNH8gFQLLzm4MyktYnfe6qzXxdchlB1aVTRswEg==
@@ -590,7 +597,7 @@
     lodash "4.17.11"
     path-to-regexp "3.0.0"
 
-"@nestjs/testing@^6.0.4":
+"@nestjs/testing@^6.1.1":
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/@nestjs/testing/-/testing-6.1.1.tgz#cc871867f9bd053069467a5a2f1b429945413313"
   integrity sha512-EQLRES20n8zWkFRXgwFKjCE0s/WsHvqv3v22umqq2XHiep7WiJub0hNG/FcC00WltXPDPAaEDu0XDPr56UWZhQ==
@@ -604,7 +611,7 @@
   dependencies:
     uuid "3.3.2"
 
-"@nestjs/websockets@^6.0.4":
+"@nestjs/websockets@^6.1.1":
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/@nestjs/websockets/-/websockets-6.1.1.tgz#99202e4ebe1310337926b5b32b264921ae957247"
   integrity sha512-iPdp9ipM8cx2Entak4oI6eg1QPhNFH81kx9on44mQ8oAGRdZVcbiS2wQ+ERbwQyNIUsWSR390kObOlXKqelaxw==
@@ -685,10 +692,10 @@
     semver "^5.5.0"
     ws "^5.1.0"
 
-"@pm2/io@^4.1.0":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@pm2/io/-/io-4.1.3.tgz#ccb8551e3d3bf3c7cdc0f1038d9f83c9d184feb4"
-  integrity sha512-M3bo1h+1neM9iDBk6zN8D/DzuZCAhQXPFcsCi7PDAfpK88wH4eQOP5RW2omdJ2Cv1RKTcZXODRD5Dx73OQNMcA==
+"@pm2/io@^4.1.2":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@pm2/io/-/io-4.1.4.tgz#3d092d829ea1559498764349313d5c3cf77f5c77"
+  integrity sha512-CD5DZaOD2kvclks9MN3EHbohGeN0ZXc3H0607I4YL6LJHf8HaCtrB3na9USFToVbbKN3rNrvVSCTRkjNf22W1g==
   dependencies:
     "@opencensus/core" "^0.0.9"
     "@opencensus/propagation-b3" "^0.0.8"
@@ -863,6 +870,13 @@
   dependencies:
     "@types/express" "*"
 
+"@types/cors@^2.8.5":
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.5.tgz#c0c54c4e643e1d943d447292f2baf9dc82cfc8ec"
+  integrity sha512-GmK8AKu8i+s+EChK/uZ5IbrXPcPaQKWaNSGevDT/7o3gFObwSUQwqb1jMqxuo+YPvj0ckGzINI+EO7EHcmJjKg==
+  dependencies:
+    "@types/express" "*"
+
 "@types/errorhandler@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/errorhandler/-/errorhandler-0.0.32.tgz#387eca73957b481254baddc15d1d40f7fe7153c6"
@@ -959,10 +973,10 @@
   dependencies:
     inversify "*"
 
-"@types/istanbul-lib-coverage@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz#2cc2ca41051498382b43157c8227fea60363f94a"
-  integrity sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ==
+"@types/istanbul-lib-coverage@^2.0.0":
+  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==
 
 "@types/jest-diff@*":
   version "20.0.1"
@@ -1048,18 +1062,18 @@
     "@types/events" "*"
     "@types/node" "*"
 
-"@types/mongodb@^3.1.22":
-  version "3.1.22"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.22.tgz#66f96c7acbf7135ce6295a8d6c26f1d97388a84b"
-  integrity sha512-hvNR0txBlJJAy1eZOeIDshW4dnQaC694COou4eHHaMdIcteCfoCQATD7sYNlXxNxfTc1iIbHUi7A8CAhQe08uA==
+"@types/mongodb@^3.1.25":
+  version "3.1.25"
+  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.25.tgz#1da0219b7d8c08859f811774673c803f906e5e05"
+  integrity sha512-BSrjY1J8Nf9hin6p0Tv8b8PIfpTq+Xp4TVSRxZbO3jhvIeu1EKZ4xk0t8tms5vA/qMIkfNX2iciOThFhXPL93g==
   dependencies:
     "@types/bson" "*"
     "@types/node" "*"
 
-"@types/mongoose@^5.3.23":
-  version "5.3.23"
-  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.23.tgz#5a37bb73313f4892af9e2e6b9641a6f7b164200c"
-  integrity sha512-UZJOkFe/ShSt3iYFBiadwwCu2Y8qm/RZyAoCQI2uf88wr3NfDBpbqqoIyrchBy1y2XtvAAyktEPzvvR7up6/TQ==
+"@types/mongoose@^5.3.26":
+  version "5.3.26"
+  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.26.tgz#a979014c7fc9395e484695d4cc5647e7686251db"
+  integrity sha512-7NPdpUGU/1ZztTICcP3GxwWBAHTDyOLW0XJxrxlTl5i7R7XbT2Ucq33JussSLkWHKjbxpAmJnDwlYKcjwG7agg==
   dependencies:
     "@types/mongodb" "*"
     "@types/node" "*"
@@ -1078,6 +1092,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.9.3.tgz#14adbb5ab8cd563f549fbae8dbe92e0b7d6e76cc"
   integrity sha512-DMiqG51GwES/c4ScBY0u5bDlH44+oY8AeYHjY1SGCWidD7h08o1dfHue/TGK7REmif2KiJzaUskO+Q0eaeZ2fQ==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/passport-jwt@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/passport-jwt/-/passport-jwt-3.0.1.tgz#bc4c2610815565de977ea1a580c047d71c646084"
@@ -1110,10 +1129,10 @@
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.2.tgz#fa8e1ad1d474688a757140c91de6dace6f4abc8d"
 
-"@types/redis@^2.8.11":
-  version "2.8.11"
-  resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.11.tgz#103b6b165edf037dd9f50216690cf8e0045f076d"
-  integrity sha512-i0AqDzjX0FlO+npqkhl1etZw1fGnJc0IeHUHKAf/V7Drk+rDJI634GE9Lwh8aj/2ahuW6jHdWX4ZnyNofWXKrw==
+"@types/redis@^2.8.12":
+  version "2.8.12"
+  resolved "https://registry.yarnpkg.com/@types/redis/-/redis-2.8.12.tgz#6405d7ece0d6cc037151b7141cef9ad3cd06f3ac"
+  integrity sha512-eT5cGYr08OnF6OlAHdc2hVOBAKBpfQQNQHsWEvUwRPFiXRd+vv+hOHSSIo4xB7M5vZOZdjMT2OUlXYqo3YlIGQ==
   dependencies:
     "@types/node" "*"
 
@@ -1123,10 +1142,10 @@
   dependencies:
     reflect-metadata "*"
 
-"@types/request-promise@^4.1.42":
-  version "4.1.42"
-  resolved "https://registry.yarnpkg.com/@types/request-promise/-/request-promise-4.1.42.tgz#a70a6777429531e60ed09faa077ead9b995204cd"
-  integrity sha512-b8li55sEZ00BXZstZ3d8WOi48dnapTqB1VufEG9Qox0nVI2JVnTVT1Mw4JbBa1j+1sGVX/qJ0R4WDv4v2GjT0w==
+"@types/request-promise@^4.1.43":
+  version "4.1.43"
+  resolved "https://registry.yarnpkg.com/@types/request-promise/-/request-promise-4.1.43.tgz#7cfd9f8868ddafd7a91938240210b466bb07d93a"
+  integrity sha512-SEJaRP9jfxS7IbgjmcRfNOEbT1wcgVEgSYX0iyABO+0vkLdtB4xjvvYF6HBvYTCbSBF+KKgdtN2mfB8ua8JlXA==
   dependencies:
     "@types/bluebird" "*"
     "@types/request" "*"
@@ -1164,10 +1183,10 @@
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/sinon@^7.0.10":
-  version "7.0.10"
-  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.10.tgz#1f921f0c347b19f754e61dbc671c088df73fe1ff"
-  integrity sha512-4w7SvsiUOtd4mUfund9QROPSJ5At/GQskDpqd87pJIRI6ULWSJqHI3GIZE337wQuN3aznroJGr94+o8fwvL37Q==
+"@types/sinon@^7.0.11":
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.11.tgz#6f28f005a36e779b7db0f1359b9fb9eef72aae88"
+  integrity sha512-6ee09Ugx6GyEr0opUIakmxIWFNmqYPjkqa3/BuxCBokA0klsOLPgMD5K4q40lH7/yZVuJVzOfQpd7pipwjngkQ==
 
 "@types/socket.io-client@^1.4.32":
   version "1.4.32"
@@ -1191,10 +1210,10 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
-"@types/stripe@^6.25.7":
-  version "6.25.7"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
-  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
+"@types/stripe@^6.25.12":
+  version "6.25.12"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.12.tgz#7d2299262968556de2b5d4854efccbc7acb49184"
+  integrity sha512-xnNajYeTdibtUfyedTv91QljDsRD+BYFI8aQKxRRU51OUBKef6Zg50kIWotgLjd4q5WHFn9fTfwPnyW2fB1xAQ==
   dependencies:
     "@types/node" "*"
 
@@ -1949,16 +1968,16 @@ babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-jest@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.5.0.tgz#0ea042789810c2bec9065f7c8ab4dc18e1d28559"
-  integrity sha512-0fKCXyRwxFTJL0UXDJiT2xYxO9Lu2vBd9n+cC+eDjESzcVG3s2DRGAxbzJX21fceB1WYoBjAh8pQ83dKcl003g==
+babel-jest@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.7.1.tgz#73902c9ff15a7dfbdc9994b0b17fcefd96042178"
+  integrity sha512-GPnLqfk8Mtt0i4OemjWkChi73A3ALs4w2/QbG64uAj8b5mmwzxc7jbJVRZt8NJkxi6FopVHog9S3xX6UJKb2qg==
   dependencies:
-    "@jest/transform" "^24.5.0"
-    "@jest/types" "^24.5.0"
+    "@jest/transform" "^24.7.1"
+    "@jest/types" "^24.7.0"
     "@types/babel__core" "^7.1.0"
     babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.3.0"
+    babel-preset-jest "^24.6.0"
     chalk "^2.4.2"
     slash "^2.0.0"
 
@@ -1971,10 +1990,10 @@ babel-plugin-istanbul@^5.1.0:
     istanbul-lib-instrument "^3.0.0"
     test-exclude "^5.0.0"
 
-babel-plugin-jest-hoist@^24.3.0:
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.3.0.tgz#f2e82952946f6e40bb0a75d266a3790d854c8b5b"
-  integrity sha512-nWh4N1mVH55Tzhx2isvUN5ebM5CDUvIpXPZYMRazQughie/EqGnbR+czzoQlhUmJG9pPJmYDRhvocotb2THl1w==
+babel-plugin-jest-hoist@^24.6.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz#f7f7f7ad150ee96d7a5e8e2c5da8319579e78019"
+  integrity sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==
   dependencies:
     "@types/babel__traverse" "^7.0.6"
 
@@ -1987,13 +2006,13 @@ babel-polyfill@6.26.0:
     core-js "^2.5.0"
     regenerator-runtime "^0.10.5"
 
-babel-preset-jest@^24.3.0:
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.3.0.tgz#db88497e18869f15b24d9c0e547d8e0ab950796d"
-  integrity sha512-VGTV2QYBa/Kn3WCOKdfS31j9qomaXSgJqi65B6o05/1GsJyj9LVhSljM9ro4S+IBGj/ENhNBuH9bpqzztKAQSw==
+babel-preset-jest@^24.6.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984"
+  integrity sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==
   dependencies:
     "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.3.0"
+    babel-plugin-jest-hoist "^24.6.0"
 
 babel-runtime@6.26.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
   version "6.26.0"
@@ -2125,10 +2144,10 @@ bluebird@^3.5.0, bluebird@^3.5.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
 
-bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+bluebird@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
+  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -2153,6 +2172,22 @@ body-parser@1.18.3, body-parser@^1.18.3:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
+body-parser@^1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
 boom@7.x.x:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/boom/-/boom-7.3.0.tgz#733a6d956d33b0b1999da3fe6c12996950d017b9"
@@ -2386,6 +2421,11 @@ bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
 cacache@^11.0.2:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
@@ -2419,15 +2459,15 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-caching-transform@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-3.0.1.tgz#1df89e850803ad15f68dafb2abe9a8b866016c7d"
-  integrity sha512-Y1KTLNwSPd4ljsDrFOtyXVmm7Gnk42yQitNq43AhE+cwUR/e4T+rmOHs1IPtzBg8066GBJfTOj1rQYFSWSsH2g==
+caching-transform@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-3.0.2.tgz#601d46b91eca87687a281e71cef99791b0efca70"
+  integrity sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==
   dependencies:
     hasha "^3.0.0"
-    make-dir "^1.3.0"
+    make-dir "^2.0.0"
     package-hash "^3.0.0"
-    write-file-atomic "^2.3.0"
+    write-file-atomic "^2.4.2"
 
 call-me-maybe@^1.0.1:
   version "1.0.1"
@@ -2497,6 +2537,11 @@ camelcase@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
 
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -2993,13 +3038,21 @@ conventional-changelog-codemirror@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-core@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.6.tgz#ac1731a461c50d150d29c1ad4f33143293bcd32f"
-  integrity sha512-5teTAZOtJ4HLR6384h50nPAaKdDr+IaU0rnD2Gg2C3MS7hKsEPH8pZxrDNqam9eOSPQg9tET6uZY79zzgSz+ig==
+conventional-changelog-conventionalcommits@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-1.1.2.tgz#bb30c8d40dbd13ba9ec4e9bc6a025578b31b17bd"
+  integrity sha512-t8VyibJHGrtsDwSHjgpW9v7oBbqDGQooCMo/a2rc0z5cousV5O11palcSPpyshEVWVijxPtzBNG02EQkMDJ8CA==
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-core@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0"
+  integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==
   dependencies:
-    conventional-changelog-writer "^4.0.3"
-    conventional-commits-parser "^3.0.1"
+    conventional-changelog-writer "^4.0.5"
+    conventional-commits-parser "^3.0.2"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
     git-raw-commits "2.0.0"
@@ -3010,7 +3063,7 @@ conventional-changelog-core@^3.1.6:
     q "^1.5.1"
     read-pkg "^3.0.0"
     read-pkg-up "^3.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
 conventional-changelog-ember@^2.0.2:
   version "2.0.2"
@@ -3018,9 +3071,10 @@ conventional-changelog-ember@^2.0.2:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-eslint@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.1.tgz#f65e0e7f63dc09c044244b8785313a602e628002"
+conventional-changelog-eslint@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.2.tgz#e9eb088cda6be3e58b2de6a5aac63df0277f3cbe"
+  integrity sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ==
   dependencies:
     q "^1.5.1"
 
@@ -3043,17 +3097,18 @@ conventional-changelog-jshint@^2.0.1:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-preset-loader@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
+conventional-changelog-preset-loader@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4"
+  integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA==
 
-conventional-changelog-writer@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.3.tgz#916a2b302d0bb5ef18efd236a034c13fb273cde1"
-  integrity sha512-bIlpSiQtQZ1+nDVHEEh798Erj2jhN/wEjyw9sfxY9es6h7pREE5BNJjfv0hXGH/FTrAsEpHUq4xzK99eePpwuA==
+conventional-changelog-writer@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.5.tgz#fb9e384bb294e8e8a9f2568a3f4d1e11953d8641"
+  integrity sha512-g/Myp4MaJ1A+f7Ai+SnVhkcWtaHk6flw0SYN7A+vQ+MTu0+gSovQWs4Pg4NtcNUcIztYQ9YHsoxHP+GGQplI7Q==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.1"
+    conventional-commits-filter "^2.0.2"
     dateformat "^3.0.0"
     handlebars "^4.1.0"
     json-stringify-safe "^5.0.1"
@@ -3061,34 +3116,36 @@ conventional-changelog-writer@^4.0.3:
     meow "^4.0.0"
     semver "^5.5.0"
     split "^1.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
-conventional-changelog@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.0.6.tgz#a0bd3b51a0549ec03eb6ef90af7f9fa8c358b15f"
-  integrity sha512-1b96x3G67lDKakRvMm+VvYGwgRk+C8aapHKL5iZ/TJzzD/RuyGA2diHNEsR+uPHmQ7/A4Ts7j6N+VNqUoOfksg==
+conventional-changelog@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.4.tgz#66db29830a799be9afcbfd67a366c1e2cbc21417"
+  integrity sha512-uMeTSzEb2oKFlL00Oh9j3+00PFq1MNneLzyy0TBftxo4PFrs7OiaRJXmXtEgSvJDdkc0RSd6ch2N+yTxPagZ0A==
   dependencies:
     conventional-changelog-angular "^5.0.3"
     conventional-changelog-atom "^2.0.1"
     conventional-changelog-codemirror "^2.0.1"
-    conventional-changelog-core "^3.1.6"
+    conventional-changelog-conventionalcommits "^1.1.2"
+    conventional-changelog-core "^3.2.2"
     conventional-changelog-ember "^2.0.2"
-    conventional-changelog-eslint "^3.0.1"
+    conventional-changelog-eslint "^3.0.2"
     conventional-changelog-express "^2.0.1"
     conventional-changelog-jquery "^3.0.4"
     conventional-changelog-jshint "^2.0.1"
-    conventional-changelog-preset-loader "^2.0.2"
+    conventional-changelog-preset-loader "^2.1.1"
 
 conventional-commit-types@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/conventional-commit-types/-/conventional-commit-types-2.2.0.tgz#5db95739d6c212acbe7b6f656a11b940baa68946"
   integrity sha1-XblXOdbCEqy+e29lahG5QLqmiUY=
 
-conventional-commits-filter@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3"
+conventional-commits-filter@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
+  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
   dependencies:
-    is-subset "^0.1.1"
+    lodash.ismatch "^4.4.0"
     modify-values "^1.0.0"
 
 conventional-commits-parser@^2.1.0:
@@ -3104,16 +3161,17 @@ conventional-commits-parser@^2.1.0:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-commits-parser@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
+conventional-commits-parser@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.2.tgz#1295590dd195f64f53d6f8eb7c41114bb9a60742"
+  integrity sha512-y5eqgaKR0F6xsBNVSQ/5cI5qIF3MojddSUi1vKIggRkqUTbkqFKH9P5YX/AT1BVZp9DtSzBTIkvjyVLotLsVog==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
     lodash "^4.2.1"
     meow "^4.0.0"
     split2 "^2.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
 
 convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0:
@@ -3183,10 +3241,10 @@ core-js@^2.5.7:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
-core-js@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957"
-  integrity sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==
+core-js@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -3225,13 +3283,14 @@ cosmiconfig@^5.0.2:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
-cosmiconfig@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
+cosmiconfig@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
+  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
+    js-yaml "^3.13.0"
     parse-json "^4.0.0"
 
 coveralls@^3.0.3:
@@ -3246,6 +3305,17 @@ coveralls@^3.0.3:
     minimist "^1.2.0"
     request "^2.86.0"
 
+cp-file@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d"
+  integrity sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    make-dir "^2.0.0"
+    nested-error-stacks "^2.0.0"
+    pify "^4.0.1"
+    safe-buffer "^5.0.1"
+
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -3875,10 +3945,10 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
     memory-fs "^0.4.0"
     tapable "^1.0.0"
 
-envalid@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/envalid/-/envalid-4.2.2.tgz#3ed23b3e42c987b4105b43789d8eb526538c025d"
-  integrity sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==
+envalid@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/envalid/-/envalid-5.0.0.tgz#0dff9302c645977b8a620278620c67a939c9ee6f"
+  integrity sha512-cLyEXc/9meYtQ+KcTsh2S8GGvQ/ZGqlUyFfQrTZqVKy3/o/CQ6waLtgf6X7QmFbW0qAFAptQ8r17LYqKTxHIgw==
   dependencies:
     chalk "^2.4.1"
     dotenv "^6.2.0"
@@ -4187,16 +4257,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-24.5.0.tgz#492fb0df8378d8474cc84b827776b069f46294ed"
-  integrity sha512-p2Gmc0CLxOgkyA93ySWmHFYHUPFIHG6XZ06l7WArWAsrqYVaVEkOU5NtT5i68KUyGKbkQgDCkiT65bWmdoL6Bw==
+expect@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-24.7.1.tgz#d91defbab4e627470a152feaf35b3c31aa1c7c14"
+  integrity sha512-mGfvMTPduksV3xoI0xur56pQsg2vJjNf5+a+bXOjqCkiCBbmCayrBbHS/75y9K430cfqyocPr2ZjiNiRx4SRKw==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
     ansi-styles "^3.2.0"
     jest-get-type "^24.3.0"
-    jest-matcher-utils "^24.5.0"
-    jest-message-util "^24.5.0"
+    jest-matcher-utils "^24.7.0"
+    jest-message-util "^24.7.1"
     jest-regex-util "^24.3.0"
 
 express-handlebars@^3.0.2:
@@ -4423,6 +4493,20 @@ find-cache-dir@^2.0.0:
     make-dir "^1.0.0"
     pkg-dir "^3.0.0"
 
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-package-json@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/find-package-json/-/find-package-json-1.2.0.tgz#4057d1b943f82d8445fe52dc9cf456f6b8b58083"
+  integrity sha512-+SOGcLGYDJHtyqHd87ysBhmaeQ95oWspDKnMXBrnQ9Eq4OkLNqejgoaD8xVWu6GPa0B6roa6KinCMEMcVeqONw==
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -4652,9 +4736,10 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
 
 get-stream@^2.2.0:
   version "2.3.1"
@@ -4930,6 +5015,13 @@ graphql-subscriptions@^1.0.0:
   dependencies:
     iterall "^1.2.1"
 
+graphql-subscriptions@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-1.1.0.tgz#5f2fa4233eda44cf7570526adfcf3c16937aef11"
+  integrity sha512-6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA==
+  dependencies:
+    iterall "^1.2.1"
+
 graphql-tag@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.0.tgz#87da024be863e357551b2b8700e496ee2d4353ae"
@@ -4979,10 +5071,10 @@ graphql@^0.13.1:
   dependencies:
     iterall "^1.2.1"
 
-graphql@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0"
-  integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q==
+graphql@^14.2.1:
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.1.tgz#779529bf9a01e7207b977a54c20670b48ca6e95c"
+  integrity sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==
   dependencies:
     iterall "^1.2.2"
 
@@ -4994,7 +5086,7 @@ growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-handlebars@*, handlebars@^4.0.13, handlebars@^4.1.1:
+handlebars@*, handlebars@^4.0.13:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.1.tgz#6e4e41c18ebe7719ae4d38e5aca3d32fa3dd23d3"
   integrity sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==
@@ -5026,6 +5118,17 @@ handlebars@^4.1.0:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+handlebars@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -5179,6 +5282,17 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-errors@^1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.1.tgz#6a4ffe5d35188e1c39f872534690585852e1f027"
@@ -5216,19 +5330,19 @@ https-proxy-agent@^2.2.1:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
-husky@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+husky@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
+  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
   dependencies:
-    cosmiconfig "^5.0.7"
+    cosmiconfig "^5.2.0"
     execa "^1.0.0"
     find-up "^3.0.0"
-    get-stdin "^6.0.0"
+    get-stdin "^7.0.0"
     is-ci "^2.0.0"
-    pkg-dir "^3.0.0"
+    pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^4.0.1"
+    read-pkg "^5.0.0"
     run-node "^1.0.0"
     slash "^2.0.0"
 
@@ -5238,7 +5352,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
@@ -5270,10 +5384,10 @@ ignore@^3.3.5, ignore@^3.3.7:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
 
-image-size@^0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.7.2.tgz#5014c2c43003020d265801867b8bcf97c4080cf1"
-  integrity sha512-CBmVIFHyDyiWi1U24eNHl8SH0Iir2IgmEv1RwdRVZxWsEbSCvV5b/eXaYP8epOFv2dbw5uNBOrn1Nc5P5KvsUA==
+image-size@^0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.7.4.tgz#092c1e541a93511917bfc957a1fc7add21c72e87"
+  integrity sha512-GqPgxs+VkOr12aWwjSkyRzf5atzObWpFtiRuDgxCl2I/SDpZOKZFRD3iIAeAN6/usmn8SeLWRt7a8JRYK0Whbw==
 
 import-fresh@^2.0.0:
   version "2.0.0"
@@ -5628,10 +5742,6 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
@@ -5746,6 +5856,11 @@ istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.3:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#0b891e5ad42312c2b9488554f603795f9a2211ba"
   integrity sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==
 
+istanbul-lib-coverage@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#927a354005d99dd43a24607bb8b33fd4e9aca1ad"
+  integrity sha512-LXTBICkMARVgo579kWDm8SqfB6nvSDKNqIOBEjmJRnL04JvoMHCYGWaMddQnseJYtkEuEvO/sIcOxPLk9gERug==
+
 istanbul-lib-hook@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz#e0e581e461c611be5d0e5ef31c5f0109759916fb"
@@ -5753,6 +5868,13 @@ istanbul-lib-hook@^2.0.3:
   dependencies:
     append-transform "^1.0.0"
 
+istanbul-lib-hook@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.6.tgz#5baa6067860a38290aef038b389068b225b01b7d"
+  integrity sha512-829DKONApZ7UCiPXcOYWSgkFXa4+vNYoNOt3F+4uDJLKL1OotAoVwvThoEj1i8jmOj7odbYcR3rnaHu+QroaXg==
+  dependencies:
+    append-transform "^1.0.0"
+
 istanbul-lib-instrument@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
@@ -5778,6 +5900,19 @@ istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.1.0:
     istanbul-lib-coverage "^2.0.3"
     semver "^5.5.0"
 
+istanbul-lib-instrument@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.2.0.tgz#c549208da8a793f6622257a2da83e0ea96ae6a93"
+  integrity sha512-06IM3xShbNW4NgZv5AP4QH0oHqf1/ivFo8eFys0ZjPXHGldHJQWb3riYOKXqmOqfxXBfxu4B+g/iuhOPZH0RJg==
+  dependencies:
+    "@babel/generator" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    istanbul-lib-coverage "^2.0.4"
+    semver "^6.0.0"
+
 istanbul-lib-report@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz#bfd324ee0c04f59119cb4f07dab157d09f24d7e4"
@@ -5787,6 +5922,15 @@ istanbul-lib-report@^2.0.4:
     make-dir "^1.3.0"
     supports-color "^6.0.0"
 
+istanbul-lib-report@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.7.tgz#370d80d433c4dbc7f58de63618f49599c74bd954"
+  integrity sha512-wLH6beJBFbRBLiTlMOBxmb85cnVM1Vyl36N48e4e/aTKSM3WbOx7zbVIH1SQ537fhhsPbX0/C5JB4qsmyRXXyA==
+  dependencies:
+    istanbul-lib-coverage "^2.0.4"
+    make-dir "^2.1.0"
+    supports-color "^6.0.0"
+
 istanbul-lib-source-maps@^3.0.1, istanbul-lib-source-maps@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz#f1e817229a9146e8424a28e5d69ba220fda34156"
@@ -5798,6 +5942,17 @@ istanbul-lib-source-maps@^3.0.1, istanbul-lib-source-maps@^3.0.2:
     rimraf "^2.6.2"
     source-map "^0.6.1"
 
+istanbul-lib-source-maps@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.5.tgz#1d9ee9d94d2633f15611ee7aae28f9cac6d1aeb9"
+  integrity sha512-eDhZ7r6r1d1zQPVZehLc3D0K14vRba/eBYkz3rw16DLOrrTzve9RmnkcwrrkWVgO1FL3EK5knujVe5S8QHE9xw==
+  dependencies:
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.4"
+    make-dir "^2.1.0"
+    rimraf "^2.6.2"
+    source-map "^0.6.1"
+
 istanbul-reports@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.1.1.tgz#72ef16b4ecb9a4a7bd0e2001e00f95d1eec8afa9"
@@ -5805,6 +5960,13 @@ istanbul-reports@^2.1.1:
   dependencies:
     handlebars "^4.1.0"
 
+istanbul-reports@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.3.tgz#14e0d00ecbfa9387757999cf36599b88e9f2176e"
+  integrity sha512-T6EbPuc8Cb620LWAYyZ4D8SSn06dY9i1+IgUX2lTH8gbwflMc9Obd33zHTyNX653ybjpamAHS9toKS3E6cGhTw==
+  dependencies:
+    handlebars "^4.1.0"
+
 iterall@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.3.tgz#1cbbff96204056dde6656e2ed2e2226d0e6d72c9"
@@ -5818,65 +5980,66 @@ iterare@1.1.2:
   resolved "https://registry.yarnpkg.com/iterare/-/iterare-1.1.2.tgz#32e65fe03c72f727b1ae5fd002ed6a215f523ae8"
   integrity sha512-25rVYmj/dDvTR6zOa9jY1Ihd6USLa0J508Ub2iy7Aga+xu9JMbjDds2Uh03ReDGbva/YN3s3Ybi+Do0nOX6wAg==
 
-jest-changed-files@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.5.0.tgz#4075269ee115d87194fd5822e642af22133cf705"
-  integrity sha512-Ikl29dosYnTsH9pYa1Tv9POkILBhN/TLZ37xbzgNsZ1D2+2n+8oEZS2yP1BrHn/T4Rs4Ggwwbp/x8CKOS5YJOg==
+jest-changed-files@^24.7.0:
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.7.0.tgz#39d723a11b16ed7b373ac83adc76a69464b0c4fa"
+  integrity sha512-33BgewurnwSfJrW7T5/ZAXGE44o7swLslwh8aUckzq2e17/2Os1V0QU506ZNik3hjs8MgnEMKNkcud442NCDTw==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
     execa "^1.0.0"
     throat "^4.0.0"
 
-jest-cli@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.5.0.tgz#598139d3446d1942fb7dc93944b9ba766d756d4b"
-  integrity sha512-P+Jp0SLO4KWN0cGlNtC7JV0dW1eSFR7eRpoOucP2UM0sqlzp/bVHeo71Omonvigrj9AvCKy7NtQANtqJ7FXz8g==
+jest-cli@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.7.1.tgz#6093a539073b6f4953145abeeb9709cd621044f1"
+  integrity sha512-32OBoSCVPzcTslGFl6yVCMzB2SqX3IrWwZCY5mZYkb0D2WsogmU3eV2o8z7+gRQa4o4sZPX/k7GU+II7CxM6WQ==
   dependencies:
-    "@jest/core" "^24.5.0"
-    "@jest/test-result" "^24.5.0"
-    "@jest/types" "^24.5.0"
+    "@jest/core" "^24.7.1"
+    "@jest/test-result" "^24.7.1"
+    "@jest/types" "^24.7.0"
     chalk "^2.0.1"
     exit "^0.1.2"
     import-local "^2.0.0"
     is-ci "^2.0.0"
-    jest-config "^24.5.0"
-    jest-util "^24.5.0"
-    jest-validate "^24.5.0"
+    jest-config "^24.7.1"
+    jest-util "^24.7.1"
+    jest-validate "^24.7.0"
     prompts "^2.0.1"
     realpath-native "^1.1.0"
     yargs "^12.0.2"
 
-jest-config@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.5.0.tgz#404d1bc6bb81aed6bd1890d07e2dca9fbba2e121"
-  integrity sha512-t2UTh0Z2uZhGBNVseF8wA2DS2SuBiLOL6qpLq18+OZGfFUxTM7BzUVKyHFN/vuN+s/aslY1COW95j1Rw81huOQ==
+jest-config@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.7.1.tgz#6c1dd4db82a89710a3cf66bdba97827c9a1cf052"
+  integrity sha512-8FlJNLI+X+MU37j7j8RE4DnJkvAghXmBWdArVzypW6WxfGuxiL/CCkzBg0gHtXhD2rxla3IMOSUAHylSKYJ83g==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^24.5.0"
-    babel-jest "^24.5.0"
+    "@jest/test-sequencer" "^24.7.1"
+    "@jest/types" "^24.7.0"
+    babel-jest "^24.7.1"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^24.5.0"
-    jest-environment-node "^24.5.0"
+    jest-environment-jsdom "^24.7.1"
+    jest-environment-node "^24.7.1"
     jest-get-type "^24.3.0"
-    jest-jasmine2 "^24.5.0"
+    jest-jasmine2 "^24.7.1"
     jest-regex-util "^24.3.0"
-    jest-resolve "^24.5.0"
-    jest-util "^24.5.0"
-    jest-validate "^24.5.0"
+    jest-resolve "^24.7.1"
+    jest-util "^24.7.1"
+    jest-validate "^24.7.0"
     micromatch "^3.1.10"
-    pretty-format "^24.5.0"
+    pretty-format "^24.7.0"
     realpath-native "^1.1.0"
 
-jest-diff@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.5.0.tgz#a2d8627964bb06a91893c0fbcb28ab228c257652"
-  integrity sha512-mCILZd9r7zqL9Uh6yNoXjwGQx0/J43OD2vvWVKwOEOLZliQOsojXwqboubAQ+Tszrb6DHGmNU7m4whGeB9YOqw==
+jest-diff@^24.7.0:
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.7.0.tgz#5d862899be46249754806f66e5729c07fcb3580f"
+  integrity sha512-ULQZ5B1lWpH70O4xsANC4tf4Ko6RrpwhE3PtG6ERjMg1TiYTC2Wp4IntJVGro6a8HG9luYHhhmF4grF0Pltckg==
   dependencies:
     chalk "^2.0.1"
     diff-sequences "^24.3.0"
     jest-get-type "^24.3.0"
-    pretty-format "^24.5.0"
+    pretty-format "^24.7.0"
 
 jest-docblock@^24.3.0:
   version "24.3.0"
@@ -5885,119 +6048,123 @@ jest-docblock@^24.3.0:
   dependencies:
     detect-newline "^2.1.0"
 
-jest-each@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.5.0.tgz#da14d017a1b7d0f01fb458d338314cafe7f72318"
-  integrity sha512-6gy3Kh37PwIT5sNvNY2VchtIFOOBh8UCYnBlxXMb5sr5wpJUDPTUATX2Axq1Vfk+HWTMpsYPeVYp4TXx5uqUBw==
+jest-each@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.7.1.tgz#fcc7dda4147c28430ad9fb6dc7211cd17ab54e74"
+  integrity sha512-4fsS8fEfLa3lfnI1Jw6NxjhyRTgfpuOVTeUZZFyVYqeTa4hPhr2YkToUhouuLTrL2eMGOfpbdMyRx0GQ/VooKA==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
     chalk "^2.0.1"
     jest-get-type "^24.3.0"
-    jest-util "^24.5.0"
-    pretty-format "^24.5.0"
-
-jest-environment-jsdom@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.5.0.tgz#1c3143063e1374100f8c2723a8b6aad23b6db7eb"
-  integrity sha512-62Ih5HbdAWcsqBx2ktUnor/mABBo1U111AvZWcLKeWN/n/gc5ZvDBKe4Og44fQdHKiXClrNGC6G0mBo6wrPeGQ==
-  dependencies:
-    "@jest/environment" "^24.5.0"
-    "@jest/fake-timers" "^24.5.0"
-    "@jest/types" "^24.5.0"
-    jest-mock "^24.5.0"
-    jest-util "^24.5.0"
+    jest-util "^24.7.1"
+    pretty-format "^24.7.0"
+
+jest-environment-jsdom@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.7.1.tgz#a40e004b4458ebeb8a98082df135fd501b9fbbd6"
+  integrity sha512-Gnhb+RqE2JuQGb3kJsLF8vfqjt3PHKSstq4Xc8ic+ax7QKo4Z0RWGucU3YV+DwKR3T9SYc+3YCUQEJs8r7+Jxg==
+  dependencies:
+    "@jest/environment" "^24.7.1"
+    "@jest/fake-timers" "^24.7.1"
+    "@jest/types" "^24.7.0"
+    jest-mock "^24.7.0"
+    jest-util "^24.7.1"
     jsdom "^11.5.1"
 
-jest-environment-node@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.5.0.tgz#763eebdf529f75b60aa600c6cf8cb09873caa6ab"
-  integrity sha512-du6FuyWr/GbKLsmAbzNF9mpr2Iu2zWSaq/BNHzX+vgOcts9f2ayXBweS7RAhr+6bLp6qRpMB6utAMF5Ygktxnw==
+jest-environment-node@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.7.1.tgz#fa2c047a31522a48038d26ee4f7c8fd9c1ecfe12"
+  integrity sha512-GJJQt1p9/C6aj6yNZMvovZuxTUd+BEJprETdvTKSb4kHcw4mFj8777USQV0FJoJ4V3djpOwA5eWyPwfq//PFBA==
   dependencies:
-    "@jest/environment" "^24.5.0"
-    "@jest/fake-timers" "^24.5.0"
-    "@jest/types" "^24.5.0"
-    jest-mock "^24.5.0"
-    jest-util "^24.5.0"
+    "@jest/environment" "^24.7.1"
+    "@jest/fake-timers" "^24.7.1"
+    "@jest/types" "^24.7.0"
+    jest-mock "^24.7.0"
+    jest-util "^24.7.1"
 
 jest-get-type@^24.3.0:
   version "24.3.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.3.0.tgz#582cfd1a4f91b5cdad1d43d2932f816d543c65da"
   integrity sha512-HYF6pry72YUlVcvUx3sEpMRwXEWGEPlJ0bSPVnB3b3n++j4phUEoSPcS6GC0pPJ9rpyPSe4cb5muFo6D39cXow==
 
-jest-haste-map@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.5.0.tgz#3f17d0c548b99c0c96ed2893f9c0ccecb2eb9066"
-  integrity sha512-mb4Yrcjw9vBgSvobDwH8QUovxApdimGcOkp+V1ucGGw4Uvr3VzZQBJhNm1UY3dXYm4XXyTW2G7IBEZ9pM2ggRQ==
+jest-haste-map@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.7.1.tgz#772e215cd84080d4bbcb759cfb668ad649a21471"
+  integrity sha512-g0tWkzjpHD2qa03mTKhlydbmmYiA2KdcJe762SbfFo/7NIMgBWAA0XqQlApPwkWOF7Cxoi/gUqL0i6DIoLpMBw==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
+    anymatch "^2.0.0"
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.15"
     invariant "^2.2.4"
     jest-serializer "^24.4.0"
-    jest-util "^24.5.0"
-    jest-worker "^24.4.0"
+    jest-util "^24.7.1"
+    jest-worker "^24.6.0"
     micromatch "^3.1.10"
     sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^1.2.7"
 
-jest-jasmine2@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.5.0.tgz#e6af4d7f73dc527d007cca5a5b177c0bcc29d111"
-  integrity sha512-sfVrxVcx1rNUbBeyIyhkqZ4q+seNKyAG6iM0S2TYBdQsXjoFDdqWFfsUxb6uXSsbimbXX/NMkJIwUZ1uT9+/Aw==
+jest-jasmine2@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.7.1.tgz#01398686dabe46553716303993f3be62e5d9d818"
+  integrity sha512-Y/9AOJDV1XS44wNwCaThq4Pw3gBPiOv/s6NcbOAkVRRUEPu+36L2xoPsqQXsDrxoBerqeyslpn2TpCI8Zr6J2w==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^24.5.0"
-    "@jest/test-result" "^24.5.0"
-    "@jest/types" "^24.5.0"
+    "@jest/environment" "^24.7.1"
+    "@jest/test-result" "^24.7.1"
+    "@jest/types" "^24.7.0"
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^24.5.0"
+    expect "^24.7.1"
     is-generator-fn "^2.0.0"
-    jest-each "^24.5.0"
-    jest-matcher-utils "^24.5.0"
-    jest-message-util "^24.5.0"
-    jest-runtime "^24.5.0"
-    jest-snapshot "^24.5.0"
-    jest-util "^24.5.0"
-    pretty-format "^24.5.0"
+    jest-each "^24.7.1"
+    jest-matcher-utils "^24.7.0"
+    jest-message-util "^24.7.1"
+    jest-runtime "^24.7.1"
+    jest-snapshot "^24.7.1"
+    jest-util "^24.7.1"
+    pretty-format "^24.7.0"
     throat "^4.0.0"
 
-jest-leak-detector@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.5.0.tgz#21ae2b3b0da252c1171cd494f75696d65fb6fa89"
-  integrity sha512-LZKBjGovFRx3cRBkqmIg+BZnxbrLqhQl09IziMk3oeh1OV81Hg30RUIx885mq8qBv1PA0comB9bjKcuyNO1bCQ==
+jest-leak-detector@^24.7.0:
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.7.0.tgz#323ff93ed69be12e898f5b040952f08a94288ff9"
+  integrity sha512-zV0qHKZGXtmPVVzT99CVEcHE9XDf+8LwiE0Ob7jjezERiGVljmqKFWpV2IkG+rkFIEUHFEkMiICu7wnoPM/RoQ==
   dependencies:
-    pretty-format "^24.5.0"
+    pretty-format "^24.7.0"
 
-jest-matcher-utils@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.5.0.tgz#5995549dcf09fa94406e89526e877b094dad8770"
-  integrity sha512-QM1nmLROjLj8GMGzg5VBra3I9hLpjMPtF1YqzQS3rvWn2ltGZLrGAO1KQ9zUCVi5aCvrkbS5Ndm2evIP9yZg1Q==
+jest-matcher-utils@^24.7.0:
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.7.0.tgz#bbee1ff37bc8b2e4afcaabc91617c1526af4bcd4"
+  integrity sha512-158ieSgk3LNXeUhbVJYRXyTPSCqNgVXOp/GT7O94mYd3pk/8+odKTyR1JLtNOQSPzNi8NFYVONtvSWA/e1RDXg==
   dependencies:
     chalk "^2.0.1"
-    jest-diff "^24.5.0"
+    jest-diff "^24.7.0"
     jest-get-type "^24.3.0"
-    pretty-format "^24.5.0"
+    pretty-format "^24.7.0"
 
-jest-message-util@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.5.0.tgz#181420a65a7ef2e8b5c2f8e14882c453c6d41d07"
-  integrity sha512-6ZYgdOojowCGiV0D8WdgctZEAe+EcFU+KrVds+0ZjvpZurUW2/oKJGltJ6FWY2joZwYXN5VL36GPV6pNVRqRnQ==
+jest-message-util@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.7.1.tgz#f1dc3a6c195647096a99d0f1dadbc447ae547018"
+  integrity sha512-dk0gqVtyqezCHbcbk60CdIf+8UHgD+lmRHifeH3JRcnAqh4nEyPytSc9/L1+cQyxC+ceaeP696N4ATe7L+omcg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.5.0"
-    "@jest/types" "^24.5.0"
+    "@jest/test-result" "^24.7.1"
+    "@jest/types" "^24.7.0"
     "@types/stack-utils" "^1.0.1"
     chalk "^2.0.1"
     micromatch "^3.1.10"
     slash "^2.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.5.0.tgz#976912c99a93f2a1c67497a9414aa4d9da4c7b76"
-  integrity sha512-ZnAtkWrKf48eERgAOiUxVoFavVBziO2pAi2MfZ1+bGXVkDfxWLxU0//oJBkgwbsv6OAmuLBz4XFFqvCFMqnGUw==
+jest-mock@^24.7.0:
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.7.0.tgz#e49ce7262c12d7f5897b0d8af77f6db8e538023b"
+  integrity sha512-6taW4B4WUcEiT2V9BbOmwyGuwuAFT2G8yghF7nyNW1/2gq5+6aTqSPcS9lS6ArvEkX55vbPAS/Jarx5LSm4Fng==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
 
 jest-pnp-resolver@^1.2.1:
   version "1.2.1"
@@ -6009,75 +6176,75 @@ jest-regex-util@^24.3.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36"
   integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==
 
-jest-resolve-dependencies@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.5.0.tgz#1a0dae9cdd41349ca4a84148b3e78da2ba33fd4b"
-  integrity sha512-dRVM1D+gWrFfrq2vlL5P9P/i8kB4BOYqYf3S7xczZ+A6PC3SgXYSErX/ScW/469pWMboM1uAhgLF+39nXlirCQ==
+jest-resolve-dependencies@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.7.1.tgz#cf93bbef26999488a96a2b2012f9fe7375aa378f"
+  integrity sha512-2Eyh5LJB2liNzfk4eo7bD1ZyBbqEJIyyrFtZG555cSWW9xVHxII2NuOkSl1yUYTAYCAmM2f2aIT5A7HzNmubyg==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
     jest-regex-util "^24.3.0"
-    jest-snapshot "^24.5.0"
+    jest-snapshot "^24.7.1"
 
-jest-resolve@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.5.0.tgz#8c16ba08f60a1616c3b1cd7afb24574f50a24d04"
-  integrity sha512-ZIfGqLX1Rg8xJpQqNjdoO8MuxHV1q/i2OO1hLXjgCWFWs5bsedS8UrOdgjUqqNae6DXA+pCyRmdcB7lQEEbXew==
+jest-resolve@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.7.1.tgz#e4150198299298380a75a9fd55043fa3b9b17fde"
+  integrity sha512-Bgrc+/UUZpGJ4323sQyj85hV9d+ANyPNu6XfRDUcyFNX1QrZpSoM0kE4Mb2vZMAYTJZsBFzYe8X1UaOkOELSbw==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
     browser-resolve "^1.11.3"
     chalk "^2.0.1"
     jest-pnp-resolver "^1.2.1"
     realpath-native "^1.1.0"
 
-jest-runner@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.5.0.tgz#9be26ece4fd4ab3dfb528b887523144b7c5ffca8"
-  integrity sha512-oqsiS9TkIZV5dVkD+GmbNfWBRPIvxqmlTQ+AQUJUQ07n+4xTSDc40r+aKBynHw9/tLzafC00DIbJjB2cOZdvMA==
+jest-runner@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.7.1.tgz#41c8a02a06aa23ea82d8bffd69d7fa98d32f85bf"
+  integrity sha512-aNFc9liWU/xt+G9pobdKZ4qTeG/wnJrJna3VqunziDNsWT3EBpmxXZRBMKCsNMyfy+A/XHiV+tsMLufdsNdgCw==
   dependencies:
-    "@jest/console" "^24.3.0"
-    "@jest/environment" "^24.5.0"
-    "@jest/test-result" "^24.5.0"
-    "@jest/types" "^24.5.0"
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.7.1"
+    "@jest/test-result" "^24.7.1"
+    "@jest/types" "^24.7.0"
     chalk "^2.4.2"
     exit "^0.1.2"
     graceful-fs "^4.1.15"
-    jest-config "^24.5.0"
+    jest-config "^24.7.1"
     jest-docblock "^24.3.0"
-    jest-haste-map "^24.5.0"
-    jest-jasmine2 "^24.5.0"
-    jest-leak-detector "^24.5.0"
-    jest-message-util "^24.5.0"
-    jest-resolve "^24.5.0"
-    jest-runtime "^24.5.0"
-    jest-util "^24.5.0"
-    jest-worker "^24.4.0"
+    jest-haste-map "^24.7.1"
+    jest-jasmine2 "^24.7.1"
+    jest-leak-detector "^24.7.0"
+    jest-message-util "^24.7.1"
+    jest-resolve "^24.7.1"
+    jest-runtime "^24.7.1"
+    jest-util "^24.7.1"
+    jest-worker "^24.6.0"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.5.0.tgz#3a76e0bfef4db3896d5116e9e518be47ba771aa2"
-  integrity sha512-GTFHzfLdwpaeoDPilNpBrorlPoNZuZrwKKzKJs09vWwHo+9TOsIIuszK8cWOuKC7ss07aN1922Ge8fsGdsqCuw==
+jest-runtime@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.7.1.tgz#2ffd70b22dd03a5988c0ab9465c85cdf5d25c597"
+  integrity sha512-0VAbyBy7tll3R+82IPJpf6QZkokzXPIS71aDeqh+WzPRXRCNz6StQ45otFariPdJ4FmXpDiArdhZrzNAC3sj6A==
   dependencies:
-    "@jest/console" "^24.3.0"
-    "@jest/environment" "^24.5.0"
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.7.1"
     "@jest/source-map" "^24.3.0"
-    "@jest/transform" "^24.5.0"
-    "@jest/types" "^24.5.0"
+    "@jest/transform" "^24.7.1"
+    "@jest/types" "^24.7.0"
     "@types/yargs" "^12.0.2"
     chalk "^2.0.1"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.1.15"
-    jest-config "^24.5.0"
-    jest-haste-map "^24.5.0"
-    jest-message-util "^24.5.0"
-    jest-mock "^24.5.0"
+    jest-config "^24.7.1"
+    jest-haste-map "^24.7.1"
+    jest-message-util "^24.7.1"
+    jest-mock "^24.7.0"
     jest-regex-util "^24.3.0"
-    jest-resolve "^24.5.0"
-    jest-snapshot "^24.5.0"
-    jest-util "^24.5.0"
-    jest-validate "^24.5.0"
+    jest-resolve "^24.7.1"
+    jest-snapshot "^24.7.1"
+    jest-util "^24.7.1"
+    jest-validate "^24.7.0"
     realpath-native "^1.1.0"
     slash "^2.0.0"
     strip-bom "^3.0.0"
@@ -6088,35 +6255,34 @@ jest-serializer@^24.4.0:
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
   integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==
 
-jest-snapshot@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.5.0.tgz#e5d224468a759fd19e36f01217aac912f500f779"
-  integrity sha512-eBEeJb5ROk0NcpodmSKnCVgMOo+Qsu5z9EDl3tGffwPzK1yV37mjGWF2YeIz1NkntgTzP+fUL4s09a0+0dpVWA==
+jest-snapshot@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.7.1.tgz#bd5a35f74aedff070975e9e9c90024f082099568"
+  integrity sha512-8Xk5O4p+JsZZn4RCNUS3pxA+ORKpEKepE+a5ejIKrId9CwrVN0NY+vkqEkXqlstA5NMBkNahXkR/4qEBy0t5yA==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
     chalk "^2.0.1"
-    expect "^24.5.0"
-    jest-diff "^24.5.0"
-    jest-matcher-utils "^24.5.0"
-    jest-message-util "^24.5.0"
-    jest-resolve "^24.5.0"
+    expect "^24.7.1"
+    jest-diff "^24.7.0"
+    jest-matcher-utils "^24.7.0"
+    jest-message-util "^24.7.1"
+    jest-resolve "^24.7.1"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^24.5.0"
+    pretty-format "^24.7.0"
     semver "^5.5.0"
 
-jest-util@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.5.0.tgz#9d9cb06d9dcccc8e7cc76df91b1635025d7baa84"
-  integrity sha512-Xy8JsD0jvBz85K7VsTIQDuY44s+hYJyppAhcsHsOsGisVtdhar6fajf2UOf2mEVEgh15ZSdA0zkCuheN8cbr1Q==
+jest-util@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.7.1.tgz#b4043df57b32a23be27c75a2763d8faf242038ff"
+  integrity sha512-/KilOue2n2rZ5AnEBYoxOXkeTu6vi7cjgQ8MXEkih0oeAXT6JkS3fr7/j8+engCjciOU1Nq5loMSKe0A1oeX0A==
   dependencies:
-    "@jest/console" "^24.3.0"
-    "@jest/fake-timers" "^24.5.0"
+    "@jest/console" "^24.7.1"
+    "@jest/fake-timers" "^24.7.1"
     "@jest/source-map" "^24.3.0"
-    "@jest/test-result" "^24.5.0"
-    "@jest/types" "^24.5.0"
-    "@types/node" "*"
+    "@jest/test-result" "^24.7.1"
+    "@jest/types" "^24.7.0"
     callsites "^3.0.0"
     chalk "^2.0.1"
     graceful-fs "^4.1.15"
@@ -6125,48 +6291,46 @@ jest-util@^24.5.0:
     slash "^2.0.0"
     source-map "^0.6.0"
 
-jest-validate@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.5.0.tgz#62fd93d81214c070bb2d7a55f329a79d8057c7de"
-  integrity sha512-gg0dYszxjgK2o11unSIJhkOFZqNRQbWOAB2/LOUdsd2LfD9oXiMeuee8XsT0iRy5EvSccBgB4h/9HRbIo3MHgQ==
+jest-validate@^24.7.0:
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.7.0.tgz#70007076f338528ee1b1c8a8258b1b0bb982508d"
+  integrity sha512-cgai/gts9B2chz1rqVdmLhzYxQbgQurh1PEQSvSgPZ8KGa1AqXsqC45W5wKEwzxKrWqypuQrQxnF4+G9VejJJA==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
     camelcase "^5.0.0"
     chalk "^2.0.1"
     jest-get-type "^24.3.0"
     leven "^2.1.0"
-    pretty-format "^24.5.0"
+    pretty-format "^24.7.0"
 
-jest-watcher@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.5.0.tgz#da7bd9cb5967e274889b42078c8f501ae1c47761"
-  integrity sha512-/hCpgR6bg0nKvD3nv4KasdTxuhwfViVMHUATJlnGCD0r1QrmIssimPbmc5KfAQblAVxkD8xrzuij9vfPUk1/rA==
+jest-watcher@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.7.1.tgz#e161363d7f3f4e1ef3d389b7b3a0aad247b673f5"
+  integrity sha512-Wd6TepHLRHVKLNPacEsBwlp9raeBIO+01xrN24Dek4ggTS8HHnOzYSFnvp+6MtkkJ3KfMzy220KTi95e2rRkrw==
   dependencies:
-    "@jest/test-result" "^24.5.0"
-    "@jest/types" "^24.5.0"
-    "@types/node" "*"
+    "@jest/test-result" "^24.7.1"
+    "@jest/types" "^24.7.0"
     "@types/yargs" "^12.0.9"
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
-    jest-util "^24.5.0"
+    jest-util "^24.7.1"
     string-length "^2.0.0"
 
-jest-worker@^24.4.0:
-  version "24.4.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.4.0.tgz#fbc452b0120bb5c2a70cdc88fa132b48eeb11dd0"
-  integrity sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==
+jest-worker@^24.6.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"
+  integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==
   dependencies:
-    "@types/node" "*"
     merge-stream "^1.0.1"
     supports-color "^6.1.0"
 
-jest@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-24.5.0.tgz#38f11ae2c2baa2f86c2bc4d8a91d2b51612cd19a"
-  integrity sha512-lxL+Fq5/RH7inxxmfS2aZLCf8MsS+YCUBfeiNO6BWz/MmjhDGaIEA/2bzEf9q4Q0X+mtFHiinHFvQ0u+RvW/qQ==
+jest@^24.7.1:
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-24.7.1.tgz#0d94331cf510c75893ee32f87d7321d5bf8f2501"
+  integrity sha512-AbvRar5r++izmqo5gdbAjTeA6uNRGoNRuj5vHB0OnDXo2DXWZJVuaObiGgtlvhKb+cWy2oYbQSfxv7Q7GjnAtA==
   dependencies:
     import-local "^2.0.0"
-    jest-cli "^24.5.0"
+    jest-cli "^24.7.1"
 
 jmespath@0.15.0:
   version "0.15.0"
@@ -6390,10 +6554,10 @@ jws@^3.2.2:
     jwa "^1.4.1"
     safe-buffer "^5.0.1"
 
-kafka-node@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/kafka-node/-/kafka-node-4.0.4.tgz#5f775737bcbda86c4e7bcde7d5c4409d555ee11e"
-  integrity sha512-wS9tvnfdbqXKLNhMrXgm1OP1BtmmK7h+rrag2zxh99K9Yp3a1xBZqr2+RZNVigSBjIcyT5kLzrZkEatFNGVtEw==
+kafka-node@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/kafka-node/-/kafka-node-4.1.1.tgz#710246f78867e9f1eba9d70336c5884b8baf3702"
+  integrity sha512-Nsx1vdxWFU7mUI59etH210QmjBsMGWAN4lz0WRmzC1QwFK4hFLgoRM3F4RtxUeDVx8PsswMA1Z0T2eJTgoV9tQ==
   dependencies:
     async "^2.6.2"
     binary "~0.3.0"
@@ -6582,6 +6746,11 @@ lodash.isinteger@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
 
+lodash.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
+
 lodash.isnumber@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
@@ -6718,6 +6887,14 @@ make-dir@^1.0.0, make-dir@^1.3.0:
   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"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-error@1.x, make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
@@ -6955,6 +7132,11 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
+mime-db@1.40.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+
 mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
@@ -6965,6 +7147,13 @@ mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.36.0"
 
+mime-types@~2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  dependencies:
+    mime-db "1.40.0"
+
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
@@ -7085,17 +7274,6 @@ moment@^2.24.0:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-mongodb-core@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.1.tgz#aac98998abc7b3f8a5e841e9a3f85b4304eadfc5"
-  integrity sha512-vvnl5F6QhvFhi28umNx+Ymyb8wVQOhvEjU30JF3TjBBomS2tamJFK4eA0uwOa6FxLi9qCQWejbF66B0rb/UUiw==
-  dependencies:
-    bson "^1.1.1"
-    require_optional "^1.0.1"
-    safe-buffer "^5.1.2"
-  optionalDependencies:
-    saslprep "^1.0.0"
-
 mongodb-core@3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.2.tgz#d1c084b34c102a98b4734087800115e639d907c5"
@@ -7118,15 +7296,17 @@ mongodb-core@^3.2.3:
   optionalDependencies:
     saslprep "^1.0.0"
 
-mongodb-memory-server-core@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/mongodb-memory-server-core/-/mongodb-memory-server-core-5.0.2.tgz#e4d21b5d6a746271fab67f1c7ff8d459a98e7c8f"
-  integrity sha512-LBzX8AKq82n35WAH67pOsp86OvtHxpKMnrcM9+dcezsSgoEHokZCkfeZJ6Z/On481jN65SJ1QMn2AQ+3EzW5UQ==
+mongodb-memory-server-core@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/mongodb-memory-server-core/-/mongodb-memory-server-core-5.1.0.tgz#fd0b39b9f5b08eb9e7ffdf2ba79146e5f6d109bc"
+  integrity sha512-M/GWVvFze0geP2smoy0ns+Yz5l4BRP6Y66OKc+w9zlX422ydQEA04bLQjooPqoaBTrV90xuDj5E+zejn/YkPew==
   dependencies:
+    camelcase "^5.3.1"
     debug "^4.1.1"
     decompress "^4.2.0"
     dedent "^0.7.0"
     find-cache-dir "^2.0.0"
+    find-package-json "^1.2.0"
     get-port "^4.2.0"
     getos "^3.1.1"
     https-proxy-agent "^2.2.1"
@@ -7138,12 +7318,12 @@ mongodb-memory-server-core@5.0.2:
   optionalDependencies:
     mongodb ">=3.0.0"
 
-mongodb-memory-server@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-5.0.2.tgz#520812b6cc50829d7a05b808989f6f2549b95677"
-  integrity sha512-SQLqpvEzpke/meyMD938yDbif7ImypjSflbQA9TgXIW5rHtbdI+HbSFMV+QNy0DEYbtDK7IF4ACANhHKgkJaVg==
+mongodb-memory-server@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-5.1.0.tgz#6861b1929bea040c25b25a006241a9c5cec88827"
+  integrity sha512-CN4fjt90fi6A3PSJIx6xYxIRqpxF1rJoz4BcJv6LmGyRAOAvCbr3SqRbfXJMS26wTDyHylXtW32PhdykDohogA==
   dependencies:
-    mongodb-memory-server-core "5.0.2"
+    mongodb-memory-server-core "5.1.0"
 
 mongodb@3.2.2:
   version "3.2.2"
@@ -7153,7 +7333,7 @@ mongodb@3.2.2:
     mongodb-core "3.2.2"
     safe-buffer "^5.1.2"
 
-mongodb@>=3.0.0:
+mongodb@>=3.0.0, mongodb@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.3.tgz#4610ee33d300caa74329c2dd03e137210723cd91"
   integrity sha512-jw8UyPsq4QleZ9z+t/pIVy3L++51vKdaJ2Q/XXeYxk/3cnKioAH8H6f5tkkDivrQL4PUgUOHe9uZzkpRFH1XtQ==
@@ -7161,22 +7341,14 @@ mongodb@>=3.0.0:
     mongodb-core "^3.2.3"
     safe-buffer "^5.1.2"
 
-mongodb@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.1.tgz#a8af8f15a30ef0fd217405d3c77a25290ce81e0b"
-  integrity sha512-Vboj2WjyQYGMe8RQ7tmxdvtcdthyEu2f+gDdua7zbKu5JjDPZFDbgjjJEgnfcluog8Po+VguqXoPs9Zh+PAuKw==
-  dependencies:
-    mongodb-core "3.2.1"
-    safe-buffer "^5.1.2"
-
 mongoose-legacy-pluralize@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
 
-mongoose@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.0.tgz#e1bf07cf9953840aaaafb25df163bc12ed70365c"
-  integrity sha512-GZdhdbTXTgikInIgtxR7ODcF3+MoJTumTsKYinX3zxJcQgMVr+Y0jBuFoLJ9YtVdF2nq1ukLnhS6RHfta1ptgQ==
+mongoose@^5.5.4:
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.4.tgz#77b0664dd7e49a0a158d1eb83f6e53433b57b48b"
+  integrity sha512-xzS7fJtXGjCOZozCtlyFS8graMub1L9knp37+1dJCDmWzOtXVHeLjV2XIC9tX0sE54cxeG5rHvSmIkLpeHjjmA==
   dependencies:
     async "2.6.1"
     bson "~1.1.1"
@@ -7184,7 +7356,7 @@ mongoose@^5.5.0:
     mongodb "3.2.2"
     mongodb-core "3.2.2"
     mongoose-legacy-pluralize "1.0.2"
-    mpath "0.5.1"
+    mpath "0.5.2"
     mquery "3.2.0"
     ms "2.1.1"
     regexp-clone "0.0.1"
@@ -7214,9 +7386,10 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-mpath@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.5.1.tgz#17131501f1ff9e6e4fbc8ffa875aa7065b5775ab"
+mpath@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.5.2.tgz#b1eac586dffb5175d2f51ca9aacba35d9940dd41"
+  integrity sha512-NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw==
 
 mquery@3.2.0:
   version "3.2.0"
@@ -7571,6 +7744,16 @@ normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -7609,7 +7792,7 @@ npm-run-path@^2.0.0:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nssocket@0.6.0, nssocket@^0.6.0:
+nssocket@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/nssocket/-/nssocket-0.6.0.tgz#59f96f6ff321566f33c70f7dbeeecdfdc07154fa"
   dependencies:
@@ -7624,35 +7807,35 @@ nwsapi@^2.0.7:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
 
-nyc@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-13.3.0.tgz#da4dbe91a9c8b9ead3f4f3344c76f353e3c78c75"
-  integrity sha512-P+FwIuro2aFG6B0Esd9ZDWUd51uZrAEoGutqZxzrVmYl3qSfkLgcQpBPBjtDFsUQLFY1dvTQJPOyeqr8S9GF8w==
+nyc@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-14.0.0.tgz#f9fc4b4d73afc976f76e72352e70f742bbfab829"
+  integrity sha512-R1zC6UZak6pzn5BZQorkSH5GdOGafrwyeja+eimS5Tu+KJ/hCgBc8qA1QWSzxQmT2FDl2lbpqPw7tBDbSvhAHg==
   dependencies:
     archy "^1.0.0"
-    arrify "^1.0.1"
-    caching-transform "^3.0.1"
+    caching-transform "^3.0.2"
     convert-source-map "^1.6.0"
-    find-cache-dir "^2.0.0"
+    cp-file "^6.2.0"
+    find-cache-dir "^2.1.0"
     find-up "^3.0.0"
     foreground-child "^1.5.6"
     glob "^7.1.3"
-    istanbul-lib-coverage "^2.0.3"
-    istanbul-lib-hook "^2.0.3"
-    istanbul-lib-instrument "^3.1.0"
-    istanbul-lib-report "^2.0.4"
-    istanbul-lib-source-maps "^3.0.2"
-    istanbul-reports "^2.1.1"
-    make-dir "^1.3.0"
+    istanbul-lib-coverage "^2.0.4"
+    istanbul-lib-hook "^2.0.6"
+    istanbul-lib-instrument "^3.2.0"
+    istanbul-lib-report "^2.0.7"
+    istanbul-lib-source-maps "^3.0.5"
+    istanbul-reports "^2.2.2"
+    make-dir "^2.1.0"
     merge-source-map "^1.1.0"
     resolve-from "^4.0.0"
     rimraf "^2.6.3"
     signal-exit "^3.0.2"
     spawn-wrap "^1.4.2"
-    test-exclude "^5.1.0"
+    test-exclude "^5.2.2"
     uuid "^3.3.2"
-    yargs "^12.0.5"
-    yargs-parser "^11.1.1"
+    yargs "^13.2.2"
+    yargs-parser "^13.0.0"
 
 oauth-sign@~0.9.0:
   version "0.9.0"
@@ -8211,6 +8394,11 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -8240,6 +8428,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-dir@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.1.0.tgz#aaeb91c0d3b9c4f74a44ad849f4de34781ae01de"
+  integrity sha512-55k9QN4saZ8q518lE6EFgYiu95u3BWkSajCifhdQjvLvmr8IpnRbhI+UGpWJQfa0KzDguHeeWT1ccO1PmkOi3A==
+  dependencies:
+    find-up "^3.0.0"
+
 please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -8281,13 +8476,13 @@ pm2-multimeter@^0.1.2:
   dependencies:
     charm "~0.1.1"
 
-pm2@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/pm2/-/pm2-3.4.0.tgz#d30d05e89f986782e0b0bf011343d46be39c3447"
-  integrity sha512-BLK3zwrCmfE9I9XEvrGweK+/IEkhVlGENc1fgOH0fJHZc1vneC3v6dUmxz32pmsi9aB4DnrYIeZi46RHd6rO3Q==
+pm2@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/pm2/-/pm2-3.5.0.tgz#56930de4c89fe66713f25cf94e374df793cfe831"
+  integrity sha512-/GlQ1cyy97Rw/4pLWXABRzyUkKSj6kmgPx6rygocfvXyLX44bv26RKy89wTOvaL51pb0JOS8v2FM6cRJf1pLrA==
   dependencies:
     "@pm2/agent" "^0.5.22"
-    "@pm2/io" "^4.1.0"
+    "@pm2/io" "^4.1.2"
     "@pm2/js-api" "^0.5.43"
     async "^2.6.1"
     blessed "^0.1.81"
@@ -8303,7 +8498,6 @@ pm2@^3.4.0:
     mkdirp "0.5.1"
     moment "^2.22.2"
     needle "^2.2.1"
-    nssocket "0.6.0"
     pidusage "^2.0.14"
     pm2-axon "3.3.0"
     pm2-axon-rpc "^0.5.1"
@@ -8374,21 +8568,21 @@ prettier-tslint@^0.4.2:
     tslint "^5.9.1"
     yargs "^11.0.0"
 
-prettier@^1.16.4:
-  version "1.16.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
-  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
+prettier@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.0.tgz#53b303676eed22cc14a9f0cec09b477b3026c008"
+  integrity sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw==
 
 pretty-bytes@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.1.0.tgz#6237ecfbdc6525beaef4de722cc60a58ae0e6c6d"
 
-pretty-format@^24.5.0:
-  version "24.5.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.5.0.tgz#cc69a0281a62cd7242633fc135d6930cd889822d"
-  integrity sha512-/3RuSghukCf8Riu5Ncve0iI+BzVkbRU5EeUoArKARZobREycuH5O4waxvaNIloEXdb0qwgmEAed5vTpX1HNROQ==
+pretty-format@^24.7.0:
+  version "24.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.7.0.tgz#d23106bc2edcd776079c2daa5da02bcb12ed0c10"
+  integrity sha512-apen5cjf/U4dj7tHetpC7UEFCvtAgnNZnBDkfPv3fokzIqyOJckAG9OlAPC1BlFALnqT/lGB2tl9EJjlK6eCsA==
   dependencies:
-    "@jest/types" "^24.5.0"
+    "@jest/types" "^24.7.0"
     ansi-regex "^4.0.0"
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
@@ -8568,6 +8762,11 @@ qs@6.5.2, qs@^6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
 qs@^6.6.0:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
@@ -8611,6 +8810,16 @@ raw-body@2.3.3, raw-body@^2.2.0:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -8670,6 +8879,16 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
+read-pkg@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
+  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^4.0.0"
+    type-fest "^0.4.1"
+
 read@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
@@ -8697,6 +8916,15 @@ readable-stream@1.1.x:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+"readable-stream@2 || 3":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -8982,6 +9210,13 @@ resolve@^1.1.6, resolve@^1.3.2, resolve@^1.6.0:
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.10.0:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.1.tgz#664842ac960795bbe758221cdccda61fb64b5f18"
+  integrity sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==
+  dependencies:
+    path-parse "^1.0.6"
+
 resolve@^1.5.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
@@ -9061,10 +9296,10 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs-compat@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.4.0.tgz#800923c15697948e1f30f18c531b12b49451c75c"
-  integrity sha512-eo/O8RS83hJdJukCtA+IF6qnqa8FPOuVo+OPCzgVi+dbTle9KCdNv97IcQO0WwNVik7DJLKmf0F8uwzc0q40vw==
+rxjs-compat@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.1.tgz#de928292c633a9a5f2f54a4431e6f9c468001c68"
+  integrity sha512-k0aaMAYFg+DCIUxo3yJcUamFRenWLR23e/VJCQvKOxwSd9DQlwcSn2ov+7b23rKaX4weKG7OrzEBWGqQPkQ07A==
 
 rxjs-tslint@0.1.5:
   version "0.1.5"
@@ -9082,10 +9317,10 @@ rxjs@^6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+rxjs@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
+  integrity sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==
   dependencies:
     tslib "^1.9.0"
 
@@ -9208,6 +9443,11 @@ semver@5.6.0, semver@^5.5, semver@^5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -9295,6 +9535,11 @@ setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
 sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -9419,7 +9664,7 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-snappy@^6.0.1:
+snappy@^6.0.1, snappy@^6.1.2:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/snappy/-/snappy-6.1.2.tgz#05b25252894f9f46494e01ada7c7708e80b4cf90"
   integrity sha512-oYjYCA5/XoYBA5t9lAaQfzq+qJ1eKqoBb7dRCk+BE2dIFe+tMJcpRnraSsK/W9Z6qnXf1oBnhRX9Lr2yMQJ91A==
@@ -9505,10 +9750,10 @@ source-map-support@^0.5.0, source-map-support@^0.5.6, source-map-support@~0.5.6:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@^0.5.11:
-  version "0.5.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
+source-map-support@^0.5.12:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -9763,6 +10008,13 @@ string_decoder@^1.0.0, string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  dependencies:
+    safe-buffer "~5.1.0"
+
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -9827,10 +10079,10 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-stripe@^6.28.0:
-  version "6.28.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.28.0.tgz#81f2bf174efe9503b50f24930a7e1d195c60f810"
-  integrity sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==
+stripe@^6.31.0:
+  version "6.31.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.31.0.tgz#524ef6997a4473c5bf9ce684b5c39e3bc307a445"
+  integrity sha512-VHVGyfrnzKdqraRHKQ42LJysQdg2iUL8pFES3dsN9yZOiEY+kxBetL7Zq2WiA24Y5PnVIO9gB5VbvmYPhEOhyA==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
@@ -10019,15 +10271,15 @@ test-exclude@^5.0.0:
     read-pkg-up "^4.0.0"
     require-main-filename "^1.0.1"
 
-test-exclude@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.1.0.tgz#6ba6b25179d2d38724824661323b73e03c0c1de1"
-  integrity sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==
+test-exclude@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.2.tgz#7322f8ab037b0b93ad2aab35fe9068baf997a4c4"
+  integrity sha512-N2pvaLpT8guUpb5Fe1GJlmvmzH3x+DAKmmyEQmFP792QcLYoGE1syxztSvPD1V8yPe6VrcCt6YGQVjSRjCASsA==
   dependencies:
-    arrify "^1.0.1"
+    glob "^7.1.3"
     minimatch "^3.0.4"
     read-pkg-up "^4.0.0"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
 
 text-extensions@^1.0.0:
   version "1.8.0"
@@ -10062,6 +10314,13 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
+through2@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
 through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3, through@~2.3.1:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -10225,10 +10484,10 @@ trim-right@^1.0.1:
   dependencies:
     glob "^7.1.2"
 
-ts-jest@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.0.tgz#3f26bf2ec1fa584863a5a9c29bd8717d549efbf6"
-  integrity sha512-o8BO3TkMREpAATaFTrXkovMsCpBl2z4NDBoLJuWZcJJj1ijI49UnvDMfVpj+iogn/Jl8Pbhuei5nc/Ti+frEHw==
+ts-jest@^24.0.2:
+  version "24.0.2"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.2.tgz#8dde6cece97c31c03e80e474c749753ffd27194d"
+  integrity sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==
   dependencies:
     bs-logger "0.x"
     buffer-from "1.x"
@@ -10240,10 +10499,10 @@ ts-jest@^24.0.0:
     semver "^5.5"
     yargs-parser "10.x"
 
-ts-loader@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.3.tgz#8b4af042e773132d86b3c99ef0acf3b4d325f473"
-  integrity sha512-KwF1SplmOJepnoZ4eRIloH/zXL195F51skt7reEsS6jvDqzgc/YSbz9b8E07GxIUwLXdcD4ssrJu6v8CwaTafA==
+ts-loader@^5.4.3:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.4.3.tgz#837f7f397799a665fc1774303c9fd0930d1c5947"
+  integrity sha512-pHwZFkZioL7Yi2su0bhW2/djxZ+0iGat1cxlAif4Eg9j5znVYuWGtW0YYY/5w8W+IzLcAlD5KwJDrs5unUKIRA==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
@@ -10348,6 +10607,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
 type-is@^1.6.16, type-is@^1.6.4, type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -10355,6 +10619,14 @@ type-is@^1.6.16, type-is@^1.6.4, type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+type-is@~1.6.17:
+  version "1.6.17"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.17.tgz#9ef72233f08ffbe83b8fa3c93f4f93ecbc330bc2"
+  integrity sha512-jYZzkOoAPVyQ9vlZ4xEJ4BBbHC4a7hbY1xqyCPe6AiQVVqfbZEulJm0VpqK4B+096O1VQi0l6OBGH210ejx/bA==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -10394,10 +10666,10 @@ typemoq@^2.1.0:
     lodash "^4.17.4"
     postinstall-build "^5.0.1"
 
-typeorm@^0.2.15:
-  version "0.2.15"
-  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.15.tgz#b0cdb4fdc6c38671350135ed72d91d1242e6ea30"
-  integrity sha512-Gpl6fdgb7WLngtuSw2l7dOdOp4jrbVIjlSgpL3P6DX9GKvSzbXmjurmGQ9RRomn+us1Bg+tCYAiSv3j55riplQ==
+typeorm@^0.2.16:
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.16.tgz#cfc119254e21f37410a60616a726cad97a8d95f6"
+  integrity sha512-Ntx9Hjx2aJcPsbqTsqnhCZOG30bDQ8EalMa9J49CXMCatUuMbn9QTyreM9AuSQb2N91ENCRWPZIuzgRaSmC1Vw==
   dependencies:
     app-root-path "^2.0.1"
     buffer "^5.1.0"
@@ -10428,7 +10700,7 @@ typescript@3.2.x:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
   integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
 
-typescript@~3.4.3:
+typescript@~3.4.5:
   version "3.4.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
   integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
@@ -10588,7 +10860,7 @@ use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
 
-util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
@@ -10687,7 +10959,7 @@ wait-on@^3.2.0:
     request "^2.88.0"
     rx "^4.1.0"
 
-walker@~1.0.5:
+walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   dependencies:
@@ -10711,10 +10983,10 @@ webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
-webpack-cli@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.0.tgz#55c8a74cae1e88117f9dda3a801c7272e93ca318"
-  integrity sha512-t1M7G4z5FhHKJ92WRKwZ1rtvi7rHc0NZoZRbSkol0YKl4HvcC8+DsmGDmK7MmZxHSAetHagiOsjOB6MmzC2TUw==
+webpack-cli@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.1.tgz#98b0499c7138ba9ece8898bd99c4f007db59909d"
+  integrity sha512-c2inFU7SM0IttEgF7fK6AaUsbBnORRzminvbyRKS+NlbQHVZdCtzKBlavRL5359bFsywXGRAItA5di/IruC8mg==
   dependencies:
     chalk "^2.4.1"
     cross-spawn "^6.0.5"
@@ -10760,9 +11032,10 @@ webpack-command@^0.4.2:
     webpack-log "^1.1.2"
     wordwrap "^1.0.0"
 
-webpack-graphql-loader@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-graphql-loader/-/webpack-graphql-loader-1.0.0.tgz#f48302826c74240ab190b38424f24b3baf1007b2"
+webpack-graphql-loader@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/webpack-graphql-loader/-/webpack-graphql-loader-1.0.2.tgz#b7da119bea3063c1b13068c9c7bb01b203d3468b"
+  integrity sha512-tMcfC/IPMYO8RXsihjMcOplOnyTFqVUHXYZN5mRNIuDy8ADNvqYWVqs3Qi/YBP+U05uesdy9UUvf7N8QZtkc5Q==
   dependencies:
     apollo-codegen "^0.19.1"
     loader-utils "^1.1.0"
@@ -10788,10 +11061,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.29.6:
-  version "4.29.6"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
-  integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
+webpack@^4.30.0:
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
+  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
@@ -10919,7 +11192,7 @@ write-file-atomic@2.4.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
+write-file-atomic@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
   dependencies:
@@ -10927,6 +11200,15 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write-file-atomic@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
+  integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
 ws@^3.0.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
@@ -10947,10 +11229,10 @@ ws@^6.0.0, ws@~6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526"
-  integrity sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==
+ws@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
@@ -11135,7 +11417,7 @@ yargs@^12.0.2, yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@^13.2.1:
+yargs@^13.2.1, yargs@^13.2.2:
   version "13.2.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
   integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..20b3f2b69 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -186,12 +186,12 @@
 		"@types/yargs": "^13.0.0",
 		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
-		"codelyzer": "^5.0.0",
+		"codelyzer": "^5.0.1",
 		"cross-env": "^5.2.0",
 		"cpr": "^3.0.1",
-		"husky": "^1.3.1",
+		"husky": "^2.1.0",
 		"dotenv": "^7.0.0",
-		"envalid": "^4.2.2",
+		"envalid": "^5.0.0",
 		"ionic": "^4.12.0",
 		"jasmine-core": "^3.3.0",
 		"jasmine-spec-reporter": "^4.2.1",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..5c0dcc452 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -872,6 +872,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.45.tgz#4c49ba34106bc7dced77ff6bae8eb6543cde8351"
   integrity sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -2599,10 +2604,10 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0.tgz#e4032efb23a7c5d4bcfe7321fc1789490c679837"
-  integrity sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==
+codelyzer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.1.tgz#c52a593368269b791594603968eb82cbecae3cda"
+  integrity sha512-UVV76+/y1RwaxzCeGPFE3G4GFtfV42r3x8EmRd7XMNFLlLC0ewdtCqWTbvhwPQMxFZZ+OTLEOJNWfyPPn3QFWg==
   dependencies:
     app-root-path "^2.1.0"
     aria-query "^3.0.0"
@@ -3078,7 +3083,7 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
+cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
   integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
@@ -3872,10 +3877,10 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-envalid@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/envalid/-/envalid-4.2.2.tgz#3ed23b3e42c987b4105b43789d8eb526538c025d"
-  integrity sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==
+envalid@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/envalid/-/envalid-5.0.0.tgz#0dff9302c645977b8a620278620c67a939c9ee6f"
+  integrity sha512-cLyEXc/9meYtQ+KcTsh2S8GGvQ/ZGqlUyFfQrTZqVKy3/o/CQ6waLtgf6X7QmFbW0qAFAptQ8r17LYqKTxHIgw==
   dependencies:
     chalk "^2.4.1"
     dotenv "^6.2.0"
@@ -4793,10 +4798,10 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
 
 get-stream@^3.0.0:
   version "3.0.0"
@@ -5267,19 +5272,19 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+husky@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
+  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
   dependencies:
-    cosmiconfig "^5.0.7"
+    cosmiconfig "^5.2.0"
     execa "^1.0.0"
     find-up "^3.0.0"
-    get-stdin "^6.0.0"
+    get-stdin "^7.0.0"
     is-ci "^2.0.0"
-    pkg-dir "^3.0.0"
+    pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^4.0.1"
+    read-pkg "^5.0.0"
     run-node "^1.0.0"
     slash "^2.0.0"
 
@@ -7332,7 +7337,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -8076,6 +8081,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-dir@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.1.0.tgz#aaeb91c0d3b9c4f74a44ad849f4de34781ae01de"
+  integrity sha512-55k9QN4saZ8q518lE6EFgYiu95u3BWkSajCifhdQjvLvmr8IpnRbhI+UGpWJQfa0KzDguHeeWT1ccO1PmkOi3A==
+  dependencies:
+    find-up "^3.0.0"
+
 please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -8505,14 +8517,15 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+read-pkg@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
+  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
   dependencies:
-    normalize-package-data "^2.3.2"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
     parse-json "^4.0.0"
-    pify "^3.0.0"
+    type-fest "^0.4.1"
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
@@ -10380,6 +10393,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..4bb4d2919 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -197,12 +197,12 @@
 		"@types/stripe": "^6.25.7",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
-		"codelyzer": "^5.0.0-beta.1",
+		"codelyzer": "^5.0.1",
 		"cpr": "^3.0.1",
 		"cross-env": "^5.2.0",
 		"dotenv": "^7.0.0",
-		"envalid": "^4.2.2",
-		"husky": "^1.3.1",
+		"envalid": "^5.0.0",
+		"husky": "^2.1.0",
 		"ionic": "^4.12.0",
 		"rxjs-tslint": "0.1.5",
 		"terser": "^3.17.0",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..ab8deecc9 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -890,6 +890,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.45.tgz#4c49ba34106bc7dced77ff6bae8eb6543cde8351"
   integrity sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/reflect-metadata@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@types/reflect-metadata/-/reflect-metadata-0.1.0.tgz#592805bdf6d63dd7229773218afeba37ac2eab16"
@@ -2615,10 +2620,10 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^5.0.0-beta.1:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0.tgz#e4032efb23a7c5d4bcfe7321fc1789490c679837"
-  integrity sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==
+codelyzer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.1.tgz#c52a593368269b791594603968eb82cbecae3cda"
+  integrity sha512-UVV76+/y1RwaxzCeGPFE3G4GFtfV42r3x8EmRd7XMNFLlLC0ewdtCqWTbvhwPQMxFZZ+OTLEOJNWfyPPn3QFWg==
   dependencies:
     app-root-path "^2.1.0"
     aria-query "^3.0.0"
@@ -3107,7 +3112,7 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
+cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
   integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
@@ -3844,10 +3849,10 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-envalid@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/envalid/-/envalid-4.2.2.tgz#3ed23b3e42c987b4105b43789d8eb526538c025d"
-  integrity sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==
+envalid@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/envalid/-/envalid-5.0.0.tgz#0dff9302c645977b8a620278620c67a939c9ee6f"
+  integrity sha512-cLyEXc/9meYtQ+KcTsh2S8GGvQ/ZGqlUyFfQrTZqVKy3/o/CQ6waLtgf6X7QmFbW0qAFAptQ8r17LYqKTxHIgw==
   dependencies:
     chalk "^2.4.1"
     dotenv "^6.2.0"
@@ -4774,10 +4779,10 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
 
 get-stream@^3.0.0:
   version "3.0.0"
@@ -5240,19 +5245,19 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+husky@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
+  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
   dependencies:
-    cosmiconfig "^5.0.7"
+    cosmiconfig "^5.2.0"
     execa "^1.0.0"
     find-up "^3.0.0"
-    get-stdin "^6.0.0"
+    get-stdin "^7.0.0"
     is-ci "^2.0.0"
-    pkg-dir "^3.0.0"
+    pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^4.0.1"
+    read-pkg "^5.0.0"
     run-node "^1.0.0"
     slash "^2.0.0"
 
@@ -7217,7 +7222,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7980,6 +7985,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-dir@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.1.0.tgz#aaeb91c0d3b9c4f74a44ad849f4de34781ae01de"
+  integrity sha512-55k9QN4saZ8q518lE6EFgYiu95u3BWkSajCifhdQjvLvmr8IpnRbhI+UGpWJQfa0KzDguHeeWT1ccO1PmkOi3A==
+  dependencies:
+    find-up "^3.0.0"
+
 please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -8460,14 +8472,15 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+read-pkg@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
+  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
   dependencies:
-    normalize-package-data "^2.3.2"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
     parse-json "^4.0.0"
-    pify "^3.0.0"
+    type-fest "^0.4.1"
 
 read@^1.0.4:
   version "1.0.7"
@@ -10235,6 +10248,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
diff --git a/package.json b/package.json
index f05825b14..10ffd09f8 100644
--- a/package.json
+++ b/package.json
@@ -51,24 +51,24 @@
 	},
 	"resolutions": {},
 	"dependencies": {
-		"@angular/core": "^7.2.4",
-		"@angular/platform-browser": "^7.2.4",
-		"@angular/platform-browser-dynamic": "^7.2.4",
+		"@angular/core": "^7.2.14",
+		"@angular/platform-browser": "^7.2.14",
+		"@angular/platform-browser-dynamic": "^7.2.14",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
 		"@captemulation/get-parameter-names": "^1.2.0",
-		"@nestjs/typeorm": "^5.3.0",
+		"@nestjs/typeorm": "^6.0.0",
 		"angular2-logger": "^0.7.0",
-		"npm": "^6.7.0",
-		"rxjs": "^6.4.0",
-		"rxjs-compat": "^6.4.0",
+		"npm": "^6.9.0",
+		"rxjs": "^6.5.1",
+		"rxjs-compat": "^6.5.1",
 		"socket.io-client": "^2.2.0",
-		"stripe": "^6.24.0",
-		"typeorm": "^0.2.13",
+		"stripe": "^6.31.0",
+		"typeorm": "^0.2.16",
 		"uuid": "^3.3.2"
 	},
 	"devDependencies": {
-		"conventional-changelog": "^3.0.5",
+		"conventional-changelog": "^3.1.4",
 		"cz-conventional-changelog": "^2.1.0",
 		"@commitlint/cli": "^7.5.2",
 		"@commitlint/config-conventional": "^7.5.0",
@@ -77,42 +77,42 @@
 		"@types/async": "^2.4.1",
 		"@types/d3-color": "^1.2.2",
 		"@types/faker": "^4.1.5",
-		"@types/googlemaps": "^3.30.16",
-		"@types/jasmine": "^3.3.9",
+		"@types/googlemaps": "^3.30.19",
+		"@types/jasmine": "^3.3.12",
 		"@types/jasminewd2": "^2.0.6",
-		"@types/jest": "^24.0.4",
-		"@types/leaflet": "^1.4.2",
-		"@types/mongodb": "^3.1.19",
-		"@types/mongoose": "^5.3.15",
-		"@types/node": "^11.9.3",
+		"@types/jest": "^24.0.11",
+		"@types/leaflet": "^1.4.4",
+		"@types/mongodb": "^3.1.25",
+		"@types/mongoose": "^5.3.26",
+		"@types/node": "^11.13.7",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.25.7",
+		"@types/stripe": "^6.25.12",
 		"@types/uuid": "^3.4.4",
 		"cloc": "^2.4.0",
 		"cross-env": "^5.2.0",
-		"codelyzer": "^4.5.0",
+		"codelyzer": "^5.0.1",
 		"concurrently": "^4.1.0",
-		"husky": "^1.3.1",
-		"jasmine-core": "^3.3.0",
+		"husky": "^2.1.0",
+		"jasmine-core": "^3.4.0",
 		"jasmine-spec-reporter": "^4.2.1",
-		"karma": "^4.0.0",
+		"karma": "^4.1.0",
 		"karma-chrome-launcher": "^2.2.0",
 		"karma-cli": "^2.0.0",
-		"karma-coverage-istanbul-reporter": "^2.0.4",
+		"karma-coverage-istanbul-reporter": "^2.0.5",
 		"karma-jasmine": "^2.0.1",
-		"karma-jasmine-html-reporter": "^1.4.0",
-		"lerna": "^3.11.1",
+		"karma-jasmine-html-reporter": "^1.4.2",
+		"lerna": "^3.13.4",
 		"lerna-changelog": "^0.8.2",
-		"lighthouse": "^4.1.0",
-		"lint-staged": "^8.1.3",
-		"npm-check-updates": "^3.1.3",
-		"prettier": "^1.16.4",
+		"lighthouse": "^4.3.0",
+		"lint-staged": "^8.1.5",
+		"npm-check-updates": "^3.1.8",
+		"prettier": "^1.17.0",
 		"prettier-tslint": "^0.4.2",
 		"pretty-quick": "^1.10.0",
 		"rxjs-tslint": "0.1.5",
-		"tslint": "^5.12.1",
+		"tslint": "^5.16.0",
 		"tslint-config-prettier": "^1.18.0",
-		"typescript": "~3.1.6"
+		"typescript": "~3.4.5"
 	},
 	"config": {
 		"commitizen": {
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..78dd2e287 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -174,12 +174,12 @@
 		"@types/yargs": "^13.0.0",
 		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
-		"codelyzer": "^5.0.0",
+		"codelyzer": "^5.0.1",
 		"cross-env": "^5.2.0",
 		"cpr": "^3.0.1",
-		"husky": "^1.3.1",
+		"husky": "^2.1.0",
 		"dotenv": "^7.0.0",
-		"envalid": "^4.2.2",
+		"envalid": "^5.0.0",
 		"ionic": "^4.12.0",
 		"jasmine-core": "^3.3.0",
 		"jasmine-spec-reporter": "^4.2.1",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index ffc64d324..125274b42 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -872,6 +872,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.45.tgz#4c49ba34106bc7dced77ff6bae8eb6543cde8351"
   integrity sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -2587,10 +2592,10 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0.tgz#e4032efb23a7c5d4bcfe7321fc1789490c679837"
-  integrity sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==
+codelyzer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.1.tgz#c52a593368269b791594603968eb82cbecae3cda"
+  integrity sha512-UVV76+/y1RwaxzCeGPFE3G4GFtfV42r3x8EmRd7XMNFLlLC0ewdtCqWTbvhwPQMxFZZ+OTLEOJNWfyPPn3QFWg==
   dependencies:
     app-root-path "^2.1.0"
     aria-query "^3.0.0"
@@ -3031,7 +3036,7 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
+cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
   integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
@@ -3825,10 +3830,10 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-envalid@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/envalid/-/envalid-4.2.2.tgz#3ed23b3e42c987b4105b43789d8eb526538c025d"
-  integrity sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==
+envalid@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/envalid/-/envalid-5.0.0.tgz#0dff9302c645977b8a620278620c67a939c9ee6f"
+  integrity sha512-cLyEXc/9meYtQ+KcTsh2S8GGvQ/ZGqlUyFfQrTZqVKy3/o/CQ6waLtgf6X7QmFbW0qAFAptQ8r17LYqKTxHIgw==
   dependencies:
     chalk "^2.4.1"
     dotenv "^6.2.0"
@@ -4741,10 +4746,10 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
 
 get-stream@^3.0.0:
   version "3.0.0"
@@ -5210,19 +5215,19 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+husky@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
+  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
   dependencies:
-    cosmiconfig "^5.0.7"
+    cosmiconfig "^5.2.0"
     execa "^1.0.0"
     find-up "^3.0.0"
-    get-stdin "^6.0.0"
+    get-stdin "^7.0.0"
     is-ci "^2.0.0"
-    pkg-dir "^3.0.0"
+    pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^4.0.1"
+    read-pkg "^5.0.0"
     run-node "^1.0.0"
     slash "^2.0.0"
 
@@ -7219,7 +7224,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7956,6 +7961,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-dir@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.1.0.tgz#aaeb91c0d3b9c4f74a44ad849f4de34781ae01de"
+  integrity sha512-55k9QN4saZ8q518lE6EFgYiu95u3BWkSajCifhdQjvLvmr8IpnRbhI+UGpWJQfa0KzDguHeeWT1ccO1PmkOi3A==
+  dependencies:
+    find-up "^3.0.0"
+
 please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -8385,14 +8397,15 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+read-pkg@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
+  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
   dependencies:
-    normalize-package-data "^2.3.2"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
     parse-json "^4.0.0"
-    pify "^3.0.0"
+    type-fest "^0.4.1"
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
@@ -10216,6 +10229,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index f7bf60f16..cb78e341f 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -187,11 +187,11 @@
 		"angular2-template-loader": "^0.6.2",
 		"assets-webpack-plugin": "^3.9.10",
 		"awesome-typescript-loader": "^5.2.1",
-		"codelyzer": "^4.5.0",
+		"codelyzer": "^5.0.1",
 		"copy-webpack-plugin": "^5.0.0",
 		"cross-env": "^5.2.0",
 		"dotenv": "^6.2.0",
-		"envalid": "^4.2.2",
+		"envalid": "^5.0.0",
 		"cryptiles": "^4.1.3",
 		"css-loader": "^2.1.0",
 		"exports-loader": "^0.7.0",
@@ -201,7 +201,7 @@
 		"find-root": "^1.1.0",
 		"gh-pages": "^2.0.1",
 		"html-webpack-plugin": "^3.2.0",
-		"husky": "^1.3.1",
+		"husky": "^2.1.0",
 		"imports-loader": "^0.8.0",
 		"istanbul-instrumenter-loader": "^3.0.1",
 		"jasmine-core": "^3.3.0",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 494492ee8..eda1a34a1 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -535,6 +535,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -1318,6 +1323,14 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+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=
+  dependencies:
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
+
 arr-diff@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
@@ -1475,6 +1488,11 @@ ast-transform@0.0.0:
     esprima "~1.0.4"
     through "~2.3.4"
 
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+
 ast-types@0.9.6:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
@@ -1558,6 +1576,13 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
+axobject-query@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
+  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
+  dependencies:
+    ast-types-flow "0.0.7"
+
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -2381,17 +2406,20 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.5.0.tgz#a65ddeeeca2894653253a89bfa229118ff9f59b1"
-  integrity sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==
+codelyzer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.1.tgz#c52a593368269b791594603968eb82cbecae3cda"
+  integrity sha512-UVV76+/y1RwaxzCeGPFE3G4GFtfV42r3x8EmRd7XMNFLlLC0ewdtCqWTbvhwPQMxFZZ+OTLEOJNWfyPPn3QFWg==
   dependencies:
     app-root-path "^2.1.0"
-    css-selector-tokenizer "^0.7.0"
+    aria-query "^3.0.0"
+    axobject-query "^2.0.2"
+    css-selector-tokenizer "^0.7.1"
     cssauron "^1.4.0"
+    damerau-levenshtein "^1.0.4"
     semver-dsl "^1.0.1"
     source-map "^0.5.7"
-    sprintf-js "^1.1.1"
+    sprintf-js "^1.1.2"
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -2445,7 +2473,7 @@ commander@2.17.x:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@~2.20.0:
+commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@~2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@@ -2826,7 +2854,7 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.7, cosmiconfig@^5.1.0:
+cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
   integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
@@ -2969,7 +2997,7 @@ css-select@^1.1.0, css-select@~1.2.0:
     domutils "1.5.1"
     nth-check "~1.0.1"
 
-css-selector-tokenizer@^0.7.0:
+css-selector-tokenizer@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
   integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
@@ -3024,6 +3052,11 @@ d@1:
   dependencies:
     es5-ext "^0.10.9"
 
+damerau-levenshtein@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
+  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
+
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
@@ -3618,10 +3651,10 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-envalid@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/envalid/-/envalid-4.2.2.tgz#3ed23b3e42c987b4105b43789d8eb526538c025d"
-  integrity sha512-D6RV00pb4c/eKzslI8bwCeLhBrD9GzNrAa2QRoSto9LdwEQXhsHUKfI61areFi6LvLDVFmlHnrk/SD34UJiMpg==
+envalid@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/envalid/-/envalid-5.0.0.tgz#0dff9302c645977b8a620278620c67a939c9ee6f"
+  integrity sha512-cLyEXc/9meYtQ+KcTsh2S8GGvQ/ZGqlUyFfQrTZqVKy3/o/CQ6waLtgf6X7QmFbW0qAFAptQ8r17LYqKTxHIgw==
   dependencies:
     chalk "^2.4.1"
     dotenv "^6.2.0"
@@ -4533,10 +4566,10 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
 
 get-stream@^3.0.0:
   version "3.0.0"
@@ -5130,19 +5163,19 @@ humanize-url@^1.0.0:
     normalize-url "^1.0.0"
     strip-url-auth "^1.0.0"
 
-husky@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+husky@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
+  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
   dependencies:
-    cosmiconfig "^5.0.7"
+    cosmiconfig "^5.2.0"
     execa "^1.0.0"
     find-up "^3.0.0"
-    get-stdin "^6.0.0"
+    get-stdin "^7.0.0"
     is-ci "^2.0.0"
-    pkg-dir "^3.0.0"
+    pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^4.0.1"
+    read-pkg "^5.0.0"
     run-node "^1.0.0"
     slash "^2.0.0"
 
@@ -7115,7 +7148,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
+normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7923,6 +7956,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-dir@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.1.0.tgz#aaeb91c0d3b9c4f74a44ad849f4de34781ae01de"
+  integrity sha512-55k9QN4saZ8q518lE6EFgYiu95u3BWkSajCifhdQjvLvmr8IpnRbhI+UGpWJQfa0KzDguHeeWT1ccO1PmkOi3A==
+  dependencies:
+    find-up "^3.0.0"
+
 please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -8437,14 +8477,15 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+read-pkg@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
+  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
   dependencies:
-    normalize-package-data "^2.3.2"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
     parse-json "^4.0.0"
-    pify "^3.0.0"
+    type-fest "^0.4.1"
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
@@ -9509,7 +9550,7 @@ split@^1.0.0:
   dependencies:
     through "2"
 
-sprintf-js@^1.1.1:
+sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
@@ -10262,6 +10303,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
diff --git a/yarn.lock b/yarn.lock
index 6f382d26a..aa6c64a99 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,24 +2,24 @@
 # yarn lockfile v1
 
 
-"@angular/core@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.4.tgz#a6c84940c8edcfa37158f666a1f99c6e4a97bf95"
-  integrity sha512-kfAxhIxl89PmB7y81FR/RAv0yWRFcEYxEnTwV+o8jKGfemAXtQ0g/Vh+lJR0SD/TBgFilMxotN1mhwH4A8GShw==
+"@angular/core@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.14.tgz#b78c936d284223c1c5a4c4b02cd0d5fd6d03ec91"
+  integrity sha512-XeZZJCyBKSKo0E/7Ef0SfJejmn+E7uBXa5cR1QapafS0Hnrq/hZu/NI039IDU/51NoycMDH2vTV19SmKu9Mkow==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser-dynamic@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.4.tgz#24dce1bb0d9dab541b3b1b3eda3084a732f11b64"
-  integrity sha512-J/xWlmaYOPUoCHZ5TiIRiyYa4uRMtCz3aGdBfY8k/NWtNo8SCYaS3aut7Sk4RS5rK8aAVi+aYFlY5YOrlW+Hbg==
+"@angular/platform-browser-dynamic@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.14.tgz#ae055ab0d3246c0f2d27d40a46cd99c012aa199d"
+  integrity sha512-lmTCBiDRbOPtniIqBjm1n5jl1TdyQM0qWQdBcoCsKpMNS/6/RacRcQsJZApAMdWm6gIVuLgmRQzaCLkSoekfYA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.4":
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.4.tgz#2cf5305878d0620d6b8c02eff00ac3ca8dbc5970"
-  integrity sha512-Klt8aKR5SP9bqfMfpSY5vQOY7AQEs8JGuZOk5Bfc2dUtYT2IEIvK2IqO8v2rcFRVO13HOPUxl328efyHqLgI7g==
+"@angular/platform-browser@^7.2.14":
+  version "7.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.14.tgz#9b259c335eb0dda64bc79409fa8dbb8fbb6bd818"
+  integrity sha512-yAq2+3W4J4B48HEmZYQucdEb9AHwRnv72q9CC/SxU7g59vaLhl1nv7cAWGJ4XFaJTbB7aB4Y4rLffuR+Gxkn7A==
   dependencies:
     tslib "^1.9.0"
 
@@ -265,62 +265,49 @@
     babel-runtime "6.26.0"
     execa "0.9.0"
 
-"@iamstarkov/listr-update-renderer@0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz#d7c48092a2dcf90fd672b6c8b458649cb350c77e"
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
-
-"@lerna/add@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.11.0.tgz#eb924d05457b5c46ce4836cf3a0a05055ae788aa"
-  integrity sha512-A2u889e+GeZzL28jCpcN53iHq2cPWVnuy5tv5nvG/MIg0PxoAQOUvphexKsIbqzVd9Damdmv5W0u9kS8y8TTow==
+"@lerna/add@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.13.3.tgz#f4c1674839780e458f0426d4f7b6d0a77b9a2ae9"
+  integrity sha512-T3/Lsbo9ZFq+vL3ssaHxA8oKikZAPTJTGFe4CRuQgWCDd/M61+51jeWsngdaHpwzSSRDRjxg8fJTG10y10pnfA==
   dependencies:
-    "@lerna/bootstrap" "3.11.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/filter-options" "3.11.0"
-    "@lerna/npm-conf" "3.7.0"
-    "@lerna/validation-error" "3.11.0"
+    "@lerna/bootstrap" "3.13.3"
+    "@lerna/command" "3.13.3"
+    "@lerna/filter-options" "3.13.3"
+    "@lerna/npm-conf" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
     dedent "^0.7.0"
     npm-package-arg "^6.1.0"
     p-map "^1.2.0"
-    pacote "^9.4.1"
+    pacote "^9.5.0"
     semver "^5.5.0"
 
-"@lerna/batch-packages@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.11.0.tgz#cb009b6680b6e5fb586e9578072f4b595288eaf8"
-  integrity sha512-ETO3prVqDZs/cpZo00ij61JEZ8/ADJx1OG/d/KtTdHlyRfQsb09Xzf0w+boimqa8fIqhpM3o5FV9GKd6GQ3iFQ==
+"@lerna/batch-packages@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.13.0.tgz#697fde5be28822af9d9dca2f750250b90a89a000"
+  integrity sha512-TgLBTZ7ZlqilGnzJ3xh1KdAHcySfHytgNRTdG9YomfriTU6kVfp1HrXxKJYVGs7ClPUNt2CTFEOkw0tMBronjw==
   dependencies:
-    "@lerna/package-graph" "3.11.0"
-    "@lerna/validation-error" "3.11.0"
+    "@lerna/package-graph" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
     npmlog "^4.1.2"
 
-"@lerna/bootstrap@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.11.0.tgz#01bfda72894b5ebf3b550b9849ee4b44c03e50be"
-  integrity sha512-MqwviGJTy86joqSX2A3fmu2wXLBXc23tHJp5Xu4bVhynPegDnRrA3d9UI80UM3JcuYIQsxT4t2q2LNsZ4VdZKQ==
-  dependencies:
-    "@lerna/batch-packages" "3.11.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/filter-options" "3.11.0"
-    "@lerna/has-npm-version" "3.10.0"
-    "@lerna/npm-install" "3.11.0"
-    "@lerna/package-graph" "3.11.0"
-    "@lerna/pulse-till-done" "3.11.0"
-    "@lerna/rimraf-dir" "3.11.0"
-    "@lerna/run-lifecycle" "3.11.0"
-    "@lerna/run-parallel-batches" "3.0.0"
-    "@lerna/symlink-binary" "3.11.0"
-    "@lerna/symlink-dependencies" "3.11.0"
-    "@lerna/validation-error" "3.11.0"
+"@lerna/bootstrap@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.13.3.tgz#a0e5e466de5c100b49d558d39139204fc4db5c95"
+  integrity sha512-2XzijnLHRZOVQh8pwS7+5GR3cG4uh+EiLrWOishCq2TVzkqgjaS3GGBoef7KMCXfWHoLqAZRr/jEdLqfETLVqg==
+  dependencies:
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/command" "3.13.3"
+    "@lerna/filter-options" "3.13.3"
+    "@lerna/has-npm-version" "3.13.3"
+    "@lerna/npm-install" "3.13.3"
+    "@lerna/package-graph" "3.13.0"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/rimraf-dir" "3.13.3"
+    "@lerna/run-lifecycle" "3.13.0"
+    "@lerna/run-parallel-batches" "3.13.0"
+    "@lerna/symlink-binary" "3.13.0"
+    "@lerna/symlink-dependencies" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
     dedent "^0.7.0"
     get-port "^3.2.0"
     multimatch "^2.1.0"
@@ -333,93 +320,93 @@
     read-package-tree "^5.1.6"
     semver "^5.5.0"
 
-"@lerna/changed@3.11.1":
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.11.1.tgz#d8a856f8237e37e7686d17a1e13bf4d082a3e48b"
-  integrity sha512-A21h3DvMjDwhksmCmTQ1+3KPHg7gHVHFs3zC5lR9W+whYlm0JI2Yp70vYnqMv2hPAcJx+2tlCrqJkzCFkNQdqg==
+"@lerna/changed@3.13.4":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.13.4.tgz#c69d8a079999e49611dd58987f08437baee81ad4"
+  integrity sha512-9lfOyRVObasw6L/z7yCSfsEl1QKy0Eamb8t2Krg1deIoAt+cE3JXOdGGC1MhOSli+7f/U9LyLXjJzIOs/pc9fw==
   dependencies:
-    "@lerna/collect-updates" "3.11.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/listable" "3.11.0"
-    "@lerna/output" "3.11.0"
-    "@lerna/version" "3.11.1"
+    "@lerna/collect-updates" "3.13.3"
+    "@lerna/command" "3.13.3"
+    "@lerna/listable" "3.13.0"
+    "@lerna/output" "3.13.0"
+    "@lerna/version" "3.13.4"
 
-"@lerna/check-working-tree@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.11.0.tgz#a513d3e28168826fa4916ef2d0ff656daa6e6de0"
-  integrity sha512-uWKKmX4BKdK57MyX3rGNHNz4JmFP3tHnaIDDVeuSlgK5KwncPFyRXi3E9H0eiq6DUvDDLtztNOfWeGP2IY656Q==
+"@lerna/check-working-tree@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.13.3.tgz#836a3ffd4413a29aca92ccca4a115e4f97109992"
+  integrity sha512-LoGZvTkne+V1WpVdCTU0XNzFKsQa2AiAFKksGRT0v8NQj6VAPp0jfVYDayTqwaWt2Ne0OGKOFE79Y5LStOuhaQ==
   dependencies:
-    "@lerna/describe-ref" "3.11.0"
-    "@lerna/validation-error" "3.11.0"
+    "@lerna/describe-ref" "3.13.3"
+    "@lerna/validation-error" "3.13.0"
 
-"@lerna/child-process@3.3.0":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.3.0.tgz#71184a763105b6c8ece27f43f166498d90fe680f"
-  integrity sha512-q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g==
+"@lerna/child-process@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.13.3.tgz#6c084ee5cca9fc9e04d6bf4fc3f743ed26ff190c"
+  integrity sha512-3/e2uCLnbU+bydDnDwyadpOmuzazS01EcnOleAnuj9235CU2U97DH6OyoG1EW/fU59x11J+HjIqovh5vBaMQjQ==
   dependencies:
     chalk "^2.3.1"
     execa "^1.0.0"
     strong-log-transformer "^2.0.0"
 
-"@lerna/clean@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.11.0.tgz#21dc85d8280cd6956d3cb8998f3f5667382a8b8f"
-  integrity sha512-sHyMYv56MIVMH79+5vcxHVdgmd8BcsihI+RL2byW+PeoNlyDeGMjTRmnzLmbSD7dkinHGoa5cghlXy9GGIqpRw==
+"@lerna/clean@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.13.3.tgz#5673a1238e0712d31711e7e4e8cb9641891daaea"
+  integrity sha512-xmNauF1PpmDaKdtA2yuRc23Tru4q7UMO6yB1a/TTwxYPYYsAWG/CBK65bV26J7x4RlZtEv06ztYGMa9zh34UXA==
   dependencies:
-    "@lerna/command" "3.11.0"
-    "@lerna/filter-options" "3.11.0"
-    "@lerna/prompt" "3.11.0"
-    "@lerna/pulse-till-done" "3.11.0"
-    "@lerna/rimraf-dir" "3.11.0"
+    "@lerna/command" "3.13.3"
+    "@lerna/filter-options" "3.13.3"
+    "@lerna/prompt" "3.13.0"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/rimraf-dir" "3.13.3"
     p-map "^1.2.0"
     p-map-series "^1.0.0"
     p-waterfall "^1.0.0"
 
-"@lerna/cli@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.11.0.tgz#502f0409a794934b8dafb7be71dc3e91ca862907"
-  integrity sha512-dn2m2PgUxcb2NyTvwfYOFZf8yN5CMf1uKxht3ajQYdDjRgFi5pUQt/DmdguOZ3CMJkENa0i3yPOmrxGPXLD2aw==
+"@lerna/cli@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.13.0.tgz#3d7b357fdd7818423e9681a7b7f2abd106c8a266"
+  integrity sha512-HgFGlyCZbYaYrjOr3w/EsY18PdvtsTmDfpUQe8HwDjXlPeCCUgliZjXLOVBxSjiOvPeOSwvopwIHKWQmYbwywg==
   dependencies:
-    "@lerna/global-options" "3.10.6"
+    "@lerna/global-options" "3.13.0"
     dedent "^0.7.0"
     npmlog "^4.1.2"
     yargs "^12.0.1"
 
-"@lerna/collect-updates@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.11.0.tgz#2332cd8c2c2e091801c8e78fea3aea0e766f971e"
-  integrity sha512-O0Y18OC2P6j9/RFq+u5Kdq7YxsDd+up3ZRoW6+i0XHWktqxXA9P4JBQppkpYtJVK2yH8QyOzuVLQgtL0xtHdYA==
+"@lerna/collect-updates@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.13.3.tgz#616648da59f0aff4a8e60257795cc46ca6921edd"
+  integrity sha512-sTpALOAxli/ZS+Mjq6fbmjU9YXqFJ2E4FrE1Ijl4wPC5stXEosg2u0Z1uPY+zVKdM+mOIhLxPVdx83rUgRS+Cg==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/describe-ref" "3.11.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/describe-ref" "3.13.3"
     minimatch "^3.0.4"
     npmlog "^4.1.2"
     slash "^1.0.0"
 
-"@lerna/command@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.11.0.tgz#a25199de8dfaf120ffa1492d5cb9185b17c45dea"
-  integrity sha512-N+Z5kauVHSb2VhSIfQexG2VlCAAQ9xYKwVTxYh0JFOFUnZ/QPcoqx4VjynDXASFXXDgcXs4FLaGsJxq83Mf5Zg==
+"@lerna/command@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.13.3.tgz#5b20b3f507224573551039e0460bc36c39f7e9d1"
+  integrity sha512-WHFIQCubJV0T8gSLRNr6exZUxTswrh+iAtJCb86SE0Sa+auMPklE8af7w2Yck5GJfewmxSjke3yrjNxQrstx7w==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/package-graph" "3.11.0"
-    "@lerna/project" "3.11.0"
-    "@lerna/validation-error" "3.11.0"
-    "@lerna/write-log-file" "3.11.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/package-graph" "3.13.0"
+    "@lerna/project" "3.13.1"
+    "@lerna/validation-error" "3.13.0"
+    "@lerna/write-log-file" "3.13.0"
     dedent "^0.7.0"
     execa "^1.0.0"
     is-ci "^1.0.10"
     lodash "^4.17.5"
     npmlog "^4.1.2"
 
-"@lerna/conventional-commits@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.11.0.tgz#6a56925a8ef3c0f66174bc74226bbdf1646800cf"
-  integrity sha512-ix1Ki5NiZdk2eMlCWNgLchWPKQTgkJdLeNjneep6OCF3ydSINizReGbFvCftRivun641cOHWswgWMsIxbqhMQw==
+"@lerna/conventional-commits@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.13.0.tgz#877aa225ca34cca61c31ea02a5a6296af74e1144"
+  integrity sha512-BeAgcNXuocmLhPxnmKU2Vy8YkPd/Uo+vu2i/p3JGsUldzrPC8iF3IDxH7fuXpEFN2Nfogu7KHachd4tchtOppA==
   dependencies:
-    "@lerna/validation-error" "3.11.0"
-    conventional-changelog-angular "^5.0.2"
-    conventional-changelog-core "^3.1.5"
+    "@lerna/validation-error" "3.13.0"
+    conventional-changelog-angular "^5.0.3"
+    conventional-changelog-core "^3.1.6"
     conventional-recommended-bump "^4.0.4"
     fs-extra "^7.0.0"
     get-stream "^4.0.0"
@@ -428,24 +415,24 @@
     pify "^3.0.0"
     semver "^5.5.0"
 
-"@lerna/create-symlink@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.11.0.tgz#2698b1f41aa81db820c20937701d7ceeb92cd421"
-  integrity sha512-UDR32uos8FIEc1keMKxXj5goZAHpCbpUd4u/btHXymUL9WqIym3cgz2iMr3ZNdZtjdMyUoHup5Dp0zjSgKCaEA==
+"@lerna/create-symlink@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.13.0.tgz#e01133082fe040779712c960683cb3a272b67809"
+  integrity sha512-PTvg3jAAJSAtLFoZDsuTMv1wTOC3XYIdtg54k7uxIHsP8Ztpt+vlilY/Cni0THAqEMHvfiToel76Xdta4TU21Q==
   dependencies:
     cmd-shim "^2.0.2"
     fs-extra "^7.0.0"
     npmlog "^4.1.2"
 
-"@lerna/create@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.11.0.tgz#06121b6370f650fc51e04afc2631c56de5a950e4"
-  integrity sha512-1izS82QML+H/itwEu1GPrcoXyugFaP9z9r6KuIQRQq8RtmNCGEmK85aiOw6mukyRcRziq2akALgFDyrundznPQ==
+"@lerna/create@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.13.3.tgz#6ded142c54b7f3cea86413c3637b067027b7f55d"
+  integrity sha512-4M5xT1AyUMwt1gCDph4BfW3e6fZmt0KjTa3FoXkUotf/w/eqTsc2IQ+ULz2+gOFQmtuNbqIZEOK3J4P9ArJJ/A==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/npm-conf" "3.7.0"
-    "@lerna/validation-error" "3.11.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.13.3"
+    "@lerna/npm-conf" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
     camelcase "^5.0.0"
     dedent "^0.7.0"
     fs-extra "^7.0.0"
@@ -453,7 +440,7 @@
     init-package-json "^1.10.3"
     npm-package-arg "^6.1.0"
     p-reduce "^1.0.0"
-    pacote "^9.4.1"
+    pacote "^9.5.0"
     pify "^3.0.0"
     semver "^5.5.0"
     slash "^1.0.0"
@@ -461,259 +448,260 @@
     validate-npm-package-name "^3.0.0"
     whatwg-url "^7.0.0"
 
-"@lerna/describe-ref@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.11.0.tgz#935049a658f3f6e30b3da9132bdf121bc890addf"
-  integrity sha512-lX/NVMqeODg4q/igN06L/KjtVUpW1oawh6IgOINy2oqm4RUR+1yDpsdVu3JyZZ4nHB572mJfbW56dl8qoxEVvQ==
+"@lerna/describe-ref@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.13.3.tgz#13318513613f6a407d37fc5dc025ec2cfb705606"
+  integrity sha512-5KcLTvjdS4gU5evW8ESbZ0BF44NM5HrP3dQNtWnOUSKJRgsES8Gj0lq9AlB2+YglZfjEftFT03uOYOxnKto4Uw==
   dependencies:
-    "@lerna/child-process" "3.3.0"
+    "@lerna/child-process" "3.13.3"
     npmlog "^4.1.2"
 
-"@lerna/diff@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.11.0.tgz#9c3417c1f1daabd55770c7a2631a1cc2125f1a4e"
-  integrity sha512-r3WASQix31ApA0tlkZejXhS8Z3SEg6Jw9YnKDt9V6wLjEUXGLauUDMrgx1YWu3cs9KB8/hqheRyRI7XAXGJS1w==
+"@lerna/diff@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.13.3.tgz#883cb3a83a956dbfc2c17bc9a156468a5d3fae17"
+  integrity sha512-/DRS2keYbnKaAC+5AkDyZRGkP/kT7v1GlUS0JGZeiRDPQ1H6PzhX09EgE5X6nj0Ytrm0sUasDeN++CDVvgaI+A==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/validation-error" "3.11.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.13.3"
+    "@lerna/validation-error" "3.13.0"
     npmlog "^4.1.2"
 
-"@lerna/exec@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.11.0.tgz#391351b024ec243050f54ca92cef5d298dc821d4"
-  integrity sha512-oIkI+Hj74kpsnHhw0qJj12H4XMPSlDbBsshLWY+f3BiwKhn6wkXoQZ1FC8/OVNHM67GtSRv4bkcOaM4ucHm9Hw==
-  dependencies:
-    "@lerna/batch-packages" "3.11.0"
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/filter-options" "3.11.0"
-    "@lerna/run-parallel-batches" "3.0.0"
-    "@lerna/validation-error" "3.11.0"
-
-"@lerna/filter-options@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.11.0.tgz#2c9b47abd5bb860652b7f40bc466539f56e6014b"
-  integrity sha512-z0krgC/YBqz7i6MGHBsPLvsQ++XEpPdGnIkSpcN0Cjp5J67K9vb5gJ2hWp1c1bitNh3xiwZ69voGqN+DYk1mUg==
-  dependencies:
-    "@lerna/collect-updates" "3.11.0"
-    "@lerna/filter-packages" "3.11.0"
+"@lerna/exec@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.13.3.tgz#5d2eda3f6e584f2f15b115e8a4b5bc960ba5de85"
+  integrity sha512-c0bD4XqM96CTPV8+lvkxzE7mkxiFyv/WNM4H01YvvbFAJzk+S4Y7cBtRkIYFTfkFZW3FLo8pEgtG1ONtIdM+tg==
+  dependencies:
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.13.3"
+    "@lerna/filter-options" "3.13.3"
+    "@lerna/run-parallel-batches" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
+
+"@lerna/filter-options@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.13.3.tgz#aa42a4ab78837b8a6c4278ba871d27e92d77c54f"
+  integrity sha512-DbtQX4eRgrBz1wCFWRP99JBD7ODykYme9ykEK79+RrKph40znhJQRlLg4idogj6IsUEzwo1OHjihCzSfnVo6Cg==
+  dependencies:
+    "@lerna/collect-updates" "3.13.3"
+    "@lerna/filter-packages" "3.13.0"
     dedent "^0.7.0"
 
-"@lerna/filter-packages@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.11.0.tgz#b9087495df4fd035f47d193e3538a56e79be3702"
-  integrity sha512-bnukkW1M0uMKWqM/m/IHou2PKRyk4fDAksAj3diHc1UVQkH2j8hXOfLl9+CgHA/cnTrf6/LARg8hKujqduqHyA==
+"@lerna/filter-packages@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.13.0.tgz#f5371249e7e1a15928e5e88c544a242e0162c21c"
+  integrity sha512-RWiZWyGy3Mp7GRVBn//CacSnE3Kw82PxE4+H6bQ3pDUw/9atXn7NRX+gkBVQIYeKamh7HyumJtyOKq3Pp9BADQ==
   dependencies:
-    "@lerna/validation-error" "3.11.0"
+    "@lerna/validation-error" "3.13.0"
     multimatch "^2.1.0"
     npmlog "^4.1.2"
 
-"@lerna/get-npm-exec-opts@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.11.0.tgz#6e151d52265921205ea3e49b08bd7ee99051741a"
-  integrity sha512-EDxsbuq2AbB3LWwH/4SOcn4gWOnoIYrSHfITWo7xz/SbEKeHtiva99l424ZRWUJqLPGIpQiMTlmOET2ZEI8WZg==
+"@lerna/get-npm-exec-opts@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.13.0.tgz#d1b552cb0088199fc3e7e126f914e39a08df9ea5"
+  integrity sha512-Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw==
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/get-packed@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.7.0.tgz#549c7738f7be5e3b1433e82ed9cda9123bcd1ed5"
-  integrity sha512-yuFtjsUZIHjeIvIYQ/QuytC+FQcHwo3peB+yGBST2uWCLUCR5rx6knoQcPzbxdFDCuUb5IFccFGd3B1fHFg3RQ==
+"@lerna/get-packed@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.13.0.tgz#335e40d77f3c1855aa248587d3e0b2d8f4b06e16"
+  integrity sha512-EgSim24sjIjqQDC57bgXD9l22/HCS93uQBbGpkzEOzxAVzEgpZVm7Fm1t8BVlRcT2P2zwGnRadIvxTbpQuDPTg==
   dependencies:
     fs-extra "^7.0.0"
     ssri "^6.0.1"
     tar "^4.4.8"
 
-"@lerna/github-client@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.11.0.tgz#54e87160a56567f4cd1d48f20d1c6b9d88fe032b"
-  integrity sha512-yPMBhzShuth3uJo0kKu84RvgjSZgOYNT8fKfhZmzTeVGuPbYBKlK+UQ6jjpb6E9WW2BVdiUCrFhqIsbK5Lqe7A==
+"@lerna/github-client@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.13.3.tgz#bcf9b4ff40bdd104cb40cd257322f052b41bb9ce"
+  integrity sha512-fcJkjab4kX0zcLLSa/DCUNvU3v8wmy2c1lhdIbL7s7gABmDcV0QZq93LhnEee3VkC9UpnJ6GKG4EkD7eIifBnA==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@octokit/plugin-enterprise-rest" "^2.1.0"
-    "@octokit/rest" "^16.15.0"
+    "@lerna/child-process" "3.13.3"
+    "@octokit/plugin-enterprise-rest" "^2.1.1"
+    "@octokit/rest" "^16.16.0"
     git-url-parse "^11.1.2"
     npmlog "^4.1.2"
 
-"@lerna/global-options@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.10.6.tgz#c491a64b0be47eca4ffc875011958a5ee70a9a3e"
-  integrity sha512-k5Xkq1M/uREFC2R9uwN5gcvIgjj4iOXo0YyeEXCMWBiW3j2GL9xN4d1MmAIcrYlAzVYh6kLlWaFWl/rNIneHIw==
+"@lerna/global-options@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.13.0.tgz#217662290db06ad9cf2c49d8e3100ee28eaebae1"
+  integrity sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ==
 
-"@lerna/has-npm-version@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.10.0.tgz#d3a73c0fedd2f2e9c6fbe166c41809131dc939d2"
-  integrity sha512-N4RRYxGeivuaKgPDzrhkQOQs1Sg4tOnxnEe3akfqu1wDA4Ng5V6Y2uW3DbkAjFL3aNJhWF5Vbf7sBsGtfgDQ8w==
+"@lerna/has-npm-version@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.13.3.tgz#167e3f602a2fb58f84f93cf5df39705ca6432a2d"
+  integrity sha512-mQzoghRw4dBg0R9FFfHrj0TH0glvXyzdEZmYZ8Isvx5BSuEEwpsryoywuZSdppcvLu8o7NAdU5Tac8cJ/mT52w==
   dependencies:
-    "@lerna/child-process" "3.3.0"
+    "@lerna/child-process" "3.13.3"
     semver "^5.5.0"
 
-"@lerna/import@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.11.0.tgz#e417231754bd660763d3b483901ff786d949a48e"
-  integrity sha512-WgF0We+4k/MrC1vetT8pt3/SSJPMvXhyPYmL2W9rcvch3zV0IgLyso4tEs8gNbwZorDVEG1KcM+x8TG4v1nV5Q==
+"@lerna/import@3.13.4":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.13.4.tgz#e9a1831b8fed33f3cbeab3b84c722c9371a2eaf7"
+  integrity sha512-dn6eNuPEljWsifBEzJ9B6NoaLwl/Zvof7PBUPA4hRyRlqG5sXRn6F9DnusMTovvSarbicmTURbOokYuotVWQQA==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/prompt" "3.11.0"
-    "@lerna/pulse-till-done" "3.11.0"
-    "@lerna/validation-error" "3.11.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.13.3"
+    "@lerna/prompt" "3.13.0"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
     dedent "^0.7.0"
     fs-extra "^7.0.0"
     p-map-series "^1.0.0"
 
-"@lerna/init@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.11.0.tgz#c56d9324984d926e98723c78c64453f46426f608"
-  integrity sha512-JZC5jpCVJgK34grye52kGWjrYCyh4LB8c0WBLaS8MOUt6rxTtPqubwvCDKPOF2H0Se6awsgEfX4wWNuqiQVpRQ==
+"@lerna/init@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.13.3.tgz#ebd522fee9b9d7d3b2dacb0261eaddb4826851ff"
+  integrity sha512-bK/mp0sF6jT0N+c+xrbMCqN4xRoiZCXQzlYsyACxPK99KH/mpHv7hViZlTYUGlYcymtew6ZC770miv5A9wF9hA==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.11.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/command" "3.13.3"
     fs-extra "^7.0.0"
     p-map "^1.2.0"
     write-json-file "^2.3.0"
 
-"@lerna/link@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.11.0.tgz#97253ffeb8a8956c3589ff4c1acf6fda322d76a2"
-  integrity sha512-QN+kxRWb6P9jrKpE2t6K9sGnFpqy1KOEjf68NpGhmp+J9Yt6Kvz9kG43CWoqg4Zyqqgqgn3NVV2Z7zSDNhdH0g==
+"@lerna/link@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.13.3.tgz#11124d4a0c8d0b79752fbda3babedfd62dd57847"
+  integrity sha512-IHhtdhA0KlIdevCsq6WHkI2rF3lHWHziJs2mlrEWAKniVrFczbELON1KJAgdJS1k3kAP/WeWVqmIYZ2hJDxMvg==
   dependencies:
-    "@lerna/command" "3.11.0"
-    "@lerna/package-graph" "3.11.0"
-    "@lerna/symlink-dependencies" "3.11.0"
+    "@lerna/command" "3.13.3"
+    "@lerna/package-graph" "3.13.0"
+    "@lerna/symlink-dependencies" "3.13.0"
     p-map "^1.2.0"
     slash "^1.0.0"
 
-"@lerna/list@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.11.0.tgz#0796d6076aa242d930ca5e470c49fc91066a1063"
-  integrity sha512-hBAwZzEzF1LQOOB2/5vQkal/nSriuJbLY39BitIGkUxifsmu7JK0k3LYrwe1sxXv5SMf2HDaTLr+Z23mUslhaQ==
+"@lerna/list@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.13.3.tgz#fa93864d43cadeb4cd540a4e78a52886c57dbe74"
+  integrity sha512-rLRDsBCkydMq2FL6WY1J/elvnXIjxxRtb72lfKHdvDEqVdquT5Qgt9ci42hwjmcocFwWcFJgF6BZozj5pbc13A==
   dependencies:
-    "@lerna/command" "3.11.0"
-    "@lerna/filter-options" "3.11.0"
-    "@lerna/listable" "3.11.0"
-    "@lerna/output" "3.11.0"
+    "@lerna/command" "3.13.3"
+    "@lerna/filter-options" "3.13.3"
+    "@lerna/listable" "3.13.0"
+    "@lerna/output" "3.13.0"
 
-"@lerna/listable@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.11.0.tgz#5a687c4547f0fb2211c9ab59629f689e170335f3"
-  integrity sha512-nCrtGSS3YiAlh5dU5mmTAU9aLRlmIUn2FnahqsksN2uQ5O4o+614tneDuO298/eWLZo00eGw69EFngaQEl8quw==
+"@lerna/listable@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.13.0.tgz#babc18442c590b549cf0966d20d75fea066598d4"
+  integrity sha512-liYJ/WBUYP4N4MnSVZuLUgfa/jy3BZ02/1Om7xUY09xGVSuNVNEeB8uZUMSC+nHqFHIsMPZ8QK9HnmZb1E/eTA==
   dependencies:
-    "@lerna/batch-packages" "3.11.0"
+    "@lerna/batch-packages" "3.13.0"
     chalk "^2.3.1"
     columnify "^1.5.4"
 
-"@lerna/log-packed@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.11.0.tgz#4b348d8b3b4faa00ae5a03a7cec389dce91f8393"
-  integrity sha512-TH//81TzSTMuNzJIQE7zqu+ymI5rH25jdEdmbYEWmaJ+T42GMQXKxP8cj2m+fWRaDML8ta0uzBOm5PKHdgoFYQ==
+"@lerna/log-packed@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.13.0.tgz#497b5f692a8d0e3f669125da97b0dadfd9e480f3"
+  integrity sha512-Rmjrcz+6aM6AEcEVWmurbo8+AnHOvYtDpoeMMJh9IZ9SmZr2ClXzmD7wSvjTQc8BwOaiWjjC/ukcT0UYA2m7wg==
   dependencies:
     byte-size "^4.0.3"
     columnify "^1.5.4"
     has-unicode "^2.0.1"
     npmlog "^4.1.2"
 
-"@lerna/npm-conf@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.7.0.tgz#f101d4fdf07cefcf1161bcfaf3c0f105b420a450"
-  integrity sha512-+WSMDfPKcKzMfqq283ydz9RRpOU6p9wfx0wy4hVSUY/6YUpsyuk8SShjcRtY8zTM5AOrxvFBuuV90H4YpZ5+Ng==
+"@lerna/npm-conf@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.13.0.tgz#6b434ed75ff757e8c14381b9bbfe5d5ddec134a7"
+  integrity sha512-Jg2kANsGnhg+fbPEzE0X9nX5oviEAvWj0nYyOkcE+cgWuT7W0zpnPXC4hA4C5IPQGhwhhh0IxhWNNHtjTuw53g==
   dependencies:
     config-chain "^1.1.11"
     pify "^3.0.0"
 
-"@lerna/npm-dist-tag@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.11.0.tgz#679fea8b6534d6a877d7efa658ba9eea5b3936ed"
-  integrity sha512-WqZcyDb+wiqAKRFcYEK6R8AQfspyro85zGGHyjYw6ZPNgJX3qhwtQ+MidDmOesi2p5/0GfeVSWega+W7fPzVpg==
+"@lerna/npm-dist-tag@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.13.0.tgz#49ecbe0e82cbe4ad4a8ea6de112982bf6c4e6cd4"
+  integrity sha512-mcuhw34JhSRFrbPn0vedbvgBTvveG52bR2lVE3M3tfE8gmR/cKS/EJFO4AUhfRKGCTFn9rjaSEzlFGYV87pemQ==
   dependencies:
     figgy-pudding "^3.5.1"
     npm-package-arg "^6.1.0"
     npm-registry-fetch "^3.9.0"
     npmlog "^4.1.2"
 
-"@lerna/npm-install@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.11.0.tgz#40533527186d774ac27906d94a8073373d4641e4"
-  integrity sha512-iNKEgFvFHMmBqn9AnFye2rv7CdUBlYciwWSTNtpfVqtOnoL/lg+4A774oL4PDoxTCGmougztyxMkqLVSBYXTpw==
+"@lerna/npm-install@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.13.3.tgz#9b09852732e51c16d2e060ff2fd8bfbbb49cf7ba"
+  integrity sha512-7Jig9MLpwAfcsdQ5UeanAjndChUjiTjTp50zJ+UZz4CbIBIDhoBehvNMTCL2G6pOEC7sGEg6sAqJINAqred6Tg==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/get-npm-exec-opts" "3.11.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/get-npm-exec-opts" "3.13.0"
     fs-extra "^7.0.0"
     npm-package-arg "^6.1.0"
     npmlog "^4.1.2"
     signal-exit "^3.0.2"
     write-pkg "^3.1.0"
 
-"@lerna/npm-publish@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.11.0.tgz#886a408c86c30c4f18df20f338d576a53902b6ba"
-  integrity sha512-wgbb55gUXRlP8uTe60oW6c06ZhquaJu9xbi2vWNpb5Fmjh/KbZ2iNm9Kj2ciZlvb8D+k4Oc3qV7slBGxyMm8wg==
+"@lerna/npm-publish@3.13.2":
+  version "3.13.2"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.13.2.tgz#ad713ca6f91a852687d7d0e1bda7f9c66df21768"
+  integrity sha512-HMucPyEYZfom5tRJL4GsKBRi47yvSS2ynMXYxL3kO0ie+j9J7cb0Ir8NmaAMEd3uJWJVFCPuQarehyfTDZsSxg==
   dependencies:
-    "@lerna/run-lifecycle" "3.11.0"
+    "@lerna/run-lifecycle" "3.13.0"
     figgy-pudding "^3.5.1"
     fs-extra "^7.0.0"
     libnpmpublish "^1.1.1"
+    npm-package-arg "^6.1.0"
     npmlog "^4.1.2"
     pify "^3.0.0"
     read-package-json "^2.0.13"
 
-"@lerna/npm-run-script@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.11.0.tgz#ef5880735aa471d9ce1109e9213a45cbdbe8146b"
-  integrity sha512-cLnTMrRQlK/N5bCr6joOFMBfRyW2EbMdk3imtjHk0LwZxsvQx3naAPUB/2RgNfC8fGf/yHF/0bmBrpb5sa2IlA==
+"@lerna/npm-run-script@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.13.3.tgz#9bb6389ed70cd506905d6b05b6eab336b4266caf"
+  integrity sha512-qR4o9BFt5hI8Od5/DqLalOJydnKpiQFEeN0h9xZi7MwzuX1Ukwh3X22vqsX4YRbipIelSFtrDzleNVUm5jj0ow==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/get-npm-exec-opts" "3.11.0"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/get-npm-exec-opts" "3.13.0"
     npmlog "^4.1.2"
 
-"@lerna/output@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.11.0.tgz#cc2c1e8573d9523f3159524e44a7cf788db6102e"
-  integrity sha512-xHYGcEaZZ4cR0Jw368QgUgFvV27a6ZO5360BMNGNsjCjuY0aOPQC5+lBhgfydJtJteKjDna853PSjBK3uMhEjw==
+"@lerna/output@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.13.0.tgz#3ded7cc908b27a9872228a630d950aedae7a4989"
+  integrity sha512-7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg==
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/pack-directory@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.11.0.tgz#5fa5d818eba97ad2c4d1f688e0754f3a4c34cc81"
-  integrity sha512-bgA3TxZx5AyZeqUadSPspktdecW7nIpg/ODq0o0gKFr7j+DC9Fqu8vQa2xmFSKsXDtOYkCV0jox6Ox9XSFSM3A==
+"@lerna/pack-directory@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.13.1.tgz#5ad4d0945f86a648f565e24d53c1e01bb3a912d1"
+  integrity sha512-kXnyqrkQbCIZOf1054N88+8h0ItC7tUN5v9ca/aWpx298gsURpxUx/1TIKqijL5TOnHMyIkj0YJmnH/PyBVLKA==
   dependencies:
-    "@lerna/get-packed" "3.7.0"
-    "@lerna/package" "3.11.0"
-    "@lerna/run-lifecycle" "3.11.0"
+    "@lerna/get-packed" "3.13.0"
+    "@lerna/package" "3.13.0"
+    "@lerna/run-lifecycle" "3.13.0"
     figgy-pudding "^3.5.1"
-    npm-packlist "^1.1.12"
+    npm-packlist "^1.4.1"
     npmlog "^4.1.2"
     tar "^4.4.8"
     temp-write "^3.4.0"
 
-"@lerna/package-graph@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.11.0.tgz#d43472eb9aa2e6ca2c18984b9f86bb5924790d7a"
-  integrity sha512-ICYiOZvCfcmeH1qfzOkFYh0t0QA56OddQfI3ydxCiWi5G+UupJXnCIWSTh3edTAtw/kyxhCOWny/PJsG4CQfjA==
+"@lerna/package-graph@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.13.0.tgz#607062f8d2ce22b15f8d4a0623f384736e67f760"
+  integrity sha512-3mRF1zuqFE1HEFmMMAIggXy+f+9cvHhW/jzaPEVyrPNLKsyfJQtpTNzeI04nfRvbAh+Gd2aNksvaW/w3xGJnnw==
   dependencies:
-    "@lerna/validation-error" "3.11.0"
+    "@lerna/validation-error" "3.13.0"
     npm-package-arg "^6.1.0"
     semver "^5.5.0"
 
-"@lerna/package@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.11.0.tgz#b783f8c93f398e4c41cfd3fc8f2bb38ad1e07b76"
-  integrity sha512-hMzBhFEubhg+Tis5C8skwIfgOk+GTl0qudvzfPU9gQqLV8u4/Hs6mka6N0rKgbUb4VFVc5MJVe1eZ6Rv+kJAWw==
+"@lerna/package@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.13.0.tgz#4baeebc49a57fc9b31062cc59f5ee38384429fc8"
+  integrity sha512-kSKO0RJQy093BufCQnkhf1jB4kZnBvL7kK5Ewolhk5gwejN+Jofjd8DGRVUDUJfQ0CkW1o6GbUeZvs8w8VIZDg==
   dependencies:
     load-json-file "^4.0.0"
     npm-package-arg "^6.1.0"
     write-pkg "^3.1.0"
 
-"@lerna/project@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.11.0.tgz#3f403e277b724a39e5fd9124b6978c426815c588"
-  integrity sha512-j3DGds+q/q2YNpoBImaEsMpkWgu5gP0IGKz1o1Ju39NZKrTPza+ARIzEByL4Jqu87tcoOj7RbZzhhrBP8JBbTg==
+"@lerna/project@3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.13.1.tgz#bce890f60187bd950bcf36c04b5260642e295e79"
+  integrity sha512-/GoCrpsCCTyb9sizk1+pMBrIYchtb+F1uCOn3cjn9yenyG/MfYEnlfrbV5k/UDud0Ei75YBLbmwCbigHkAKazQ==
   dependencies:
-    "@lerna/package" "3.11.0"
-    "@lerna/validation-error" "3.11.0"
-    cosmiconfig "^5.0.2"
+    "@lerna/package" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
+    cosmiconfig "^5.1.0"
     dedent "^0.7.0"
     dot-prop "^4.2.0"
     glob-parent "^3.1.0"
@@ -724,37 +712,37 @@
     resolve-from "^4.0.0"
     write-json-file "^2.3.0"
 
-"@lerna/prompt@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.11.0.tgz#35c6bf18e5218ccf4bf2cde678667fd967ea1564"
-  integrity sha512-SB/wvyDPQASze9txd+8/t24p6GiJuhhL30zxuRwvVwER5lIJR7kaXy1KhQ7kUAKPlNTVfCBm3GXReIMl4jhGhw==
+"@lerna/prompt@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.13.0.tgz#53571462bb3f5399cc1ca6d335a411fe093426a5"
+  integrity sha512-P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA==
   dependencies:
     inquirer "^6.2.0"
     npmlog "^4.1.2"
 
-"@lerna/publish@3.11.1":
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.11.1.tgz#06b0f646afea7f29cd820a63086692a4ac4d080e"
-  integrity sha512-UOvmSivuqzWoiTqoYWk+liPDZvC6O7NrT8DwoG2peRvjIPs5RKYMubwXPOrBBVVE+yX/vR6V1Y3o6vf3av52dg==
-  dependencies:
-    "@lerna/batch-packages" "3.11.0"
-    "@lerna/check-working-tree" "3.11.0"
-    "@lerna/child-process" "3.3.0"
-    "@lerna/collect-updates" "3.11.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/describe-ref" "3.11.0"
-    "@lerna/log-packed" "3.11.0"
-    "@lerna/npm-conf" "3.7.0"
-    "@lerna/npm-dist-tag" "3.11.0"
-    "@lerna/npm-publish" "3.11.0"
-    "@lerna/output" "3.11.0"
-    "@lerna/pack-directory" "3.11.0"
-    "@lerna/prompt" "3.11.0"
-    "@lerna/pulse-till-done" "3.11.0"
-    "@lerna/run-lifecycle" "3.11.0"
-    "@lerna/run-parallel-batches" "3.0.0"
-    "@lerna/validation-error" "3.11.0"
-    "@lerna/version" "3.11.1"
+"@lerna/publish@3.13.4":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.13.4.tgz#25b678c285110897a7fc5198a35bdfa9db7f9cc1"
+  integrity sha512-v03pabiPlqCDwX6cVNis1PDdT6/jBgkVb5Nl4e8wcJXevIhZw3ClvtI94gSZu/wdoVFX0RMfc8QBVmaimSO0qg==
+  dependencies:
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/check-working-tree" "3.13.3"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/collect-updates" "3.13.3"
+    "@lerna/command" "3.13.3"
+    "@lerna/describe-ref" "3.13.3"
+    "@lerna/log-packed" "3.13.0"
+    "@lerna/npm-conf" "3.13.0"
+    "@lerna/npm-dist-tag" "3.13.0"
+    "@lerna/npm-publish" "3.13.2"
+    "@lerna/output" "3.13.0"
+    "@lerna/pack-directory" "3.13.1"
+    "@lerna/prompt" "3.13.0"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/run-lifecycle" "3.13.0"
+    "@lerna/run-parallel-batches" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
+    "@lerna/version" "3.13.4"
     figgy-pudding "^3.5.1"
     fs-extra "^7.0.0"
     libnpmaccess "^3.0.1"
@@ -765,119 +753,119 @@
     p-map "^1.2.0"
     p-pipe "^1.2.0"
     p-reduce "^1.0.0"
-    pacote "^9.4.1"
+    pacote "^9.5.0"
     semver "^5.5.0"
 
-"@lerna/pulse-till-done@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-3.11.0.tgz#44221de131606104b705dc861440887d543d28ed"
-  integrity sha512-nMwBa6S4+VI/ketN92oj1xr8y74Fz4ul2R5jdbrRqLLEU/IMBWIqn6NRM2P+OQBoLpPZ2MdWENLJVFNN8X1Q+A==
+"@lerna/pulse-till-done@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-3.13.0.tgz#c8e9ce5bafaf10d930a67d7ed0ccb5d958fe0110"
+  integrity sha512-1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA==
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/resolve-symlink@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.11.0.tgz#0df9834cbacc5a39774899a83b119a7187dfb277"
-  integrity sha512-lDer8zPXS36iL4vJdZwOk6AnuUjDXswoTWdYkl+HdAKXp7cBlS+VeGmcFIJS4R3mSSZE20h1oEDuH8h8GGORIQ==
+"@lerna/resolve-symlink@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.13.0.tgz#3e6809ef53b63fe914814bfa071cd68012e22fbb"
+  integrity sha512-Lc0USSFxwDxUs5JvIisS8JegjA6SHSAWJCMvi2osZx6wVRkEDlWG2B1JAfXUzCMNfHoZX0/XX9iYZ+4JIpjAtg==
   dependencies:
     fs-extra "^7.0.0"
     npmlog "^4.1.2"
     read-cmd-shim "^1.0.1"
 
-"@lerna/rimraf-dir@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.11.0.tgz#98e6a41b2a7bfe83693d9594347cb3dbed2aebdc"
-  integrity sha512-roy4lKel7BMNLfFvyzK0HI251mgI9EwbpOccR2Waz0V22d0gaqLKzfVrzovat9dVHXrKNxAhJ5iKkKeT93IunQ==
+"@lerna/rimraf-dir@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.13.3.tgz#3a8e71317fde853893ef0262bc9bba6a180b7227"
+  integrity sha512-d0T1Hxwu3gpYVv73ytSL+/Oy8JitsmvOYUR5ouRSABsmqS7ZZCh5t6FgVDDGVXeuhbw82+vuny1Og6Q0k4ilqw==
   dependencies:
-    "@lerna/child-process" "3.3.0"
+    "@lerna/child-process" "3.13.3"
     npmlog "^4.1.2"
     path-exists "^3.0.0"
     rimraf "^2.6.2"
 
-"@lerna/run-lifecycle@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.11.0.tgz#2839d18d7603318dbdd545cbfa1321bc41cbc474"
-  integrity sha512-3xeeVz9s3Dh2ljKqJI/Fl+gkZD9Y8JblAN62f4WNM76d/zFlgpCXDs62OpxNjEuXujA7YFix0sJ+oPKMm8mDrw==
+"@lerna/run-lifecycle@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.13.0.tgz#d8835ee83425edee40f687a55f81b502354d3261"
+  integrity sha512-oyiaL1biZdjpmjh6X/5C4w07wNFyiwXSSHH5GQB4Ay4BPwgq9oNhCcxRoi0UVZlZ1YwzSW8sTwLgj8emkIo3Yg==
   dependencies:
-    "@lerna/npm-conf" "3.7.0"
+    "@lerna/npm-conf" "3.13.0"
     figgy-pudding "^3.5.1"
     npm-lifecycle "^2.1.0"
     npmlog "^4.1.2"
 
-"@lerna/run-parallel-batches@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0.tgz#468704934084c74991d3124d80607857d4dfa840"
-  integrity sha512-Mj1ravlXF7AkkewKd9YFq9BtVrsStNrvVLedD/b2wIVbNqcxp8lS68vehXVOzoL/VWNEDotvqCQtyDBilCodGw==
+"@lerna/run-parallel-batches@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.13.0.tgz#0276bb4e7cd0995297db82d134ca2bd08d63e311"
+  integrity sha512-bICFBR+cYVF1FFW+Tlm0EhWDioTUTM6dOiVziDEGE1UZha1dFkMYqzqdSf4bQzfLS31UW/KBd/2z8jy2OIjEjg==
   dependencies:
     p-map "^1.2.0"
     p-map-series "^1.0.0"
 
-"@lerna/run@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.11.0.tgz#2a07995ccd570230d01ee8fe2e8c6b742ed58c37"
-  integrity sha512-8c2yzbKJFzgO6VTOftWmB0fOLTL7G1GFAG5UTVDSk95Z2Gnjof3I/Xkvtbzq8L+DIOLpr+Tpj3fRBjZd8rONlA==
-  dependencies:
-    "@lerna/batch-packages" "3.11.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/filter-options" "3.11.0"
-    "@lerna/npm-run-script" "3.11.0"
-    "@lerna/output" "3.11.0"
-    "@lerna/run-parallel-batches" "3.0.0"
-    "@lerna/timer" "3.5.0"
-    "@lerna/validation-error" "3.11.0"
+"@lerna/run@3.13.3":
+  version "3.13.3"
+  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.13.3.tgz#0781c82d225ef6e85e28d3e763f7fc090a376a21"
+  integrity sha512-ygnLIfIYS6YY1JHWOM4CsdZiY8kTYPsDFOLAwASlRnlAXF9HiMT08GFXLmMHIblZJ8yJhsM2+QgraCB0WdxzOQ==
+  dependencies:
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/command" "3.13.3"
+    "@lerna/filter-options" "3.13.3"
+    "@lerna/npm-run-script" "3.13.3"
+    "@lerna/output" "3.13.0"
+    "@lerna/run-parallel-batches" "3.13.0"
+    "@lerna/timer" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
     p-map "^1.2.0"
 
-"@lerna/symlink-binary@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.11.0.tgz#927e1e0d561e52949feb7e3b2a83b26a00cbde49"
-  integrity sha512-5sOED+1O8jI+ckDS6DRUKtAtbKo7lbxFIJs6sWWEu5qKzM5e21O6E2wTWimJkad8nJ1SJAuyc8DC8M8ki4kT4w==
+"@lerna/symlink-binary@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.13.0.tgz#36a9415d468afcb8105750296902f6f000a9680d"
+  integrity sha512-obc4Y6jxywkdaCe+DB0uTxYqP0IQ8mFWvN+k/YMbwH4G2h7M7lCBWgPy8e7xw/50+1II9tT2sxgx+jMus1sTJg==
   dependencies:
-    "@lerna/create-symlink" "3.11.0"
-    "@lerna/package" "3.11.0"
+    "@lerna/create-symlink" "3.13.0"
+    "@lerna/package" "3.13.0"
     fs-extra "^7.0.0"
     p-map "^1.2.0"
 
-"@lerna/symlink-dependencies@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.11.0.tgz#f1e9488c5d7e87aa945b34f4f4ce53e655178698"
-  integrity sha512-XKNX8oOgcOmiKHUn7qT5GvvmKP3w5otZPOjRixUDUILWTc3P8nO5I1VNILNF6IE5ajNw6yiXOWikSxc6KuFqBQ==
+"@lerna/symlink-dependencies@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.13.0.tgz#76c23ecabda7824db98a0561364f122b457509cf"
+  integrity sha512-7CyN5WYEPkbPLbqHBIQg/YiimBzb5cIGQB0E9IkLs3+racq2vmUNQZn38LOaazQacAA83seB+zWSxlI6H+eXSg==
   dependencies:
-    "@lerna/create-symlink" "3.11.0"
-    "@lerna/resolve-symlink" "3.11.0"
-    "@lerna/symlink-binary" "3.11.0"
+    "@lerna/create-symlink" "3.13.0"
+    "@lerna/resolve-symlink" "3.13.0"
+    "@lerna/symlink-binary" "3.13.0"
     fs-extra "^7.0.0"
     p-finally "^1.0.0"
     p-map "^1.2.0"
     p-map-series "^1.0.0"
 
-"@lerna/timer@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-3.5.0.tgz#8dee6acf002c55de64678c66ef37ca52143f1b9b"
-  integrity sha512-TAb99hqQN6E3JBGtG9iyZNPq1/DbmqgBOeNrKtdJsGvIeX/NGLgUDWMrj2h04V4O+jpBFmSf6HIld6triKmxCA==
+"@lerna/timer@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-3.13.0.tgz#bcd0904551db16e08364d6c18e5e2160fc870781"
+  integrity sha512-RHWrDl8U4XNPqY5MQHkToWS9jHPnkLZEt5VD+uunCKTfzlxGnRCr3/zVr8VGy/uENMYpVP3wJa4RKGY6M0vkRw==
 
-"@lerna/validation-error@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.11.0.tgz#3b2e97a7f5158bb1fc6c0eb3789061b99f01d7fb"
-  integrity sha512-/mS4o6QYm4OXUqfPJnW1mKudGhvhLe9uiQ9eK2cgSxkCAVq9G2Sl/KVohpnqAgeRI3nXordGxHS745CdAhg7pA==
+"@lerna/validation-error@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.13.0.tgz#c86b8f07c5ab9539f775bd8a54976e926f3759c3"
+  integrity sha512-SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA==
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/version@3.11.1":
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.11.1.tgz#c4031670838ccd5e285ec481c36e8703f4d835b2"
-  integrity sha512-+lFq4D8BpchIslIz6jyUY6TZO1kuAgQ+G1LjaYwUBiP2SzXVWgPoPoq/9dnaSq38Hhhvlf7FF6i15d+q8gk1xQ==
-  dependencies:
-    "@lerna/batch-packages" "3.11.0"
-    "@lerna/check-working-tree" "3.11.0"
-    "@lerna/child-process" "3.3.0"
-    "@lerna/collect-updates" "3.11.0"
-    "@lerna/command" "3.11.0"
-    "@lerna/conventional-commits" "3.11.0"
-    "@lerna/github-client" "3.11.0"
-    "@lerna/output" "3.11.0"
-    "@lerna/prompt" "3.11.0"
-    "@lerna/run-lifecycle" "3.11.0"
-    "@lerna/validation-error" "3.11.0"
+"@lerna/version@3.13.4":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.13.4.tgz#ea23b264bebda425ccbfcdcd1de13ef45a390e59"
+  integrity sha512-pptWUEgN/lUTQZu34+gfH1g4Uhs7TDKRcdZY9A4T9k6RTOwpKC2ceLGiXdeR+ZgQJAey2C4qiE8fo5Z6Rbc6QA==
+  dependencies:
+    "@lerna/batch-packages" "3.13.0"
+    "@lerna/check-working-tree" "3.13.3"
+    "@lerna/child-process" "3.13.3"
+    "@lerna/collect-updates" "3.13.3"
+    "@lerna/command" "3.13.3"
+    "@lerna/conventional-commits" "3.13.0"
+    "@lerna/github-client" "3.13.3"
+    "@lerna/output" "3.13.0"
+    "@lerna/prompt" "3.13.0"
+    "@lerna/run-lifecycle" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
     chalk "^2.3.1"
     dedent "^0.7.0"
     minimatch "^3.0.4"
@@ -890,10 +878,10 @@
     slash "^1.0.0"
     temp-write "^3.4.0"
 
-"@lerna/write-log-file@3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.11.0.tgz#20550b5e6e6e4c20b11d80dc042aacb2a250502a"
-  integrity sha512-skpTDMDOkQAN4lCeAoI6/rPhbNE431eD0i6Ts3kExUOrYTr0m5CIwVtMZ31Flpky0Jfh4ET6rOl5SDNMLbf4VA==
+"@lerna/write-log-file@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.13.0.tgz#b78d9e4cfc1349a8be64d91324c4c8199e822a26"
+  integrity sha512-RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A==
   dependencies:
     npmlog "^4.1.2"
     write-file-atomic "^2.3.0"
@@ -914,10 +902,10 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nestjs/typeorm@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-5.3.0.tgz#448d6d08d73ceb3c1f8a00a07e26a86c8a62b9f8"
-  integrity sha512-8g80OcKRTfhh5oSkfUKPMfcKBuC0gsr79wBksUwEWoglB/7bvO/erz8RC0XQPdjRH6NRUc+qrglywGm6Be2FZQ==
+"@nestjs/typeorm@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-6.0.0.tgz#a3fb0885f2e0b5d94710c43d06489cfab7200de8"
+  integrity sha512-ZUlUu8DxlgN0dFoeTiaWrD0EU8V/dRjSkqPjrbwspYfZkg/Gws/B8EFK0n0hgyVuJaG4oggV+BjupnKtO8KqGw==
   dependencies:
     uuid "3.3.2"
 
@@ -939,43 +927,48 @@
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.1.tgz#53f349bb986ab273d601175aa1b25a655ab90ee3"
 
-"@octokit/endpoint@^3.1.1":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-3.1.2.tgz#22b5aa8596482fbefc3f1ce22c24ad217aed60fa"
-  integrity sha512-iRx4kDYybAv9tOrHDBE6HwlgiFi8qmbZl8SHliZWtxbUFuXLZXh2yv8DxGIK9wzD9J0wLDMZneO8vNYJNUSJ9Q==
+"@octokit/endpoint@^4.0.0":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-4.1.1.tgz#847075b85157c7bd60d0f23c426b23bed8a232dd"
+  integrity sha512-lfphGC9hglBDiIOU84f1xDUzjWE5j3jGkO3Ng/IpDDVARw760A+/x408JOEpdV20ZUj2GRWdDBC0+HPu5qA5gQ==
   dependencies:
-    deepmerge "3.1.0"
+    deepmerge "3.2.0"
     is-plain-object "^2.0.4"
     universal-user-agent "^2.0.1"
     url-template "^2.0.8"
 
-"@octokit/plugin-enterprise-rest@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.1.0.tgz#e5fa5213627a8910fd151fab2934594e66fce8fd"
-  integrity sha512-Rx7hpUsLt4MBgEuKiRFi+NNzKTeo/3YXveEDFD2xuNFmPTtgJLx580/C1Sci83kBFkMWXf6Sk57ZrBG+f5jWIw==
+"@octokit/plugin-enterprise-rest@^2.1.1":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.2.2.tgz#c0e22067a043e19f96ff9c7832e2a3019f9be75c"
+  integrity sha512-CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw==
 
-"@octokit/request@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-2.3.0.tgz#da2672308bcf0b9376ef66f51bddbe5eb87cc00a"
-  integrity sha512-5YRqYNZOAaL7+nt7w3Scp6Sz4P2g7wKFP9npx1xdExMomk8/M/ICXVLYVam2wzxeY0cIc6wcKpjC5KI4jiNbGw==
+"@octokit/request@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-3.0.0.tgz#304a279036b2dc89e7fba7cb30c9e6a9b1f4d2df"
+  integrity sha512-DZqmbm66tq+a9FtcKrn0sjrUpi0UaZ9QPUCxxyk/4CJ2rseTMpAWRf6gCwOSUCzZcx/4XVIsDk+kz5BVdaeenA==
   dependencies:
-    "@octokit/endpoint" "^3.1.1"
+    "@octokit/endpoint" "^4.0.0"
+    deprecation "^1.0.1"
     is-plain-object "^2.0.4"
     node-fetch "^2.3.0"
+    once "^1.4.0"
     universal-user-agent "^2.0.1"
 
-"@octokit/rest@^16.15.0":
-  version "16.15.0"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.15.0.tgz#648a88d5de055bcf38976709c5b2bdf1227b926f"
-  integrity sha512-Un+e7rgh38RtPOTe453pT/KPM/p2KZICimBmuZCd2wEo8PacDa4h6RqTPZs+f2DPazTTqdM7QU4LKlUjgiBwWw==
+"@octokit/rest@^16.16.0":
+  version "16.25.0"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.25.0.tgz#1111dc2b2058bc77442fd7fbd295dab3991b62bf"
+  integrity sha512-QKIzP0gNYjyIGmY3Gpm3beof0WFwxFR+HhRZ+Wi0fYYhkEUvkJiXqKF56Pf5glzzfhEwOrggfluEld5F/ZxsKw==
   dependencies:
-    "@octokit/request" "2.3.0"
-    before-after-hook "^1.2.0"
+    "@octokit/request" "3.0.0"
+    atob-lite "^2.0.0"
+    before-after-hook "^1.4.0"
     btoa-lite "^1.0.0"
+    deprecation "^1.0.1"
     lodash.get "^4.4.2"
     lodash.set "^4.3.2"
     lodash.uniq "^4.5.0"
     octokit-pagination-methods "^1.1.0"
+    once "^1.4.0"
     universal-user-agent "^2.0.0"
     url-template "^2.0.8"
 
@@ -1030,18 +1023,19 @@
   version "7946.0.4"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.4.tgz#4e049756383c3f055dd8f3d24e63fb543e98eb07"
 
-"@types/googlemaps@^3.30.16":
-  version "3.30.16"
-  resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.16.tgz#3264d5ef7c3a92fab2a9f00e09e3247866ff3532"
+"@types/googlemaps@^3.30.19":
+  version "3.30.19"
+  resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.19.tgz#359c025e244490b0775826fb216bed093fd66b16"
+  integrity sha512-9uzg5jC6FRyAsMrhOLnUbblyN1xbcOVnqecQZxrnCDxTKssn4lwk0K4EWsw/sw8cJX32MFRMivyAT8dX/JBatg==
 
 "@types/jasmine@*":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.0.tgz#6b0e4b0192367d77e438ff660ccc4487c9602e7b"
 
-"@types/jasmine@^3.3.9":
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.9.tgz#ee886a9113db567e722a8a0c37f0e6283f2cefa3"
-  integrity sha512-vw3VyFPa9mlba6NZPBZC3q2Zrnkgy5xuCVI43/tTLX6umdYrYvcFtQUKi2zH3PjFZQ9XCxNM/NMrM9uk8TPOzg==
+"@types/jasmine@^3.3.12":
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.12.tgz#bf282cb540e9ad7a0a04b742082c073b655eab39"
+  integrity sha512-lXvr2xFQEVQLkIhuGaR3GC1L9lMU1IxeWnAF/wNY5ZWpC4p9dgxkKkzMp7pntpAdv9pZSnYqgsBkCg32MXSZMg==
 
 "@types/jasminewd2@^2.0.6":
   version "2.0.6"
@@ -1054,17 +1048,17 @@
   resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
   integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==
 
-"@types/jest@^24.0.4":
-  version "24.0.4"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.4.tgz#9e91eeebd464536a2f57043fb50da29a91d1271d"
-  integrity sha512-7PbnoOkfxpvmPehi8hf/JapEc3nwQi2hOs3cB5SsiBiPcniT0ejrbjjEIY4bPsXlEYFuS/RiN/jpA6hrcbOokA==
+"@types/jest@^24.0.11":
+  version "24.0.11"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.11.tgz#1f099bea332c228ea6505a88159bfa86a5858340"
+  integrity sha512-2kLuPC5FDnWIDvaJBzsGTBQaBbnDweznicvK7UGYzlIJP4RJR2a4A/ByLUXEyEgag6jz8eHdlWExGDtH3EYUXQ==
   dependencies:
     "@types/jest-diff" "*"
 
-"@types/leaflet@^1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.4.2.tgz#28a95f45e71d8f3e44b1d95f64deb5f05e739e04"
-  integrity sha512-iRyUFh6m5OSbhekHxlZb5SkdfUVpaXhk+e8fgQviZL6iZ1chV3Q030/+M6jO2A6VM235A1hYuUmBMVsrLAvKEA==
+"@types/leaflet@^1.4.4":
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.4.4.tgz#4a3d9815fe6c32a04ac3a230fe23772be8e0de83"
+  integrity sha512-CROxHvsRDFyR1OQKZv/WJsCVFv8Wj6wFF/FOI/yiGwX7GMivyvF8Ks5AT3/JYk269pGiE43wP9JOgcr7EK2eUw==
   dependencies:
     "@types/geojson" "*"
 
@@ -1080,18 +1074,18 @@
     "@types/events" "*"
     "@types/node" "*"
 
-"@types/mongodb@^3.1.19":
-  version "3.1.19"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.19.tgz#40c4310986888975771857810aa47fd3ea8e1acf"
-  integrity sha512-H54hQEovAhyLrIZOhPNfGyCCDoTqKsjb8GQBy8nptJqfxrYCp5WVcPJf9v0kfTPR72xOhaz9+WcYxOXWwEg1Vg==
+"@types/mongodb@^3.1.25":
+  version "3.1.25"
+  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.25.tgz#1da0219b7d8c08859f811774673c803f906e5e05"
+  integrity sha512-BSrjY1J8Nf9hin6p0Tv8b8PIfpTq+Xp4TVSRxZbO3jhvIeu1EKZ4xk0t8tms5vA/qMIkfNX2iciOThFhXPL93g==
   dependencies:
     "@types/bson" "*"
     "@types/node" "*"
 
-"@types/mongoose@^5.3.15":
-  version "5.3.15"
-  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.15.tgz#b826e6011bd6f992434f2a9541442166297a8236"
-  integrity sha512-Pj64zQumjylyhNz4sTYVl4ua2dU/ei/6iwXR3DlTXPO+DcmWDk972sUiI0+jpX3e6bXjO06fpq5ADVzGz4PVmw==
+"@types/mongoose@^5.3.26":
+  version "5.3.26"
+  resolved "https://registry.yarnpkg.com/@types/mongoose/-/mongoose-5.3.26.tgz#a979014c7fc9395e484695d4cc5647e7686251db"
+  integrity sha512-7NPdpUGU/1ZztTICcP3GxwWBAHTDyOLW0XJxrxlTl5i7R7XbT2Ucq33JussSLkWHKjbxpAmJnDwlYKcjwG7agg==
   dependencies:
     "@types/mongodb" "*"
     "@types/node" "*"
@@ -1100,15 +1094,20 @@
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
 
-"@types/node@^11.9.3":
-  version "11.9.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.9.3.tgz#14adbb5ab8cd563f549fbae8dbe92e0b7d6e76cc"
-  integrity sha512-DMiqG51GwES/c4ScBY0u5bDlH44+oY8AeYHjY1SGCWidD7h08o1dfHue/TGK7REmif2KiJzaUskO+Q0eaeZ2fQ==
+"@types/node@^11.13.7":
+  version "11.13.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.7.tgz#85dbb71c510442d00c0631f99dae957ce44fd104"
+  integrity sha512-suFHr6hcA9mp8vFrZTgrmqW2ZU3mbWsryQtQlY/QvwTISCw7nw/j+bCQPPohqmskhmqa5wLNuMHTTsc+xf1MQg==
 
 "@types/node@^9.3.0":
   version "9.6.40"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.40.tgz#2d69cefbc090cb0bb824542a4c575b14dde7d3aa"
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/rimraf@^0.0.28":
   version "0.0.28"
   resolved "http://registry.npmjs.org/@types/rimraf/-/rimraf-0.0.28.tgz#5562519bc7963caca8abf7f128cae3b594d41d06"
@@ -1117,10 +1116,10 @@
   version "1.4.32"
   resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14"
 
-"@types/stripe@^6.25.7":
-  version "6.25.7"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.7.tgz#3d4a1b7785cc603cfb4fee0f4ca44537917ad65a"
-  integrity sha512-l1t70QWVv2LgIbv0Ol20dPA7UWyZmvGMEMfKF9EI+eGkZABNrR7BU0mJKhf+2NnLBrTtfCEPchBgRbKUi1KmIQ==
+"@types/stripe@^6.25.12":
+  version "6.25.12"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.12.tgz#7d2299262968556de2b5d4854efccbc7acb49184"
+  integrity sha512-xnNajYeTdibtUfyedTv91QljDsRD+BYFI8aQKxRRU51OUBKef6Zg50kIWotgLjd4q5WHFn9fTfwPnyW2fB1xAQ==
   dependencies:
     "@types/node" "*"
 
@@ -1145,6 +1144,11 @@ JSONStream@^1.3.5:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
+"JSV@>= 4.0.x":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
+  integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=
+
 abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -1181,18 +1185,6 @@ ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-align-text@^0.1.1, align-text@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-  dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-
 angular2-logger@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/angular2-logger/-/angular2-logger-0.7.0.tgz#60f8a3f0d94bc715275af387f7afdc000c44e51f"
@@ -1215,6 +1207,11 @@ ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -1225,6 +1222,11 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+  integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
+
 ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
@@ -1283,6 +1285,14 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+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=
+  dependencies:
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -1312,10 +1322,6 @@ array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
 
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-
 array-union@^1.0.1, array-union@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -1326,10 +1332,6 @@ array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -1360,6 +1362,11 @@ assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
 
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -1368,11 +1375,7 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@^1.4.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
-async@^2.5.0, async@^2.6.1:
+async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
@@ -1382,6 +1385,11 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob-lite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
+  integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
+
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -1399,6 +1407,13 @@ axe-core@3.1.2:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-3.1.2.tgz#ca0aff897ebefca7552f97859dc1217c06c4f9e6"
   integrity sha512-e1WVs0SQu3tM29J9a/mISGvlo2kdCStE+yffIAJF6eb42FS+eUFEVz9j4rgDeV2TAfPJmuOZdRetWYycIbK7Vg==
 
+axobject-query@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
+  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
+  dependencies:
+    ast-types-flow "0.0.7"
+
 babel-code-frame@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -1463,10 +1478,10 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-before-after-hook@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.3.2.tgz#7bfbf844ad670aa7a96b5a4e4e15bd74b08ed66b"
-  integrity sha512-zyPgY5dgbf99c0uGUjhY4w+mxqEGxPKg9RQDl34VvrVh2bM31lFN+mwR1ZHepq/KA3VCPk1gwJZL6IIJqjLy2w==
+before-after-hook@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.4.0.tgz#2b6bf23dca4f32e628fd2747c10a37c74a4b484d"
+  integrity sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg==
 
 better-assert@~1.0.0:
   version "1.0.2"
@@ -1541,13 +1556,7 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^0.1.2:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  dependencies:
-    expand-range "^0.1.0"
-
-braces@^2.3.0, braces@^2.3.1:
+braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   dependencies:
@@ -1734,10 +1743,6 @@ camelcase-keys@^4.0.0:
     map-obj "^2.0.0"
     quick-lru "^1.0.0"
 
-camelcase@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
 camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
@@ -1759,13 +1764,6 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
-
 chalk@2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
@@ -1793,7 +1791,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.3.2, chalk@^2.4.0, chalk@^2.4.2:
+chalk@^2.4.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1802,6 +1800,15 @@ chalk@^2.3.2, chalk@^2.4.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  integrity sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -1874,10 +1881,6 @@ cint@^8.2.1:
   version "8.2.1"
   resolved "https://registry.yarnpkg.com/cint/-/cint-8.2.1.tgz#70386b1b48e2773d0d63166a55aff94ef4456a12"
 
-circular-json@^0.5.5:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -1915,6 +1918,17 @@ cli-highlight@^1.2.3:
     parse5 "^3.0.3"
     yargs "^10.0.3"
 
+cli-highlight@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.0.tgz#1e2e6770b6c3d72c4c7d4e5ea27c496f82ec2c67"
+  integrity sha512-DxaFAFBGRaB+xueXP7jlJC5f867gZUZXz74RaxeZ9juEZM2Sm/s6ilzpz0uxKiT+Mj6TzHlibtXfG/dK5bSwDA==
+  dependencies:
+    chalk "^2.3.0"
+    highlight.js "^9.6.0"
+    mz "^2.4.0"
+    parse5 "^4.0.0"
+    yargs "^11.0.0"
+
 cli-table3@^0.5.0, cli-table3@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
@@ -1942,14 +1956,6 @@ cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
 
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
-
 cliui@^3.0.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
@@ -1997,17 +2003,20 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codelyzer@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.5.0.tgz#a65ddeeeca2894653253a89bfa229118ff9f59b1"
-  integrity sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==
+codelyzer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.1.tgz#c52a593368269b791594603968eb82cbecae3cda"
+  integrity sha512-UVV76+/y1RwaxzCeGPFE3G4GFtfV42r3x8EmRd7XMNFLlLC0ewdtCqWTbvhwPQMxFZZ+OTLEOJNWfyPPn3QFWg==
   dependencies:
     app-root-path "^2.1.0"
-    css-selector-tokenizer "^0.7.0"
+    aria-query "^3.0.0"
+    axobject-query "^2.0.2"
+    css-selector-tokenizer "^0.7.1"
     cssauron "^1.4.0"
+    damerau-levenshtein "^1.0.4"
     semver-dsl "^1.0.1"
     source-map "^0.5.7"
-    sprintf-js "^1.1.1"
+    sprintf-js "^1.1.2"
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -2050,18 +2059,17 @@ columnify@^1.5.4, columnify@~1.5.4:
     strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combine-lists@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  dependencies:
-    lodash "^4.5.0"
-
 combined-stream@1.0.6, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^2.11.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+
 commander@^2.12.1, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -2176,10 +2184,10 @@ conventional-changelog-angular@^1.3.3:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-angular@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.2.tgz#39d945635e03b6d0c9d4078b1df74e06163dc66a"
-  integrity sha512-yx7m7lVrXmt4nKWQgWZqxSALEiAKZhOAcbxdUaU9575mB0CzXVbgrgpfSnSP7OqWDUTYGD0YVJ0MSRdyOPgAwA==
+conventional-changelog-angular@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz#299fdd43df5a1f095283ac16aeedfb0a682ecab0"
+  integrity sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -2198,13 +2206,21 @@ conventional-changelog-codemirror@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-core@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.5.tgz#c2edf928539308b54fe1b90a2fc731abc021852c"
-  integrity sha512-iwqAotS4zk0wA4S84YY1JCUG7X3LxaRjJxuUo6GI4dZuIy243j5nOg/Ora35ExT4DOiw5dQbMMQvw2SUjh6moQ==
+conventional-changelog-conventionalcommits@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-1.1.2.tgz#bb30c8d40dbd13ba9ec4e9bc6a025578b31b17bd"
+  integrity sha512-t8VyibJHGrtsDwSHjgpW9v7oBbqDGQooCMo/a2rc0z5cousV5O11palcSPpyshEVWVijxPtzBNG02EQkMDJ8CA==
   dependencies:
-    conventional-changelog-writer "^4.0.2"
-    conventional-commits-parser "^3.0.1"
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-core@^3.1.6, conventional-changelog-core@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0"
+  integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==
+  dependencies:
+    conventional-changelog-writer "^4.0.5"
+    conventional-commits-parser "^3.0.2"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
     git-raw-commits "2.0.0"
@@ -2215,7 +2231,7 @@ conventional-changelog-core@^3.1.5:
     q "^1.5.1"
     read-pkg "^3.0.0"
     read-pkg-up "^3.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
 conventional-changelog-ember@^2.0.2:
   version "2.0.2"
@@ -2224,10 +2240,10 @@ conventional-changelog-ember@^2.0.2:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-eslint@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.1.tgz#f65e0e7f63dc09c044244b8785313a602e628002"
-  integrity sha512-yH3+bYrtvgKxSFChUBQnKNh9/U9kN2JElYBm253VpYs5wXhPHVc9ENcuVGWijh24nnOkei7wEJmnmUzgZ4ok+A==
+conventional-changelog-eslint@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.2.tgz#e9eb088cda6be3e58b2de6a5aac63df0277f3cbe"
+  integrity sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ==
   dependencies:
     q "^1.5.1"
 
@@ -2258,37 +2274,43 @@ conventional-changelog-preset-loader@^2.0.2:
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
   integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ==
 
-conventional-changelog-writer@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.2.tgz#eb493ed84269e7a663da36e49af51c54639c9a67"
-  integrity sha512-d8/FQY/fix2xXEBUhOo8u3DCbyEw3UOQgYHxLsPDw+wHUDma/GQGAGsGtoH876WyNs32fViHmTOUrgRKVLvBug==
+conventional-changelog-preset-loader@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4"
+  integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA==
+
+conventional-changelog-writer@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.5.tgz#fb9e384bb294e8e8a9f2568a3f4d1e11953d8641"
+  integrity sha512-g/Myp4MaJ1A+f7Ai+SnVhkcWtaHk6flw0SYN7A+vQ+MTu0+gSovQWs4Pg4NtcNUcIztYQ9YHsoxHP+GGQplI7Q==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.1"
+    conventional-commits-filter "^2.0.2"
     dateformat "^3.0.0"
-    handlebars "^4.0.2"
+    handlebars "^4.1.0"
     json-stringify-safe "^5.0.1"
     lodash "^4.2.1"
     meow "^4.0.0"
     semver "^5.5.0"
     split "^1.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
-conventional-changelog@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.0.5.tgz#660a61c1c5c9c9ba967ff3d2f5e7e9d7e0680be6"
-  integrity sha512-JYSVGJbnOl9S2gkZwmoJ+wX2gxNVHodUmEiv+eIykeJBNX0zN5vJ3oa2xCvk2HiF7TZ+Les0eq/aX49dcymONA==
+conventional-changelog@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.4.tgz#66db29830a799be9afcbfd67a366c1e2cbc21417"
+  integrity sha512-uMeTSzEb2oKFlL00Oh9j3+00PFq1MNneLzyy0TBftxo4PFrs7OiaRJXmXtEgSvJDdkc0RSd6ch2N+yTxPagZ0A==
   dependencies:
-    conventional-changelog-angular "^5.0.2"
+    conventional-changelog-angular "^5.0.3"
     conventional-changelog-atom "^2.0.1"
     conventional-changelog-codemirror "^2.0.1"
-    conventional-changelog-core "^3.1.5"
+    conventional-changelog-conventionalcommits "^1.1.2"
+    conventional-changelog-core "^3.2.2"
     conventional-changelog-ember "^2.0.2"
-    conventional-changelog-eslint "^3.0.1"
+    conventional-changelog-eslint "^3.0.2"
     conventional-changelog-express "^2.0.1"
     conventional-changelog-jquery "^3.0.4"
     conventional-changelog-jshint "^2.0.1"
-    conventional-changelog-preset-loader "^2.0.2"
+    conventional-changelog-preset-loader "^2.1.1"
 
 conventional-commit-types@^2.0.0:
   version "2.2.0"
@@ -2303,6 +2325,14 @@ conventional-commits-filter@^2.0.1:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
+conventional-commits-filter@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
+  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
+  dependencies:
+    lodash.ismatch "^4.4.0"
+    modify-values "^1.0.0"
+
 conventional-commits-parser@^2.1.0:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
@@ -2329,6 +2359,19 @@ conventional-commits-parser@^3.0.1:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
+conventional-commits-parser@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.2.tgz#1295590dd195f64f53d6f8eb7c41114bb9a60742"
+  integrity sha512-y5eqgaKR0F6xsBNVSQ/5cI5qIF3MojddSUi1vKIggRkqUTbkqFKH9P5YX/AT1BVZp9DtSzBTIkvjyVLotLsVog==
+  dependencies:
+    JSONStream "^1.0.4"
+    is-text-path "^1.0.0"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    split2 "^2.0.0"
+    through2 "^3.0.0"
+    trim-off-newlines "^1.0.0"
+
 conventional-recommended-bump@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
@@ -2393,13 +2436,14 @@ cosmiconfig@^5.0.2:
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
 
-cosmiconfig@^5.0.7:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
+cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
+  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
+    js-yaml "^3.13.0"
     parse-json "^4.0.0"
 
 create-error-class@^3.0.0:
@@ -2442,9 +2486,10 @@ crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
 
-css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+css-selector-tokenizer@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
+  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -2464,9 +2509,10 @@ cssom@0.3.x:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"
 
-cssstyle@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"
+cssstyle@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.1.tgz#3aceb2759eaf514ac1a21628d723d6043a819495"
+  integrity sha512-7DYm8qe+gPx/h77QlCyFmX80+fGaE/6A/Ekl0zaszYOubvySO2saYFdQ78P29D0UsULxFKCetDGNaNRUdSF+2A==
   dependencies:
     cssom "0.3.x"
 
@@ -2495,6 +2541,11 @@ cz-conventional-changelog@^2.1.0:
     right-pad "^1.0.1"
     word-wrap "^1.0.3"
 
+damerau-levenshtein@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
+  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
+
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
@@ -2516,9 +2567,10 @@ date-fns@^1.27.2:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
 
-date-format@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+date-format@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.0.0.tgz#7cf7b172f1ec564f0003b39ea302c5498fb98c8f"
+  integrity sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==
 
 dateformat@^3.0.0:
   version "3.0.3"
@@ -2543,7 +2595,14 @@ debug@^4.0.1, debug@^4.1.0:
   dependencies:
     ms "^2.1.1"
 
-debuglog@^1.0.1:
+debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
+debuglog@*, debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
 
@@ -2554,7 +2613,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
@@ -2583,10 +2642,10 @@ deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
 
-deepmerge@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.1.0.tgz#a612626ce4803da410d77554bfd80361599c034d"
-  integrity sha512-/TnecbwXEdycfbsM2++O3eGiatEFHjjNciHEwJclM+T5Kd94qD1AP+2elP/Mq0L5b9VZJao5znR01Mz6eX8Seg==
+deepmerge@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
+  integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==
 
 default-require-extensions@^2.0.0:
   version "2.0.0"
@@ -2653,6 +2712,11 @@ depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
+deprecation@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-1.0.1.tgz#2df79b79005752180816b7b6e079cbd80490d711"
+  integrity sha512-ccVHpE72+tcIKaGMql33x5MAjKQIZrk+3x2GbJ7TeraUCZWHoT+KSZpoC+JQFsUBlSTXUrBaGiF0j6zVTepPLg==
+
 details-element-polyfill@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/details-element-polyfill/-/details-element-polyfill-2.2.0.tgz#1c0bb65372c20f622e90974b9694ae204d4c8d8c"
@@ -2719,6 +2783,11 @@ dotenv@^5.0.1:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
   integrity sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==
 
+dotenv@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
+  integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -2755,6 +2824,11 @@ elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
 
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 encodeurl@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -2881,7 +2955,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
 
@@ -2954,14 +3028,6 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-expand-braces@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  dependencies:
-    array-slice "^0.2.3"
-    array-unique "^0.2.1"
-    braces "^0.1.2"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -2974,13 +3040,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^0.1.0:
-  version "0.1.1"
-  resolved "http://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  dependencies:
-    is-number "^0.1.1"
-    repeat-string "^0.2.2"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -3306,6 +3365,11 @@ get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
 
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
 get-own-enumerable-property-symbols@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz#5c4ad87f2834c4b9b4e84549dc1e0650fb38c24b"
@@ -3344,6 +3408,11 @@ get-stdin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
 
+get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -3525,26 +3594,17 @@ graceful-fs@^4.1.15, graceful-fs@^4.1.3:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-handlebars@^4.0.11:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+handlebars@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
   dependencies:
-    async "^2.5.0"
+    neo-async "^2.6.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
     uglify-js "^3.1.4"
 
-handlebars@^4.0.2:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
-  dependencies:
-    async "^1.4.0"
-    optimist "^0.6.1"
-    source-map "^0.4.4"
-  optionalDependencies:
-    uglify-js "^2.6"
-
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -3568,6 +3628,11 @@ has-binary2@~1.0.2:
   dependencies:
     isarray "2.0.1"
 
+has-color@~0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+  integrity sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=
+
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
@@ -3684,19 +3749,19 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+husky@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
+  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
   dependencies:
-    cosmiconfig "^5.0.7"
+    cosmiconfig "^5.2.0"
     execa "^1.0.0"
     find-up "^3.0.0"
-    get-stdin "^6.0.0"
+    get-stdin "^7.0.0"
     is-ci "^2.0.0"
-    pkg-dir "^3.0.0"
+    pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^4.0.1"
+    read-pkg "^5.0.0"
     run-node "^1.0.0"
     slash "^2.0.0"
 
@@ -3773,7 +3838,7 @@ import-local@^1.0.0:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
 
-imurmurhash@^0.1.4:
+imurmurhash@*, imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
@@ -4029,10 +4094,6 @@ is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
 
-is-number@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -4176,73 +4237,86 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.0.6.tgz#cd7b33ee678f6c01531d05f5e567ebbcd25f8ecc"
+istanbul-api@^2.1.1:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.5.tgz#697b95ec69856c278aacafc0f86ee7392338d5b5"
+  integrity sha512-meYk1BwDp59Pfse1TvPrkKYgVqAufbdBLEVoqvu/hLLKSaQ054ZTksbNepyc223tMnWdm6AdK2URIJJRqdP87g==
   dependencies:
     async "^2.6.1"
     compare-versions "^3.2.1"
     fileset "^2.0.3"
-    istanbul-lib-coverage "^2.0.1"
-    istanbul-lib-hook "^2.0.1"
-    istanbul-lib-instrument "^3.0.0"
-    istanbul-lib-report "^2.0.2"
-    istanbul-lib-source-maps "^2.0.1"
-    istanbul-reports "^2.0.1"
-    js-yaml "^3.12.0"
-    make-dir "^1.3.0"
+    istanbul-lib-coverage "^2.0.4"
+    istanbul-lib-hook "^2.0.6"
+    istanbul-lib-instrument "^3.2.0"
+    istanbul-lib-report "^2.0.7"
+    istanbul-lib-source-maps "^3.0.5"
+    istanbul-reports "^2.2.3"
+    js-yaml "^3.13.0"
+    make-dir "^2.1.0"
+    minimatch "^3.0.4"
     once "^1.4.0"
 
-istanbul-lib-coverage@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
+istanbul-lib-coverage@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#927a354005d99dd43a24607bb8b33fd4e9aca1ad"
+  integrity sha512-LXTBICkMARVgo579kWDm8SqfB6nvSDKNqIOBEjmJRnL04JvoMHCYGWaMddQnseJYtkEuEvO/sIcOxPLk9gERug==
 
-istanbul-lib-hook@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz#918a57b75a0f951d552a08487ca1fa5336433d72"
+istanbul-lib-hook@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.6.tgz#5baa6067860a38290aef038b389068b225b01b7d"
+  integrity sha512-829DKONApZ7UCiPXcOYWSgkFXa4+vNYoNOt3F+4uDJLKL1OotAoVwvThoEj1i8jmOj7odbYcR3rnaHu+QroaXg==
   dependencies:
     append-transform "^1.0.0"
 
-istanbul-lib-instrument@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
+istanbul-lib-instrument@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.2.0.tgz#c549208da8a793f6622257a2da83e0ea96ae6a93"
+  integrity sha512-06IM3xShbNW4NgZv5AP4QH0oHqf1/ivFo8eFys0ZjPXHGldHJQWb3riYOKXqmOqfxXBfxu4B+g/iuhOPZH0RJg==
   dependencies:
     "@babel/generator" "^7.0.0"
     "@babel/parser" "^7.0.0"
     "@babel/template" "^7.0.0"
     "@babel/traverse" "^7.0.0"
     "@babel/types" "^7.0.0"
-    istanbul-lib-coverage "^2.0.1"
-    semver "^5.5.0"
+    istanbul-lib-coverage "^2.0.4"
+    semver "^6.0.0"
 
-istanbul-lib-report@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz#430a2598519113e1da7af274ba861bd42dd97535"
+istanbul-lib-report@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.7.tgz#370d80d433c4dbc7f58de63618f49599c74bd954"
+  integrity sha512-wLH6beJBFbRBLiTlMOBxmb85cnVM1Vyl36N48e4e/aTKSM3WbOx7zbVIH1SQ537fhhsPbX0/C5JB4qsmyRXXyA==
   dependencies:
-    istanbul-lib-coverage "^2.0.1"
-    make-dir "^1.3.0"
-    supports-color "^5.4.0"
+    istanbul-lib-coverage "^2.0.4"
+    make-dir "^2.1.0"
+    supports-color "^6.0.0"
 
-istanbul-lib-source-maps@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz#ce8b45131d8293fdeaa732f4faf1852d13d0a97e"
+istanbul-lib-source-maps@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.5.tgz#1d9ee9d94d2633f15611ee7aae28f9cac6d1aeb9"
+  integrity sha512-eDhZ7r6r1d1zQPVZehLc3D0K14vRba/eBYkz3rw16DLOrrTzve9RmnkcwrrkWVgO1FL3EK5knujVe5S8QHE9xw==
   dependencies:
-    debug "^3.1.0"
-    istanbul-lib-coverage "^2.0.1"
-    make-dir "^1.3.0"
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.4"
+    make-dir "^2.1.0"
     rimraf "^2.6.2"
     source-map "^0.6.1"
 
-istanbul-reports@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.0.1.tgz#fb8d6ea850701a3984350b977a969e9a556116a7"
+istanbul-reports@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.3.tgz#14e0d00ecbfa9387757999cf36599b88e9f2176e"
+  integrity sha512-T6EbPuc8Cb620LWAYyZ4D8SSn06dY9i1+IgUX2lTH8gbwflMc9Obd33zHTyNX653ybjpamAHS9toKS3E6cGhTw==
   dependencies:
-    handlebars "^4.0.11"
+    handlebars "^4.1.0"
 
-jasmine-core@^3.3, jasmine-core@^3.3.0:
+jasmine-core@^3.3:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
 
+jasmine-core@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
+
 jasmine-spec-reporter@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
@@ -4269,17 +4343,17 @@ js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
-js-yaml@^3.11.0:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
-  integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
+js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+js-yaml@^3.12.2, js-yaml@^3.13.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4335,6 +4409,24 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonld@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/jsonld/-/jsonld-1.6.0.tgz#faf968a35e47ababe5b79a0309ee67155a5a8832"
+  integrity sha512-gtbEplGXOgSrD7fP0vCmZoYX35MIQqFrpiMfJkEs9KwT7+bNzEd9y9gAUK8SGYXIYJISQCWNU5/eSDPKKxXeHw==
+  dependencies:
+    rdf-canonize "^1.0.2"
+    request "^2.88.0"
+    semver "^5.6.0"
+    xmldom "0.1.19"
+
+jsonlint-mod@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/jsonlint-mod/-/jsonlint-mod-1.7.4.tgz#310390e1a6a85cef99f45f200e662ef23b48f7a6"
+  integrity sha512-FYOkwHqiuBbdVCHgXYlmtL+iUOz9AxCgjotzXl+edI0Hc1km1qK6TrBEAyPpO+5R0/IX3XENRp66mfob4jwxow==
+  dependencies:
+    JSV ">= 4.0.x"
+    nomnom ">= 1.5.x"
+
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -4361,16 +4453,18 @@ karma-cli@^2.0.0:
   dependencies:
     resolve "^1.3.3"
 
-karma-coverage-istanbul-reporter@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz#402ae4ed6eadb9d9dafbd408ffda17897c0d003a"
+karma-coverage-istanbul-reporter@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz#ca5899d4905e44a5984dd4f963adfc1a74dce767"
+  integrity sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==
   dependencies:
-    istanbul-api "^2.0.5"
+    istanbul-api "^2.1.1"
     minimatch "^3.0.4"
 
-karma-jasmine-html-reporter@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.0.tgz#1abbd30d4509a8c82b96707ae7d2fa4da459ca19"
+karma-jasmine-html-reporter@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz#16d100fd701271192d27fd28ddc90b710ad36fff"
+  integrity sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==
 
 karma-jasmine@^2.0.1:
   version "2.0.1"
@@ -4378,28 +4472,27 @@ karma-jasmine@^2.0.1:
   dependencies:
     jasmine-core "^3.3"
 
-karma@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.0.tgz#f28e38a2b66243fde3f98e12a8dcaa2c6ff8ca9c"
-  integrity sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==
+karma@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.1.0.tgz#d07387c9743a575b40faf73e8a3eb5421c2193e1"
+  integrity sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
+    braces "^2.3.2"
     chokidar "^2.0.3"
     colors "^1.1.0"
-    combine-lists "^1.0.0"
     connect "^3.6.0"
     core-js "^2.2.0"
     di "^0.0.1"
     dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
     flatted "^2.0.0"
     glob "^7.1.1"
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^4.17.5"
-    log4js "^3.0.0"
+    lodash "^4.17.11"
+    log4js "^4.0.0"
     mime "^2.3.1"
     minimatch "^3.0.2"
     optimist "^0.6.1"
@@ -4450,10 +4543,6 @@ latest-version@^3.0.0:
   dependencies:
     package-json "^4.0.0"
 
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-
 lazy-property@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz#84ddc4b370679ba8bd4cdcfa4c06b43d57111147"
@@ -4487,26 +4576,26 @@ lerna-changelog@^0.8.2:
     string.prototype.padend "^3.0.0"
     yargs "^11.0.0"
 
-lerna@^3.11.1:
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.11.1.tgz#c3f86aaf6add615ffc172554657a139bc2360b9a"
-  integrity sha512-7an/cia9u6qVTts5PQ/adFq8QSgE7gzG1pUHhH+XKVU1seDKQ99JLu61n3/euv2qeQF+ww4WLKnFHIPa5+LJSQ==
-  dependencies:
-    "@lerna/add" "3.11.0"
-    "@lerna/bootstrap" "3.11.0"
-    "@lerna/changed" "3.11.1"
-    "@lerna/clean" "3.11.0"
-    "@lerna/cli" "3.11.0"
-    "@lerna/create" "3.11.0"
-    "@lerna/diff" "3.11.0"
-    "@lerna/exec" "3.11.0"
-    "@lerna/import" "3.11.0"
-    "@lerna/init" "3.11.0"
-    "@lerna/link" "3.11.0"
-    "@lerna/list" "3.11.0"
-    "@lerna/publish" "3.11.1"
-    "@lerna/run" "3.11.0"
-    "@lerna/version" "3.11.1"
+lerna@^3.13.4:
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.13.4.tgz#03026c11c5643f341fda42e4fb1882e2df35e6cb"
+  integrity sha512-qTp22nlpcgVrJGZuD7oHnFbTk72j2USFimc2Pj4kC0/rXmcU2xPtCiyuxLl8y6/6Lj5g9kwEuvKDZtSXujjX/A==
+  dependencies:
+    "@lerna/add" "3.13.3"
+    "@lerna/bootstrap" "3.13.3"
+    "@lerna/changed" "3.13.4"
+    "@lerna/clean" "3.13.3"
+    "@lerna/cli" "3.13.0"
+    "@lerna/create" "3.13.3"
+    "@lerna/diff" "3.13.3"
+    "@lerna/exec" "3.13.3"
+    "@lerna/import" "3.13.4"
+    "@lerna/init" "3.13.3"
+    "@lerna/link" "3.13.3"
+    "@lerna/list" "3.13.3"
+    "@lerna/publish" "3.13.4"
+    "@lerna/run" "3.13.3"
+    "@lerna/version" "3.13.4"
     import-local "^1.0.0"
     npmlog "^4.1.2"
 
@@ -4557,7 +4646,7 @@ libnpm@^2.0.1:
     read-package-json "^2.0.13"
     stringify-package "^1.0.0"
 
-libnpmaccess@^3.0.1:
+libnpmaccess@*, libnpmaccess@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8"
   integrity sha512-RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA==
@@ -4586,7 +4675,7 @@ libnpmhook@^5.0.2:
     get-stream "^4.0.0"
     npm-registry-fetch "^3.8.0"
 
-libnpmorg@^1.0.0:
+libnpmorg@*, libnpmorg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.0.tgz#979b868c48ba28c5820e3bb9d9e73c883c16a232"
   integrity sha512-o+4eVJBoDGMgRwh2lJY0a8pRV2c/tQM/SxlqXezjcAg26Qe9jigYVs+Xk0vvlYDWCDhP0g74J8UwWeAgsB7gGw==
@@ -4626,7 +4715,7 @@ libnpmpublish@^1.1.1:
     semver "^5.5.1"
     ssri "^6.0.1"
 
-libnpmsearch@^2.0.0:
+libnpmsearch@*, libnpmsearch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.0.tgz#de05af47ada81554a5f64276a69599070d4a5685"
   integrity sha512-vd+JWbTGzOSfiOc+72MU6y7WqmBXn49egCCrIXp27iE/88bX8EpG64ST1blWQI1bSMUr9l1AKPMVsqa2tS5KWA==
@@ -4635,7 +4724,7 @@ libnpmsearch@^2.0.0:
     get-stream "^4.0.0"
     npm-registry-fetch "^3.8.0"
 
-libnpmteam@^1.0.1:
+libnpmteam@*, libnpmteam@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.1.tgz#ff704b1b6c06ea674b3b1101ac3e305f5114f213"
   integrity sha512-gDdrflKFCX7TNwOMX1snWojCoDE5LoRWcfOC0C/fqF7mBq8Uz9zWAX4B2RllYETNO7pBupBaSyBDkTAC15cAMg==
@@ -4666,23 +4755,24 @@ lighthouse-logger@^1.0.0, lighthouse-logger@^1.2.0:
     debug "^2.6.8"
     marky "^1.2.0"
 
-lighthouse@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/lighthouse/-/lighthouse-4.1.0.tgz#365b60bada153103ab6c237fd10c363dd49eee44"
-  integrity sha512-C5iSjjAHeqkvQtt4Fzgdo6566pnlhmp133lSjs2ByPudRfGTSZcXJ8X45dha8hHyYuPpCNbo0fVCgrg7hsr/dQ==
+lighthouse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lighthouse/-/lighthouse-4.3.0.tgz#5b6a89871ece5016103a3fb0c1c33d8976f80f80"
+  integrity sha512-gSekIsP+d2kT2Ly6vkjj+hpmeNbR47w+iKwlUUkp7pWA+VfLY4uihmm4scYb4Qw0g4UCoe13f1JrMCw4oXIeIw==
   dependencies:
     axe-core "3.1.2"
     chrome-launcher "^0.10.5"
     configstore "^3.1.1"
-    cssstyle "1.1.1"
+    cssstyle "1.2.1"
     details-element-polyfill "2.2.0"
-    esprima "^4.0.1"
     http-link-header "^0.8.0"
     inquirer "^3.3.0"
     intl-messageformat "^2.2.0"
     intl-messageformat-parser "^1.4.0"
     jpeg-js "0.1.2"
     js-library-detector "^5.1.0"
+    jsonld "^1.5.0"
+    jsonlint-mod "^1.7.4"
     lighthouse-logger "^1.2.0"
     lodash.isequal "^4.5.0"
     lookup-closest-locale "6.0.4"
@@ -4695,17 +4785,16 @@ lighthouse@^4.1.0:
     robots-parser "^2.0.1"
     semver "^5.3.0"
     speedline-core "1.4.2"
-    update-notifier "^2.1.0"
+    update-notifier "^2.5.0"
     ws "3.3.2"
     yargs "3.32.0"
     yargs-parser "7.0.0"
 
-lint-staged@^8.1.3:
-  version "8.1.3"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.3.tgz#bb069db5466c0fe16710216e633a84f2b362fa60"
-  integrity sha512-6TGkikL1B+6mIOuSNq2TV6oP21IhPMnV8q0cf9oYZ296ArTVNcbFh1l1pfVOHHbBIYLlziWNsQ2q45/ffmJ4AA==
+lint-staged@^8.1.5:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.5.tgz#372476fe1a58b8834eb562ed4c99126bd60bdd79"
+  integrity sha512-e5ZavfnSLcBJE1BTzRTqw6ly8OkqVyO3GL2M6teSmTBYQ/2BuueD5GIt2RPsP31u/vjKdexUyDCxSyK75q4BDA==
   dependencies:
-    "@iamstarkov/listr-update-renderer" "0.4.1"
     chalk "^2.3.1"
     commander "^2.14.1"
     cosmiconfig "^5.0.2"
@@ -4718,7 +4807,8 @@ lint-staged@^8.1.3:
     is-glob "^4.0.0"
     is-windows "^1.0.2"
     listr "^0.14.2"
-    lodash "^4.17.5"
+    listr-update-renderer "^0.5.0"
+    lodash "^4.17.11"
     log-symbols "^2.2.0"
     micromatch "^3.1.8"
     npm-which "^3.0.1"
@@ -4812,12 +4902,25 @@ lock-verify@^2.0.2:
     npm-package-arg "^5.1.2 || 6"
     semver "^5.4.1"
 
+lock-verify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.1.0.tgz#fff4c918b8db9497af0c5fa7f6d71555de3ceb47"
+  integrity sha512-vcLpxnGvrqisKvLQ2C2v0/u7LVly17ak2YSgoK4PrdsYBXQIax19vhKiLfvKNFx7FRrpTnitrpzF/uuCMuorIg==
+  dependencies:
+    npm-package-arg "^6.1.0"
+    semver "^5.4.1"
+
 lockfile@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609"
   dependencies:
     signal-exit "^3.0.2"
 
+lodash._baseindexof@*:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
+  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
+
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -4825,10 +4928,32 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
+lodash._bindcallback@*:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
+
+lodash._cacheindexof@*:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
+  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
+
+lodash._createcache@*:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
+  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
+  dependencies:
+    lodash._getnative "^3.0.0"
+
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
 
+lodash._getnative@*, lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -4855,6 +4980,11 @@ lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
 
+lodash.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
+
 lodash.isplainobject@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -4864,6 +4994,11 @@ lodash.map@^4.5.1:
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
   integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
 
+lodash.restparam@*:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+
 lodash.set@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
@@ -4898,7 +5033,7 @@ lodash.without@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
 
-lodash@4.17.11, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
+lodash@4.17.11, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -4927,15 +5062,16 @@ log-update@^2.3.0:
     cli-cursor "^2.0.0"
     wrap-ansi "^3.0.1"
 
-log4js@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
+log4js@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.1.0.tgz#57983c6a443546a8c8607e9cb045d2a117c27644"
+  integrity sha512-eDa+zZPeVEeK6QGJAePyXM6pg4P3n3TO5rX9iZMVY48JshsTyLJZLIL5HipI1kQ2qLsSyOpUqNND/C5H4WhhiA==
   dependencies:
-    circular-json "^0.5.5"
-    date-format "^1.2.0"
-    debug "^3.1.0"
+    date-format "^2.0.0"
+    debug "^4.1.1"
+    flatted "^2.0.0"
     rfdc "^1.1.2"
-    streamroller "0.7.0"
+    streamroller "^1.0.4"
 
 longest@^1.0.1:
   version "1.0.1"
@@ -4983,12 +5119,20 @@ macos-release@^2.0.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab"
   integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==
 
-make-dir@^1.0.0, make-dir@^1.3.0:
+make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
   dependencies:
     pify "^3.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"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-fetch-happen@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
@@ -5338,6 +5482,11 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+neo-async@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
+
 nested-error-stacks@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz#d2cc9fc5235ddb371fc44d506234339c8e4b0a4b"
@@ -5367,6 +5516,11 @@ node-fetch@^2.3.0:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
   integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==
 
+node-forge@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.8.2.tgz#b4bcc59fb12ce77a8825fc6a783dfe3182499c5a"
+  integrity sha512-mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg==
+
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
@@ -5399,6 +5553,14 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
+"nomnom@>= 1.5.x":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
+  integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=
+  dependencies:
+    chalk "~0.4.0"
+    underscore "~1.6.0"
+
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -5416,7 +5578,7 @@ normalize-git-url@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/normalize-git-url/-/normalize-git-url-3.0.2.tgz#8e5f14be0bdaedb73e07200310aa416c27350fc4"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@~2.4.0:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -5425,6 +5587,16 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -5452,10 +5624,10 @@ npm-cache-filename@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
 
-npm-check-updates@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-3.1.3.tgz#9cd5af8f5c8c541f4e0287ca5d7f00aad1dad5fc"
-  integrity sha512-Et4QQkHQtffGbeP2sbdguC4VIkHstd8WWIk292zoY1SRiJZ45FfSINhrRn0dPftQ5z40C0P7aLS6gBjR8gxbtw==
+npm-check-updates@^3.1.8:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-3.1.8.tgz#4ac5af3eafd2a8659c5867fe3e176f90bf84d362"
+  integrity sha512-a/gb2RzV35cBZqVvUtOj6NIg5VODXr5V5fLbP5G+LJTxLosWzsV+SXdmaaXKEAjbNPGl7uZrdXlKuBm/8Mp+HA==
   dependencies:
     bluebird "^3.5.3"
     chalk "^2.4.2"
@@ -5531,10 +5703,10 @@ npm-packlist@^1.1.12, npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-packlist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.2.0.tgz#55a60e793e272f00862c7089274439a4cc31fc7f"
-  integrity sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==
+npm-packlist@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
+  integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -5554,7 +5726,7 @@ npm-pick-manifest@^2.2.3:
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
-npm-profile@^4.0.1:
+npm-profile@*, npm-profile@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.1.tgz#d350f7a5e6b60691c7168fbb8392c3603583f5aa"
   integrity sha512-NQ1I/1Q7YRtHZXkcuU1/IyHeLy6pd+ScKg4+DQHdfsm769TGq6HPrkbuNJVJS4zwE+0mvvmeULzQdWn2L2EsVA==
@@ -5605,10 +5777,10 @@ npm-which@^3.0.1:
     npm-path "^2.0.2"
     which "^1.2.10"
 
-npm@^6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/npm/-/npm-6.7.0.tgz#a563d6e6806913b2afa4c713ba63047cb7c63ea4"
-  integrity sha512-OtxCLzx+pcsjMGrjZpBp214ZjxzHcAe3zLYIlaVpRYqFHff6bgggyTLf2OZPO8lfxN0RHLJnFFUU016JCzM/Ww==
+npm@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/npm/-/npm-6.9.0.tgz#5296720486814a64a7fb082de00c4b5cfd11211f"
+  integrity sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==
   dependencies:
     JSONStream "^1.3.5"
     abbrev "~1.1.1"
@@ -5653,7 +5825,7 @@ npm@^6.7.0:
     libnpm "^2.0.1"
     libnpmhook "^5.0.2"
     libnpx "^10.2.0"
-    lock-verify "^2.0.2"
+    lock-verify "^2.1.0"
     lockfile "^1.0.4"
     lodash._baseuniq "~4.6.0"
     lodash.clonedeep "~4.5.0"
@@ -5667,21 +5839,21 @@ npm@^6.7.0:
     move-concurrently "^1.0.1"
     node-gyp "^3.8.0"
     nopt "~4.0.1"
-    normalize-package-data "~2.4.0"
+    normalize-package-data "^2.5.0"
     npm-audit-report "^1.3.2"
     npm-cache-filename "~1.0.2"
     npm-install-checks "~3.0.0"
     npm-lifecycle "^2.1.0"
     npm-package-arg "^6.1.0"
-    npm-packlist "^1.2.0"
+    npm-packlist "^1.4.1"
     npm-pick-manifest "^2.2.3"
-    npm-registry-fetch "^3.8.0"
+    npm-registry-fetch "^3.9.0"
     npm-user-validate "~1.0.0"
     npmlog "~4.1.2"
     once "~1.4.0"
     opener "^1.5.1"
     osenv "^0.1.5"
-    pacote "^9.4.0"
+    pacote "^9.5.0"
     path-is-inside "~1.0.2"
     promise-inflight "~1.0.1"
     qrcode-terminal "^0.12.0"
@@ -5691,7 +5863,7 @@ npm@^6.7.0:
     read-cmd-shim "~1.0.1"
     read-installed "~4.0.3"
     read-package-json "^2.0.13"
-    read-package-tree "^5.2.1"
+    read-package-tree "^5.2.2"
     readable-stream "^3.1.1"
     request "^2.88.0"
     retry "^0.12.0"
@@ -5832,7 +6004,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-locale@^3.0.0:
+os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -6024,10 +6196,10 @@ pacote@^9.2.3:
     unique-filename "^1.1.1"
     which "^1.3.1"
 
-pacote@^9.4.0, pacote@^9.4.1:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.1.tgz#f0af2a52d241bce523d39280ac810c671db62279"
-  integrity sha512-YKSRsQqmeHxgra0KCdWA2FtVxDPUlBiCdmew+mSe44pzlx5t1ViRMWiQg18T+DREA+vSqYfKzynaToFR4hcKHw==
+pacote@^9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
+  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"
@@ -6122,6 +6294,11 @@ parse5@^3.0.3:
   dependencies:
     "@types/node" "*"
 
+parse5@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -6168,9 +6345,10 @@ path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
-path-parse@^1.0.5:
+path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-type@^1.0.0:
   version "1.1.0"
@@ -6198,6 +6376,11 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -6214,9 +6397,10 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+pkg-dir@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.1.0.tgz#aaeb91c0d3b9c4f74a44ad849f4de34781ae01de"
+  integrity sha512-55k9QN4saZ8q518lE6EFgYiu95u3BWkSajCifhdQjvLvmr8IpnRbhI+UGpWJQfa0KzDguHeeWT1ccO1PmkOi3A==
   dependencies:
     find-up "^3.0.0"
 
@@ -6251,10 +6435,10 @@ prettier-tslint@^0.4.2:
     tslint "^5.9.1"
     yargs "^11.0.0"
 
-prettier@^1.16.4:
-  version "1.16.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
-  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
+prettier@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.0.tgz#53b303676eed22cc14a9f0cec09b477b3026c008"
+  integrity sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw==
 
 pretty-quick@^1.10.0:
   version "1.10.0"
@@ -6383,10 +6567,15 @@ qrcode-terminal@^0.12.0:
   resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
   integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
 
-qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
+qs@6.5.2, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
+qs@^6.6.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
 query-string@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.2.0.tgz#468edeb542b7e0538f9f9b1aeb26f034f19c86e1"
@@ -6449,6 +6638,14 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8, rc@~1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+rdf-canonize@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/rdf-canonize/-/rdf-canonize-1.0.3.tgz#71dc56bb808a39d12e3ca17674c15f881cad648a"
+  integrity sha512-piLMOB5Q6LJSVx2XzmdpHktYVb8TmVTy8coXJBFtdkcMC96DknZOuzpAYqCWx2ERZX7xEW+mMi8/wDuMJS/95w==
+  dependencies:
+    node-forge "^0.8.1"
+    semver "^5.6.0"
+
 read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
@@ -6479,7 +6676,7 @@ read-installed@~4.0.3:
   optionalDependencies:
     graceful-fs "^4.1.2"
 
-read-package-tree@^5.1.6, read-package-tree@^5.2.1:
+read-package-tree@^5.1.6:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.1.tgz#6218b187d6fac82289ce4387bbbaf8eef536ad63"
   dependencies:
@@ -6489,6 +6686,17 @@ read-package-tree@^5.1.6, read-package-tree@^5.2.1:
     read-package-json "^2.0.0"
     readdir-scoped-modules "^1.0.0"
 
+read-package-tree@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
+  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -6527,13 +6735,23 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
+read-pkg@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
+  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^4.0.0"
+    type-fest "^0.4.1"
+
 read@1, read@~1.0.1, read@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -6545,6 +6763,15 @@ read@1, read@~1.0.1, read@~1.0.7:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+"readable-stream@2 || 3":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
+  integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readable-stream@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
@@ -6564,7 +6791,7 @@ readable-stream@~1.1.10:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readdir-scoped-modules@^1.0.0:
+readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
   dependencies:
@@ -6595,10 +6822,10 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-reflect-metadata@^0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
-  integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==
+reflect-metadata@^0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
+  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
 
 regenerate@^1.2.1:
   version "1.4.0"
@@ -6680,11 +6907,7 @@ repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
 
-repeat-string@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-
-repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
@@ -6732,6 +6955,11 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -6787,6 +7015,13 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
+resolve@^1.10.0:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.1.tgz#664842ac960795bbe758221cdccda61fb64b5f18"
+  integrity sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==
+  dependencies:
+    path-parse "^1.0.6"
+
 resolve@^1.3.2, resolve@^1.3.3:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
@@ -6831,12 +7066,6 @@ rfdc@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
 
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  dependencies:
-    align-text "^0.1.1"
-
 right-pad@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
@@ -6885,10 +7114,10 @@ rx-lite@*, rx-lite@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
 
-rxjs-compat@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.4.0.tgz#800923c15697948e1f30f18c531b12b49451c75c"
-  integrity sha512-eo/O8RS83hJdJukCtA+IF6qnqa8FPOuVo+OPCzgVi+dbTle9KCdNv97IcQO0WwNVik7DJLKmf0F8uwzc0q40vw==
+rxjs-compat@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.1.tgz#de928292c633a9a5f2f54a4431e6f9c468001c68"
+  integrity sha512-k0aaMAYFg+DCIUxo3yJcUamFRenWLR23e/VJCQvKOxwSd9DQlwcSn2ov+7b23rKaX4weKG7OrzEBWGqQPkQ07A==
 
 rxjs-tslint@0.1.5:
   version "0.1.5"
@@ -6906,10 +7135,10 @@ rxjs@^6.1.0, rxjs@^6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+rxjs@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
+  integrity sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==
   dependencies:
     tslib "^1.9.0"
 
@@ -6961,6 +7190,11 @@ semver@5.6.0, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, se
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -7185,13 +7419,7 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -7256,9 +7484,10 @@ split@^1.0.0:
   dependencies:
     through "2"
 
-sprintf-js@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
+sprintf-js@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
 sprintf-js@~1.0.2:
   version "1.0.3"
@@ -7327,14 +7556,16 @@ stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
 
-streamroller@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+streamroller@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.4.tgz#d485c7624796d5e2eb34190c79afcbf006afb5e6"
+  integrity sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==
   dependencies:
-    date-format "^1.2.0"
+    async "^2.6.1"
+    date-format "^2.0.0"
     debug "^3.1.0"
-    mkdirp "^0.5.1"
-    readable-stream "^2.3.0"
+    fs-extra "^7.0.0"
+    lodash "^4.17.10"
 
 strict-uri-encode@^2.0.0:
   version "2.0.0"
@@ -7360,6 +7591,15 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
@@ -7410,6 +7650,18 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+strip-ansi@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
+  integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -7438,14 +7690,15 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-stripe@^6.24.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.24.0.tgz#b9b6966ecaf127fa4c03bfc8b083c46a61f53f16"
-  integrity sha512-8YXWtkKXe3WRuqcHjSWOP8sL2UBREMLk6LnNMskvQtykuRb4gx+9OXFOa2GgzLGs6ze39mxBevNkqQxsa3+Obw==
+stripe@^6.31.0:
+  version "6.31.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.31.0.tgz#524ef6997a4473c5bf9ce684b5c39e3bc307a445"
+  integrity sha512-VHVGyfrnzKdqraRHKQ42LJysQdg2iUL8pFES3dsN9yZOiEY+kxBetL7Zq2WiA24Y5PnVIO9gB5VbvmYPhEOhyA==
   dependencies:
     lodash.isplainobject "^4.0.6"
-    qs "~6.5.1"
+    qs "^6.6.0"
     safe-buffer "^5.1.1"
+    uuid "^3.3.2"
 
 strong-log-transformer@^2.0.0:
   version "2.0.0"
@@ -7467,12 +7720,19 @@ supports-color@^4.5.0:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.2.0, supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
 symbol-observable@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
@@ -7550,6 +7810,13 @@ through2@^2.0.0, through2@^2.0.2:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
+through2@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
 through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.4, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -7652,7 +7919,26 @@ tslint-config-prettier@^1.18.0:
   resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
   integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==
 
-tslint@^5.12.1, tslint@^5.9.1:
+tslint@^5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.16.0.tgz#ae61f9c5a98d295b9a4f4553b1b1e831c1984d67"
+  integrity sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    builtin-modules "^1.1.1"
+    chalk "^2.3.0"
+    commander "^2.12.1"
+    diff "^3.2.0"
+    glob "^7.1.1"
+    js-yaml "^3.13.0"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.8.0"
+    tsutils "^2.29.0"
+
+tslint@^5.9.1:
   version "5.12.1"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1"
   integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==
@@ -7670,7 +7956,7 @@ tslint@^5.12.1, tslint@^5.9.1:
     tslib "^1.8.0"
     tsutils "^2.27.2"
 
-tsutils@^2.25.0, tsutils@^2.27.2:
+tsutils@^2.25.0, tsutils@^2.27.2, tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
   dependencies:
@@ -7686,6 +7972,11 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
+type-fest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -7697,39 +7988,30 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typeorm@^0.2.13:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.13.tgz#d6d49cd83aba5709134b99cdaca0b0f1b5002543"
-  integrity sha512-SfRHZt6un1rCsTtHpBSgG5kh2jWznzrBex1Dfxbnji0nlrrNQ+ET4uxIhq3herk0TE0ETx3R+UjU0MGv8DB/3g==
+typeorm@^0.2.16:
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.16.tgz#cfc119254e21f37410a60616a726cad97a8d95f6"
+  integrity sha512-Ntx9Hjx2aJcPsbqTsqnhCZOG30bDQ8EalMa9J49CXMCatUuMbn9QTyreM9AuSQb2N91ENCRWPZIuzgRaSmC1Vw==
   dependencies:
     app-root-path "^2.0.1"
     buffer "^5.1.0"
-    chalk "^2.3.2"
-    cli-highlight "^1.2.3"
-    debug "^3.1.0"
-    dotenv "^5.0.1"
+    chalk "^2.4.2"
+    cli-highlight "^2.0.0"
+    debug "^4.1.1"
+    dotenv "^6.2.0"
     glob "^7.1.2"
-    js-yaml "^3.11.0"
+    js-yaml "^3.12.2"
     mkdirp "^0.5.1"
-    reflect-metadata "^0.1.12"
+    reflect-metadata "^0.1.13"
     tslib "^1.9.0"
     xml2js "^0.4.17"
     yargonaut "^1.1.2"
-    yargs "^12.0.5"
-
-typescript@~3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
-  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
+    yargs "^13.2.1"
 
-uglify-js@^2.6:
-  version "2.8.29"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
-  dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
+typescript@~3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
 
 uglify-js@^3.1.4:
   version "3.4.9"
@@ -7738,10 +8020,6 @@ uglify-js@^3.1.4:
     commander "~2.17.1"
     source-map "~0.6.1"
 
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-
 uid-number@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -7754,6 +8032,11 @@ umask@^1.1.0, umask@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
 
+underscore@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
+  integrity sha1-izixDKze9jM3uLJOT/htRa6lKag=
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -7818,7 +8101,7 @@ upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
 
-update-notifier@^2.1.0, update-notifier@^2.3.0, update-notifier@^2.5.0:
+update-notifier@^2.3.0, update-notifier@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
   dependencies:
@@ -7947,10 +8230,6 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
@@ -7967,10 +8246,6 @@ word-wrap@^1.0.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
@@ -8074,6 +8349,11 @@ xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
+xmldom@0.1.19:
+  version "0.1.19"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.19.tgz#631fc07776efd84118bf25171b37ed4d075a0abc"
+  integrity sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw=
+
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
@@ -8124,10 +8404,10 @@ yargs-parser@^10.0.0, yargs-parser@^10.1.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+yargs-parser@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
+  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -8207,32 +8487,22 @@ yargs@^12.0.1:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+yargs@^13.2.1:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
+  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^1.2.0"
     find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
-
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
 
 yeast@0.1.2:
   version "0.1.2"

From 03b1286714325eca1a4aac665cd0c144ec03e54e Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 26 Apr 2019 18:42:16 +0300
Subject: [PATCH 205/382] refactor: tiny fixes / improvements

---
 .../categories-table.stories.ts               | 16 +++---------
 .../category-create.component.ts              |  4 +--
 .../category-create.stories.ts                | 16 +++---------
 .../dashboard-select-store.stories.ts         |  4 +--
 .../app/pages/+dashboard/dashboard.stories.ts |  4 +--
 .../src/app/pages/+device/device.component.ts |  5 ++--
 .../src/app/pages/+device/device.stories.ts   |  3 +--
 .../locale/product-locales.service.ts         | 26 ++++++++++---------
 8 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
index 3c580db6f..17d1f749a 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
@@ -1,5 +1,4 @@
 import { storiesOf, moduleMetadata } from '@storybook/angular';
-
 import { of } from 'rxjs';
 import { withKnobs, boolean } from '@storybook/addon-knobs';
 import { ThemeModule } from 'app/@theme';
@@ -34,6 +33,7 @@ import { LocaleModule } from '@modules/client.common.angular2/locale/locale.modu
 import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { CategoriesTableComponent } from './categories-table.component';
+import { I18nModule } from 'app/@core/utils/i18n.module';
 
 const stories = storiesOf('Categories Table Component', module);
 
@@ -51,6 +51,7 @@ export const staticTranslateLoader: TranslateLoader = {
 };
 
 stories.addDecorator(withKnobs);
+
 stories.addDecorator(
 	moduleMetadata({
 		declarations: [],
@@ -62,16 +63,7 @@ stories.addDecorator(
 			ConfirmationModalModule,
 			BrowserAnimationsModule,
 			ToasterModule.forRoot(),
-			TranslateModule.forChild({
-				loader: {
-					provide: TranslateLoader,
-					useValue: staticTranslateLoader
-				},
-				missingTranslationHandler: {
-					provide: MissingTranslationHandler,
-					useClass: FakeMissingTranslationHandler
-				}
-			}),
+			I18nModule,
 			RouterModule.forChild(routes),
 			NbAuthModule,
 			ApolloModule,
@@ -92,10 +84,10 @@ stories.addDecorator(
 				deps: [HttpLink]
 			},
 			TranslateStore,
+			TranslateService,
 			NotifyService,
 			NgbActiveModal,
 			ProductLocalesService,
-			TranslateService,
 			ProductsCategoryService,
 			TranslatePipe
 		]
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
index 9bb4abe9f..7759c39da 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
@@ -25,11 +25,11 @@ export class CategoryCreateComponent implements OnDestroy {
 	constructor(
 		private readonly activeModal: NgbActiveModal,
 		private readonly _productLocalesService: ProductLocalesService,
-		private readonly _langTranslateService: TranslateService,
+		private readonly _translateService: TranslateService,
 		private readonly _notifyService: NotifyService,
 		private readonly _productsCategoryService: ProductsCategoryService
 	) {
-		this._langTranslateService.use('en');
+		this._translateService.use('en');
 	}
 
 	ngOnDestroy() {
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
index 233e5ea0c..6f0a4b169 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
@@ -1,5 +1,4 @@
 import { storiesOf, moduleMetadata } from '@storybook/angular';
-
 import { of } from 'rxjs';
 import { withKnobs, boolean } from '@storybook/addon-knobs';
 import { ThemeModule } from 'app/@theme';
@@ -35,6 +34,7 @@ import { ProductLocalesService } from '@modules/client.common.angular2/locale/pr
 import { LocaleModule } from '@modules/client.common.angular2/locale/locale.module';
 import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { I18nModule } from 'app/@core/utils/i18n.module';
 
 const stories = storiesOf('Categories Create Component', module);
 
@@ -52,6 +52,7 @@ export const staticTranslateLoader: TranslateLoader = {
 };
 
 stories.addDecorator(withKnobs);
+
 stories.addDecorator(
 	moduleMetadata({
 		declarations: [CategoryCreateComponent],
@@ -63,16 +64,7 @@ stories.addDecorator(
 			ConfirmationModalModule,
 			BrowserAnimationsModule,
 			ToasterModule.forRoot(),
-			TranslateModule.forChild({
-				loader: {
-					provide: TranslateLoader,
-					useValue: staticTranslateLoader
-				},
-				missingTranslationHandler: {
-					provide: MissingTranslationHandler,
-					useClass: FakeMissingTranslationHandler
-				}
-			}),
+			I18nModule,
 			RouterModule.forChild(routes),
 			NbAuthModule,
 			ApolloModule,
@@ -94,10 +86,10 @@ stories.addDecorator(
 				deps: [HttpLink]
 			},
 			TranslateStore,
+			TranslateService,
 			NotifyService,
 			NgbActiveModal,
 			ProductLocalesService,
-			TranslateService,
 			ProductsCategoryService,
 			TranslatePipe
 		]
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.stories.ts b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.stories.ts
index d41562748..169e5beab 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.stories.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.stories.ts
@@ -1,5 +1,4 @@
 import { storiesOf, moduleMetadata } from '@storybook/angular';
-
 import { text, withKnobs, object } from '@storybook/addon-knobs';
 import { action } from '@storybook/addon-actions';
 import { ThemeModule } from 'app/@theme';
@@ -36,6 +35,7 @@ export function createTranslateLoader(http: HttpClient) {
 }
 
 stories.addDecorator(withKnobs);
+
 stories.addDecorator(
 	moduleMetadata({
 		declarations: [DashboardSelectStoreComponent],
@@ -61,8 +61,8 @@ stories.addDecorator(
 				deps: [HttpLink]
 			},
 			TranslateStore,
-			NotifyService,
 			TranslateService,
+			NotifyService,
 			HttpLink
 		]
 	})
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard.stories.ts b/admin/website-angular/src/app/pages/+dashboard/dashboard.stories.ts
index d4b506368..670e1793b 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard.stories.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard.stories.ts
@@ -1,5 +1,4 @@
 import { storiesOf, moduleMetadata } from '@storybook/angular';
-
 import { text, withKnobs, object } from '@storybook/addon-knobs';
 import { action } from '@storybook/addon-actions';
 import { ThemeModule } from 'app/@theme';
@@ -84,6 +83,7 @@ export function createTranslateLoader(http: HttpClient) {
 }
 
 stories.addDecorator(withKnobs);
+
 stories.addDecorator(
 	moduleMetadata({
 		declarations: [
@@ -136,8 +136,8 @@ stories.addDecorator(
 				deps: [HttpLink]
 			},
 			TranslateStore,
-			NotifyService,
 			TranslateService,
+			NotifyService,
 			HttpLink,
 			WarehousesService,
 			WarehouseOrdersService,
diff --git a/admin/website-angular/src/app/pages/+device/device.component.ts b/admin/website-angular/src/app/pages/+device/device.component.ts
index 384636be6..08930ecea 100644
--- a/admin/website-angular/src/app/pages/+device/device.component.ts
+++ b/admin/website-angular/src/app/pages/+device/device.component.ts
@@ -33,8 +33,7 @@ export class DeviceComponent implements OnDestroy, OnInit {
 		private readonly _deviceService: DeviceService,
 		private readonly _modalService: NgbModal,
 		private readonly _translateService: TranslateService,
-		private readonly _notifyService: NotifyService,
-		private readonly modalService: NgbModal
+		private readonly _notifyService: NotifyService
 	) {
 		this._loadSmartTableSettings();
 		this._setupDataForSmartTable();
@@ -103,7 +102,7 @@ export class DeviceComponent implements OnDestroy, OnInit {
 	}
 
 	async deleteDevice(e) {
-		const activeModal = this.modalService.open(ConfimationModalComponent, {
+		const activeModal = this._modalService.open(ConfimationModalComponent, {
 			size: 'sm',
 			container: 'nb-layout',
 			backdrop: 'static'
diff --git a/admin/website-angular/src/app/pages/+device/device.stories.ts b/admin/website-angular/src/app/pages/+device/device.stories.ts
index 7f1a6f837..d90119701 100644
--- a/admin/website-angular/src/app/pages/+device/device.stories.ts
+++ b/admin/website-angular/src/app/pages/+device/device.stories.ts
@@ -1,5 +1,4 @@
 import { storiesOf, moduleMetadata } from '@storybook/angular';
-
 import { withKnobs } from '@storybook/addon-knobs';
 import { DeviceComponent } from './device.component';
 import { ThemeModule } from 'app/@theme';
@@ -61,8 +60,8 @@ stories.addDecorator(
 				deps: [HttpLink]
 			},
 			TranslateStore,
-			NotifyService,
 			TranslateService,
+			NotifyService,
 			HttpLink
 		]
 	})
diff --git a/shared/core-angular/locale/product-locales.service.ts b/shared/core-angular/locale/product-locales.service.ts
index 877716459..49a9da6e7 100644
--- a/shared/core-angular/locale/product-locales.service.ts
+++ b/shared/core-angular/locale/product-locales.service.ts
@@ -2,6 +2,16 @@ import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
 
+class ProductTransientViewModel {
+	public title: string;
+	public description: string;
+
+	constructor() {
+		this.title = '';
+		this.description = '';
+	}
+}
+
 @Injectable()
 export class ProductLocalesService {
 	private readonly _defaultLang: string = 'en';
@@ -10,7 +20,7 @@ export class ProductLocalesService {
 
 	public currentLocale: string;
 
-	constructor(private translate: TranslateService) {}
+	constructor(private readonly _translateService: TranslateService) {}
 
 	public get isServiceStateValid() {
 		return (
@@ -33,7 +43,9 @@ export class ProductLocalesService {
 
 		const productMember: ILocaleMember =
 			member.find((x) =>
-				x.locale.startsWith(langChoice || this.translate.currentLang)
+				x.locale.startsWith(
+					langChoice || this._translateService.currentLang
+				)
 			) ||
 			// Use default lang
 			member.find((x) => x.locale.startsWith(this._defaultLang)) ||
@@ -117,13 +129,3 @@ export class ProductLocalesService {
 		}
 	}
 }
-
-class ProductTransientViewModel {
-	public title: string;
-	public description: string;
-
-	constructor() {
-		this.title = '';
-		this.description = '';
-	}
-}

From 6d4095ab8bf55f20ab1bb2db02439c9011b481ee Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 26 Apr 2019 18:59:17 +0300
Subject: [PATCH 206/382] fix: attempt to fix core-js v3 related issues

---
 admin/website-angular/tsconfig.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/website-angular/tsconfig.json b/admin/website-angular/tsconfig.json
index 18c6b09d4..14e17f831 100644
--- a/admin/website-angular/tsconfig.json
+++ b/admin/website-angular/tsconfig.json
@@ -23,7 +23,11 @@
 				"./modules/client.common.angular2/mongoose-placeholder"
 			],
 			"typeorm": ["./modules/client.common.angular2/typeorm-placeholder"],
-			"environment": ["./environments/environment"]
+			"environment": ["./environments/environment"],
+			"core-js/es7/reflect": [
+				"../node_modules/core-js/proposals/reflect-metadata"
+			],
+			"core-js/es6/*": ["../node_modules/core-js/es"]
 		},
 		"lib": ["es2017", "dom", "esnext"],
 		"noUnusedLocals": false,

From 6581450742884d13824c0acbf785df00f65ab2bd Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Fri, 26 Apr 2019 19:45:13 +0300
Subject: [PATCH 207/382] fix: few more fixes for core-js v3

---
 admin/website-angular/tsconfig.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/website-angular/tsconfig.json b/admin/website-angular/tsconfig.json
index 14e17f831..8cd4808ac 100644
--- a/admin/website-angular/tsconfig.json
+++ b/admin/website-angular/tsconfig.json
@@ -27,6 +27,8 @@
 			"core-js/es7/reflect": [
 				"../node_modules/core-js/proposals/reflect-metadata"
 			],
+			"core-js/es7/array": ["../node_modules/core-js/stable/array"],
+			"core-js/es7/object": ["../node_modules/core-js/stable/object"],
 			"core-js/es6/*": ["../node_modules/core-js/es"]
 		},
 		"lib": ["es2017", "dom", "esnext"],

From 2c2035910117c77e24be253f6d3d2853808f624d Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Sat, 27 Apr 2019 08:55:45 +0300
Subject: [PATCH 208/382] fix: storybook needs TranslateService provider &
 refactoring

---
 .../categories-table.stories.ts                 | 17 ++---------------
 .../category-create.component.ts                |  7 ++++++-
 .../category-create/category-create.stories.ts  |  3 ---
 shared/core-angular/locale/locale.module.ts     | 13 ++++++++++++-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
index 17d1f749a..e2e57ae44 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
@@ -7,15 +7,7 @@ import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { NbSpinnerModule } from '@nebular/theme';
 import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
 import { ToasterModule } from 'angular2-toaster';
-import {
-	TranslateModule,
-	TranslateStore,
-	TranslateLoader,
-	MissingTranslationHandler,
-	FakeMissingTranslationHandler,
-	TranslateService,
-	TranslatePipe
-} from '@ngx-translate/core';
+import { TranslateLoader } from '@ngx-translate/core';
 import { RouterModule } from '@angular/router';
 import { routes, NbAuthModule } from '@nebular/auth';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
@@ -28,7 +20,6 @@ import { HttpClientModule } from '@angular/common/http';
 import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
 import { FormsModule } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
 import { LocaleModule } from '@modules/client.common.angular2/locale/locale.module';
 import { ProductsCategoryService } from 'app/@core/data/productsCategory.service';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -83,13 +74,9 @@ stories.addDecorator(
 				useFactory: createApollo,
 				deps: [HttpLink]
 			},
-			TranslateStore,
-			TranslateService,
 			NotifyService,
 			NgbActiveModal,
-			ProductLocalesService,
-			ProductsCategoryService,
-			TranslatePipe
+			ProductsCategoryService
 		]
 	})
 );
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
index 7759c39da..d684374b9 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
@@ -29,6 +29,7 @@ export class CategoryCreateComponent implements OnDestroy {
 		private readonly _notifyService: NotifyService,
 		private readonly _productsCategoryService: ProductsCategoryService
 	) {
+		this._translateService.setDefaultLang('en');
 		this._translateService.use('en');
 	}
 
@@ -43,7 +44,11 @@ export class CategoryCreateComponent implements OnDestroy {
 
 	async createCategory(createObject) {
 		if (this.storybookVersion) {
-			this._notifyService.success('Success Message');
+			this._notifyService.success(
+				'Category ' +
+					this.localeTranslate(createObject.name) +
+					' is added'
+			);
 			return true;
 		}
 		try {
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
index 6f0a4b169..6299e7a53 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
@@ -8,11 +8,8 @@ import { NbSpinnerModule } from '@nebular/theme';
 import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
 import { ToasterModule } from 'angular2-toaster';
 import {
-	TranslateModule,
 	TranslateStore,
 	TranslateLoader,
-	MissingTranslationHandler,
-	FakeMissingTranslationHandler,
 	TranslateService,
 	TranslatePipe
 } from '@ngx-translate/core';
diff --git a/shared/core-angular/locale/locale.module.ts b/shared/core-angular/locale/locale.module.ts
index 40731aa27..e5a0f4349 100644
--- a/shared/core-angular/locale/locale.module.ts
+++ b/shared/core-angular/locale/locale.module.ts
@@ -1,7 +1,18 @@
 import { NgModule } from '@angular/core';
 import { ProductLocalesService } from './product-locales.service';
+import {
+	TranslateService,
+	TranslateModule,
+	TranslateLoader,
+	TranslateFakeLoader
+} from '@ngx-translate/core';
 
 @NgModule({
-	providers: [ProductLocalesService]
+	imports: [
+		TranslateModule.forRoot({
+			loader: { provide: TranslateLoader, useClass: TranslateFakeLoader }
+		})
+	],
+	providers: [ProductLocalesService, TranslateService]
 })
 export class LocaleModule {}

From ba1018e3335d3fc96befccd0c17317511d7d627b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 12:14:35 +0000
Subject: [PATCH 209/382] fix(package): update ionic-selectable to version
 4.4.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..acdc26180 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -139,7 +139,7 @@
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"imagesloaded": "^4.1.4",
-		"ionic-selectable": "4.4.0",
+		"ionic-selectable": "4.4.1",
 		"ionicons": "^4.5.5",
 		"jsbarcode": "^3.11.0",
 		"lodash": "^4.17.11",

From 2743a291802b831df80546bd185e0b125f089723 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 12:14:40 +0000
Subject: [PATCH 210/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..426108bff 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -5493,10 +5493,10 @@ invert-kv@^2.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
-ionic-selectable@4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/ionic-selectable/-/ionic-selectable-4.4.0.tgz#20c3279e67eabe35ac0d92981e5cd764d0b54ee9"
-  integrity sha512-1ET0wbw6t2Vap1YoPS6BIrnt5oJrGMU4dSVnyzxJWZCiqmoOPlXr+RN8vpq4ULSA6kyh2ZWZpMt5eTLczkun0g==
+ionic-selectable@4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/ionic-selectable/-/ionic-selectable-4.4.1.tgz#991393a652cf6e616081304b4c00cb683529485e"
+  integrity sha512-6Pai6Pqw4ofCNFSpbcN7SiOeH419wjczehrxWbMVNy3KOmSw1mfY0/wazEKlqk+iwgsOuYrhkAaEC8srtHdsBQ==
 
 ionic@^4.12.0:
   version "4.12.0"

From 827174992b711ebb284a69e5e96d33435c33df3c Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 13:28:43 +0000
Subject: [PATCH 211/382] chore(package): update @nestjs/typeorm to version
 6.1.0

---
 backend/api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index 5f59f9d15..e7574ded4 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -56,7 +56,7 @@
 		"@nestjs/platform-express": "^6.0.4",
 		"@nestjs/platform-socket.io": "^6.0.4",
 		"@nestjs/swagger": "^3.0.2",
-		"@nestjs/typeorm": "^6.0.0",
+		"@nestjs/typeorm": "^6.1.0",
 		"@nestjs/websockets": "^6.0.4",
 		"apollo-server-express": "^2.4.8",
 		"axios": "^0.18.0",

From 6b8cf391afa817bcc06b37eb07d33c2ade6789d8 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 13:28:47 +0000
Subject: [PATCH 212/382] fix(package): update @nestjs/typeorm to version 6.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index af8e56d77..846d5bbec 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
 		"@angular/platform-browser": "^7.2.4",
 		"@angular/platform-browser-dynamic": "^7.2.4",
 		"@captemulation/get-parameter-names": "^1.2.0",
-		"@nestjs/typeorm": "^5.3.0",
+		"@nestjs/typeorm": "^6.1.0",
 		"angular2-logger": "^0.7.0",
 		"npm": "^6.7.0",
 		"rxjs": "^6.4.0",

From e17b0d18d8ab6cf49b8acfd0037357b210d2b94f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 13:28:50 +0000
Subject: [PATCH 213/382] chore(package): update lockfile yarn.lock

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7162e7691..11793904c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -914,10 +914,10 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nestjs/typeorm@^5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-5.3.0.tgz#448d6d08d73ceb3c1f8a00a07e26a86c8a62b9f8"
-  integrity sha512-8g80OcKRTfhh5oSkfUKPMfcKBuC0gsr79wBksUwEWoglB/7bvO/erz8RC0XQPdjRH6NRUc+qrglywGm6Be2FZQ==
+"@nestjs/typeorm@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-6.1.0.tgz#bfc97ab68032d4df4bb9e30495f10957b2d60575"
+  integrity sha512-bKZeL5IXr4Z9ZtPNiiriodF8nEcjoUEAO3ugEQXGRBcYqecMpj+6+1VBCDmTloamzrUiuBil9JxBwQUJ8u0Nag==
   dependencies:
     uuid "3.3.2"
 

From c6cac23ea048a6419759d2524615885513d6e4c4 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2019 13:28:54 +0000
Subject: [PATCH 214/382] chore(package): update lockfile backend/api/yarn.lock

---
 backend/api/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 638f31a5a..0efd62d8e 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -597,10 +597,10 @@
   dependencies:
     optional "0.1.4"
 
-"@nestjs/typeorm@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-6.0.0.tgz#a3fb0885f2e0b5d94710c43d06489cfab7200de8"
-  integrity sha512-ZUlUu8DxlgN0dFoeTiaWrD0EU8V/dRjSkqPjrbwspYfZkg/Gws/B8EFK0n0hgyVuJaG4oggV+BjupnKtO8KqGw==
+"@nestjs/typeorm@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-6.1.0.tgz#bfc97ab68032d4df4bb9e30495f10957b2d60575"
+  integrity sha512-bKZeL5IXr4Z9ZtPNiiriodF8nEcjoUEAO3ugEQXGRBcYqecMpj+6+1VBCDmTloamzrUiuBil9JxBwQUJ8u0Nag==
   dependencies:
     uuid "3.3.2"
 

From d0d6b5b29d32d3052042c94135ba6a7f88681c02 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:24:56 +0000
Subject: [PATCH 215/382] chore(package): update @ionic-native/barcode-scanner
 to version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..be7ffc813 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -62,7 +62,7 @@
 		"@angular/pwa": "^0.13.7",
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
-		"@ionic-native/barcode-scanner": "^5.3.0",
+		"@ionic-native/barcode-scanner": "^5.5.1",
 		"@ionic-native/call-number": "^5.3.0",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",

From 9b121b21a16e5331ffc2eff86564ab6c6c8345a2 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:24:59 +0000
Subject: [PATCH 216/382] chore(package): update @ionic-native/barcode-scanner
 to version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..08e9e99e8 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -65,7 +65,7 @@
 		"@angular/pwa": "^0.13.8",
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
-		"@ionic-native/barcode-scanner": "^5.3.0",
+		"@ionic-native/barcode-scanner": "^5.5.1",
 		"@ionic-native/call-number": "^5.3.0",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",

From 9503895163bdd53443c08d514b8e6641b568cefe Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:25:08 +0000
Subject: [PATCH 217/382] chore(package): update @ionic-native/barcode-scanner
 to version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..7e618a51d 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -62,7 +62,7 @@
 		"@angular/pwa": "^0.13.8",
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
-		"@ionic-native/barcode-scanner": "^5.3.0",
+		"@ionic-native/barcode-scanner": "^5.5.1",
 		"@ionic-native/call-number": "^5.3.0",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",

From 121472426c52ee3276da3fa9b0392043d6357139 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:25:13 +0000
Subject: [PATCH 218/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..54ba61189 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1018,18 +1018,11 @@
 			}
 		},
 		"@ionic-native/barcode-scanner": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.3.0.tgz",
-			"integrity": "sha512-ubwQ6Xp4kGjYQYLFRIEiiafsA4ofFHHmh4TYu8L/tBuLd+/UoBvkU3+q22owJGPK4we4b+15CjDRSjsAkpUgqg==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/barcode-scanner/-/barcode-scanner-5.5.1.tgz",
+			"integrity": "sha512-u3JxJgrTI/JH17nxovik2AqUCxTMOSTWREpbJ8vFXqmDEFrf9E2f0CuJq8I5KJv2at3P3MlryLq8U+FbXfgKUw==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/call-number": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From 10bfab88128f13515d2498e4f665fe97c672b9a4 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:25:19 +0000
Subject: [PATCH 219/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..5dd82297f 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -312,10 +312,10 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
-"@ionic-native/barcode-scanner@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.4.0.tgz#b38db6a40973ee2780dd993c3521f3962d3f083a"
-  integrity sha512-p7/wBtu3P20jX98eVoAvxoPNw9UhlVPjDTJ/DHimlFlUnj5jRl0jcQJ7ZXo8AYCYfs7vC8a32BDnqTkQlo6Lfw==
+"@ionic-native/barcode-scanner@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.5.1.tgz#12f813134a6d61fba4e371e0cd516e543fdabcaf"
+  integrity sha512-u3JxJgrTI/JH17nxovik2AqUCxTMOSTWREpbJ8vFXqmDEFrf9E2f0CuJq8I5KJv2at3P3MlryLq8U+FbXfgKUw==
   dependencies:
     "@types/cordova" latest
 

From b38eb5ef069ae1f2edbc211f9bb8f2787c46497b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:25:22 +0000
Subject: [PATCH 220/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..de81f2b04 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -400,10 +400,10 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
-"@ionic-native/barcode-scanner@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.4.0.tgz#b38db6a40973ee2780dd993c3521f3962d3f083a"
-  integrity sha512-p7/wBtu3P20jX98eVoAvxoPNw9UhlVPjDTJ/DHimlFlUnj5jRl0jcQJ7ZXo8AYCYfs7vC8a32BDnqTkQlo6Lfw==
+"@ionic-native/barcode-scanner@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.5.1.tgz#12f813134a6d61fba4e371e0cd516e543fdabcaf"
+  integrity sha512-u3JxJgrTI/JH17nxovik2AqUCxTMOSTWREpbJ8vFXqmDEFrf9E2f0CuJq8I5KJv2at3P3MlryLq8U+FbXfgKUw==
   dependencies:
     "@types/cordova" latest
 

From ddc1d654f718c62c7dd2dbcb6e78cc52de8f7b8d Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:38:06 +0000
Subject: [PATCH 221/382] chore(package): update @ionic-native/call-number to
 version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..7cdcded31 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -63,7 +63,7 @@
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
-		"@ionic-native/call-number": "^5.3.0",
+		"@ionic-native/call-number": "^5.5.1",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",

From f843b0c67257175fc3efab18d5c1c972d2f7db80 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:38:10 +0000
Subject: [PATCH 222/382] chore(package): update @ionic-native/call-number to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..dacc6afb1 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -66,7 +66,7 @@
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
-		"@ionic-native/call-number": "^5.3.0",
+		"@ionic-native/call-number": "^5.5.1",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",

From ea47ad1656d027c27bb820febc9576db107f24cc Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:38:13 +0000
Subject: [PATCH 223/382] chore(package): update @ionic-native/call-number to
 version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..34280e370 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -63,7 +63,7 @@
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
-		"@ionic-native/call-number": "^5.3.0",
+		"@ionic-native/call-number": "^5.5.1",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",

From 46f481ed4772bd5642391652fc84779801d296eb Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:38:16 +0000
Subject: [PATCH 224/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..43c3a341e 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1033,18 +1033,11 @@
 			}
 		},
 		"@ionic-native/call-number": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.3.0.tgz",
-			"integrity": "sha512-KQPPwX2DCKksX/SENRAuMopfMXpqf34v5a3jTWtNh37wKryDxNwCObjWKy3Fh6zvYQ8AlXBxKa2kmgi/14jzKA==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/call-number/-/call-number-5.5.1.tgz",
+			"integrity": "sha512-d9yuaNyLFWXZlAyzCQTIPtnEAdF13D/kxLyXzLfEsuTrY49IOUdjB4PzSXDZjdZYcBjbtnaW1amABsaEowiNzQ==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/camera": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From 1667455b2de2adea50510f1654b7474c532dc836 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:38:20 +0000
Subject: [PATCH 225/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..f7a9763d4 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -319,10 +319,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/call-number@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.4.0.tgz#097ec2f732b8e8eaf12bc6797e4ebf7511c6d4cd"
-  integrity sha512-rG/rLePAqWxNNgh0YlneiT0QdArRXICWF0Zz/YyqD9vuXr2D0as1xPomXSjWhoUu0J6UO5LdLK5Up2PL9+LwGw==
+"@ionic-native/call-number@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.5.1.tgz#a450af8e04dc5c37959f0ddddcb4a911b9e4402d"
+  integrity sha512-d9yuaNyLFWXZlAyzCQTIPtnEAdF13D/kxLyXzLfEsuTrY49IOUdjB4PzSXDZjdZYcBjbtnaW1amABsaEowiNzQ==
   dependencies:
     "@types/cordova" latest
 

From 4eccf2e496f3fd6bcad147911ba730236d3d2c14 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:49:41 +0000
Subject: [PATCH 226/382] chore(package): update @ionic-native/camera to
 version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..1eb5ea77e 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -64,7 +64,7 @@
 		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
 		"@ionic-native/call-number": "^5.3.0",
-		"@ionic-native/camera": "^5.3.0",
+		"@ionic-native/camera": "^5.5.1",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
 		"@ionic-native/dialogs": "^5.3.0",

From 0dbb91a782446bfd885e13591d9447e0215ea005 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:49:45 +0000
Subject: [PATCH 227/382] chore(package): update @ionic-native/camera to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..3936f0744 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -67,7 +67,7 @@
 		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
 		"@ionic-native/call-number": "^5.3.0",
-		"@ionic-native/camera": "^5.3.0",
+		"@ionic-native/camera": "^5.5.1",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
 		"@ionic-native/dialogs": "^5.3.0",

From 0624e0be32d19a049d8dc04ac0241192ff49ee3d Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:49:49 +0000
Subject: [PATCH 228/382] chore(package): update @ionic-native/camera to
 version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..6a307565e 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -64,7 +64,7 @@
 		"@angular/service-worker": "^7.2.11",
 		"@ionic-native/barcode-scanner": "^5.3.0",
 		"@ionic-native/call-number": "^5.3.0",
-		"@ionic-native/camera": "^5.3.0",
+		"@ionic-native/camera": "^5.5.1",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
 		"@ionic-native/dialogs": "^5.3.0",

From a00e843137f8bd7a2505b8652fce6f3753f19c82 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:49:53 +0000
Subject: [PATCH 229/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..a8872164a 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1048,18 +1048,11 @@
 			}
 		},
 		"@ionic-native/camera": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.3.0.tgz",
-			"integrity": "sha512-psFnwz76ZPHuofNzMah/Z8gComMUgr8nAbFhCDx4OS+zZctmmnpXSvvW/CottQGYb9fYS0gZj8VUzVF4zEcb/A==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.5.1.tgz",
+			"integrity": "sha512-snNkhPmGUeoiQGvjPjdjWdpEBswyk8aHwZpZQFfOGRTWKfRoXVNxgQPtXIauUBkPnBw6u9UDvgoU8Q5JHSM6Vg==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/core": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From 4635765aba72153d0c82789cecadcb8bd4d0d007 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:49:56 +0000
Subject: [PATCH 230/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..17e49beab 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -326,10 +326,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/camera@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.4.0.tgz#d10461b9486ef8b064a7314b77c090b59620208f"
-  integrity sha512-lReblyrDaDA3Nr4uLYozOpixvdrHrpLVaGfPd7I1oR0sIYWyphFPXiCMFQL2r29GDl4hRm0jsxG5ygAvjXVTXw==
+"@ionic-native/camera@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.5.1.tgz#a652d51f6416bfbafaba9a1883d171824a31f9be"
+  integrity sha512-snNkhPmGUeoiQGvjPjdjWdpEBswyk8aHwZpZQFfOGRTWKfRoXVNxgQPtXIauUBkPnBw6u9UDvgoU8Q5JHSM6Vg==
   dependencies:
     "@types/cordova" latest
 

From 4e3bc556d86152f29c65c476239392d5067f7b0c Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 06:50:00 +0000
Subject: [PATCH 231/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..025bca6cd 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -414,10 +414,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/camera@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.4.0.tgz#d10461b9486ef8b064a7314b77c090b59620208f"
-  integrity sha512-lReblyrDaDA3Nr4uLYozOpixvdrHrpLVaGfPd7I1oR0sIYWyphFPXiCMFQL2r29GDl4hRm0jsxG5ygAvjXVTXw==
+"@ionic-native/camera@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.5.1.tgz#a652d51f6416bfbafaba9a1883d171824a31f9be"
+  integrity sha512-snNkhPmGUeoiQGvjPjdjWdpEBswyk8aHwZpZQFfOGRTWKfRoXVNxgQPtXIauUBkPnBw6u9UDvgoU8Q5JHSM6Vg==
   dependencies:
     "@types/cordova" latest
 

From f42811f9334961204a181db10fee314eee6d5872 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:04:35 +0000
Subject: [PATCH 232/382] chore(package): update @ionic-native/device to
 version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..6f382aa82 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -66,7 +66,7 @@
 		"@ionic-native/call-number": "^5.3.0",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
-		"@ionic-native/device": "^5.3.0",
+		"@ionic-native/device": "^5.5.1",
 		"@ionic-native/dialogs": "^5.3.0",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",

From 7ae1bb37f295ddfb6c4b9a7e22be2be1b6836196 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:04:38 +0000
Subject: [PATCH 233/382] chore(package): update @ionic-native/device to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..f2e137042 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -69,7 +69,7 @@
 		"@ionic-native/call-number": "^5.3.0",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
-		"@ionic-native/device": "^5.3.0",
+		"@ionic-native/device": "^5.5.1",
 		"@ionic-native/dialogs": "^5.3.0",
 		"@ionic-native/email-composer": "^5.3.0",
 		"@ionic-native/file-transfer": "^5.3.0",

From c60b47dea363b7edf02e843b0e03437e4552e976 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:04:41 +0000
Subject: [PATCH 234/382] chore(package): update @ionic-native/device to
 version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..413741a50 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -66,7 +66,7 @@
 		"@ionic-native/call-number": "^5.3.0",
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
-		"@ionic-native/device": "^5.3.0",
+		"@ionic-native/device": "^5.5.1",
 		"@ionic-native/dialogs": "^5.3.0",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",

From 9d8d3ebc51e7c386165732851654b97145809517 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:04:45 +0000
Subject: [PATCH 235/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..cb634257e 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1078,18 +1078,11 @@
 			}
 		},
 		"@ionic-native/device": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.3.0.tgz",
-			"integrity": "sha512-T2Ah4umfXG3beBiPW6D8hAN/Fgssd/hU663sOa8a7Cb4kimg9sA13KaEt0xRhaojwqZL4wZ4eC2JHVY/RQa5kQ==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.5.1.tgz",
+			"integrity": "sha512-w3Zv0eM76I9IQcKyXXiAZ3lnDnYsLXtXgGKMC0t404VMEBarVfYanM6XUueYrOAUuqoUgXKij6u4QArMuK5Jlg==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/dialogs": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From b4edd0f03dd14894f6d1f0f7d12d3b1819cdbdb7 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:04:49 +0000
Subject: [PATCH 236/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..91e34b09f 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -340,10 +340,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/device@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.4.0.tgz#1f071460a2559468256a8b7a82127cd7c1ebacff"
-  integrity sha512-C9j2iryuDzWXkFucR0liKgA2DU0vVkEWweOIqgPXcYSlS6NgdguYcbBWh8Bi+JKhT/lqTNq9bKrquZUwkf1IcA==
+"@ionic-native/device@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.5.1.tgz#e3c3146bef8a704882cdeb14c1a84ad7ffffa5ea"
+  integrity sha512-w3Zv0eM76I9IQcKyXXiAZ3lnDnYsLXtXgGKMC0t404VMEBarVfYanM6XUueYrOAUuqoUgXKij6u4QArMuK5Jlg==
   dependencies:
     "@types/cordova" latest
 

From 6ca5abd506236c6756cd4869ea645e68ff3548ef Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:13:06 +0000
Subject: [PATCH 237/382] chore(package): update @ionic-native/dialogs to
 version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..618fea11a 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -67,7 +67,7 @@
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
-		"@ionic-native/dialogs": "^5.3.0",
+		"@ionic-native/dialogs": "^5.5.1",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",

From a788dd943c274bc68ebfd22a41074d296f5868e9 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:13:09 +0000
Subject: [PATCH 238/382] chore(package): update @ionic-native/dialogs to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..cf6f16e2f 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -70,7 +70,7 @@
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
-		"@ionic-native/dialogs": "^5.3.0",
+		"@ionic-native/dialogs": "^5.5.1",
 		"@ionic-native/email-composer": "^5.3.0",
 		"@ionic-native/file-transfer": "^5.3.0",
 		"@ionic-native/geolocation": "^5.3.0",

From c6aac023cb7038bb74d078b4cc880965632c7279 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:13:12 +0000
Subject: [PATCH 239/382] chore(package): update @ionic-native/dialogs to
 version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..da1118db1 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -67,7 +67,7 @@
 		"@ionic-native/camera": "^5.3.0",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
-		"@ionic-native/dialogs": "^5.3.0",
+		"@ionic-native/dialogs": "^5.5.1",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",

From 29b6bc435e3f557fcf0eb027577bbd5fd864fc35 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:13:16 +0000
Subject: [PATCH 240/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..ae140f3a0 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1093,18 +1093,11 @@
 			}
 		},
 		"@ionic-native/dialogs": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.3.0.tgz",
-			"integrity": "sha512-TzSSGkbMDcAulX+j2oSh4yzxO+4H9q2BaA/lCkX7nwosgwdL1+JEBDfLPcNOc02DLZ5j2hNpdf1ce6x5dwEbPg==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/dialogs/-/dialogs-5.5.1.tgz",
+			"integrity": "sha512-4SSjlZiJQkoi/GI7vXFk+6tFEZOfXGw44npcAo4VIrFKElPaBu6SCnfxo87aXQC7Sk8gXwJdkzkQ/aKfvaDJ1Q==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/geolocation": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From a99312eee2502eebb6020f735979bdf50a8c03db Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:15:23 +0000
Subject: [PATCH 241/382] chore(package): update @ionic-native/email-composer
 to version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..b1121eb85 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -71,7 +71,7 @@
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
 		"@ionic-native/dialogs": "^5.3.0",
-		"@ionic-native/email-composer": "^5.3.0",
+		"@ionic-native/email-composer": "^5.5.1",
 		"@ionic-native/file-transfer": "^5.3.0",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",

From 394b1552080076ea5144227a9cdbf47c815f06fb Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:19:06 +0000
Subject: [PATCH 242/382] chore(package): update @ionic-native/file-transfer to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..cc061a974 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -72,7 +72,7 @@
 		"@ionic-native/device": "^5.3.0",
 		"@ionic-native/dialogs": "^5.3.0",
 		"@ionic-native/email-composer": "^5.3.0",
-		"@ionic-native/file-transfer": "^5.3.0",
+		"@ionic-native/file-transfer": "^5.5.1",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",

From 224ec2d5079eaafab9c153517b652e68122cec78 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:24:22 +0000
Subject: [PATCH 243/382] chore(package): update @ionic-native/geolocation to
 version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..d4ec930e4 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -68,7 +68,7 @@
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
 		"@ionic-native/dialogs": "^5.3.0",
-		"@ionic-native/geolocation": "^5.3.0",
+		"@ionic-native/geolocation": "^5.5.1",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.5.0",

From d3a37c4a8729cb45b32cf1f59ea7355e5cabf1ac Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:24:26 +0000
Subject: [PATCH 244/382] chore(package): update @ionic-native/geolocation to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..98a0f1495 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -73,7 +73,7 @@
 		"@ionic-native/dialogs": "^5.3.0",
 		"@ionic-native/email-composer": "^5.3.0",
 		"@ionic-native/file-transfer": "^5.3.0",
-		"@ionic-native/geolocation": "^5.3.0",
+		"@ionic-native/geolocation": "^5.5.1",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.5.0",

From 2d218a18d651bea075b2272a99425c85f6ed96c3 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:24:30 +0000
Subject: [PATCH 245/382] chore(package): update @ionic-native/geolocation to
 version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..84d149ffd 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -68,7 +68,7 @@
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.3.0",
 		"@ionic-native/dialogs": "^5.3.0",
-		"@ionic-native/geolocation": "^5.3.0",
+		"@ionic-native/geolocation": "^5.5.1",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.5.0",

From a430e12ced9a6dd1505de1124fa438c9f063ee69 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:24:34 +0000
Subject: [PATCH 246/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..f42578d1d 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1108,18 +1108,11 @@
 			}
 		},
 		"@ionic-native/geolocation": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.3.0.tgz",
-			"integrity": "sha512-TBpS5ALQqrE2WIwxbyDc72//gX0+2kxivTbRB0fyx+U7r+TScF9Exh6XUhldMBObQsUTHKeMPYxPeJp1HBPaXQ==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.5.1.tgz",
+			"integrity": "sha512-DOZG7sdCMIAJc5jFTqBCLLbCJPcI2538ALypc9bR0Qg3gilm6BKjck3ZrJrt5Qk/d4IYnWN2XoVfnps7k4RiyA==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/globalization": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From da0a1ca2555c69da95ccec6f43dfb82236ca9643 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:24:38 +0000
Subject: [PATCH 247/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..5cb052bd9 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -368,10 +368,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/geolocation@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.4.0.tgz#332f0650c16b103d48c8a06b4ba0465ac0f88220"
-  integrity sha512-mcnIVhYZwRvoDMX9yRIgrixZBDSRjbtojIXWLjdWUoaO/YcOv/I5VhsICAUpiKM89NFW8Dcip3YLYDGGmCkSVA==
+"@ionic-native/geolocation@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.5.1.tgz#033341ac3e245fb4598c5b9306a0b38ef69ce4de"
+  integrity sha512-DOZG7sdCMIAJc5jFTqBCLLbCJPcI2538ALypc9bR0Qg3gilm6BKjck3ZrJrt5Qk/d4IYnWN2XoVfnps7k4RiyA==
   dependencies:
     "@types/cordova" latest
 

From b1f4e788d8e75c4862e8ccc86da02aad6f54c0d6 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:24:42 +0000
Subject: [PATCH 248/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..e667de8a9 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -442,10 +442,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/geolocation@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.4.0.tgz#332f0650c16b103d48c8a06b4ba0465ac0f88220"
-  integrity sha512-mcnIVhYZwRvoDMX9yRIgrixZBDSRjbtojIXWLjdWUoaO/YcOv/I5VhsICAUpiKM89NFW8Dcip3YLYDGGmCkSVA==
+"@ionic-native/geolocation@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.5.1.tgz#033341ac3e245fb4598c5b9306a0b38ef69ce4de"
+  integrity sha512-DOZG7sdCMIAJc5jFTqBCLLbCJPcI2538ALypc9bR0Qg3gilm6BKjck3ZrJrt5Qk/d4IYnWN2XoVfnps7k4RiyA==
   dependencies:
     "@types/cordova" latest
 

From f98575c5760ff31ca456d03479969ea18a3c65de Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:33:42 +0000
Subject: [PATCH 249/382] chore(package): update @ionic-native/google-analytics
 to version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..1778d1912 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -70,7 +70,7 @@
 		"@ionic-native/dialogs": "^5.3.0",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
-		"@ionic-native/google-analytics": "^5.3.0",
+		"@ionic-native/google-analytics": "^5.5.1",
 		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",

From 8682b70448352c2b4343c86771751408a90cf23f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:33:45 +0000
Subject: [PATCH 250/382] chore(package): update @ionic-native/google-analytics
 to version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..ed73b63c2 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -75,7 +75,7 @@
 		"@ionic-native/file-transfer": "^5.3.0",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
-		"@ionic-native/google-analytics": "^5.3.0",
+		"@ionic-native/google-analytics": "^5.5.1",
 		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",

From 068021cb5bef08e9e9f90366bf1f4b78600612a6 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:33:49 +0000
Subject: [PATCH 251/382] chore(package): update @ionic-native/google-analytics
 to version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..90cf0e246 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -70,7 +70,7 @@
 		"@ionic-native/dialogs": "^5.3.0",
 		"@ionic-native/geolocation": "^5.3.0",
 		"@ionic-native/globalization": "^5.3.0",
-		"@ionic-native/google-analytics": "^5.3.0",
+		"@ionic-native/google-analytics": "^5.5.1",
 		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",

From 75e05798dafc01591ab28553677dd7be1a90e0e0 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:33:52 +0000
Subject: [PATCH 252/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..0cf6d3313 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1138,18 +1138,11 @@
 			}
 		},
 		"@ionic-native/google-analytics": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.3.0.tgz",
-			"integrity": "sha512-hP5MX1gfpnfCteKCbii7UBoNvsbpMmofbekFUSvXEM3ItldzjytJ2CHhEIhytpsAoR33opZcyh61V3yG/i0KJw==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/google-analytics/-/google-analytics-5.5.1.tgz",
+			"integrity": "sha512-fYPJdlPPrRP9WIR6mAELCdlUGwnrq9gRgREP6Z9hsVSyQPiqsZC+qzKKtSiM92esH8gQZoYeHB+1XceA1UkLyg==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/google-maps": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From 1d6344afa1ad88d934f350b9b47fe31161e4f210 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:33:56 +0000
Subject: [PATCH 253/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..d5b8cd4ec 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -382,10 +382,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/google-analytics@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.4.0.tgz#3155c889b98dc2cb5b30a9a8c2c61324eb16c9bb"
-  integrity sha512-Lk96Oqam0nczNWvSulWvUH8yjfyp0KBxmn9m8/0kEEkQnTZD+tIuQIDYB9zZTXnw7rkpbdqJCWb+Q2CLqoEwjA==
+"@ionic-native/google-analytics@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.5.1.tgz#44249fd09d827a70ee411b05e51bef47e8cbcd95"
+  integrity sha512-fYPJdlPPrRP9WIR6mAELCdlUGwnrq9gRgREP6Z9hsVSyQPiqsZC+qzKKtSiM92esH8gQZoYeHB+1XceA1UkLyg==
   dependencies:
     "@types/cordova" latest
 

From 226b4a5913a9fd048bc613eb65b2becd8b5995e5 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:34:00 +0000
Subject: [PATCH 254/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..16ae2bf1c 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -456,10 +456,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/google-analytics@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.4.0.tgz#3155c889b98dc2cb5b30a9a8c2c61324eb16c9bb"
-  integrity sha512-Lk96Oqam0nczNWvSulWvUH8yjfyp0KBxmn9m8/0kEEkQnTZD+tIuQIDYB9zZTXnw7rkpbdqJCWb+Q2CLqoEwjA==
+"@ionic-native/google-analytics@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.5.1.tgz#44249fd09d827a70ee411b05e51bef47e8cbcd95"
+  integrity sha512-fYPJdlPPrRP9WIR6mAELCdlUGwnrq9gRgREP6Z9hsVSyQPiqsZC+qzKKtSiM92esH8gQZoYeHB+1XceA1UkLyg==
   dependencies:
     "@types/cordova" latest
 

From 20f98a4dc8a4de0b9ae6db9e56fbac7d0f6c5a0e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:37:59 +0000
Subject: [PATCH 255/382] chore(package): update @ionic-native/in-app-browser
 to version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..3dec4467b 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -72,7 +72,7 @@
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.5.0",
-		"@ionic-native/in-app-browser": "^5.3.0",
+		"@ionic-native/in-app-browser": "^5.5.1",
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",

From 99be73230621adbcb80e8b2ac3e8f33f5037c33c Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:38:03 +0000
Subject: [PATCH 256/382] chore(package): update @ionic-native/in-app-browser
 to version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..d88372c24 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -77,7 +77,7 @@
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.5.0",
-		"@ionic-native/in-app-browser": "^5.3.0",
+		"@ionic-native/in-app-browser": "^5.5.1",
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",

From 57bd75160d4cdbaf8cb23c549637345aa6fd5330 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:38:07 +0000
Subject: [PATCH 257/382] chore(package): update @ionic-native/in-app-browser
 to version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..5fa42a878 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -72,7 +72,7 @@
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.5.0",
-		"@ionic-native/in-app-browser": "^5.3.0",
+		"@ionic-native/in-app-browser": "^5.5.1",
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",

From f81b679e7ba322b84be88f953938a12752269c32 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:38:10 +0000
Subject: [PATCH 258/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..ce349231e 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1158,18 +1158,11 @@
 			"integrity": "sha512-+sCaB7cLR35ApsOyYSfwDX2ZTO2ItOI6FHkgTQ2rzOA1DVJ9rlU8HDL6jYBUhq+aDe3lhCPexSOryeBynaSvpQ=="
 		},
 		"@ionic-native/in-app-browser": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.3.0.tgz",
-			"integrity": "sha512-CXxBpngCnm45aekCxTPzECFd1aRdOh4nHszVU39xazvHD+O7vdeSu1NpZ7dnyNs4LxVjK1kBbGszmpO24Y+Bmg==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/in-app-browser/-/in-app-browser-5.5.1.tgz",
+			"integrity": "sha512-lRdB21N361c+vK4Eq2GGI9gstuwextRVVdDwGwblaW6HVtCmMz1zNw4BRDCMY0uzwsxZ1PrUOZLZLSGsItTy1A==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/intercom": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From 08d02b794eaa37a4dc427166aee041a02c20d1e0 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:38:15 +0000
Subject: [PATCH 259/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..913661cea 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -394,10 +394,10 @@
   resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.5.0.tgz#02537e04bb0d01d5580f936d8ccce6745188d90a"
   integrity sha512-+sCaB7cLR35ApsOyYSfwDX2ZTO2ItOI6FHkgTQ2rzOA1DVJ9rlU8HDL6jYBUhq+aDe3lhCPexSOryeBynaSvpQ==
 
-"@ionic-native/in-app-browser@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.4.0.tgz#b5a74580a9bf3e0797aabf52f53c3529dee80f0e"
-  integrity sha512-cPRKu7nl9oLKgqJyt/1SeO+aWTABWzu+QzkOQBOLfoAaqP1eXm/AU2C9joULnTl3P+s7oFZqXKiEAKI/jF+x1Q==
+"@ionic-native/in-app-browser@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.5.1.tgz#3163d62674a232cfc4218ba0325ad2a8d6cee6ee"
+  integrity sha512-lRdB21N361c+vK4Eq2GGI9gstuwextRVVdDwGwblaW6HVtCmMz1zNw4BRDCMY0uzwsxZ1PrUOZLZLSGsItTy1A==
   dependencies:
     "@types/cordova" latest
 

From 1d4239a59d59ab7608b29712074efe69e92c861a Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:38:18 +0000
Subject: [PATCH 260/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..939911baf 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -468,10 +468,10 @@
   resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.5.0.tgz#02537e04bb0d01d5580f936d8ccce6745188d90a"
   integrity sha512-+sCaB7cLR35ApsOyYSfwDX2ZTO2ItOI6FHkgTQ2rzOA1DVJ9rlU8HDL6jYBUhq+aDe3lhCPexSOryeBynaSvpQ==
 
-"@ionic-native/in-app-browser@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.4.0.tgz#b5a74580a9bf3e0797aabf52f53c3529dee80f0e"
-  integrity sha512-cPRKu7nl9oLKgqJyt/1SeO+aWTABWzu+QzkOQBOLfoAaqP1eXm/AU2C9joULnTl3P+s7oFZqXKiEAKI/jF+x1Q==
+"@ionic-native/in-app-browser@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.5.1.tgz#3163d62674a232cfc4218ba0325ad2a8d6cee6ee"
+  integrity sha512-lRdB21N361c+vK4Eq2GGI9gstuwextRVVdDwGwblaW6HVtCmMz1zNw4BRDCMY0uzwsxZ1PrUOZLZLSGsItTy1A==
   dependencies:
     "@types/cordova" latest
 

From 61e62322b5c53cc57486270cd4f3aaa9b547844e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:42:13 +0000
Subject: [PATCH 261/382] chore(package): update @ionic-native/intercom to
 version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..3dfcec581 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -73,7 +73,7 @@
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
-		"@ionic-native/intercom": "^5.3.0",
+		"@ionic-native/intercom": "^5.5.1",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",
 		"@ionic-native/network": "^5.3.0",

From f9665dd3da77451ee6bf3279463d1c902f53add6 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:42:16 +0000
Subject: [PATCH 262/382] chore(package): update @ionic-native/intercom to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..49160175b 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -78,7 +78,7 @@
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
-		"@ionic-native/intercom": "^5.3.0",
+		"@ionic-native/intercom": "^5.5.1",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",
 		"@ionic-native/network": "^5.3.0",

From 65cada44c56a26cabf827b5644ece80794c6776f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:42:20 +0000
Subject: [PATCH 263/382] chore(package): update @ionic-native/intercom to
 version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..e65268edb 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -73,7 +73,7 @@
 		"@ionic-native/google-analytics": "^5.3.0",
 		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
-		"@ionic-native/intercom": "^5.3.0",
+		"@ionic-native/intercom": "^5.5.1",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",
 		"@ionic-native/network": "^5.3.0",

From 9522edef69b9f1fa496be7f6a6e416b586175447 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:42:24 +0000
Subject: [PATCH 264/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..7442d1f2a 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1173,18 +1173,11 @@
 			}
 		},
 		"@ionic-native/intercom": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.3.0.tgz",
-			"integrity": "sha512-a9W6FclBEyVhSJpC2kDjpoWla/lFby8/aRzDA5o+Vt7mEmMruf08QgH5qK+H3ohiZJpUUEULdeJR+WU6a9bqrQ==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/intercom/-/intercom-5.5.1.tgz",
+			"integrity": "sha512-A6FhQHBhAoYgxuRci063va8vOxzy3559fygF07N1H4cpt6qvlkk5xIaulym0T5TyDQkjUiHEdqWav1x5CXmDrA==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/local-notifications": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From cc4f63edfd7582982f082720db7254358d2edfe0 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:42:28 +0000
Subject: [PATCH 265/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..2279771df 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -401,10 +401,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/intercom@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.4.0.tgz#e742e008b14529c09e2825f0d7d936499478adef"
-  integrity sha512-WXEpoRt7auxtd9P4NjMwk+QTCWskEfrcn/XjJHVLDLtyvQid/ek0SLlDbJh8tB0EQuOTpXS4CE4cwfRD28NlBw==
+"@ionic-native/intercom@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.5.1.tgz#8db36c3c0aa80b3f5c8723d18cefe97948d81af0"
+  integrity sha512-A6FhQHBhAoYgxuRci063va8vOxzy3559fygF07N1H4cpt6qvlkk5xIaulym0T5TyDQkjUiHEdqWav1x5CXmDrA==
   dependencies:
     "@types/cordova" latest
 

From 52e1791a70a69c8ba1c41ac7d3e6837372021247 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:42:32 +0000
Subject: [PATCH 266/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..6f7fee044 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -475,10 +475,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/intercom@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.4.0.tgz#e742e008b14529c09e2825f0d7d936499478adef"
-  integrity sha512-WXEpoRt7auxtd9P4NjMwk+QTCWskEfrcn/XjJHVLDLtyvQid/ek0SLlDbJh8tB0EQuOTpXS4CE4cwfRD28NlBw==
+"@ionic-native/intercom@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.5.1.tgz#8db36c3c0aa80b3f5c8723d18cefe97948d81af0"
+  integrity sha512-A6FhQHBhAoYgxuRci063va8vOxzy3559fygF07N1H4cpt6qvlkk5xIaulym0T5TyDQkjUiHEdqWav1x5CXmDrA==
   dependencies:
     "@types/cordova" latest
 

From 8df9bfda80443c11145b8ba57049bd1359f12b1e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:46:22 +0000
Subject: [PATCH 267/382] chore(package): update
 @ionic-native/local-notifications to version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..2abf714f8 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -74,7 +74,7 @@
 		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",
-		"@ionic-native/local-notifications": "^5.3.0",
+		"@ionic-native/local-notifications": "^5.5.1",
 		"@ionic-native/mixpanel": "^5.3.0",
 		"@ionic-native/network": "^5.3.0",
 		"@ionic-native/splash-screen": "^5.3.0",

From f902168b5d48fae1a1524a65f1fcfce661d7cfac Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:46:25 +0000
Subject: [PATCH 268/382] chore(package): update
 @ionic-native/local-notifications to version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..227a0a56b 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -79,7 +79,7 @@
 		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",
-		"@ionic-native/local-notifications": "^5.3.0",
+		"@ionic-native/local-notifications": "^5.5.1",
 		"@ionic-native/mixpanel": "^5.3.0",
 		"@ionic-native/network": "^5.3.0",
 		"@ionic-native/open-native-settings": "^5.3.0",

From 94ced5789bf2fe898ebc20be9f3c8dbda7d07bae Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:46:28 +0000
Subject: [PATCH 269/382] chore(package): update
 @ionic-native/local-notifications to version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..9091df753 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -74,7 +74,7 @@
 		"@ionic-native/google-maps": "~5.5.0",
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",
-		"@ionic-native/local-notifications": "^5.3.0",
+		"@ionic-native/local-notifications": "^5.5.1",
 		"@ionic-native/mixpanel": "^5.3.0",
 		"@ionic-native/network": "^5.3.0",
 		"@ionic-native/splash-screen": "^5.3.0",

From d494e3694f3e5d893c9ed682c8c861299cd9ee21 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:46:32 +0000
Subject: [PATCH 270/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..dd9c97c5d 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1188,18 +1188,11 @@
 			}
 		},
 		"@ionic-native/local-notifications": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.3.0.tgz",
-			"integrity": "sha512-/CdVDs29ESISFnnkXfM/SOpzIiBZqFkgPYHE0U6lqCcmNtKyCQfZ7X+kDV8rw09EmloNLHIBNfq/juWPB06JPg==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.5.1.tgz",
+			"integrity": "sha512-L3RbUH3Py1A0ooXKN2zzE2kFk3kOLM1Iw+2N+0GoRsQhAjBQqLiC0KXec0ecRIK1KN21PNsZmA0iYY1h4xHA4w==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/mixpanel": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From e4462e855da9858734b4071c7a9e85cd52027ee9 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:46:36 +0000
Subject: [PATCH 271/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..99308d36c 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -408,10 +408,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/local-notifications@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.4.0.tgz#b8310dafb53bae509af57f5b153095a0ca2063c3"
-  integrity sha512-xKpcljk4mOFhe/6BzsL8AkPPZyB6WloqUcu1jp61ADEKfkeqr4uTzpADfZ/pzlw/aL05waHwvPZRgpQM/uUHlA==
+"@ionic-native/local-notifications@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.5.1.tgz#8a1f3474bc831a9dbfa16b10a390910c655586f1"
+  integrity sha512-L3RbUH3Py1A0ooXKN2zzE2kFk3kOLM1Iw+2N+0GoRsQhAjBQqLiC0KXec0ecRIK1KN21PNsZmA0iYY1h4xHA4w==
   dependencies:
     "@types/cordova" latest
 

From 2d0722212cabc51b35bb5ff1c5d26b37f735c8db Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:46:40 +0000
Subject: [PATCH 272/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..817e7bc4e 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -482,10 +482,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/local-notifications@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.4.0.tgz#b8310dafb53bae509af57f5b153095a0ca2063c3"
-  integrity sha512-xKpcljk4mOFhe/6BzsL8AkPPZyB6WloqUcu1jp61ADEKfkeqr4uTzpADfZ/pzlw/aL05waHwvPZRgpQM/uUHlA==
+"@ionic-native/local-notifications@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.5.1.tgz#8a1f3474bc831a9dbfa16b10a390910c655586f1"
+  integrity sha512-L3RbUH3Py1A0ooXKN2zzE2kFk3kOLM1Iw+2N+0GoRsQhAjBQqLiC0KXec0ecRIK1KN21PNsZmA0iYY1h4xHA4w==
   dependencies:
     "@types/cordova" latest
 

From 647c2df597e0926ba45d42298b118eb809e49974 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:50:29 +0000
Subject: [PATCH 273/382] chore(package): update @ionic-native/mixpanel to
 version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..15b0bcd7a 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -75,7 +75,7 @@
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
-		"@ionic-native/mixpanel": "^5.3.0",
+		"@ionic-native/mixpanel": "^5.5.1",
 		"@ionic-native/network": "^5.3.0",
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",

From 051f1f2c2ff7b8104006937fa8a6ceeff9ab11f8 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:50:32 +0000
Subject: [PATCH 274/382] chore(package): update @ionic-native/mixpanel to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..3d8ed987b 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -80,7 +80,7 @@
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
-		"@ionic-native/mixpanel": "^5.3.0",
+		"@ionic-native/mixpanel": "^5.5.1",
 		"@ionic-native/network": "^5.3.0",
 		"@ionic-native/open-native-settings": "^5.3.0",
 		"@ionic-native/screen-orientation": "^5.3.0",

From aaded39e5406614d41c1497452e214d193497c32 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:50:35 +0000
Subject: [PATCH 275/382] chore(package): update @ionic-native/mixpanel to
 version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..e4afab343 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -75,7 +75,7 @@
 		"@ionic-native/in-app-browser": "^5.3.0",
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
-		"@ionic-native/mixpanel": "^5.3.0",
+		"@ionic-native/mixpanel": "^5.5.1",
 		"@ionic-native/network": "^5.3.0",
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",

From 02bf78b697fbe927abae8964fe74899cabe07633 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:50:39 +0000
Subject: [PATCH 276/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..c16b2445a 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1203,18 +1203,11 @@
 			}
 		},
 		"@ionic-native/mixpanel": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.3.0.tgz",
-			"integrity": "sha512-Ha+7NxuMeRuBtPWjyL7qRx76PmqWvxtbmXseAA74PHT+e3hiGn5dBTDdFIfK/BUXhtfUde+1QU/5NK91ZhibIQ==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/mixpanel/-/mixpanel-5.5.1.tgz",
+			"integrity": "sha512-0DHufZWF/MWkgocyvw8025yI/jkTrIVE/vCbZrbYJIwG6bmVTGcSkQ1FB9aVTIl4qXpaN0HnoCKsj0S3qOUGQQ==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/network": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From 0858414af1c2657012962fdd953f93254b0b3c1c Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:50:43 +0000
Subject: [PATCH 277/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..475f7a60a 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -415,10 +415,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/mixpanel@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.4.0.tgz#7d022e29c20237208ed7f64db5d7e68251dbe81b"
-  integrity sha512-+f+3des08I3LwJQD8m0JglskOgEjqHivyYoU0DrSHZ0H+sPndOwwL6Q0LNXGwJ00gAv8173YFGxht5TxAP+neQ==
+"@ionic-native/mixpanel@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.5.1.tgz#f90143363df9c48ff9c86210bed7837665b805d4"
+  integrity sha512-0DHufZWF/MWkgocyvw8025yI/jkTrIVE/vCbZrbYJIwG6bmVTGcSkQ1FB9aVTIl4qXpaN0HnoCKsj0S3qOUGQQ==
   dependencies:
     "@types/cordova" latest
 

From fc035f4694c5106569db9b150848ef48f499b386 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:50:47 +0000
Subject: [PATCH 278/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..430c59d01 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -489,10 +489,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/mixpanel@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.4.0.tgz#7d022e29c20237208ed7f64db5d7e68251dbe81b"
-  integrity sha512-+f+3des08I3LwJQD8m0JglskOgEjqHivyYoU0DrSHZ0H+sPndOwwL6Q0LNXGwJ00gAv8173YFGxht5TxAP+neQ==
+"@ionic-native/mixpanel@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.5.1.tgz#f90143363df9c48ff9c86210bed7837665b805d4"
+  integrity sha512-0DHufZWF/MWkgocyvw8025yI/jkTrIVE/vCbZrbYJIwG6bmVTGcSkQ1FB9aVTIl4qXpaN0HnoCKsj0S3qOUGQQ==
   dependencies:
     "@types/cordova" latest
 

From d201627a485f7a15db6948c2e6bffaa604cb03f8 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:54:51 +0000
Subject: [PATCH 279/382] chore(package): update @ionic-native/network to
 version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..2d34a8756 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -76,7 +76,7 @@
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",
-		"@ionic-native/network": "^5.3.0",
+		"@ionic-native/network": "^5.5.1",
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",
 		"@ionic-native/unique-device-id": "^5.3.0",

From 4126ecb9d9cff67b67ca071679cac403fd2e7afd Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:54:54 +0000
Subject: [PATCH 280/382] chore(package): update @ionic-native/network to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..dbbd6aff9 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -81,7 +81,7 @@
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",
-		"@ionic-native/network": "^5.3.0",
+		"@ionic-native/network": "^5.5.1",
 		"@ionic-native/open-native-settings": "^5.3.0",
 		"@ionic-native/screen-orientation": "^5.3.0",
 		"@ionic-native/splash-screen": "^5.3.0",

From 8e13e70526776de686dd75b493c021b698b54d57 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:54:58 +0000
Subject: [PATCH 281/382] chore(package): update @ionic-native/network to
 version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..15b0a7112 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -76,7 +76,7 @@
 		"@ionic-native/intercom": "^5.3.0",
 		"@ionic-native/local-notifications": "^5.3.0",
 		"@ionic-native/mixpanel": "^5.3.0",
-		"@ionic-native/network": "^5.3.0",
+		"@ionic-native/network": "^5.5.1",
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",
 		"@ionic-native/unique-device-id": "^5.3.0",

From bfa1746a9718fd05b51bfee01d283be0d50834cc Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:55:01 +0000
Subject: [PATCH 282/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..af678b0f7 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1218,18 +1218,11 @@
 			}
 		},
 		"@ionic-native/network": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.3.0.tgz",
-			"integrity": "sha512-WcbcBDszeWRyV4qskXPRZ8Nc+K1/VeiUiGBWgQ85L2TuCcZ8jjb+47nJXvRzeFf4bsQr3Fgo3npYbQguesjIjQ==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.5.1.tgz",
+			"integrity": "sha512-GUIdaJj79K5x+Irv12491+WrVIYs2QAmNX7b9fLSjgV3EQ3dff+isW/sGi2skMrZhyrGJofgrdLS30VgrVfPrw==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic-native/splash-screen": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From e87000edbc5ef50244937aaa2ec2ceeca98e4e22 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:55:05 +0000
Subject: [PATCH 283/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..3051a20dc 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -422,10 +422,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/network@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.4.0.tgz#4f4c12da0484a1a05fccd520402b402dc1c72af0"
-  integrity sha512-qHDoterYyz65E4nl6W1GdliiNtx7oeIyO/AsA3DFoY4Adlc+SmL7Ks+ZyIBqIPCwTvrK9CQ9VxOU26LsyneLOw==
+"@ionic-native/network@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.5.1.tgz#d85eb1380ffa2d66be173a9fec1b63c61cf82577"
+  integrity sha512-GUIdaJj79K5x+Irv12491+WrVIYs2QAmNX7b9fLSjgV3EQ3dff+isW/sGi2skMrZhyrGJofgrdLS30VgrVfPrw==
   dependencies:
     "@types/cordova" latest
 

From 1c2eb631ac28f4bef8de80d9546f816c863db064 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:55:10 +0000
Subject: [PATCH 284/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..7ac315016 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -496,10 +496,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/network@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.4.0.tgz#4f4c12da0484a1a05fccd520402b402dc1c72af0"
-  integrity sha512-qHDoterYyz65E4nl6W1GdliiNtx7oeIyO/AsA3DFoY4Adlc+SmL7Ks+ZyIBqIPCwTvrK9CQ9VxOU26LsyneLOw==
+"@ionic-native/network@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.5.1.tgz#d85eb1380ffa2d66be173a9fec1b63c61cf82577"
+  integrity sha512-GUIdaJj79K5x+Irv12491+WrVIYs2QAmNX7b9fLSjgV3EQ3dff+isW/sGi2skMrZhyrGJofgrdLS30VgrVfPrw==
   dependencies:
     "@types/cordova" latest
 

From fcaac0fb2acfb195feb793834adb47a8fb6ec44e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:59:06 +0000
Subject: [PATCH 285/382] chore(package): update @ionic-native/vibration to
 version 5.5.1

---
 carrier/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index aa8597602..e7f5ac25d 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -80,7 +80,7 @@
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",
 		"@ionic-native/unique-device-id": "^5.3.0",
-		"@ionic-native/vibration": "^5.3.0",
+		"@ionic-native/vibration": "^5.5.1",
 		"@ionic/angular": "^4.1.2",
 		"@ionic/pro": "^2.0.4",
 		"@ionic/storage": "^2.2.0",

From 8b00268649db1c1082db809c885095e2f20702ec Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:59:09 +0000
Subject: [PATCH 286/382] chore(package): update @ionic-native/vibration to
 version 5.5.1

---
 merchant/tablet-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6217ef2fe..c9b545f71 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -87,7 +87,7 @@
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",
 		"@ionic-native/unique-device-id": "^5.3.0",
-		"@ionic-native/vibration": "^5.3.0",
+		"@ionic-native/vibration": "^5.5.1",
 		"@ionic/angular": "^4.1.2",
 		"@ionic/pro": "^2.0.4",
 		"@ionic/storage": "^2.2.0",

From fce2227852ab17603c2bb3b73f05e14e04cbec4e Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:59:13 +0000
Subject: [PATCH 287/382] chore(package): update @ionic-native/vibration to
 version 5.5.1

---
 shop/mobile-ionic/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3913c6725..1ad591c28 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -80,7 +80,7 @@
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",
 		"@ionic-native/unique-device-id": "^5.3.0",
-		"@ionic-native/vibration": "^5.3.0",
+		"@ionic-native/vibration": "^5.5.1",
 		"@ionic/angular": "^4.1.2",
 		"@ionic/pro": "^2.0.4",
 		"@ionic/storage": "^2.2.0",

From e0fe2ed4171df0c801dbd0e2bf77e29bc2eb3d33 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:59:17 +0000
Subject: [PATCH 288/382] chore(package): update lockfile
 shop/mobile-ionic/package-lock.json

---
 shop/mobile-ionic/package-lock.json | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/shop/mobile-ionic/package-lock.json b/shop/mobile-ionic/package-lock.json
index 606848824..dc038dbb2 100644
--- a/shop/mobile-ionic/package-lock.json
+++ b/shop/mobile-ionic/package-lock.json
@@ -1278,18 +1278,11 @@
 			}
 		},
 		"@ionic-native/vibration": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.3.0.tgz",
-			"integrity": "sha512-q7Pcx1065xYZ5+ioN0LLGZYgkzigTOHHdn0i9cHKHo7nD+xqUOmBuiT8+sZ56P40L1Wr/CPCEBl5TbmOPrtFaw==",
+			"version": "5.5.1",
+			"resolved": "https://registry.npmjs.org/@ionic-native/vibration/-/vibration-5.5.1.tgz",
+			"integrity": "sha512-9a/+3Q9UmIP9XFbbREywc6dKjLNDai7ki+tvlLnxbe5QR7jm0mGSWKMasMCHx70dyolFD+/BuJf99iffiuO1rQ==",
 			"requires": {
 				"@types/cordova": "^0.0.34"
-			},
-			"dependencies": {
-				"@types/cordova": {
-					"version": "0.0.34",
-					"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-					"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-				}
 			}
 		},
 		"@ionic/angular": {
@@ -2290,6 +2283,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/cordova": {
+			"version": "0.0.34",
+			"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
+			"integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
+		},
 		"@types/d3-color": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.2.2.tgz",

From 7b399af0f2113e5b906641a982da9b746e805ef7 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:59:21 +0000
Subject: [PATCH 289/382] chore(package): update lockfile
 merchant/tablet-ionic/yarn.lock

---
 merchant/tablet-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index c97c0bde4..cb5331e5b 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -464,10 +464,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/vibration@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.4.0.tgz#27d77ea805eb5c9e2e4c5587a6c4ca5629613879"
-  integrity sha512-eKxpz4QpefHfEw9P2N3+QjmlSgKbEbZcCjButpnpM3FhUddrNzQ9ISaWHe3m/IZ8R4aj8x6N7FrZ7V32XVmidQ==
+"@ionic-native/vibration@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.5.1.tgz#98678a35f7a2326e1c8d11e5122382519cb946ef"
+  integrity sha512-9a/+3Q9UmIP9XFbbREywc6dKjLNDai7ki+tvlLnxbe5QR7jm0mGSWKMasMCHx70dyolFD+/BuJf99iffiuO1rQ==
   dependencies:
     "@types/cordova" latest
 

From 4e78adb63386956779aafaec893caa8de3895757 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2019 07:59:25 +0000
Subject: [PATCH 290/382] chore(package): update lockfile
 carrier/mobile-ionic/yarn.lock

---
 carrier/mobile-ionic/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 821c647a2..d7fe85975 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -524,10 +524,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/vibration@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.4.0.tgz#27d77ea805eb5c9e2e4c5587a6c4ca5629613879"
-  integrity sha512-eKxpz4QpefHfEw9P2N3+QjmlSgKbEbZcCjButpnpM3FhUddrNzQ9ISaWHe3m/IZ8R4aj8x6N7FrZ7V32XVmidQ==
+"@ionic-native/vibration@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.5.1.tgz#98678a35f7a2326e1c8d11e5122382519cb946ef"
+  integrity sha512-9a/+3Q9UmIP9XFbbREywc6dKjLNDai7ki+tvlLnxbe5QR7jm0mGSWKMasMCHx70dyolFD+/BuJf99iffiuO1rQ==
   dependencies:
     "@types/cordova" latest
 

From c6b4f709614ff3ae7a1bf65f6c87e8129cb09a74 Mon Sep 17 00:00:00 2001
From: chandwanideepak1994 <chandwanideepak1994@gmail.com>
Date: Mon, 29 Apr 2019 21:44:48 +0530
Subject: [PATCH 291/382] minor

---
 .../categories/categories-table/categories-table.stories.ts   | 4 ++--
 .../categories/category-create/category-create.stories.ts     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
index e2e57ae44..cd9b6fd13 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.stories.ts
@@ -54,7 +54,6 @@ stories.addDecorator(
 			ConfirmationModalModule,
 			BrowserAnimationsModule,
 			ToasterModule.forRoot(),
-			I18nModule,
 			RouterModule.forChild(routes),
 			NbAuthModule,
 			ApolloModule,
@@ -65,7 +64,8 @@ stories.addDecorator(
 			NbSpinnerModule,
 			FormsModule,
 			LocaleModule,
-			HttpClientModule
+			HttpClientModule,
+			I18nModule
 		],
 		providers: [
 			DeviceService,
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
index 6299e7a53..0850a68d2 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.stories.ts
@@ -61,7 +61,6 @@ stories.addDecorator(
 			ConfirmationModalModule,
 			BrowserAnimationsModule,
 			ToasterModule.forRoot(),
-			I18nModule,
 			RouterModule.forChild(routes),
 			NbAuthModule,
 			ApolloModule,
@@ -73,7 +72,8 @@ stories.addDecorator(
 			FormsModule,
 			ProductCategoriesFormsModule,
 			LocaleModule,
-			HttpClientModule
+			HttpClientModule,
+			I18nModule
 		],
 		providers: [
 			DeviceService,

From 566079dd144784bd21b7df4b928b24d05244a4ab Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 30 Apr 2019 16:17:47 +0000
Subject: [PATCH 292/382] fix(package): update ws to version 7.0.0

---
 backend/api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index 5f59f9d15..1af4b1d3a 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -136,7 +136,7 @@
 		"upath": "^1.1.2",
 		"uuid": "^3.3.2",
 		"validator": "^10.11.0",
-		"ws": "^6.2.0"
+		"ws": "^7.0.0"
 	},
 	"devDependencies": {
 		"@nestjs/testing": "^6.0.4",

From 36f963735ad62b1654e5c436e7c9319eaa683d3a Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 30 Apr 2019 16:17:51 +0000
Subject: [PATCH 293/382] chore(package): update lockfile backend/api/yarn.lock

---
 backend/api/yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 638f31a5a..b917d6094 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -1866,7 +1866,7 @@ async-foreach@^0.1.3:
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
   integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
-async-limiter@~1.0.0:
+async-limiter@^1.0.0, async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
@@ -10947,12 +10947,12 @@ ws@^6.0.0, ws@~6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526"
-  integrity sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==
+ws@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.0.0.tgz#79351cbc3f784b3c20d0821baf4b4ff809ffbf51"
+  integrity sha512-cknCal4k0EAOrh1SHHPPWWh4qm93g1IuGGGwBjWkXmCG7LsDtL8w9w+YVfaF+KSVwiHQKDIMsSLBVftKf9d1pg==
   dependencies:
-    async-limiter "~1.0.0"
+    async-limiter "^1.0.0"
 
 xdg-basedir@^3.0.0:
   version "3.0.0"

From a4423fd6fb35f66809d2a2bbd4f759da9e37e209 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sun, 5 May 2019 07:47:47 +0000
Subject: [PATCH 294/382] fix: package.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:mem:20180117
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index af8e56d77..3f508d55d 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
 		"rxjs-compat": "^6.4.0",
 		"socket.io-client": "^2.2.0",
 		"stripe": "^6.24.0",
-		"typeorm": "^0.2.13",
+		"typeorm": "^0.2.15",
 		"uuid": "^3.3.2"
 	},
 	"devDependencies": {

From cdb3faf6bab4fda1983f9d5e11f82cb1d5583484 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sun, 5 May 2019 22:08:16 +0000
Subject: [PATCH 295/382] fix: backend/api/.snyk & backend/api/package.json to
 reduce vulnerabilities

The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-AXIOS-174505
---
 backend/api/.snyk        |  10 +
 backend/api/package.json | 508 ++++++++++++++++++++-------------------
 2 files changed, 266 insertions(+), 252 deletions(-)
 create mode 100644 backend/api/.snyk

diff --git a/backend/api/.snyk b/backend/api/.snyk
new file mode 100644
index 000000000..3f37a2163
--- /dev/null
+++ b/backend/api/.snyk
@@ -0,0 +1,10 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.3
+ignore: {}
+# patches apply the minimum changes required to fix a vulnerability
+patch:
+  SNYK-JS-AXIOS-174505:
+    - axios:
+        patched: '2019-05-05T22:08:14.658Z'
+    - '@nestjs/common > axios':
+        patched: '2019-05-05T22:08:14.658Z'
diff --git a/backend/api/package.json b/backend/api/package.json
index 5f59f9d15..bfbdf6751 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -1,254 +1,258 @@
 {
-	"name": "ever-api",
-	"version": "0.2.0",
-	"description": "Ever API",
-	"license": "AGPL-3.0",
-	"homepage": "https://ever.co",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/ever-co/ever.git"
-	},
-	"bugs": {
-		"url": "https://github.com/ever-co/ever/issues"
-	},
-	"private": false,
-	"author": {
-		"name": "Ever Co. LTD",
-		"email": "ever@ever.co",
-		"url": "https://ever.co"
-	},
-	"contributors": [
-		{
-			"name": "Ruslan Konviser (Evereq)",
-			"email": "ruslan@ever.co",
-			"url": "https://ever.co"
-		},
-		{
-			"name": "Misha Konviser (Komish)",
-			"email": "michael@ever.co",
-			"url": "https://ever.co"
-		}
-	],
-	"scripts": {
-		"coverage": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 nyc report --reporter=text-lcov | coveralls",
-		"precommit": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 lint-staged",
-		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node build/main.js",
-		"start:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 concurrently \"wait-on build/main.js && nodemon\" \"tsc -w -p tsconfig.build.json\" ",
-		"start:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node ./build/pm2bootstrap.js",
-		"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && yarn webpack",
-		"dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node ./build/main.js",
-		"test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 jest",
-		"prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 node ./build/pm2bootstrap.js",
-		"nestjs": "cross-env NODE_OPTIONS=--max_old_space_size=4096 node ./dist/server",
-		"webpack": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 webpack --config webpack.config.js",
-		"lint": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 tslint -p tsconfig.json -c tslint.json",
-		"format": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 prettier **/**/*.ts --ignore-path ./.prettierignore --write && git status",
-		"docs": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 typedoc --out docs --mode modules"
-	},
-	"dependencies": {
-		"@captemulation/get-parameter-names": "^1.2.0",
-		"@nestjs/common": "^6.0.4",
-		"@nestjs/core": "^6.0.4",
-		"@nestjs/cqrs": "^6.0.0",
-		"@nestjs/graphql": "^6.0.4",
-		"@nestjs/microservices": "^6.0.4",
-		"@nestjs/passport": "^6.0.0",
-		"@nestjs/platform-express": "^6.0.4",
-		"@nestjs/platform-socket.io": "^6.0.4",
-		"@nestjs/swagger": "^3.0.2",
-		"@nestjs/typeorm": "^6.0.0",
-		"@nestjs/websockets": "^6.0.4",
-		"apollo-server-express": "^2.4.8",
-		"axios": "^0.18.0",
-		"bcrypt": "^3.0.4",
-		"bluebird": "^3.5.3",
-		"body-parser": "^1.18.3",
-		"bunyan": "^1.8.12",
-		"bunyan-cloudwatch": "^2.2.0",
-		"bunyan-prettystream": "^0.1.3",
-		"cli-color": "^1.4.0",
-		"concurix": "^1.1.2",
-		"connect": "^3.6.6",
-		"cookie-session": "^2.0.0-beta.3",
-		"core-decorators": "^0.20.0",
-		"cors": "^2.8.5",
-		"cryptiles": "^4.1.3",
-		"destroy": "^1.0.4",
-		"dotenv": "^7.0.0",
-		"envalid": "^4.2.2",
-		"errorhandler": "^1.5.0",
-		"etag": "^1.8.1",
-		"event-stream": "3.3.4",
-		"express": "^4.16.4",
-		"express-handlebars": "^3.0.2",
-		"faker": "^4.1.0",
-		"graphql": "^14.1.1",
-		"graphql-playground-middleware-express": "^1.7.12",
-		"graphql-subscriptions": "^1.0.0",
-		"graphql-tools": "^4.0.4",
-		"handlebars": "^4.1.1",
-		"image-size": "^0.7.2",
-		"install": "^0.12.2",
-		"inversify": "^5.0.1",
-		"ipstack": "^0.1.1",
-		"jsonwebtoken": "^8.5.1",
-		"kafka-node": "^4.0.4",
-		"lodash": "^4.17.11",
-		"method-override": "^3.0.0",
-		"mkdirp": "^0.5.1",
-		"module-alias": "^2.2.0",
-		"moment": "^2.24.0",
-		"mongodb": "^3.2.1",
-		"mongodb-memory-server": "^5.0.2",
-		"mongoose": "^5.5.0",
-		"morgan": "^1.9.1",
-		"ms": "^2.1.1",
-		"node-sass": "^4.11.0",
-		"on-finished": "^2.3.0",
-		"passport": "^0.4.0",
-		"passport-facebook": "^3.0.0",
-		"passport-google-oauth20": "^2.0.0",
-		"passport-http-bearer": "^1.0.1",
-		"passport-jwt": "^4.0.0",
-		"passport-local": "^1.0.0",
-		"passport-url": "^1.0.4",
-		"pem": "^1.14.2",
-		"pm2": "^3.4.0",
-		"redis": "^2.8.0",
-		"reflect-metadata": "^0.1.13",
-		"request": "^2.88.0",
-		"request-ip": "^2.1.3",
-		"request-promise": "^4.2.4",
-		"rxjs": "^6.4.0",
-		"rxjs-compat": "^6.4.0",
-		"serve-favicon": "^2.5.0",
-		"socket.io": "^2.2.0",
-		"socket.io-client": "^2.2.0",
-		"source-map-support": "^0.5.11",
-		"stripe": "^6.28.0",
-		"subscriptions-transport-ws": "^0.9.16",
-		"swagger-ui-express": "^4.0.2",
-		"symbol": "^0.3.1",
-		"symbol-observable": "^1.2.0",
-		"typeorm": "^0.2.15",
-		"typescript-collections": "^1.3.2",
-		"underscore.string": "^3.3.5",
-		"upath": "^1.1.2",
-		"uuid": "^3.3.2",
-		"validator": "^10.11.0",
-		"ws": "^6.2.0"
-	},
-	"devDependencies": {
-		"@nestjs/testing": "^6.0.4",
-		"@commitlint/cli": "^7.5.2",
-		"@commitlint/config-conventional": "^7.5.0",
-		"@commitlint/config-lerna-scopes": "^7.5.1",
-		"@commitlint/travis-cli": "^7.5.2",
-		"@types/bcrypt": "^3.0.0",
-		"@types/bluebird": "^3.5.26",
-		"@types/body-parser": "^1.17.0",
-		"@types/bunyan": "^1.8.6",
-		"@types/core-decorators": "^0.20.0",
-		"@types/cors": "^2.8.4",
-		"@types/errorhandler": "^0.0.32",
-		"@types/express": "^4.16.1",
-		"@types/faker": "^4.1.5",
-		"@types/form-data": "^2.2.1",
-		"@types/google-maps": "^3.2.0",
-		"@types/handlebars": "^4.1.0",
-		"@types/inversify": "^2.0.33",
-		"@types/jest": "^24.0.11",
-		"@types/jsonwebtoken": "^8.3.2",
-		"@types/kafka-node": "^2.0.8",
-		"@types/lodash": "^4.14.123",
-		"@types/method-override": "^0.0.31",
-		"@types/mkdirp": "^0.5.2",
-		"@types/moment": "^2.13.0",
-		"@types/mongodb": "^3.1.22",
-		"@types/mongoose": "^5.3.23",
-		"@types/node": "^11.9.3",
-		"@types/passport": "^1.0.0",
-		"@types/passport-jwt": "^3.0.1",
-		"@types/redis": "^2.8.11",
-		"@types/reflect-metadata": "^0.1.0",
-		"@types/request": "^2.48.1",
-		"@types/request-promise": "^4.1.42",
-		"@types/sinon": "^7.0.10",
-		"@types/socket.io": "^2.1.2",
-		"@types/socket.io-client": "^1.4.32",
-		"@types/source-map-support": "^0.5.0",
-		"@types/stripe": "^6.25.7",
-		"@types/uuid": "^3.4.4",
-		"@types/ws": "^6.0.1",
-		"concurrently": "^4.1.0",
-		"conventional-changelog": "^3.0.6",
-		"core-js": "^3.0.0",
-		"coveralls": "^3.0.3",
-		"cross-env": "^5.2.0",
-		"cz-conventional-changelog": "^2.1.0",
-		"husky": "^1.3.1",
-		"jest": "^24.5.0",
-		"nodemon": "^1.18.11",
-		"nyc": "^13.3.0",
-		"prettier": "^1.16.4",
-		"prettier-tslint": "^0.4.2",
-		"pretty-quick": "^1.10.0",
-		"require-directory": "^2.1.1",
-		"rxjs-tslint": "0.1.5",
-		"supertest": "^4.0.2",
-		"ts-jest": "^24.0.0",
-		"ts-loader": "^5.3.3",
-		"ts-node": "^8.1.0",
-		"tslint": "^5.16.0",
-		"typedoc": "^0.14.2",
-		"typemoq": "^2.1.0",
-		"typescript": "~3.4.3",
-		"wait-on": "^3.2.0",
-		"webpack": "^4.29.6",
-		"webpack-cli": "^3.3.0",
-		"webpack-command": "^0.4.2",
-		"webpack-graphql-loader": "^1.0.0",
-		"webpack-node-externals": "^1.7.2"
-	},
-	"nyc": {
-		"include": [
-			"packages/**/*.ts"
-		],
-		"exclude": [
-			"node_modules/",
-			"packages/**/*.spec.ts",
-			"packages/core/adapters/*.ts",
-			"packages/websockets/adapters/*.ts",
-			"packages/**/nest-*.ts",
-			"packages/core/errors/**/*",
-			"packages/common/exceptions/*.ts",
-			"packages/common/http/*.ts",
-			"packages/microservices/exceptions/",
-			"packages/microservices/microservices-module.ts",
-			"packages/core/middleware/middleware-module.ts",
-			"packages/common/services/logger.service.ts"
-		],
-		"extension": [
-			".ts"
-		],
-		"require": [
-			"ts-node/register"
-		],
-		"reporter": [
-			"text-summary",
-			"html"
-		],
-		"sourceMap": true,
-		"instrument": true
-	},
-	"lint-staged": {
-		"packages/**/*.{ts,json}": [
-			"npm run format",
-			"git add"
-		]
-	},
-	"engines": {
-		"node": ">=10.15.0",
-		"yarn": ">=1.13.0"
-	}
+  "name": "ever-api",
+  "version": "0.2.0",
+  "description": "Ever API",
+  "license": "AGPL-3.0",
+  "homepage": "https://ever.co",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ever-co/ever.git"
+  },
+  "bugs": {
+    "url": "https://github.com/ever-co/ever/issues"
+  },
+  "private": false,
+  "author": {
+    "name": "Ever Co. LTD",
+    "email": "ever@ever.co",
+    "url": "https://ever.co"
+  },
+  "contributors": [
+    {
+      "name": "Ruslan Konviser (Evereq)",
+      "email": "ruslan@ever.co",
+      "url": "https://ever.co"
+    },
+    {
+      "name": "Misha Konviser (Komish)",
+      "email": "michael@ever.co",
+      "url": "https://ever.co"
+    }
+  ],
+  "scripts": {
+    "coverage": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 nyc report --reporter=text-lcov | coveralls",
+    "precommit": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 lint-staged",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node build/main.js",
+    "start:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 concurrently \"wait-on build/main.js && nodemon\" \"tsc -w -p tsconfig.build.json\" ",
+    "start:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node ./build/pm2bootstrap.js",
+    "build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && yarn webpack",
+    "dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node ./build/main.js",
+    "test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 jest",
+    "prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 node ./build/pm2bootstrap.js",
+    "nestjs": "cross-env NODE_OPTIONS=--max_old_space_size=4096 node ./dist/server",
+    "webpack": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 webpack --config webpack.config.js",
+    "lint": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 tslint -p tsconfig.json -c tslint.json",
+    "format": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 prettier **/**/*.ts --ignore-path ./.prettierignore --write && git status",
+    "docs": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 typedoc --out docs --mode modules",
+    "snyk-protect": "snyk protect",
+    "prepublish": "npm run snyk-protect"
+  },
+  "dependencies": {
+    "@captemulation/get-parameter-names": "^1.2.0",
+    "@nestjs/common": "^6.0.4",
+    "@nestjs/core": "^6.0.4",
+    "@nestjs/cqrs": "^6.0.0",
+    "@nestjs/graphql": "^6.0.4",
+    "@nestjs/microservices": "^6.0.4",
+    "@nestjs/passport": "^6.0.0",
+    "@nestjs/platform-express": "^6.0.4",
+    "@nestjs/platform-socket.io": "^6.0.4",
+    "@nestjs/swagger": "^3.0.2",
+    "@nestjs/typeorm": "^6.0.0",
+    "@nestjs/websockets": "^6.0.4",
+    "apollo-server-express": "^2.4.8",
+    "axios": "^0.18.0",
+    "bcrypt": "^3.0.4",
+    "bluebird": "^3.5.3",
+    "body-parser": "^1.18.3",
+    "bunyan": "^1.8.12",
+    "bunyan-cloudwatch": "^2.2.0",
+    "bunyan-prettystream": "^0.1.3",
+    "cli-color": "^1.4.0",
+    "concurix": "^1.1.2",
+    "connect": "^3.6.6",
+    "cookie-session": "^2.0.0-beta.3",
+    "core-decorators": "^0.20.0",
+    "cors": "^2.8.5",
+    "cryptiles": "^4.1.3",
+    "destroy": "^1.0.4",
+    "dotenv": "^7.0.0",
+    "envalid": "^4.2.2",
+    "errorhandler": "^1.5.0",
+    "etag": "^1.8.1",
+    "event-stream": "3.3.4",
+    "express": "^4.16.4",
+    "express-handlebars": "^3.0.2",
+    "faker": "^4.1.0",
+    "graphql": "^14.1.1",
+    "graphql-playground-middleware-express": "^1.7.12",
+    "graphql-subscriptions": "^1.0.0",
+    "graphql-tools": "^4.0.4",
+    "handlebars": "^4.1.1",
+    "image-size": "^0.7.2",
+    "install": "^0.12.2",
+    "inversify": "^5.0.1",
+    "ipstack": "^0.1.1",
+    "jsonwebtoken": "^8.5.1",
+    "kafka-node": "^4.0.4",
+    "lodash": "^4.17.11",
+    "method-override": "^3.0.0",
+    "mkdirp": "^0.5.1",
+    "module-alias": "^2.2.0",
+    "moment": "^2.24.0",
+    "mongodb": "^3.2.1",
+    "mongodb-memory-server": "^5.0.2",
+    "mongoose": "^5.5.0",
+    "morgan": "^1.9.1",
+    "ms": "^2.1.1",
+    "node-sass": "^4.11.0",
+    "on-finished": "^2.3.0",
+    "passport": "^0.4.0",
+    "passport-facebook": "^3.0.0",
+    "passport-google-oauth20": "^2.0.0",
+    "passport-http-bearer": "^1.0.1",
+    "passport-jwt": "^4.0.0",
+    "passport-local": "^1.0.0",
+    "passport-url": "^1.0.4",
+    "pem": "^1.14.2",
+    "pm2": "^3.4.0",
+    "redis": "^2.8.0",
+    "reflect-metadata": "^0.1.13",
+    "request": "^2.88.0",
+    "request-ip": "^2.1.3",
+    "request-promise": "^4.2.4",
+    "rxjs": "^6.4.0",
+    "rxjs-compat": "^6.4.0",
+    "serve-favicon": "^2.5.0",
+    "socket.io": "^2.2.0",
+    "socket.io-client": "^2.2.0",
+    "source-map-support": "^0.5.11",
+    "stripe": "^6.28.0",
+    "subscriptions-transport-ws": "^0.9.16",
+    "swagger-ui-express": "^4.0.2",
+    "symbol": "^0.3.1",
+    "symbol-observable": "^1.2.0",
+    "typeorm": "^0.2.15",
+    "typescript-collections": "^1.3.2",
+    "underscore.string": "^3.3.5",
+    "upath": "^1.1.2",
+    "uuid": "^3.3.2",
+    "validator": "^10.11.0",
+    "ws": "^6.2.0",
+    "snyk": "^1.161.1"
+  },
+  "devDependencies": {
+    "@nestjs/testing": "^6.0.4",
+    "@commitlint/cli": "^7.5.2",
+    "@commitlint/config-conventional": "^7.5.0",
+    "@commitlint/config-lerna-scopes": "^7.5.1",
+    "@commitlint/travis-cli": "^7.5.2",
+    "@types/bcrypt": "^3.0.0",
+    "@types/bluebird": "^3.5.26",
+    "@types/body-parser": "^1.17.0",
+    "@types/bunyan": "^1.8.6",
+    "@types/core-decorators": "^0.20.0",
+    "@types/cors": "^2.8.4",
+    "@types/errorhandler": "^0.0.32",
+    "@types/express": "^4.16.1",
+    "@types/faker": "^4.1.5",
+    "@types/form-data": "^2.2.1",
+    "@types/google-maps": "^3.2.0",
+    "@types/handlebars": "^4.1.0",
+    "@types/inversify": "^2.0.33",
+    "@types/jest": "^24.0.11",
+    "@types/jsonwebtoken": "^8.3.2",
+    "@types/kafka-node": "^2.0.8",
+    "@types/lodash": "^4.14.123",
+    "@types/method-override": "^0.0.31",
+    "@types/mkdirp": "^0.5.2",
+    "@types/moment": "^2.13.0",
+    "@types/mongodb": "^3.1.22",
+    "@types/mongoose": "^5.3.23",
+    "@types/node": "^11.9.3",
+    "@types/passport": "^1.0.0",
+    "@types/passport-jwt": "^3.0.1",
+    "@types/redis": "^2.8.11",
+    "@types/reflect-metadata": "^0.1.0",
+    "@types/request": "^2.48.1",
+    "@types/request-promise": "^4.1.42",
+    "@types/sinon": "^7.0.10",
+    "@types/socket.io": "^2.1.2",
+    "@types/socket.io-client": "^1.4.32",
+    "@types/source-map-support": "^0.5.0",
+    "@types/stripe": "^6.25.7",
+    "@types/uuid": "^3.4.4",
+    "@types/ws": "^6.0.1",
+    "concurrently": "^4.1.0",
+    "conventional-changelog": "^3.0.6",
+    "core-js": "^3.0.0",
+    "coveralls": "^3.0.3",
+    "cross-env": "^5.2.0",
+    "cz-conventional-changelog": "^2.1.0",
+    "husky": "^1.3.1",
+    "jest": "^24.5.0",
+    "nodemon": "^1.18.11",
+    "nyc": "^13.3.0",
+    "prettier": "^1.16.4",
+    "prettier-tslint": "^0.4.2",
+    "pretty-quick": "^1.10.0",
+    "require-directory": "^2.1.1",
+    "rxjs-tslint": "0.1.5",
+    "supertest": "^4.0.2",
+    "ts-jest": "^24.0.0",
+    "ts-loader": "^5.3.3",
+    "ts-node": "^8.1.0",
+    "tslint": "^5.16.0",
+    "typedoc": "^0.14.2",
+    "typemoq": "^2.1.0",
+    "typescript": "~3.4.3",
+    "wait-on": "^3.2.0",
+    "webpack": "^4.29.6",
+    "webpack-cli": "^3.3.0",
+    "webpack-command": "^0.4.2",
+    "webpack-graphql-loader": "^1.0.0",
+    "webpack-node-externals": "^1.7.2"
+  },
+  "nyc": {
+    "include": [
+      "packages/**/*.ts"
+    ],
+    "exclude": [
+      "node_modules/",
+      "packages/**/*.spec.ts",
+      "packages/core/adapters/*.ts",
+      "packages/websockets/adapters/*.ts",
+      "packages/**/nest-*.ts",
+      "packages/core/errors/**/*",
+      "packages/common/exceptions/*.ts",
+      "packages/common/http/*.ts",
+      "packages/microservices/exceptions/",
+      "packages/microservices/microservices-module.ts",
+      "packages/core/middleware/middleware-module.ts",
+      "packages/common/services/logger.service.ts"
+    ],
+    "extension": [
+      ".ts"
+    ],
+    "require": [
+      "ts-node/register"
+    ],
+    "reporter": [
+      "text-summary",
+      "html"
+    ],
+    "sourceMap": true,
+    "instrument": true
+  },
+  "lint-staged": {
+    "packages/**/*.{ts,json}": [
+      "npm run format",
+      "git add"
+    ]
+  },
+  "engines": {
+    "node": ">=10.15.0",
+    "yarn": ">=1.13.0"
+  },
+  "snyk": true
 }

From 18032bb405a5e44d7e205a965abae39225e409c9 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Tue, 7 May 2019 14:59:59 +0300
Subject: [PATCH 296/382] feat(ever-admin): add translate to track carriers
 page EV-1224

---
 .../carrier-tracking/carrier-tracking.component.html      | 7 +++++--
 admin/website-angular/src/assets/i18n/bg.json             | 4 ++++
 admin/website-angular/src/assets/i18n/en.json             | 4 ++++
 admin/website-angular/src/assets/i18n/he.json             | 8 ++++++++
 admin/website-angular/src/assets/i18n/ru.json             | 8 ++++++++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
index 63850718f..1c3b3cc0b 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
@@ -4,7 +4,10 @@
 			<div class="col-8">
 				<nb-card>
 					<nb-card-header>
-						Track all working carriers
+						{{
+							'CARRIERS_VIEW.TRACK.TRACK_ALL_WORKING_CARRIERS'
+								| translate
+						}}
 					</nb-card-header>
 					<nb-card-body>
 						<div #gmap class="googleMap"></div>
@@ -15,7 +18,7 @@
 			<div class="col-4">
 				<nb-card>
 					<nb-card-header>
-						Filter Carriers
+						{{ 'CARRIERS_VIEW.TRACK.FILTER_CARRIERS' | translate }}
 					</nb-card-header>
 					<nb-card-body style="overflow:inherit;">
 						<div>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 74bd74146..345be326e 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -848,6 +848,10 @@
 		"CREATE": {
 			"BASIC_INFO": "Основна информация",
 			"LOCATION": "Местоположение"
+		},
+		"TRACK": {
+			"TRACK_ALL_WORKING_CARRIERS": "Проследете всички работещи превозвачи",
+			"FILTER_CARRIERS": "Филтрирай превозвачите"
 		}
 	},
 	"PRODUCT_TYPE_VIEW": {
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index fda6fd5ef..e754e05f8 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -847,6 +847,10 @@
 		"CREATE": {
 			"BASIC_INFO": "Basic Info",
 			"LOCATION": "Location"
+		},
+		"TRACK": {
+			"TRACK_ALL_WORKING_CARRIERS": "Track all working carriers",
+			"FILTER_CARRIERS": "Filter Carriers"
 		}
 	},
 	"PRODUCT_TYPE_VIEW": {
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 61472a7d4..1ad18e09c 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -843,6 +843,14 @@
 			"CONTACT_PHONE": "צור קשר עם הטלפון",
 			"FIRST_NAME": "שם פרטי",
 			"LAST_NAME": "שם משפחה"
+		},
+		"CREATE": {
+			"BASIC_INFO": "מידע בסיסי",
+			"LOCATION": "מקום"
+		},
+		"TRACK": {
+			"TRACK_ALL_WORKING_CARRIERS": "עקוב אחר כל ספקי השירות",
+			"FILTER_CARRIERS": "מסנני מסננים"
 		}
 	},
 	"PRODUCT_TYPE_VIEW": {
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 822b5d6af..974ff1f9a 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -840,6 +840,14 @@
 			"CONTACT_PHONE": "Контактный телефон",
 			"FIRST_NAME": "Имя",
 			"LAST_NAME": "Фамилия"
+		},
+		"CREATE": {
+			"BASIC_INFO": "Базовая информация",
+			"LOCATION": "Место нахождения"
+		},
+		"TRACK": {
+			"TRACK_ALL_WORKING_CARRIERS": "Отслеживание всех работающих перевозчиков",
+			"FILTER_CARRIERS": "Фильтр-носители"
 		}
 	},
 	"PRODUCT_TYPE_VIEW": {

From 65bc9061dfdb4d8f197f871e681789d80b73413c Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Tue, 7 May 2019 15:52:38 +0300
Subject: [PATCH 297/382] feat(ever-admin): dashboard always sets the language
 to "en" EV-1224

---
 .../src/app/pages/+dashboard/dashboard.component.ts          | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.ts b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.ts
index 180556a98..62ba48187 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.ts
@@ -57,10 +57,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
 		private readonly _storeOrdersService: WarehouseOrdersService,
 		private readonly _ordersService: OrdersService,
 		private readonly _translateService: TranslateService
-	) {
-		this._translateService.setDefaultLang('en');
-		this._translateService.use('en');
-	}
+	) {}
 
 	get labelAvgPercent() {
 		const maxPercentRate = 100;

From ce5e8661479389bcfa0206bffd3d7b65b9f90493 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Tue, 7 May 2019 17:38:47 +0300
Subject: [PATCH 298/382] feat(ever-admin): made password required on creating
 new store EV-1222

---
 .../warehouse/forms/basic-info/basic-info-form.component.html   | 2 +-
 .../warehouse-mutation/warehouse-mutation.component.html        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.html b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.html
index 53587d995..4d1f673be 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.html
@@ -142,7 +142,7 @@
 
 			<div class="col-sm-8">
 				<input
-					type="text"
+					type="password"
 					class="form-control"
 					placeholder="{{ 'PLACEHOLDER.PASSWORD' | translate }}"
 					[formControl]="password"
diff --git a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html
index ea21b1070..cf921028b 100644
--- a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.html
@@ -16,7 +16,7 @@
 >
 	<wizard-step
 		[title]="'WAREHOUSE_VIEW.MUTATION.WIZARD_TITLES.BASIC_INFO' | translate"
-		[isValid]="basicInfo.valid"
+		[isValid]="basicInfo.valid && password.valid"
 	>
 		<div class="pt-5"></div>
 		<ea-warehouse-basic-info-form

From 23e8c841e130b2f759768a8dd1f6df9806d43562 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Tue, 7 May 2019 18:32:46 +0300
Subject: [PATCH 299/382] feat(ever-admin): center the icons in the categories
 table EV-1223

---
 .../categories-table/categories-table.component.html          | 1 +
 admin/website-angular/src/app/@theme/styles/styles.scss       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.html b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.html
index cb0eb0fd1..5abf1c22a 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.html
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.html
@@ -1,4 +1,5 @@
 <ng2-smart-table
+	class="category-table"
 	[settings]="settingsSmartTable"
 	[source]="sourceSmartTable"
 	(userRowSelect)="selectCategoryTmp($event)"
diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index c3d3f784e..d5b727bc6 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -77,6 +77,10 @@
 	padding: 0 !important;
 }
 
+.category-table td.ng2-smart-actions.ng-star-inserted {
+	padding: 0 !important;
+}
+
 ea-warehouse-product-create {
 	max-height: 800px;
 	// overflow: scroll;

From d8c49a6479233c0bfbb5dbda67476827582e4eb0 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Wed, 8 May 2019 11:52:21 +0300
Subject: [PATCH 300/382] feat(ever-admin): add translate EV-1224

---
 .../src/app/pages/+carriers/carriers.component.html        | 2 +-
 .../track/carrier-tracking/carrier-tracking.component.html | 7 +++++--
 admin/website-angular/src/assets/i18n/bg.json              | 3 ++-
 admin/website-angular/src/assets/i18n/en.json              | 3 ++-
 admin/website-angular/src/assets/i18n/he.json              | 3 ++-
 admin/website-angular/src/assets/i18n/ru.json              | 3 ++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.html b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
index f3d94e967..0033e3687 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
@@ -22,7 +22,7 @@
 			routerLink="track"
 		>
 			<i class="ion-md-map button-icon"></i>
-			Track
+			{{ 'CARRIERS_VIEW.TRACK' | translate }}
 		</button>
 	</nb-card-header>
 	<nb-card-body [nbSpinner]="loading">
diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
index 1c3b3cc0b..38c9ef094 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
@@ -5,7 +5,7 @@
 				<nb-card>
 					<nb-card-header>
 						{{
-							'CARRIERS_VIEW.TRACK.TRACK_ALL_WORKING_CARRIERS'
+							'CARRIERS_VIEW.TRACK_PAGE.TRACK_ALL_WORKING_CARRIERS'
 								| translate
 						}}
 					</nb-card-header>
@@ -18,7 +18,10 @@
 			<div class="col-4">
 				<nb-card>
 					<nb-card-header>
-						{{ 'CARRIERS_VIEW.TRACK.FILTER_CARRIERS' | translate }}
+						{{
+							'CARRIERS_VIEW.TRACK_PAGE.FILTER_CARRIERS'
+								| translate
+						}}
 					</nb-card-header>
 					<nb-card-body style="overflow:inherit;">
 						<div>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 345be326e..e4ea9a680 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -780,6 +780,7 @@
 		"CREATE_BUTTON": "създавам",
 		"ACTIVE_AND_AVAILABLE_ORDERS": "Активни и налични поръчки",
 		"ORDERS_HISTORY": "История на поръчките",
+		"TRACK": "Проследи",
 		"SMART_TABLE_COLUMNS": {
 			"IMAGE": "Изображение",
 			"NAME": "Име",
@@ -849,7 +850,7 @@
 			"BASIC_INFO": "Основна информация",
 			"LOCATION": "Местоположение"
 		},
-		"TRACK": {
+		"TRACK_PAGE": {
 			"TRACK_ALL_WORKING_CARRIERS": "Проследете всички работещи превозвачи",
 			"FILTER_CARRIERS": "Филтрирай превозвачите"
 		}
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index e754e05f8..c47c0602a 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -779,6 +779,7 @@
 		"CREATE_BUTTON": "CREATE",
 		"ACTIVE_AND_AVAILABLE_ORDERS": "Active and Available Orders",
 		"ORDERS_HISTORY": "Orders History",
+		"TRACK": "Track",
 		"SMART_TABLE_COLUMNS": {
 			"IMAGE": "Image",
 			"NAME": "Name",
@@ -848,7 +849,7 @@
 			"BASIC_INFO": "Basic Info",
 			"LOCATION": "Location"
 		},
-		"TRACK": {
+		"TRACK_PAGE": {
 			"TRACK_ALL_WORKING_CARRIERS": "Track all working carriers",
 			"FILTER_CARRIERS": "Filter Carriers"
 		}
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 1ad18e09c..9a3950fda 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -779,6 +779,7 @@
 		"CREATE_BUTTON": "צור",
 		"ACTIVE_AND_AVAILABLE_ORDERS": "הזמנות זמינות וזמינות",
 		"ORDERS_HISTORY": "היסטוריה",
+		"TRACK": "לעקוב",
 		"SMART_TABLE_COLUMNS": {
 			"IMAGE": "תמונה",
 			"NAME": "שם",
@@ -848,7 +849,7 @@
 			"BASIC_INFO": "מידע בסיסי",
 			"LOCATION": "מקום"
 		},
-		"TRACK": {
+		"TRACK_PAGE": {
 			"TRACK_ALL_WORKING_CARRIERS": "עקוב אחר כל ספקי השירות",
 			"FILTER_CARRIERS": "מסנני מסננים"
 		}
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 974ff1f9a..bfc4b28ec 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -776,6 +776,7 @@
 		"CREATE_BUTTON": "Создайте",
 		"ACTIVE_AND_AVAILABLE_ORDERS": "Активные и доступные заказы",
 		"ORDERS_HISTORY": "История на поръчките",
+		"TRACK": "Следовать",
 		"SMART_TABLE_COLUMNS": {
 			"IMAGE": "Образ",
 			"NAME": "Имя",
@@ -845,7 +846,7 @@
 			"BASIC_INFO": "Базовая информация",
 			"LOCATION": "Место нахождения"
 		},
-		"TRACK": {
+		"TRACK_PAGE": {
 			"TRACK_ALL_WORKING_CARRIERS": "Отслеживание всех работающих перевозчиков",
 			"FILTER_CARRIERS": "Фильтр-носители"
 		}

From 96ad9e4776a699591b340d2efa0a94f18720cdaa Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Wed, 8 May 2019 18:39:55 +0300
Subject: [PATCH 301/382] docs: fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 30b88f1b4..2f50dacfd 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 # Open-Source On-Demand Commerce Platform
 
-[Ever](https://ever.co)® is an Open-Source, Real-Time, Reactive, **On-Demand** Commerce Platform build with [TypeScript](http://www.typescriptlang.org).
+[Ever](https://ever.co)® is an Open-Source, Real-Time, Reactive, **On-Demand** Commerce Platform built with [TypeScript](http://www.typescriptlang.org).
 
 ![overview](https://docs.ever.co/docs/assets/overview_small.png)
 

From 62688526fc4dbb2f25e0866c1bed2b00ff15b205 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Thu, 9 May 2019 02:53:29 +0300
Subject: [PATCH 302/382] Update LICENSE.md

---
 LICENSE.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/LICENSE.md b/LICENSE.md
index b768a6ab9..10e933cee 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -16,13 +16,16 @@ Different parts of the Platform are made available under the terms of the separa
 -   Pyro shared modules - [MIT License](https://opensource.org/licenses/MIT)
 -   Other shared modules - [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.txt)
 
+We suggest to check a great overview about different open-source licenses at https://choosealicense.com/licenses.  
+Feel free to [Contact Us](https://github.com/ever-co/ever#contact-us) for an additional information about used open-source licenses!
+
 If you decide to choose the Ever Platform Community Edition License, you must comply with the following terms:
 
 This program is free software: you can redistribute it and/or modify it under the terms of the corresponding licenses described in the LICENSE.md files located in software sub-folders and under the terms of licenses described in individual files.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-You should have received a copy of the relevant GNU Licenses along with this program. If not, see http://www.gnu.org/licenses/.
+You should have received a copy of the relevant GNU Licenses along with this program. If not, see http://www.gnu.org/licenses.
 
 ### _Ever Platform Enterprise_ License
 

From c2405f7024f93e0374186415993aa7f0717ce4a3 Mon Sep 17 00:00:00 2001
From: Alish <alish931@abv.bg>
Date: Thu, 16 May 2019 22:24:04 +0300
Subject: [PATCH 303/382] Feature/ev 1227 improve initial start for web/mobile
 shop (#507)

* feat(ever-shop-mobile): improved mobile app EV-1227

* feat(ever-shop-web): improved initial start on Web Shop app EV-1227

* fix: fixed wrong code and some syntactic errors
---
 .../+by-location/by-location.page.html        | 69 ++++++++++++++-----
 .../+invite/+by-location/by-location.page.ts  | 14 +++-
 .../app/pages/+merchants/merchants.page.ts    |  5 +-
 .../src/app/pages/+products/products.page.ts  |  6 +-
 .../src/app/services/geo-location.ts          | 13 +++-
 .../src/app/+products/products.component.ts   |  5 +-
 .../src/app/services/geo-location.ts          | 14 ++++
 .../src/app/toolbar/toolbar.component.html    |  2 +-
 .../src/app/toolbar/toolbar.component.ts      |  9 ++-
 9 files changed, 111 insertions(+), 26 deletions(-)

diff --git a/shop/mobile-ionic/src/app/pages/+invite/+by-location/by-location.page.html b/shop/mobile-ionic/src/app/pages/+invite/+by-location/by-location.page.html
index 4559c8c7f..8f93dec87 100644
--- a/shop/mobile-ionic/src/app/pages/+invite/+by-location/by-location.page.html
+++ b/shop/mobile-ionic/src/app/pages/+invite/+by-location/by-location.page.html
@@ -1,18 +1,23 @@
 <div class="by-location" dir="{{ 'CURRENT_DIRECTION' | translate }}">
+	<h1>{{ 'INVITE_VIEW.YOUR_ADDRESS' | translate }}</h1>
 
-	<h1> {{ 'INVITE_VIEW.YOUR_ADDRESS' | translate }} </h1>
-
-	<h2> {{ 'INVITE_VIEW.LAUNCH_NOTIFICATION' | translate }} </h2>
+	<h2>{{ 'INVITE_VIEW.LAUNCH_NOTIFICATION' | translate }}</h2>
 
 	<div style="padding-top: 50px" *ngIf="detectingLocation">
-		<h3 style="color: white"> {{ 'INVITE_VIEW.DETECTING_LOCATION' | translate }} </h3>
-		<br/>
+		<h3 style="color: white">
+			{{ 'INVITE_VIEW.DETECTING_LOCATION' | translate }}
+		</h3>
+		<br />
 	</div>
 
 	<ion-spinner color="light" [hidden]="!detectingLocation"></ion-spinner>
 
 	<div *ngIf="!detectingLocation">
-		<input class="ion-autocomplete" [(ngModel)]="city" placeholder="{{ 'CITY' | translate }}" />
+		<input
+			class="ion-autocomplete"
+			[(ngModel)]="city"
+			placeholder="{{ 'CITY' | translate }}"
+		/>
 		<!--<input ion-autocomplete type="text" readonly="readonly" class="ion-autocomplete" autocomplete="off"
 			   [(ngModel)]="city" max-selected-items="1"
 			   items-method="inviteByLocationCtrl?.queryCities(query)" selected-items-label="Selected City"
@@ -21,8 +26,12 @@ <h3 style="color: white"> {{ 'INVITE_VIEW.DETECTING_LOCATION' | translate }} </h
 		<!-- Angular have no such label:
           cancel-label="{{ 'BACK' | translate }}"       -->
 
-		<div *ngIf='city'>
-			<input class="ion-autocomplete" [(ngModel)]="streetAddress" placeholder="{{ 'STREET' | translate }}" />
+		<div *ngIf="city">
+			<input
+				class="ion-autocomplete"
+				[(ngModel)]="streetAddress"
+				placeholder="{{ 'STREET' | translate }}"
+			/>
 			<!--<input ion-autocomplete readonly class="ion-autocomplete" autocomplete="off" [(ngModel)]="streetAddress"
 				   max-selected-items="1"
 				   items-method="inviteByLocationCtrl?.queryStreets(query)" selected-items-label="Selected Street"
@@ -30,26 +39,48 @@ <h3 style="color: white"> {{ 'INVITE_VIEW.DETECTING_LOCATION' | translate }} </h
 			<!-- Angular have no such label:
               cancel-label="{{ 'BACK' | translate }}"       -->
 
-			<div *ngIf='streetAddress'>
+			<div *ngIf="streetAddress">
 				<ion-grid no-padding>
 					<ion-row class="house-and-apartment">
 						<ion-col no-padding>
-							<div class="house house-{{ 'CURRENT_DIRECTION' | translate }}">
-								<input type="number" [(ngModel)]="house" placeholder="{{ 'HOUSE' | translate }}" />
+							<div
+								class="house house-{{
+									'CURRENT_DIRECTION' | translate
+								}}"
+							>
+								<input
+									type="number"
+									[(ngModel)]="house"
+									placeholder="{{ 'HOUSE' | translate }}"
+								/>
 							</div>
 						</ion-col>
 
 						<ion-col no-padding>
 							<div class="apartment">
-								<input type="number" *ngIf="isApartment" [(ngModel)]="apartment" placeholder="{{ 'APARTMENT' | translate }}" class="apartment apartment-{{ 'CURRENT_DIRECTION' | translate }}"
+								<input
+									type="number"
+									*ngIf="isApartment"
+									[(ngModel)]="apartment"
+									placeholder="{{ 'APARTMENT' | translate }}"
+									class="apartment apartment-{{
+										'CURRENT_DIRECTION' | translate
+									}}"
 								/>
 
-								<div *ngIf="!apartment" class="is-apartment is-apartment-{{ 'CURRENT_DIRECTION' | translate }}">
+								<div
+									*ngIf="!apartment"
+									class="is-apartment is-apartment-{{
+										'CURRENT_DIRECTION' | translate
+									}}"
+								>
 									<span class="description">
 										{{ 'APARTMENT' | translate }}
 									</span>
 									<label class="toggle toggle-assertive">
-										<ion-checkbox [(ngModel)]="isApartment"></ion-checkbox>
+										<ion-checkbox
+											[(ngModel)]="isApartment"
+										></ion-checkbox>
 										<div class="track">
 											<div class="handle"></div>
 										</div>
@@ -59,10 +90,16 @@ <h3 style="color: white"> {{ 'INVITE_VIEW.DETECTING_LOCATION' | translate }} </h
 						</ion-col>
 					</ion-row>
 				</ion-grid>
-				<ion-button color="secondary" *ngIf="house && (apartment || !isApartment)" expand="block" class="submit-button" (click)="login()">
+				<ion-button
+					color="secondary"
+					*ngIf="house && (apartment || !isApartment)"
+					expand="block"
+					class="submit-button"
+					(click)="login()"
+				>
 					{{ 'INVITE_VIEW.GET_IN' | translate }}
 				</ion-button>
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/shop/mobile-ionic/src/app/pages/+invite/+by-location/by-location.page.ts b/shop/mobile-ionic/src/app/pages/+invite/+by-location/by-location.page.ts
index bff2f4e6e..5315edb6f 100644
--- a/shop/mobile-ionic/src/app/pages/+invite/+by-location/by-location.page.ts
+++ b/shop/mobile-ionic/src/app/pages/+invite/+by-location/by-location.page.ts
@@ -16,6 +16,7 @@ import { Store } from '../../../services/store.service';
 import { UserAuthRouter } from '@modules/client.common.angular2/routers/user-auth-router.service';
 import { GeoLocationRouter } from '@modules/client.common.angular2/routers/geo-location-router.service';
 import { Subject } from 'rxjs';
+import { environment } from 'environment';
 
 @Component({
 	selector: 'e-cu-by-location',
@@ -71,7 +72,18 @@ export class ByLocationPage implements OnInit, OnDestroy {
 				enableHighAccuracy: true // will try to use GPS (if enabled) on mobile
 			};
 
-			const response = await Geolocation.getCurrentPosition(options);
+			const defaultLat = environment.DEFAULT_LATITUDE;
+			const defaultLng = environment.DEFAULT_LONGITUDE;
+
+			let response: { coords: { longitude: number; latitude: number } };
+
+			if (!environment.production && defaultLat && defaultLng) {
+				response = {
+					coords: { latitude: defaultLat, longitude: defaultLng }
+				};
+			} else {
+				response = await Geolocation.getCurrentPosition(options);
+			}
 
 			const { coords } = response;
 
diff --git a/shop/mobile-ionic/src/app/pages/+merchants/merchants.page.ts b/shop/mobile-ionic/src/app/pages/+merchants/merchants.page.ts
index 15ece3a4a..18cd34046 100644
--- a/shop/mobile-ionic/src/app/pages/+merchants/merchants.page.ts
+++ b/shop/mobile-ionic/src/app/pages/+merchants/merchants.page.ts
@@ -11,6 +11,7 @@ import { MerchantsService } from 'app/services/merchants/merchants.service';
 import { ILocation } from '@modules/server.common/interfaces/IGeoLocation';
 import { BarcodeScanner } from '@ionic-native/barcode-scanner';
 import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
+import { environment } from 'environment';
 
 @Component({
 	templateUrl: './merchants.page.html',
@@ -92,7 +93,9 @@ export class MerchantsPage implements OnDestroy {
 	private async getLocation() {
 		let location: ILocation;
 
-		if (this.store.userId) {
+		const isProductionEnv = environment.production;
+
+		if (this.store.userId && isProductionEnv) {
 			const user = await this.userRouter
 				.get(this.store.userId)
 				.pipe(first())
diff --git a/shop/mobile-ionic/src/app/pages/+products/products.page.ts b/shop/mobile-ionic/src/app/pages/+products/products.page.ts
index 82c914bd5..8b71969b2 100644
--- a/shop/mobile-ionic/src/app/pages/+products/products.page.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/products.page.ts
@@ -101,7 +101,7 @@ export class ProductsPage implements OnInit, OnDestroy {
 			this.store.registrationSystem = RegistrationSystem.Once;
 			this.store.buyProduct = currentProduct.warehouseProduct.id;
 			this.store.warehouseId = currentProduct.warehouseId;
-			this.navCtrl.navigateRoot('/invite');
+			this.router.navigateByUrl('/invite');
 		} else {
 			const orderCreateInput: IOrderCreateInput = {
 				warehouseId:
@@ -207,7 +207,9 @@ export class ProductsPage implements OnInit, OnDestroy {
 	private async loadGeoLocationProducts() {
 		let geoLocationForProducts: GeoLocation;
 
-		if (this.store.userId) {
+		const isProductionEnv = environment.production;
+
+		if (this.store.userId && isProductionEnv) {
 			const user = await this.userRouter
 				.get(this.store.userId)
 				.pipe(first())
diff --git a/shop/mobile-ionic/src/app/services/geo-location.ts b/shop/mobile-ionic/src/app/services/geo-location.ts
index 62f565667..8678e56e1 100644
--- a/shop/mobile-ionic/src/app/services/geo-location.ts
+++ b/shop/mobile-ionic/src/app/services/geo-location.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { ILocation } from '@modules/server.common/interfaces/IGeoLocation';
 import { Geolocation } from '@ionic-native/geolocation';
 import GeoLocation from '@modules/server.common/entities/GeoLocation';
+import { environment } from 'environment';
 
 @Injectable()
 export class GeoLocationService {
@@ -10,7 +11,17 @@ export class GeoLocationService {
 	getCurrentGeoLocation(): Promise<GeoLocation> {
 		return new Promise(async (resolve, reject) => {
 			try {
-				const { coords } = await Geolocation.getCurrentPosition();
+				const defaultLat = environment.DEFAULT_LATITUDE;
+				const defaultLng = environment.DEFAULT_LONGITUDE;
+
+				let coords: { longitude: number; latitude: number };
+
+				if (!environment.production && defaultLat && defaultLng) {
+					coords = { latitude: defaultLat, longitude: defaultLng };
+				} else {
+					const data = await Geolocation.getCurrentPosition();
+					coords = data.coords;
+				}
 
 				const location: ILocation = {
 					type: 'Point',
diff --git a/shop/website-angular/src/app/+products/products.component.ts b/shop/website-angular/src/app/+products/products.component.ts
index e106e36a2..3b8c74521 100644
--- a/shop/website-angular/src/app/+products/products.component.ts
+++ b/shop/website-angular/src/app/+products/products.component.ts
@@ -24,6 +24,7 @@ import { Subject } from 'rxjs';
 import 'rxjs/add/operator/debounceTime';
 import 'rxjs/add/operator/distinctUntilChanged';
 import { CarouselViewComponent } from './views/carousel/carousel-view.component';
+import { environment } from 'environments/environment';
 
 const initializeProductsNumber: number = 10;
 
@@ -139,7 +140,9 @@ export class ProductsComponent implements OnInit, OnDestroy {
 	private async loadGeoLocationProducts() {
 		let geoLocationForProducts: GeoLocation;
 
-		if (this.store.userId) {
+		const isProductionEnv = environment.production;
+
+		if (this.store.userId && isProductionEnv) {
 			const user = await this.userRouter
 				.get(this.store.userId)
 				.pipe(first())
diff --git a/shop/website-angular/src/app/services/geo-location.ts b/shop/website-angular/src/app/services/geo-location.ts
index 699882afa..71c746576 100644
--- a/shop/website-angular/src/app/services/geo-location.ts
+++ b/shop/website-angular/src/app/services/geo-location.ts
@@ -46,6 +46,20 @@ export class GeoLocationService {
 
 	getCurrentCoords(): Promise<Coords> {
 		return new Promise((resolve, reject) => {
+			const defaultLat = environment.DEFAULT_LATITUDE;
+			const defaultLng = environment.DEFAULT_LONGITUDE;
+
+			if (!environment.production && defaultLat && defaultLng) {
+				resolve(
+					this.getCoordsObj({
+						latitude: defaultLat,
+						longitude: defaultLng
+					})
+				);
+
+				return;
+			}
+
 			navigator.geolocation.getCurrentPosition(
 				(res) => {
 					// If user is enable GPS on browser
diff --git a/shop/website-angular/src/app/toolbar/toolbar.component.html b/shop/website-angular/src/app/toolbar/toolbar.component.html
index 3fd0f2e53..6677b8102 100644
--- a/shop/website-angular/src/app/toolbar/toolbar.component.html
+++ b/shop/website-angular/src/app/toolbar/toolbar.component.html
@@ -52,7 +52,7 @@
 			[color]="styleVariables.brandLighted"
 			focusedColor="#f1f1f1"
 			(searchLocation)="tryFindNewAddress($event)"
-			(detectLocation)="laodAddress(true)"
+			(detectLocation)="loadAddress(true)"
 		></mat-search>
 	</section>
 
diff --git a/shop/website-angular/src/app/toolbar/toolbar.component.ts b/shop/website-angular/src/app/toolbar/toolbar.component.ts
index 59aad09e9..018975a01 100644
--- a/shop/website-angular/src/app/toolbar/toolbar.component.ts
+++ b/shop/website-angular/src/app/toolbar/toolbar.component.ts
@@ -13,6 +13,7 @@ import { GeoLocationService } from 'app/services/geo-location';
 import { MatSearchComponent } from '@modules/material-extensions/search/mat-search.component';
 import { MatDialog } from '@angular/material';
 import { LocationPopupComponent } from 'app/shared/location-popup/location-popup.component';
+import { environment } from 'environments/environment';
 
 @Component({
 	selector: 'toolbar',
@@ -39,7 +40,7 @@ export class ToolbarComponent implements AfterViewInit {
 	) {
 		this.isDeliveryRequired =
 			this.store.deliveryType === DeliveryType.Delivery;
-		this.laodAddress();
+		this.loadAddress();
 		/*let autocomplete = new google.maps.places.Autocomplete(this.searchElementRef.nativeElement, {
 			types: ["address"]
 		});
@@ -92,10 +93,12 @@ export class ToolbarComponent implements AfterViewInit {
 		);
 	}
 
-	private async laodAddress(findNew: boolean = false) {
+	private async loadAddress(findNew: boolean = false) {
 		let geoLocationForProducts: GeoLocation;
 
-		if (this.store.userId && !findNew) {
+		const isProductionEnv = environment.production;
+
+		if (this.store.userId && !findNew && isProductionEnv) {
 			const user = await this.userRouter
 				.get(this.store.userId)
 				.pipe(first())

From a5c94b2fb12e61eddc236bf94d475b82d91c6bfb Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Fri, 17 May 2019 08:23:10 +0300
Subject: [PATCH 304/382] feat(ever-admin): added map

---
 .../src/app/@core/data/warehouses.service.ts  |   5 +
 .../warehouse-track.component.html            | 156 +++++++++++++++++-
 .../warehouse-track.component.scss            |   3 +
 .../warehouse-track.component.ts              |  28 +++-
 4 files changed, 188 insertions(+), 4 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/warehouses.service.ts b/admin/website-angular/src/app/@core/data/warehouses.service.ts
index 62e47467c..6653e3238 100644
--- a/admin/website-angular/src/app/@core/data/warehouses.service.ts
+++ b/admin/website-angular/src/app/@core/data/warehouses.service.ts
@@ -77,6 +77,11 @@ export class WarehousesService {
 						getAllStores {
 							id
 							_createdAt
+							geoLocation {
+								loc {
+									coordinates
+								}
+							}
 						}
 					}
 				`
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
index 94e71347b..63850718f 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
@@ -1 +1,155 @@
-Hello I'm a tracker
+<div class="row">
+	<div class="col-12">
+		<div class="row">
+			<div class="col-8">
+				<nb-card>
+					<nb-card-header>
+						Track all working carriers
+					</nb-card-header>
+					<nb-card-body>
+						<div #gmap class="googleMap"></div>
+					</nb-card-body>
+				</nb-card>
+			</div>
+
+			<div class="col-4">
+				<nb-card>
+					<nb-card-header>
+						Filter Carriers
+					</nb-card-header>
+					<nb-card-body style="overflow:inherit;">
+						<div>
+							<ng-select
+								[items]="stores"
+								placeholder="{{
+									'DASHBOARD_VIEW.SELECT_COMPONENT.SELECT_STORE'
+										| translate
+								}}"
+								[clearable]="false"
+								bindLabel="id"
+								style="width:100%;margin-bottom:30px;"
+								(change)="storeListener($event)"
+								[(ngModel)]="selectedStore"
+							>
+								<ng-template ng-label-tmp let-item="item">
+									<img
+										*ngIf="item.logo"
+										height="15"
+										width="15"
+										class="mr-2"
+										[src]="item.logo"
+									/>
+									<b>{{ item.name }}</b>
+								</ng-template>
+								<ng-template
+									ng-option-tmp
+									let-item="item"
+									let-index="index"
+								>
+									<h6 class="card-title">
+										<img
+											*ngIf="item.logo"
+											height="40"
+											width="40"
+											class="mr-1"
+											[src]="item.logo"
+										/>
+										{{ item.name }}
+									</h6>
+								</ng-template>
+							</ng-select>
+							<ng-select
+								(change)="carrierListener($event)"
+								[items]="filteredCarriersList"
+								[(ngModel)]="selectedCarrier"
+								[clearable]="false"
+								placeholder="{{
+									'CARRIERS_VIEW.CARRIER_PAGE.SELECT_CARRIER'
+										| translate
+								}}"
+								bindLabel="fullName"
+								style="width:100%; margin-bottom:30px;"
+							>
+								<ng-template ng-label-tmp let-item="item">
+									<img
+										*ngIf="item.logo"
+										height="15"
+										width="15"
+										class="mr-2"
+										[src]="item.logo"
+									/>
+									{{ item.fullName }}
+								</ng-template>
+								<ng-template
+									ng-option-tmp
+									let-item="item"
+									let-index="index"
+								>
+									<h6 class="card-title">
+										<img
+											*ngIf="item.logo"
+											height="40"
+											width="40"
+											class="mr-1"
+											[src]="item.logo"
+										/>
+										{{ item.fullName }}
+									</h6>
+								</ng-template>
+							</ng-select>
+						</div>
+						<nb-card-footer>
+							<div class="details">
+								<div class="warehouse" *ngIf="selectedStore">
+									<h5>
+										<b>{{ selectedStore.name }}</b>
+									</h5>
+									<ul>
+										<li>
+											Phone:
+											{{ selectedStore.contactPhone }}
+										</li>
+										<li>
+											Email:
+											{{ selectedStore.contactEmail }}
+										</li>
+										<li>
+											Address:
+											{{
+												selectedStore.geoLocation
+													.streetAddress
+											}}
+										</li>
+									</ul>
+								</div>
+								<div class="carrier" *ngIf="selectedCarrier">
+									<h5>
+										<b>{{ selectedCarrier.fullName }}</b>
+									</h5>
+									<ul>
+										<li>
+											Delivery Count:
+											{{
+												selectedCarrier.numberOfDeliveries
+											}}
+										</li>
+										<li>
+											Phone: {{ selectedCarrier.phone }}
+										</li>
+										<li>
+											Address:
+											{{
+												selectedCarrier.geoLocation
+													.streetAddress
+											}}
+										</li>
+									</ul>
+								</div>
+							</div>
+						</nb-card-footer>
+					</nb-card-body>
+				</nb-card>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.scss
index e69de29bb..aba87115b 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.scss
@@ -0,0 +1,3 @@
+.googleMap {
+	height: 700px;
+}
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index aa490e8ea..1e25fcbc7 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -1,9 +1,31 @@
-import { Component } from '@angular/core';
+import { Component, ViewChild, OnInit } from '@angular/core';
+import { WarehousesService } from 'app/@core/data/warehouses.service';
 
 @Component({
 	templateUrl: './warehouse-track.component.html',
 	styleUrls: ['./warehouse-track.component.scss']
 })
-export class WarehouseTrackComponent {
-	constructor() {}
+export class WarehouseTrackComponent implements OnInit {
+	@ViewChild('gmap')
+	gmapElement: any;
+	map: google.maps.Map;
+
+	constructor(private warehouseService: WarehousesService) {
+		this.warehouseService.getAllStores().subscribe((store) => {
+			console.log(store);
+		});
+	}
+
+	ngOnInit(): void {
+		this.showMap();
+	}
+
+	showMap() {
+		const mapProp = {
+			center: new google.maps.LatLng(42.642941, 23.334149),
+			zoom: 15,
+			mapTypeId: google.maps.MapTypeId.ROADMAP
+		};
+		this.map = new google.maps.Map(this.gmapElement.nativeElement, mapProp);
+	}
 }

From 0b193d8efb08ba46823d7bf26e62fae6934bc592 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 17 May 2019 09:33:26 +0300
Subject: [PATCH 305/382] chore(ever-api): update ws to the latest version

---
 backend/api/package.json |  16 +-
 backend/api/yarn.lock    | 706 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 679 insertions(+), 43 deletions(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index a653c670e..94d7db470 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -1,4 +1,4 @@
-{  
+{
 	"name": "ever-api",
 	"version": "0.2.0",
 	"description": "Ever API",
@@ -44,8 +44,8 @@
 		"lint": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 tslint -p tsconfig.json -c tslint.json",
 		"format": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 prettier **/**/*.ts --ignore-path ./.prettierignore --write && git status",
 		"docs": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 typedoc --out docs --mode modules",
-    "snyk-protect": "yarn snyk protect",
-    "prepublish": "yarn run snyk-protect"
+		"snyk-protect": "yarn snyk protect",
+		"prepublish": "yarn run snyk-protect"
 	},
 	"dependencies": {
 		"@captemulation/get-parameter-names": "^1.2.0",
@@ -139,7 +139,7 @@
 		"upath": "^1.1.2",
 		"uuid": "^3.3.2",
 		"validator": "^10.11.0",
-		"ws": "^6.2.1"
+		"ws": "^7.0.0"
 	},
 	"devDependencies": {
 		"@commitlint/cli": "^7.5.2",
@@ -185,10 +185,10 @@
 		"@types/ws": "^6.0.1",
 		"concurrently": "^4.1.0",
 		"conventional-changelog": "^3.1.4",
-		"cz-conventional-changelog": "^2.1.0",
 		"core-js": "^3.0.1",
 		"coveralls": "^3.0.3",
 		"cross-env": "^5.2.0",
+		"cz-conventional-changelog": "^2.1.0",
 		"husky": "^2.1.0",
 		"jest": "^24.7.1",
 		"nodemon": "^1.18.11",
@@ -198,6 +198,7 @@
 		"pretty-quick": "^1.10.0",
 		"require-directory": "^2.1.1",
 		"rxjs-tslint": "0.1.5",
+		"snyk": "^1.161.1",
 		"supertest": "^4.0.2",
 		"ts-jest": "^24.0.2",
 		"ts-loader": "^5.4.3",
@@ -211,8 +212,7 @@
 		"webpack-cli": "^3.3.1",
 		"webpack-command": "^0.4.2",
 		"webpack-graphql-loader": "^1.0.2",
-		"webpack-node-externals": "^1.7.2",
-    "snyk": "^1.161.1"
+		"webpack-node-externals": "^1.7.2"
 	},
 	"nyc": {
 		"include": [
@@ -255,5 +255,5 @@
 		"node": ">=10.15.0",
 		"yarn": ">=1.13.0"
 	},
-  "snyk": true
+	"snyk": true
 }
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 5e9b77e81..5d5a7e722 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -774,6 +774,21 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
+"@snyk/dep-graph@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.4.1.tgz#035e96224d12d260388d00abc46da02fb9d92d94"
+  integrity sha512-7L096NNuNggcSjyOlITaU17n0dz0J4K4WpIHvatP4K0kIbhxolil1QbJF/+xKMRpW6OuaXILiP0hp7szhkEIzQ==
+  dependencies:
+    graphlib "^2.1.5"
+    lodash "^4"
+    source-map-support "^0.5.9"
+    tslib "^1.9.3"
+
+"@snyk/gemfile@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457"
+  integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==
+
 "@types/accepts@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575"
@@ -1420,6 +1435,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+"@yarnpkg/lockfile@^1.0.2":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
 JSONStream@^1.0.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
@@ -1431,7 +1451,7 @@ abab@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
 
-abbrev@1:
+abbrev@1, abbrev@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
@@ -1532,6 +1552,18 @@ ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
 
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+
+ansi-escapes@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.1.0.tgz#62a9e5fa78e99c5bb588b1796855f5d729231b53"
+  integrity sha512-2VY/iCUZTDLD/qxptS3Zn3c6k2MeIbYqjRXqM8T5oC7N2mMjh3xIU3oYru6cHGbldFa9h5i8N0fP65UaUqrMWA==
+  dependencies:
+    type-fest "^0.3.0"
+
 ansi-regex@^2.0.0, ansi-regex@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -1560,6 +1592,11 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansicolors@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
+
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -1835,7 +1872,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
-asap@~2.0.6:
+asap@~2.0.3, asap@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -1885,7 +1922,7 @@ async-foreach@^0.1.3:
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
   integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
-async-limiter@~1.0.0:
+async-limiter@^1.0.0, async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
@@ -1909,6 +1946,11 @@ async@2.6.1, async@^2.4.1, async@^2.5.0, async@^2.6, async@^2.6.0, async@^2.6.1:
   dependencies:
     lodash "^4.17.10"
 
+async@^1.4.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+
 async@^2.6.2, async@~2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
@@ -2520,7 +2562,7 @@ camelcase-keys@^4.0.0:
     map-obj "^2.0.0"
     quick-lru "^1.0.0"
 
-camelcase@^2.0.0:
+camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
@@ -2624,6 +2666,11 @@ change-case@^3.0.1:
     upper-case "^1.1.1"
     upper-case-first "^1.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==
+
 charenc@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
@@ -2753,7 +2800,12 @@ cli-table-redemption@^1.0.0:
   dependencies:
     chalk "^1.1.3"
 
-cliui@^3.2.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=
+
+cliui@^3.0.3, cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
   integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
@@ -2770,6 +2822,16 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+clone-deep@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
+  integrity sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=
+  dependencies:
+    for-own "^1.0.0"
+    is-plain-object "^2.0.1"
+    kind-of "^3.2.2"
+    shallow-clone "^0.1.2"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -2948,7 +3010,7 @@ concurrently@^4.1.0:
     tree-kill "^1.1.0"
     yargs "^12.0.1"
 
-configstore@^3.0.0:
+configstore@^3.0.0, configstore@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
   dependencies:
@@ -3524,15 +3586,15 @@ debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0, debug@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
+debug@^3, debug@^3.1, debug@^3.2.5, debug@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   dependencies:
     ms "^2.1.1"
 
-debug@^3.1:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+debug@^3.0, debug@^3.1.0:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
   dependencies:
     ms "^2.1.1"
 
@@ -3749,6 +3811,11 @@ diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
+diff@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
+  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -3764,6 +3831,13 @@ dir-glob@^2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
+dockerfile-ast@0.0.12:
+  version "0.0.12"
+  resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz#6f25f6ad55eeecdd297ab68b08be1b32e64b5aeb"
+  integrity sha512-cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==
+  dependencies:
+    vscode-languageserver-types "^3.5.0"
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -3869,6 +3943,11 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+email-validator@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed"
+  integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==
+
 emitter-listener@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.1.tgz#e8bbbe8244bc8e0d0b4ef71cd14294c7f241c7ec"
@@ -4333,6 +4412,15 @@ extend@3, extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
+external-editor@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -4427,6 +4515,13 @@ figlet@^1.1.1:
   resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.2.1.tgz#48d35df9d9b10b1b3888302e6e57904a0b00509c"
   integrity sha512-qc8gycfnnfOmfvPl7Fi3JeTbcvdmbZkckyUVGGAM02je7Ookvu+bBfKy1I4FKqTsQHCs3ARJ76ip/k98r+OQuQ==
 
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 file-type@^3.8.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
@@ -4559,10 +4654,22 @@ follow-redirects@^1.3.0:
   dependencies:
     debug "=3.1.0"
 
-for-in@^1.0.2:
+for-in@^0.1.3:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
+
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
+  dependencies:
+    for-in "^1.0.1"
+
 foreground-child@^1.5.6:
   version "1.5.6"
   resolved "http://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
@@ -4828,6 +4935,21 @@ git-sha1@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/git-sha1/-/git-sha1-0.1.2.tgz#599ac192b71875825e13a445f3a6e05118c2f745"
 
+git-up@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0"
+  integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw==
+  dependencies:
+    is-ssh "^1.3.0"
+    parse-url "^5.0.0"
+
+git-url-parse@11.1.2:
+  version "11.1.2"
+  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67"
+  integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ==
+  dependencies:
+    git-up "^4.0.0"
+
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
@@ -4959,6 +5081,13 @@ graceful-fs@^4.1.15, graceful-fs@^4.1.3:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
+graphlib@^2.1.1, graphlib@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz#b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc"
+  integrity sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==
+  dependencies:
+    lodash "^4.17.5"
+
 graphql-config@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-1.2.1.tgz#97b4403707db408feb335fbc159651f2a36cb558"
@@ -5263,7 +5392,7 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4:
+hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
 
@@ -5352,7 +5481,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
@@ -5389,6 +5518,11 @@ image-size@^0.7.4:
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.7.4.tgz#092c1e541a93511917bfc957a1fc7add21c72e87"
   integrity sha512-GqPgxs+VkOr12aWwjSkyRzf5atzObWpFtiRuDgxCl2I/SDpZOKZFRD3iIAeAN6/usmn8SeLWRt7a8JRYK0Whbw==
 
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+
 import-fresh@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
@@ -5471,10 +5605,29 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
+ini@^1.3.0, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
+inquirer@^6.2.2:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.11"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
 install@^0.12.2:
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/install/-/install-0.12.2.tgz#ea10e9b2cbb5b0484f25080b24b5b34429d9f564"
@@ -5551,7 +5704,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5, is-buffer@~1.1.1:
+is-buffer@^1.0.2, is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -5713,7 +5866,7 @@ 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:
+is-promise@^2.1, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
@@ -5738,6 +5891,13 @@ is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
 
+is-ssh@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3"
+  integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==
+  dependencies:
+    protocols "^1.1.0"
+
 is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -6390,7 +6550,7 @@ js-yaml@^3.12.2:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.13.0:
+js-yaml@^3.13.0, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -6522,6 +6682,16 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jszip@^3.1.5:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.1.tgz#c5d32df7274042282b157efb16e522b43435e01a"
+  integrity sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw==
+  dependencies:
+    lie "~3.3.0"
+    pako "~1.0.2"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
+
 jwa@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6"
@@ -6583,7 +6753,14 @@ keygrip@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.3.tgz#399d709f0aed2bab0a059e0cdd3a5023a053e1dc"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
+  integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=
+  dependencies:
+    is-buffer "^1.0.2"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
@@ -6614,6 +6791,11 @@ latest-version@^3.0.0:
   dependencies:
     package-json "^4.0.0"
 
+lazy-cache@^0.2.3:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
+  integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=
+
 lazy@~1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/lazy/-/lazy-1.0.11.tgz#daa068206282542c088288e975c297c1ae77b690"
@@ -6649,6 +6831,13 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
+  dependencies:
+    immediate "~3.0.5"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -6709,7 +6898,17 @@ lodash.assign@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
   integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
-lodash.clonedeep@^4.3.2:
+lodash.assignin@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.clone@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
+  integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
+
+lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -6722,6 +6921,11 @@ lodash.findindex@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106"
 
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
@@ -6781,6 +6985,11 @@ lodash.once@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
 
+lodash.set@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
+  integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
+
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -6798,7 +7007,7 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@4.17.11, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@~4.17.10:
+lodash@4.17.11, lodash@^4, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
 
@@ -6861,6 +7070,14 @@ lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
+lru-cache@^4.0.0:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
 lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
@@ -6881,6 +7098,11 @@ lru-queue@0.1:
   dependencies:
     es5-ext "~0.10.2"
 
+macos-release@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
+  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
+
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -7239,6 +7461,14 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mixin-object@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
+  dependencies:
+    for-in "^0.1.3"
+    is-extendable "^0.1.1"
+
 mkdirp@0.5.1, mkdirp@0.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -7446,7 +7676,7 @@ multimatch@^3.0.0:
     arrify "^1.0.1"
     minimatch "^3.0.4"
 
-mute-stream@~0.0.4:
+mute-stream@0.0.7, mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
@@ -7501,6 +7731,16 @@ natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
+nconf@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2"
+  integrity sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==
+  dependencies:
+    async "^1.4.0"
+    ini "^1.3.0"
+    secure-keys "^1.0.0"
+    yargs "^3.19.0"
+
 ncp@~2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
@@ -7513,6 +7753,15 @@ needle@^2.2.1:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
+needle@^2.2.4:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
+  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@@ -7765,6 +8014,11 @@ normalize-path@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
+normalize-url@^3.3.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-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
@@ -7940,6 +8194,13 @@ opn@^5.3.0:
   dependencies:
     is-wsl "^1.1.0"
 
+opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+  dependencies:
+    is-wsl "^1.1.0"
+
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -8013,6 +8274,14 @@ os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
+os-name@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
+  dependencies:
+    macos-release "^2.2.0"
+    windows-release "^3.1.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -8125,6 +8394,11 @@ pako@^0.2.5:
   version "0.2.9"
   resolved "http://registry.npmjs.org/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
 
+pako@~1.0.2:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
+
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -8187,6 +8461,24 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
+parse-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff"
+  integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA==
+  dependencies:
+    is-ssh "^1.3.0"
+    protocols "^1.4.0"
+
+parse-url@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f"
+  integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg==
+  dependencies:
+    is-ssh "^1.3.0"
+    normalize-url "^3.3.0"
+    parse-path "^4.0.0"
+    protocols "^1.4.0"
+
 parse5@4.0.0, parse5@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -8615,6 +8907,13 @@ promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
 
+"promise@>=3.2 <8":
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
 promise@^8.0.2:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz#f592e099c6cddc000d538ee7283bb190452b0bf6"
@@ -8655,6 +8954,11 @@ protobufjs@^6.8.6:
     "@types/node" "^10.1.0"
     long "^4.0.0"
 
+protocols@^1.1.0, protocols@^1.4.0:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32"
+  integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==
+
 proxy-addr@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
@@ -8675,6 +8979,20 @@ proxy-agent@^3.0.3:
     proxy-from-env "^1.0.0"
     socks-proxy-agent "^4.0.1"
 
+proxy-agent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
+  integrity sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^3.1.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    pac-proxy-agent "^3.0.0"
+    proxy-from-env "^1.0.0"
+    socks-proxy-agent "^4.0.1"
+
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -8895,7 +9213,7 @@ read@^1.0.4:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, 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@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, 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.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -9281,6 +9599,13 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz#b50e6b34583f3dd89329a2f23a8a2be072845911"
   integrity sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA==
 
+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-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
@@ -9317,6 +9642,13 @@ rxjs@^6.3.3:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.4.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  dependencies:
+    tslib "^1.9.0"
+
 rxjs@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
@@ -9414,6 +9746,11 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
+secure-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca"
+  integrity sha1-8MgtmKOxOah3aogIBQuCRDEIf8o=
+
 seek-bzip@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
@@ -9443,6 +9780,11 @@ semver@5.6.0, semver@^5.5, semver@^5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@^5.5.1:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+
 semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
@@ -9509,6 +9851,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
 
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
@@ -9548,6 +9895,16 @@ sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+shallow-clone@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
+  integrity sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=
+  dependencies:
+    is-extendable "^0.1.1"
+    kind-of "^2.0.1"
+    lazy-cache "^0.2.3"
+    mixin-object "^2.0.1"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -9673,6 +10030,225 @@ snappy@^6.0.1, snappy@^6.1.2:
     nan "^2.12.1"
     prebuild-install "^5.2.2"
 
+snyk-config@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-2.2.1.tgz#bdacf79193158ec659bdcc4194140fd8d3772f9d"
+  integrity sha512-eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA==
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.17.11"
+    nconf "^0.10.0"
+
+snyk-docker-plugin@1.24.1:
+  version "1.24.1"
+  resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.24.1.tgz#a27fdabfdc86b00423968217850eff17ccdbd212"
+  integrity sha512-Y130BbrZ5hEPhjR1s57n5m1kNnlh4ydA000nPY4HvXylAX3JWQZR3/HFJ6nCKLes/z1cH19EsSdBNw7+r/N2ag==
+  dependencies:
+    debug "^3"
+    dockerfile-ast "0.0.12"
+    semver "^5.6.0"
+    tslib "^1"
+
+snyk-go-parser@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.0.2.tgz#7f60455b5af9407ad06ddc310d4a139300545646"
+  integrity sha512-vQfrPecK3j5JYwEI5lO0Gsy+QvFN2dHusGecmiXYpQPiyn1QLnYFTBxFIu94buxlxdKtujYkR/lA4dB82LJ8Lw==
+  dependencies:
+    toml "^3.0.0"
+    tslib "^1.9.3"
+
+snyk-go-plugin@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.7.2.tgz#d93c068e4965a3c5f5edb0f45cfa27a165c310f4"
+  integrity sha512-PDYZplpMVS3G5mQWDJakje4h2QibJSfwuNNaKMjBYFi+i8YoO6SG//G57Pdkz0uJ5iz5sEldfEtQNN2xN/zlIw==
+  dependencies:
+    debug "^4.1.1"
+    graphlib "^2.1.1"
+    snyk-go-parser "1.0.2"
+    tmp "0.0.33"
+
+snyk-gradle-plugin@2.10.2:
+  version "2.10.2"
+  resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-2.10.2.tgz#1822f618a01698745a1ad32aa5a0b891ccb0151d"
+  integrity sha512-XUn6ShQIY53qti8l3zluGsS2KjPGO0P3hfcXK9T34bWcOyLDLvSQjvM1HK/TpCqGldClbyuu+x6kHs5YRe+jjw==
+  dependencies:
+    chalk "^2.4.2"
+    clone-deep "^0.3.0"
+    tmp "0.0.33"
+    tslib "^1.9.3"
+
+snyk-module@1.9.1, snyk-module@^1.6.0, snyk-module@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.9.1.tgz#b2a78f736600b0ab680f1703466ed7309c980804"
+  integrity sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA==
+  dependencies:
+    debug "^3.1.0"
+    hosted-git-info "^2.7.1"
+
+snyk-mvn-plugin@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.0.tgz#a76cfc0041ecc4333f2c6f6f72138f1e4621da24"
+  integrity sha512-LOSiJu+XUPVqKCXcnQPLhlyTGm3ikDwjvYw5fpiEnvjMWkMDd8IfzZqulqreebJDmadUpP7Cn0fabfx7TszqxA==
+  dependencies:
+    lodash "4.17.11"
+    tslib "1.9.3"
+
+snyk-nodejs-lockfile-parser@1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.13.0.tgz#f3c81fd9a1870fdb5f71370e510d760326f3ee21"
+  integrity sha512-fC1o9SJ+iM+IYeBUYtvCIYh005WAvWMzqhEH3hI4zGPdCYQqGYIfVpXf29aCOKoorkTR345k5g6Etx54+BbrTQ==
+  dependencies:
+    "@yarnpkg/lockfile" "^1.0.2"
+    graphlib "^2.1.5"
+    lodash "^4.17.11"
+    source-map-support "^0.5.7"
+    tslib "^1.9.3"
+    uuid "^3.3.2"
+
+snyk-nuget-plugin@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.10.0.tgz#58aba49e37ca4ac99afcecb3d3c3917188daad84"
+  integrity sha512-V69AIWcHw4KrgEFC8kNWoqHo54wZkWGfqyVv+kJjQxARWYmQqV4YL/vxfLAoZ7mDsNXgjPn5M4ZEaeHFCeWcyA==
+  dependencies:
+    debug "^3.1.0"
+    jszip "^3.1.5"
+    lodash "^4.17.10"
+    snyk-paket-parser "1.4.3"
+    xml2js "^0.4.17"
+
+snyk-paket-parser@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/snyk-paket-parser/-/snyk-paket-parser-1.4.3.tgz#380ae8c5fb598f81c110f6b645c728c9cc50b7a5"
+  integrity sha512-6m736zGVoeT/zS9KEtlmqTSPEPjAfLe8iYoQ3AwbyxDhzuLY49lTaV67MyZtGwjhi1x4KBe+XOgeWwyf6Avf/A==
+  dependencies:
+    tslib "^1.9.3"
+
+snyk-php-plugin@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/snyk-php-plugin/-/snyk-php-plugin-1.5.3.tgz#a4de181ee0f186f75095cba7931c7b7e603b2d89"
+  integrity sha512-iZB3UpleLbeOL1D1bNLMFfh5hSflbQnepxmtXxXSD3S+euAhqJTZz/26QrsUIAtLQ2eHl3LfAXGTp6131tWyGw==
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.17.5"
+
+snyk-policy@1.13.5:
+  version "1.13.5"
+  resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.13.5.tgz#c5cf262f759879a65ab0810dd58d59c8ec7e9e47"
+  integrity sha512-KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ==
+  dependencies:
+    debug "^3.1.0"
+    email-validator "^2.0.4"
+    js-yaml "^3.13.1"
+    lodash.clonedeep "^4.5.0"
+    semver "^6.0.0"
+    snyk-module "^1.9.1"
+    snyk-resolve "^1.0.1"
+    snyk-try-require "^1.3.1"
+    then-fs "^2.0.0"
+
+snyk-python-plugin@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.10.0.tgz#16ce09a72b3676bfde2188837ee42e4695860938"
+  integrity sha512-U88Om9HxKxRp6EQ3Mn/iySr60ozjxzVaui+/Vmv6tcXqAEotstW/q24EBC3wmnRyAxzfZ7qTMQ+6XJxnYSKa2w==
+  dependencies:
+    tmp "0.0.33"
+
+snyk-resolve-deps@4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.0.3.tgz#f44389430c3712af8f574952e9ff188c6448dbd7"
+  integrity sha512-GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A==
+  dependencies:
+    ansicolors "^0.3.2"
+    debug "^3.2.5"
+    lodash.assign "^4.2.0"
+    lodash.assignin "^4.2.0"
+    lodash.clone "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.get "^4.4.2"
+    lodash.set "^4.3.2"
+    lru-cache "^4.0.0"
+    semver "^5.5.1"
+    snyk-module "^1.6.0"
+    snyk-resolve "^1.0.0"
+    snyk-tree "^1.0.0"
+    snyk-try-require "^1.1.1"
+    then-fs "^2.0.0"
+
+snyk-resolve@1.0.1, snyk-resolve@^1.0.0, snyk-resolve@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.1.tgz#eaa4a275cf7e2b579f18da5b188fe601b8eed9ab"
+  integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==
+  dependencies:
+    debug "^3.1.0"
+    then-fs "^2.0.0"
+
+snyk-sbt-plugin@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/snyk-sbt-plugin/-/snyk-sbt-plugin-2.2.0.tgz#77c07e8d9ed041a55629dbea39c909db3faf11c2"
+  integrity sha512-me/Su5J0ZVoOag3SrbfezHD6kkFymovGhZ0eK2P3T8607iWAOeGVEIbOXAAwMLSFmv8TpihQeWmnRgrCvPLfKw==
+
+snyk-tree@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/snyk-tree/-/snyk-tree-1.0.0.tgz#0fb73176dbf32e782f19100294160448f9111cc8"
+  integrity sha1-D7cxdtvzLngvGRAClBYESPkRHMg=
+  dependencies:
+    archy "^1.0.0"
+
+snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.3.1.tgz#6e026f92e64af7fcccea1ee53d524841e418a212"
+  integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI=
+  dependencies:
+    debug "^3.1.0"
+    lodash.clonedeep "^4.3.0"
+    lru-cache "^4.0.0"
+    then-fs "^2.0.0"
+
+snyk@^1.161.1:
+  version "1.165.0"
+  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.165.0.tgz#8ab56a62fdf8d66f6c2c773082187a1814378a97"
+  integrity sha512-EFB4iZywig+4PMGn8EyLjNcAbESg8kxxPytRxu8gAV7fAd0HNsqAInwmTsd/4F3T3onjI9hAWfXv8UbkITh3FA==
+  dependencies:
+    "@snyk/dep-graph" "1.4.1"
+    "@snyk/gemfile" "1.2.0"
+    abbrev "^1.1.1"
+    ansi-escapes "^4.1.0"
+    chalk "^2.4.2"
+    configstore "^3.1.2"
+    debug "^3.1.0"
+    diff "^4.0.1"
+    git-url-parse "11.1.2"
+    glob "^7.1.3"
+    inquirer "^6.2.2"
+    lodash "^4.17.11"
+    needle "^2.2.4"
+    opn "^5.5.0"
+    os-name "^3.0.0"
+    proxy-agent "^3.1.0"
+    proxy-from-env "^1.0.0"
+    semver "^6.0.0"
+    snyk-config "^2.2.1"
+    snyk-docker-plugin "1.24.1"
+    snyk-go-plugin "1.7.2"
+    snyk-gradle-plugin "2.10.2"
+    snyk-module "1.9.1"
+    snyk-mvn-plugin "2.3.0"
+    snyk-nodejs-lockfile-parser "1.13.0"
+    snyk-nuget-plugin "1.10.0"
+    snyk-php-plugin "1.5.3"
+    snyk-policy "1.13.5"
+    snyk-python-plugin "1.10.0"
+    snyk-resolve "1.0.1"
+    snyk-resolve-deps "4.0.3"
+    snyk-sbt-plugin "2.2.0"
+    snyk-tree "^1.0.0"
+    snyk-try-require "1.3.1"
+    source-map-support "^0.5.11"
+    tempfile "^2.0.0"
+    then-fs "^2.0.0"
+    update-notifier "^2.5.0"
+    uuid "^3.3.2"
+
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
@@ -9750,7 +10326,7 @@ source-map-support@^0.5.0, source-map-support@^0.5.6, source-map-support@~0.5.6:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@^0.5.12:
+source-map-support@^0.5.11, source-map-support@^0.5.12, source-map-support@^0.5.7, source-map-support@^0.5.9:
   version "0.5.12"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
   integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
@@ -9986,7 +10562,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -10235,6 +10811,19 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
+temp-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
+
+tempfile@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265"
+  integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU=
+  dependencies:
+    temp-dir "^1.0.0"
+    uuid "^3.0.1"
+
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -10289,6 +10878,13 @@ text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
+then-fs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2"
+  integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI=
+  dependencies:
+    promise ">=3.2 <8"
+
 thenify-all@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
@@ -10358,7 +10954,7 @@ titleize@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/titleize/-/titleize-1.0.1.tgz#21bc24fcca658eadc6d3bd3c38f2bd173769b4c5"
 
-tmp@^0.0.33:
+tmp@0.0.33, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:
@@ -10411,6 +11007,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toml@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
+  integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
+
 topo@3.x.x:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c"
@@ -10536,7 +11137,7 @@ ts-node@^8.1.0:
     source-map-support "^0.5.6"
     yn "^3.0.0"
 
-tslib@1.9.3, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@1.9.3, tslib@^1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
 
@@ -10607,6 +11208,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
+  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+
 type-fest@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
@@ -10891,7 +11497,7 @@ uuid@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
-uuid@3.3.2, uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2:
+uuid@3.3.2, uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
@@ -10942,6 +11548,11 @@ vm-browserify@0.0.4:
   dependencies:
     indexof "0.0.1"
 
+vscode-languageserver-types@^3.5.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
+  integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
+
 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"
@@ -11153,6 +11764,18 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
+window-size@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+  integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
+
+windows-release@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
+  dependencies:
+    execa "^1.0.0"
+
 word-wrap@^1.0.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -11229,12 +11852,12 @@ ws@^6.0.0, ws@~6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+ws@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.0.0.tgz#79351cbc3f784b3c20d0821baf4b4ff809ffbf51"
+  integrity sha512-cknCal4k0EAOrh1SHHPPWWh4qm93g1IuGGGwBjWkXmCG7LsDtL8w9w+YVfaF+KSVwiHQKDIMsSLBVftKf9d1pg==
   dependencies:
-    async-limiter "~1.0.0"
+    async-limiter "^1.0.0"
 
 xdg-basedir@^3.0.0:
   version "3.0.0"
@@ -11275,7 +11898,7 @@ xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
-y18n@^3.2.1:
+y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
@@ -11434,6 +12057,19 @@ yargs@^13.2.1, yargs@^13.2.2:
     y18n "^4.0.0"
     yargs-parser "^13.0.0"
 
+yargs@^3.19.0:
+  version "3.32.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+  integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
+  dependencies:
+    camelcase "^2.0.1"
+    cliui "^3.0.3"
+    decamelize "^1.1.1"
+    os-locale "^1.4.0"
+    string-width "^1.0.1"
+    window-size "^0.1.4"
+    y18n "^3.2.0"
+
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"

From b411073431a6d8877e3b42a6ffd15109e3e9ad9f Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Fri, 17 May 2019 10:04:18 +0300
Subject: [PATCH 306/382] feat(ever-admin): added merchant markers on map

---
 .../warehouse-track.component.html            |  4 +--
 .../warehouse-track.component.ts              | 29 +++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
index 63850718f..a9b275e4b 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
@@ -4,7 +4,7 @@
 			<div class="col-8">
 				<nb-card>
 					<nb-card-header>
-						Track all working carriers
+						Track all merchants
 					</nb-card-header>
 					<nb-card-body>
 						<div #gmap class="googleMap"></div>
@@ -15,7 +15,7 @@
 			<div class="col-4">
 				<nb-card>
 					<nb-card-header>
-						Filter Carriers
+						Filter Merchants
 					</nb-card-header>
 					<nb-card-body style="overflow:inherit;">
 						<div>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index 1e25fcbc7..a01e7a50b 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -1,5 +1,7 @@
 import { Component, ViewChild, OnInit } from '@angular/core';
 import { WarehousesService } from 'app/@core/data/warehouses.service';
+import { environment } from 'environments/environment';
+import { Marker } from '@agm/core/services/google-maps-types';
 
 @Component({
 	templateUrl: './warehouse-track.component.html',
@@ -10,14 +12,23 @@ export class WarehouseTrackComponent implements OnInit {
 	gmapElement: any;
 	map: google.maps.Map;
 
-	constructor(private warehouseService: WarehousesService) {
-		this.warehouseService.getAllStores().subscribe((store) => {
-			console.log(store);
-		});
-	}
+	merchantMarkers: any[] = [];
+
+	constructor(private warehouseService: WarehousesService) {}
 
 	ngOnInit(): void {
 		this.showMap();
+		this.warehouseService.getAllStores().subscribe((store) => {
+			store.forEach((mer) => {
+				const coords = new google.maps.LatLng(
+					mer.geoLocation.loc.coordinates[1],
+					mer.geoLocation.loc.coordinates[0]
+				);
+				const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
+				const marker = this.addMarker(coords, this.map, storeIcon);
+				this.merchantMarkers.push(marker);
+			});
+		});
 	}
 
 	showMap() {
@@ -28,4 +39,12 @@ export class WarehouseTrackComponent implements OnInit {
 		};
 		this.map = new google.maps.Map(this.gmapElement.nativeElement, mapProp);
 	}
+
+	addMarker(position, map, icon) {
+		return new google.maps.Marker({
+			position,
+			map,
+			icon
+		});
+	}
 }

From cf96a93be82c8edc77f2be2c9eaaa10b6e18d1f3 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 17 May 2019 10:18:15 +0300
Subject: [PATCH 307/382] chore: update husky and mpath to the latest version

---
 admin/website-angular/package.json |   4 +-
 admin/website-angular/yarn.lock    |  25 +++---
 backend/api/package.json           |   2 +-
 backend/api/yarn.lock              |  25 +++---
 carrier/mobile-ionic/package.json  |  28 +++---
 carrier/mobile-ionic/yarn.lock     |  59 +++++++------
 merchant/tablet-ionic/package.json |  20 ++---
 merchant/tablet-ionic/yarn.lock    |  52 ++++++------
 package.json                       |  12 +--
 shop/mobile-ionic/package.json     |  30 +++----
 shop/mobile-ionic/yarn.lock        | 132 ++++++++++++++---------------
 shop/website-angular/package.json  |  10 +--
 shop/website-angular/yarn.lock     |  25 +++---
 yarn.lock                          |  75 +++++-----------
 14 files changed, 244 insertions(+), 255 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index b91b408df..0b385ee47 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -187,7 +187,7 @@
 		"cross-env": "^5.2.0",
 		"dotenv": "^7.0.0",
 		"envalid": "^5.0.0",
-		"husky": "^2.1.0",
+		"husky": "^2.3.0",
 		"jasmine-core": "^3.4.0",
 		"jasmine-spec-reporter": "^4.2.1",
 		"karma": "^4.1.0",
@@ -203,8 +203,8 @@
 		"stylelint": "^10.0.1",
 		"ts-node": "^8.1.0",
 		"tslint": "^5.16.0",
-		"typescript-tslint-plugin": "^0.3.1",
 		"typescript": "~3.2.4",
+		"typescript-tslint-plugin": "^0.3.1",
 		"webpack-dev-server": "^3.3.1",
 		"yargs": "^13.2.2"
 	},
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 57f9b2bfc..db0aecde3 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -7261,10 +7261,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
-  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
+husky@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
+  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
@@ -7273,9 +7273,9 @@ husky@^2.1.0:
     is-ci "^2.0.0"
     pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^5.0.0"
+    read-pkg "^5.1.1"
     run-node "^1.0.0"
-    slash "^2.0.0"
+    slash "^3.0.0"
 
 i18next@^15.0.4:
   version "15.0.9"
@@ -11264,10 +11264,10 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
-  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
+read-pkg@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+  integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
     normalize-package-data "^2.5.0"
@@ -12131,6 +12131,11 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
diff --git a/backend/api/package.json b/backend/api/package.json
index 94d7db470..a1fe0d869 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -189,7 +189,7 @@
 		"coveralls": "^3.0.3",
 		"cross-env": "^5.2.0",
 		"cz-conventional-changelog": "^2.1.0",
-		"husky": "^2.1.0",
+		"husky": "^2.3.0",
 		"jest": "^24.7.1",
 		"nodemon": "^1.18.11",
 		"nyc": "^14.0.0",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 5d5a7e722..26922c0dc 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -5459,10 +5459,10 @@ https-proxy-agent@^2.2.1:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
-husky@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
-  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
+husky@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
+  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
@@ -5471,9 +5471,9 @@ husky@^2.1.0:
     is-ci "^2.0.0"
     pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^5.0.0"
+    read-pkg "^5.1.1"
     run-node "^1.0.0"
-    slash "^2.0.0"
+    slash "^3.0.0"
 
 iconv-lite@0.4.23:
   version "0.4.23"
@@ -9197,10 +9197,10 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-read-pkg@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
-  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
+read-pkg@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+  integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
     normalize-package-data "^2.5.0"
@@ -9980,6 +9980,11 @@ slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 sliced@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 05a964d79..40b74c9d7 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -62,9 +62,9 @@
 		"@angular/pwa": "^0.13.7",
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
-		"@ionic-native/camera": "^5.5.1",
-		"@ionic-native/call-number": "^5.5.1",
 		"@ionic-native/barcode-scanner": "^5.5.1",
+		"@ionic-native/call-number": "^5.5.1",
+		"@ionic-native/camera": "^5.5.1",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.5.1",
 		"@ionic-native/dialogs": "^5.5.1",
@@ -72,11 +72,11 @@
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.5.1",
 		"@ionic-native/google-maps": "~5.5.0",
-		"@ionic-native/network": "^5.5.1",
-		"@ionic-native/mixpanel": "^5.5.1",
-		"@ionic-native/local-notifications": "^5.5.1",
-		"@ionic-native/intercom": "^5.5.1",
 		"@ionic-native/in-app-browser": "^5.5.1",
+		"@ionic-native/intercom": "^5.5.1",
+		"@ionic-native/local-notifications": "^5.5.1",
+		"@ionic-native/mixpanel": "^5.5.1",
+		"@ionic-native/network": "^5.5.1",
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",
 		"@ionic-native/unique-device-id": "^5.3.0",
@@ -134,7 +134,7 @@
 		"kareem": "^2.3.0",
 		"lodash": "^4.17.11",
 		"mongoose": "^5.5.0",
-		"mpath": "^0.5.1",
+		"mpath": "^0.6.0",
 		"mquery": "^3.2.0",
 		"mx.ferreyra.callnumber": "0.0.2",
 		"node-sass": "^4.11.0",
@@ -166,11 +166,11 @@
 		"@angular/compiler": "^7.2.12",
 		"@angular/compiler-cli": "^7.2.12",
 		"@angular/language-service": "^7.2.12",
-		"@schematics/angular": "^7.3.8",
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.1",
 		"@ionic/app-scripts": "^3.2.3",
 		"@ionic/lab": "^1.0.24",
+		"@schematics/angular": "^7.3.8",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
 		"@types/graphql": "^14.0.7",
@@ -182,16 +182,16 @@
 		"@types/node": "^11.9.3",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/uuid": "^3.4.4",
-		"@types/yargs": "^13.0.0",
 		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
+		"@types/uuid": "^3.4.4",
+		"@types/yargs": "^13.0.0",
 		"codelyzer": "^5.0.1",
-		"cross-env": "^5.2.0",
 		"cpr": "^3.0.1",
-		"husky": "^2.1.0",
+		"cross-env": "^5.2.0",
 		"dotenv": "^7.0.0",
 		"envalid": "^5.0.0",
+		"husky": "^2.3.0",
 		"ionic": "^4.12.0",
 		"jasmine-core": "^3.3.0",
 		"jasmine-spec-reporter": "^4.2.1",
@@ -206,10 +206,10 @@
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
-		"yargs": "^13.2.2",
 		"typescript": "~3.2.4",
 		"webpack-bundle-analyzer": "^3.1.0",
-		"webpack-merge": "^4.2.1"
+		"webpack-merge": "^4.2.1",
+		"yargs": "^13.2.2"
 	},
 	"config": {
 		"ionic_webpack": "./config/webpack.config.js"
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 4039bc29d..718fb5381 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -407,10 +407,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/call-number@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.4.0.tgz#097ec2f732b8e8eaf12bc6797e4ebf7511c6d4cd"
-  integrity sha512-rG/rLePAqWxNNgh0YlneiT0QdArRXICWF0Zz/YyqD9vuXr2D0as1xPomXSjWhoUu0J6UO5LdLK5Up2PL9+LwGw==
+"@ionic-native/call-number@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.6.0.tgz#3c0b4a2b42ae4eced3f40918badefcd24c577651"
+  integrity sha512-8MfFo5BLwqsLUKh56pyCJ04yqk2AmnF13tTlyfUbgw8wvspoJkcDtf4kBd1KVoBn8Uywo1vC4EcWeBwEhI8AQQ==
   dependencies:
     "@types/cordova" latest
 
@@ -428,17 +428,17 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/device@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.4.0.tgz#1f071460a2559468256a8b7a82127cd7c1ebacff"
-  integrity sha512-C9j2iryuDzWXkFucR0liKgA2DU0vVkEWweOIqgPXcYSlS6NgdguYcbBWh8Bi+JKhT/lqTNq9bKrquZUwkf1IcA==
+"@ionic-native/device@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.6.0.tgz#e08a492b56e92701124ce197b84dd8a0a661de58"
+  integrity sha512-bdLqmaXIdPiYNX+BUin4ByplgFJIyvUArZrVw2cWJS19Ry6FwQ1Z2OkF4BRxSKw06ppRM3OKERe3AeyqN2VuZA==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/dialogs@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.4.0.tgz#650357eb0c3ea444eabfaa12cae34fba555d284d"
-  integrity sha512-8JlLXsGjvWmLWjVJJUnfKaR1jFQD5qK5gqKcoylkQRakUBpuzTB/fFAMwOyBcHZcioXWkKDInELq2h2fu5T+WA==
+"@ionic-native/dialogs@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.6.0.tgz#12d820c4d2a1736469e38e2e512fb52a33c7bb12"
+  integrity sha512-2Xi5Y65hplnKoZbrMzmGu966rcMw4CMF8es++5C1gqDq1RIgLKVC2W+/tGUl3Z+EEFZYkDyzeeowhviW2vO4mA==
   dependencies:
     "@types/cordova" latest
 
@@ -5272,10 +5272,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
-  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
+husky@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
+  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
@@ -5284,9 +5284,9 @@ husky@^2.1.0:
     is-ci "^2.0.0"
     pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^5.0.0"
+    read-pkg "^5.1.1"
     run-node "^1.0.0"
-    slash "^2.0.0"
+    slash "^3.0.0"
 
 i18next@^15.0.4:
   version "15.0.9"
@@ -7083,11 +7083,16 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-mpath@0.5.1, mpath@^0.5.1:
+mpath@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.5.1.tgz#17131501f1ff9e6e4fbc8ffa875aa7065b5775ab"
   integrity sha512-H8OVQ+QEz82sch4wbODFOz+3YQ61FYz/z3eJ5pIdbMEaUzDqA268Wd+Vt4Paw9TJfvDgVKaayC0gBzMIw2jhsg==
 
+mpath@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.6.0.tgz#aa922029fca4f0f641f360e74c5c1b6a4c47078e"
+  integrity sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw==
+
 mquery@3.2.0, mquery@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/mquery/-/mquery-3.2.0.tgz#e276472abd5109686a15eb2a8e0761db813c81cc"
@@ -8517,10 +8522,10 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
-  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
+read-pkg@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+  integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
     normalize-package-data "^2.5.0"
@@ -9276,10 +9281,10 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slice-ansi@^2.0.0:
   version "2.1.0"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index dcc75e706..f64979b22 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -65,23 +65,23 @@
 		"@angular/pwa": "^0.13.8",
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
-		"@ionic-native/camera": "^5.5.1",
-		"@ionic-native/call-number": "^5.5.1",
 		"@ionic-native/barcode-scanner": "^5.5.1",
+		"@ionic-native/call-number": "^5.5.1",
+		"@ionic-native/camera": "^5.5.1",
 		"@ionic-native/core": "^5.3.0",
-		"@ionic-native/email-composer": "^5.5.1",
 		"@ionic-native/device": "^5.5.1",
 		"@ionic-native/dialogs": "^5.5.1",
+		"@ionic-native/email-composer": "^5.5.1",
 		"@ionic-native/file-transfer": "^5.5.1",
 		"@ionic-native/geolocation": "^5.5.1",
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.5.1",
 		"@ionic-native/google-maps": "~5.5.0",
-		"@ionic-native/network": "^5.5.1",
-		"@ionic-native/mixpanel": "^5.5.1",
-		"@ionic-native/local-notifications": "^5.5.1",
-		"@ionic-native/intercom": "^5.5.1",
 		"@ionic-native/in-app-browser": "^5.5.1",
+		"@ionic-native/intercom": "^5.5.1",
+		"@ionic-native/local-notifications": "^5.5.1",
+		"@ionic-native/mixpanel": "^5.5.1",
+		"@ionic-native/network": "^5.5.1",
 		"@ionic-native/open-native-settings": "^5.3.0",
 		"@ionic-native/screen-orientation": "^5.3.0",
 		"@ionic-native/splash-screen": "^5.3.0",
@@ -202,17 +202,17 @@
 		"cross-env": "^5.2.0",
 		"dotenv": "^7.0.0",
 		"envalid": "^5.0.0",
-		"husky": "^2.1.0",
+		"husky": "^2.3.0",
 		"ionic": "^4.12.0",
 		"rxjs-tslint": "0.1.5",
 		"terser": "^3.17.0",
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
-		"yargs": "^13.2.2",
 		"typescript": "~3.2.4",
 		"webpack-bundle-analyzer": "^3.1.0",
-		"webpack-merge": "^4.2.1"
+		"webpack-merge": "^4.2.1",
+		"yargs": "^13.2.2"
 	},
 	"cordova": {
 		"platforms": [
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 2aa66d4d7..27ef0afab 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -347,24 +347,24 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/dialogs@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.4.0.tgz#650357eb0c3ea444eabfaa12cae34fba555d284d"
-  integrity sha512-8JlLXsGjvWmLWjVJJUnfKaR1jFQD5qK5gqKcoylkQRakUBpuzTB/fFAMwOyBcHZcioXWkKDInELq2h2fu5T+WA==
+"@ionic-native/dialogs@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.6.0.tgz#12d820c4d2a1736469e38e2e512fb52a33c7bb12"
+  integrity sha512-2Xi5Y65hplnKoZbrMzmGu966rcMw4CMF8es++5C1gqDq1RIgLKVC2W+/tGUl3Z+EEFZYkDyzeeowhviW2vO4mA==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/email-composer@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/email-composer/-/email-composer-5.4.0.tgz#eef344baf3dd0c2eb9bbdf98b187605713502728"
-  integrity sha512-LfUivEmQBBBMJzMNy3Cfv/ZtfNw2lF7K2VyVoYqAuRFWXaTpmmj8LiHT3bTsUVL1hr3D99lcaGBzNADZ8QwV0g==
+"@ionic-native/email-composer@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/email-composer/-/email-composer-5.6.0.tgz#a728120b2741621b23b402c575baff620f859431"
+  integrity sha512-2+Txwv/rjT+/k5azQIFVK3ttm7NfGMFqusOEn5g26B9opZKHjINK6yD9ofIAI7HlYd8aYBc4xQ2/rvssvDZ03g==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/file-transfer@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/file-transfer/-/file-transfer-5.4.0.tgz#efb6acfbf63206000945626244e268dc863443dd"
-  integrity sha512-Z5PQNyAZLlXmRDF7bNxs9sBou+CluYG0wAk11tPNlfoSXYnN/i8OIrk56hJrDfNLw8+yCnyy7+HRFaPocg36ew==
+"@ionic-native/file-transfer@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/file-transfer/-/file-transfer-5.6.0.tgz#b2a256c9623bcd98fc9c29dff20afc48a10a37a8"
+  integrity sha512-5tK4d03ma7nibc1ETYK01BSUzoAypW54XMvBOO2a4/fEAXXfh8o5zWK0nGv9LEbT2a291WBCWkr2G/UpxC938A==
   dependencies:
     "@types/cordova" latest
 
@@ -5245,10 +5245,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
-  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
+husky@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
+  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
@@ -5257,9 +5257,9 @@ husky@^2.1.0:
     is-ci "^2.0.0"
     pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^5.0.0"
+    read-pkg "^5.1.1"
     run-node "^1.0.0"
-    slash "^2.0.0"
+    slash "^3.0.0"
 
 i18next@^15.0.4:
   version "15.0.9"
@@ -8472,10 +8472,10 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
-  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
+read-pkg@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+  integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
     normalize-package-data "^2.5.0"
@@ -9214,10 +9214,10 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slice-ansi@^2.0.0:
   version "2.1.0"
diff --git a/package.json b/package.json
index e295ab516..a919489b4 100644
--- a/package.json
+++ b/package.json
@@ -54,10 +54,10 @@
 		"@angular/core": "^7.2.14",
 		"@angular/platform-browser": "^7.2.14",
 		"@angular/platform-browser-dynamic": "^7.2.14",
-		"@ngx-translate/core": "^11.0.1",
-		"@ngx-translate/http-loader": "^4.0.0",
 		"@captemulation/get-parameter-names": "^1.2.0",
 		"@nestjs/typeorm": "^6.1.0",
+		"@ngx-translate/core": "^11.0.1",
+		"@ngx-translate/http-loader": "^4.0.0",
 		"angular2-logger": "^0.7.0",
 		"npm": "^6.9.0",
 		"rxjs": "^6.5.1",
@@ -68,8 +68,6 @@
 		"uuid": "^3.3.2"
 	},
 	"devDependencies": {
-		"conventional-changelog": "^3.1.4",
-		"cz-conventional-changelog": "^2.1.0",
 		"@commitlint/cli": "^7.5.2",
 		"@commitlint/config-conventional": "^7.5.0",
 		"@commitlint/config-lerna-scopes": "^7.5.1",
@@ -89,10 +87,12 @@
 		"@types/stripe": "^6.25.12",
 		"@types/uuid": "^3.4.4",
 		"cloc": "^2.4.0",
-		"cross-env": "^5.2.0",
 		"codelyzer": "^5.0.1",
 		"concurrently": "^4.1.0",
-		"husky": "^2.1.0",
+		"conventional-changelog": "^3.1.4",
+		"cross-env": "^5.2.0",
+		"cz-conventional-changelog": "^2.1.0",
+		"husky": "^2.3.0",
 		"jasmine-core": "^3.4.0",
 		"jasmine-spec-reporter": "^4.2.1",
 		"karma": "^4.1.0",
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 148147997..cf65dc9ce 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -62,9 +62,9 @@
 		"@angular/pwa": "^0.13.8",
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
-		"@ionic-native/camera": "^5.5.1",
-		"@ionic-native/call-number": "^5.5.1",
 		"@ionic-native/barcode-scanner": "^5.5.1",
+		"@ionic-native/call-number": "^5.5.1",
+		"@ionic-native/camera": "^5.5.1",
 		"@ionic-native/core": "^5.3.0",
 		"@ionic-native/device": "^5.5.1",
 		"@ionic-native/dialogs": "^5.5.1",
@@ -72,11 +72,11 @@
 		"@ionic-native/globalization": "^5.3.0",
 		"@ionic-native/google-analytics": "^5.5.1",
 		"@ionic-native/google-maps": "~5.5.0",
-		"@ionic-native/network": "^5.5.1",
-		"@ionic-native/mixpanel": "^5.5.1",
-		"@ionic-native/local-notifications": "^5.5.1",
-		"@ionic-native/intercom": "^5.5.1",
 		"@ionic-native/in-app-browser": "^5.5.1",
+		"@ionic-native/intercom": "^5.5.1",
+		"@ionic-native/local-notifications": "^5.5.1",
+		"@ionic-native/mixpanel": "^5.5.1",
+		"@ionic-native/network": "^5.5.1",
 		"@ionic-native/splash-screen": "^5.3.0",
 		"@ionic-native/status-bar": "^5.3.0",
 		"@ionic-native/unique-device-id": "^5.3.0",
@@ -116,7 +116,6 @@
 		"cordova-plugin-uniquedeviceid": "^1.3.2",
 		"cordova-plugin-vibration": "^3.1.0",
 		"cordova-plugin-whitelist": "^1.3.3",
-		"phonegap-plugin-barcodescanner": "^8.0.1",
 		"core-js": "^3.0.0",
 		"cryptiles": "^4.1.3",
 		"font-awesome": "^4.7.0",
@@ -128,6 +127,7 @@
 		"lodash": "^4.17.11",
 		"mx.ferreyra.callnumber": "0.0.2",
 		"node-sass": "^4.11.0",
+		"phonegap-plugin-barcodescanner": "^8.0.1",
 		"qrcode": "^1.3.3",
 		"reflect-metadata": "^0.1.13",
 		"rxjs": "^6.4.0",
@@ -136,8 +136,8 @@
 		"save": "^2.3.3",
 		"socket.io-client": "^2.2.0",
 		"stripe": "^6.28.0",
-		"swiper": "^4.5.0",
 		"subscriptions-transport-ws": "^0.9.16",
+		"swiper": "^4.5.0",
 		"tslib": "^1.9.3",
 		"uuid": "^3.3.2",
 		"zone.js": "^0.9.0"
@@ -154,11 +154,11 @@
 		"@angular/compiler": "^7.2.12",
 		"@angular/compiler-cli": "^7.2.12",
 		"@angular/language-service": "^7.2.12",
-		"@schematics/angular": "^7.3.8",
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.1",
 		"@ionic/app-scripts": "^3.2.3",
 		"@ionic/lab": "^1.0.24",
+		"@schematics/angular": "^7.3.8",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
 		"@types/graphql": "^14.0.7",
@@ -170,16 +170,16 @@
 		"@types/node": "^11.9.3",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/uuid": "^3.4.4",
-		"@types/yargs": "^13.0.0",
 		"@types/stripe": "^6.25.7",
 		"@types/swiper": "^4.4.2",
+		"@types/uuid": "^3.4.4",
+		"@types/yargs": "^13.0.0",
 		"codelyzer": "^5.0.1",
-		"cross-env": "^5.2.0",
 		"cpr": "^3.0.1",
-		"husky": "^2.1.0",
+		"cross-env": "^5.2.0",
 		"dotenv": "^7.0.0",
 		"envalid": "^5.0.0",
+		"husky": "^2.3.0",
 		"ionic": "^4.12.0",
 		"jasmine-core": "^3.3.0",
 		"jasmine-spec-reporter": "^4.2.1",
@@ -194,10 +194,10 @@
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
-		"yargs": "^13.2.2",
 		"typescript": "~3.2.4",
 		"webpack-bundle-analyzer": "^3.1.0",
-		"webpack-merge": "^4.2.1"
+		"webpack-merge": "^4.2.1",
+		"yargs": "^13.2.2"
 	},
 	"cordova": {
 		"platforms": [
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 125274b42..09dbf6dd2 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -400,24 +400,24 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
-"@ionic-native/barcode-scanner@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.4.0.tgz#b38db6a40973ee2780dd993c3521f3962d3f083a"
-  integrity sha512-p7/wBtu3P20jX98eVoAvxoPNw9UhlVPjDTJ/DHimlFlUnj5jRl0jcQJ7ZXo8AYCYfs7vC8a32BDnqTkQlo6Lfw==
+"@ionic-native/barcode-scanner@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/barcode-scanner/-/barcode-scanner-5.6.0.tgz#54433212422be34afdb58ef63c8af5c5a0ab7545"
+  integrity sha512-zga7ScJv6B05uKCu7YvdYoVQCMg0+3vgebynMX0ViEp68R5g6Ro9etmtWPUes/vNBWGGgv/YCATrlGzdYH8tcA==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/call-number@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.4.0.tgz#097ec2f732b8e8eaf12bc6797e4ebf7511c6d4cd"
-  integrity sha512-rG/rLePAqWxNNgh0YlneiT0QdArRXICWF0Zz/YyqD9vuXr2D0as1xPomXSjWhoUu0J6UO5LdLK5Up2PL9+LwGw==
+"@ionic-native/call-number@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/call-number/-/call-number-5.6.0.tgz#3c0b4a2b42ae4eced3f40918badefcd24c577651"
+  integrity sha512-8MfFo5BLwqsLUKh56pyCJ04yqk2AmnF13tTlyfUbgw8wvspoJkcDtf4kBd1KVoBn8Uywo1vC4EcWeBwEhI8AQQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/camera@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.4.0.tgz#d10461b9486ef8b064a7314b77c090b59620208f"
-  integrity sha512-lReblyrDaDA3Nr4uLYozOpixvdrHrpLVaGfPd7I1oR0sIYWyphFPXiCMFQL2r29GDl4hRm0jsxG5ygAvjXVTXw==
+"@ionic-native/camera@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/camera/-/camera-5.6.0.tgz#7e878eb939c377350ccaef32ddf459c6da319a99"
+  integrity sha512-XSTWP1VlAchV9phapWkP/VivnRtTf+LQLP8XC3NWlMdayrQTos8ON6Lz83/hIpidsBgOzwpus/Q7OrP8cpgtlA==
   dependencies:
     "@types/cordova" latest
 
@@ -428,24 +428,24 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/device@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.4.0.tgz#1f071460a2559468256a8b7a82127cd7c1ebacff"
-  integrity sha512-C9j2iryuDzWXkFucR0liKgA2DU0vVkEWweOIqgPXcYSlS6NgdguYcbBWh8Bi+JKhT/lqTNq9bKrquZUwkf1IcA==
+"@ionic-native/device@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/device/-/device-5.6.0.tgz#e08a492b56e92701124ce197b84dd8a0a661de58"
+  integrity sha512-bdLqmaXIdPiYNX+BUin4ByplgFJIyvUArZrVw2cWJS19Ry6FwQ1Z2OkF4BRxSKw06ppRM3OKERe3AeyqN2VuZA==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/dialogs@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.4.0.tgz#650357eb0c3ea444eabfaa12cae34fba555d284d"
-  integrity sha512-8JlLXsGjvWmLWjVJJUnfKaR1jFQD5qK5gqKcoylkQRakUBpuzTB/fFAMwOyBcHZcioXWkKDInELq2h2fu5T+WA==
+"@ionic-native/dialogs@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/dialogs/-/dialogs-5.6.0.tgz#12d820c4d2a1736469e38e2e512fb52a33c7bb12"
+  integrity sha512-2Xi5Y65hplnKoZbrMzmGu966rcMw4CMF8es++5C1gqDq1RIgLKVC2W+/tGUl3Z+EEFZYkDyzeeowhviW2vO4mA==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/geolocation@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.4.0.tgz#332f0650c16b103d48c8a06b4ba0465ac0f88220"
-  integrity sha512-mcnIVhYZwRvoDMX9yRIgrixZBDSRjbtojIXWLjdWUoaO/YcOv/I5VhsICAUpiKM89NFW8Dcip3YLYDGGmCkSVA==
+"@ionic-native/geolocation@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/geolocation/-/geolocation-5.6.0.tgz#f442fad7ddb520efe089d3ca89805ed3bc4722ac"
+  integrity sha512-0VEj62+l2aZ/IozyCyT205tWYEc2mnK9Nqs7XizjBDv2iGtFIZbFqF2lzv7vYTKYb7NXxJ7gM/Y5Qx5x5GKnoA==
   dependencies:
     "@types/cordova" latest
 
@@ -456,10 +456,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/google-analytics@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.4.0.tgz#3155c889b98dc2cb5b30a9a8c2c61324eb16c9bb"
-  integrity sha512-Lk96Oqam0nczNWvSulWvUH8yjfyp0KBxmn9m8/0kEEkQnTZD+tIuQIDYB9zZTXnw7rkpbdqJCWb+Q2CLqoEwjA==
+"@ionic-native/google-analytics@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/google-analytics/-/google-analytics-5.6.0.tgz#46f1b7fa24150ac50c250bf155cc5d4bcae2afbc"
+  integrity sha512-pxjBEMu8x0ezsr0699VDxMet/5M7U561BMVchq3/mcvT1Lz56xyvdSeEJFRSm8wy33UShY8woE7Aj6AWZzCtCw==
   dependencies:
     "@types/cordova" latest
 
@@ -468,38 +468,38 @@
   resolved "https://registry.yarnpkg.com/@ionic-native/google-maps/-/google-maps-5.5.0.tgz#02537e04bb0d01d5580f936d8ccce6745188d90a"
   integrity sha512-+sCaB7cLR35ApsOyYSfwDX2ZTO2ItOI6FHkgTQ2rzOA1DVJ9rlU8HDL6jYBUhq+aDe3lhCPexSOryeBynaSvpQ==
 
-"@ionic-native/in-app-browser@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.4.0.tgz#b5a74580a9bf3e0797aabf52f53c3529dee80f0e"
-  integrity sha512-cPRKu7nl9oLKgqJyt/1SeO+aWTABWzu+QzkOQBOLfoAaqP1eXm/AU2C9joULnTl3P+s7oFZqXKiEAKI/jF+x1Q==
+"@ionic-native/in-app-browser@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/in-app-browser/-/in-app-browser-5.6.0.tgz#e6de8502fa30d713db2613384e9b42004dfb4c7d"
+  integrity sha512-ld3sxbJyeZjr9fN+SU81bVn9HhpqRRU5DFvV0nWv2rcl1NT7BWdpw9ErNBKHAM4H1K0/K1GOeIU+blQMPUz07w==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/intercom@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.4.0.tgz#e742e008b14529c09e2825f0d7d936499478adef"
-  integrity sha512-WXEpoRt7auxtd9P4NjMwk+QTCWskEfrcn/XjJHVLDLtyvQid/ek0SLlDbJh8tB0EQuOTpXS4CE4cwfRD28NlBw==
+"@ionic-native/intercom@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/intercom/-/intercom-5.6.0.tgz#06470e089254a1d9bed460d09b93e538807eac00"
+  integrity sha512-4sxRphLIVfpHBG0CF78bTJpm6ZSsDosp0nflVVkAPeoNzw9dJkOtolrof7X/V1Rpwobb0UJw0nLOaHIlMx156Q==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/local-notifications@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.4.0.tgz#b8310dafb53bae509af57f5b153095a0ca2063c3"
-  integrity sha512-xKpcljk4mOFhe/6BzsL8AkPPZyB6WloqUcu1jp61ADEKfkeqr4uTzpADfZ/pzlw/aL05waHwvPZRgpQM/uUHlA==
+"@ionic-native/local-notifications@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/local-notifications/-/local-notifications-5.6.0.tgz#e4c41f9560ae9059d761fcc3ed7deba7b4c972c2"
+  integrity sha512-PvOOqK3xh7GnHq6UB4WvETY4nq7OL+5JmgUWi2loAPXqpX1a+0g3D91YejCrVLjTxx2kK25UJsuGTw+gs9vdmQ==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/mixpanel@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.4.0.tgz#7d022e29c20237208ed7f64db5d7e68251dbe81b"
-  integrity sha512-+f+3des08I3LwJQD8m0JglskOgEjqHivyYoU0DrSHZ0H+sPndOwwL6Q0LNXGwJ00gAv8173YFGxht5TxAP+neQ==
+"@ionic-native/mixpanel@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/mixpanel/-/mixpanel-5.6.0.tgz#0c5fae56ebac2a1659c1c72de708231ab67a68fd"
+  integrity sha512-5qdzRENHp7SoA9Y1/1cPOxXsSe9u14uoEP+ArpQ53hmwp3BrYzpLoClIfDWkAEZ2/PGCW63PLQBKKGuETrXlAw==
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/network@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.4.0.tgz#4f4c12da0484a1a05fccd520402b402dc1c72af0"
-  integrity sha512-qHDoterYyz65E4nl6W1GdliiNtx7oeIyO/AsA3DFoY4Adlc+SmL7Ks+ZyIBqIPCwTvrK9CQ9VxOU26LsyneLOw==
+"@ionic-native/network@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/network/-/network-5.6.0.tgz#53685576c76a8c8d93c88c07eabf6646e029c104"
+  integrity sha512-q87bkEC+6kanC87KQ7A7+EcEuUzEOjYHX/WZPyhDLMyweLcYGmYTH7N2hpax3KnwIfAcVFvQDoei5ObR292BXg==
   dependencies:
     "@types/cordova" latest
 
@@ -524,10 +524,10 @@
   dependencies:
     "@types/cordova" latest
 
-"@ionic-native/vibration@^5.3.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.4.0.tgz#27d77ea805eb5c9e2e4c5587a6c4ca5629613879"
-  integrity sha512-eKxpz4QpefHfEw9P2N3+QjmlSgKbEbZcCjButpnpM3FhUddrNzQ9ISaWHe3m/IZ8R4aj8x6N7FrZ7V32XVmidQ==
+"@ionic-native/vibration@^5.5.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/vibration/-/vibration-5.6.0.tgz#18455cbb0c461c9fc2feed5029ecf5086fb6a7f6"
+  integrity sha512-Yv8q1jBB2Gf7ZACbvOhG//NFw673kEIbSFRznWkmiUlIywKxn/S/3f1D+tuYujhkRO8eSfWloAvwYeOqn3KoSw==
   dependencies:
     "@types/cordova" latest
 
@@ -5215,10 +5215,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
-  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
+husky@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
+  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
@@ -5227,9 +5227,9 @@ husky@^2.1.0:
     is-ci "^2.0.0"
     pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^5.0.0"
+    read-pkg "^5.1.1"
     run-node "^1.0.0"
-    slash "^2.0.0"
+    slash "^3.0.0"
 
 i18next@^15.0.4:
   version "15.0.9"
@@ -8397,10 +8397,10 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
-  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
+read-pkg@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+  integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
     normalize-package-data "^2.5.0"
@@ -9121,10 +9121,10 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slice-ansi@^2.0.0:
   version "2.1.0"
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index cb78e341f..5a48b55a8 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -190,10 +190,10 @@
 		"codelyzer": "^5.0.1",
 		"copy-webpack-plugin": "^5.0.0",
 		"cross-env": "^5.2.0",
-		"dotenv": "^6.2.0",
-		"envalid": "^5.0.0",
 		"cryptiles": "^4.1.3",
 		"css-loader": "^2.1.0",
+		"dotenv": "^6.2.0",
+		"envalid": "^5.0.0",
 		"exports-loader": "^0.7.0",
 		"expose-loader": "^0.7.5",
 		"extract-text-webpack-plugin": "~3.0.2",
@@ -201,7 +201,7 @@
 		"find-root": "^1.1.0",
 		"gh-pages": "^2.0.1",
 		"html-webpack-plugin": "^3.2.0",
-		"husky": "^2.1.0",
+		"husky": "^2.3.0",
 		"imports-loader": "^0.8.0",
 		"istanbul-instrumenter-loader": "^3.0.1",
 		"jasmine-core": "^3.3.0",
@@ -239,6 +239,7 @@
 		"tslint": "^5.13.1",
 		"tslint-loader": "^3.6.0",
 		"typedoc": "^0.14.2",
+		"typescript": "~3.1.6",
 		"uglifyjs-webpack-plugin": "^2.1.2",
 		"url-loader": "^1.1.2",
 		"webpack": "^4.29.6",
@@ -248,8 +249,7 @@
 		"webpack-dev-server": "^3.2.1",
 		"webpack-inline-manifest-plugin": "^4.0.1",
 		"webpack-merge": "^4.2.1",
-		"yargs": "^13.2.1",
-		"typescript": "~3.1.6"
+		"yargs": "^13.2.1"
 	},
 	"engines": {
 		"node": ">=10.15.0",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index eda1a34a1..ed63b7650 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -5163,10 +5163,10 @@ humanize-url@^1.0.0:
     normalize-url "^1.0.0"
     strip-url-auth "^1.0.0"
 
-husky@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
-  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
+husky@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
+  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
@@ -5175,9 +5175,9 @@ husky@^2.1.0:
     is-ci "^2.0.0"
     pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^5.0.0"
+    read-pkg "^5.1.1"
     run-node "^1.0.0"
-    slash "^2.0.0"
+    slash "^3.0.0"
 
 i18next@^15.0.4:
   version "15.0.9"
@@ -8477,10 +8477,10 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
-  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
+read-pkg@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+  integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
     normalize-package-data "^2.5.0"
@@ -9198,6 +9198,11 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 smart-buffer@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
diff --git a/yarn.lock b/yarn.lock
index 088067981..815e4d549 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2602,7 +2602,7 @@ debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
 
@@ -3749,10 +3749,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.1.0.tgz#f486dd063596ad3aad4bbbcd8673ca5bface3caa"
-  integrity sha512-FHsqdIJPmQX/89Xg/761RMFCPSNNG2eiQMxChGP081NTohHexEuu/4nYh5m4TcFKq4xm+DqaGp8J/EUnkzL1Aw==
+husky@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
+  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
@@ -3761,9 +3761,9 @@ husky@^2.1.0:
     is-ci "^2.0.0"
     pkg-dir "^4.1.0"
     please-upgrade-node "^3.1.1"
-    read-pkg "^5.0.0"
+    read-pkg "^5.1.1"
     run-node "^1.0.0"
-    slash "^2.0.0"
+    slash "^3.0.0"
 
 iconv-lite@0.4.23:
   version "0.4.23"
@@ -3838,7 +3838,7 @@ import-local@^1.0.0:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
@@ -4646,7 +4646,7 @@ libnpm@^2.0.1:
     read-package-json "^2.0.13"
     stringify-package "^1.0.0"
 
-libnpmaccess@*, libnpmaccess@^3.0.1:
+libnpmaccess@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8"
   integrity sha512-RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA==
@@ -4675,7 +4675,7 @@ libnpmhook@^5.0.2:
     get-stream "^4.0.0"
     npm-registry-fetch "^3.8.0"
 
-libnpmorg@*, libnpmorg@^1.0.0:
+libnpmorg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.0.tgz#979b868c48ba28c5820e3bb9d9e73c883c16a232"
   integrity sha512-o+4eVJBoDGMgRwh2lJY0a8pRV2c/tQM/SxlqXezjcAg26Qe9jigYVs+Xk0vvlYDWCDhP0g74J8UwWeAgsB7gGw==
@@ -4715,7 +4715,7 @@ libnpmpublish@^1.1.1:
     semver "^5.5.1"
     ssri "^6.0.1"
 
-libnpmsearch@*, libnpmsearch@^2.0.0:
+libnpmsearch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.0.tgz#de05af47ada81554a5f64276a69599070d4a5685"
   integrity sha512-vd+JWbTGzOSfiOc+72MU6y7WqmBXn49egCCrIXp27iE/88bX8EpG64ST1blWQI1bSMUr9l1AKPMVsqa2tS5KWA==
@@ -4724,7 +4724,7 @@ libnpmsearch@*, libnpmsearch@^2.0.0:
     get-stream "^4.0.0"
     npm-registry-fetch "^3.8.0"
 
-libnpmteam@*, libnpmteam@^1.0.1:
+libnpmteam@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.1.tgz#ff704b1b6c06ea674b3b1101ac3e305f5114f213"
   integrity sha512-gDdrflKFCX7TNwOMX1snWojCoDE5LoRWcfOC0C/fqF7mBq8Uz9zWAX4B2RllYETNO7pBupBaSyBDkTAC15cAMg==
@@ -4916,11 +4916,6 @@ lockfile@^1.0.4:
   dependencies:
     signal-exit "^3.0.2"
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -4928,32 +4923,10 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -4994,11 +4967,6 @@ lodash.map@^4.5.1:
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
   integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
 
-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.set@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
@@ -5726,7 +5694,7 @@ npm-pick-manifest@^2.2.3:
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
-npm-profile@*, npm-profile@^4.0.1:
+npm-profile@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.1.tgz#d350f7a5e6b60691c7168fbb8392c3603583f5aa"
   integrity sha512-NQ1I/1Q7YRtHZXkcuU1/IyHeLy6pd+ScKg4+DQHdfsm769TGq6HPrkbuNJVJS4zwE+0mvvmeULzQdWn2L2EsVA==
@@ -6735,10 +6703,10 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-read-pkg@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390"
-  integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg==
+read-pkg@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+  integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
     normalize-package-data "^2.5.0"
@@ -6791,7 +6759,7 @@ readable-stream@~1.1.10:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
+readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
   dependencies:
@@ -7261,9 +7229,10 @@ slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slice-ansi@0.0.4:
   version "0.0.4"

From 9827b762466a530a86e9ba0dadd60ac84ed8946c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 17 May 2019 10:56:08 +0300
Subject: [PATCH 308/382] chore: update more packages to the latest version
 nyc, dotenv, @types/node, @angular-extensions/testing-library,
 standard-version, @angular-extensions/testing-library

---
 admin/website-angular/package.json |   4 +-
 admin/website-angular/yarn.lock    |  15 +-
 backend/api/package.json           |   6 +-
 backend/api/yarn.lock              | 175 +++++++++++------
 carrier/mobile-ionic/package.json  |   4 +-
 carrier/mobile-ionic/yarn.lock     |  15 +-
 merchant/tablet-ionic/package.json |   4 +-
 merchant/tablet-ionic/yarn.lock    |  15 +-
 package.json                       |   2 +-
 shop/mobile-ionic/package.json     |   4 +-
 shop/mobile-ionic/yarn.lock        |  15 +-
 shop/website-angular/package.json  |   8 +-
 shop/website-angular/yarn.lock     | 303 +++++++++++++++++++----------
 yarn.lock                          |   8 +-
 14 files changed, 379 insertions(+), 199 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 0b385ee47..a3ce08414 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -176,7 +176,7 @@
 		"@types/leaflet": "^1.4.4",
 		"@types/mongodb": "^3.1.25",
 		"@types/mongoose": "^5.3.26",
-		"@types/node": "^11.9.3",
+		"@types/node": "^12.0.2",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/stripe": "^6.25.12",
 		"@types/uuid": "^3.4.4",
@@ -185,7 +185,7 @@
 		"codelyzer": "^5.0.1",
 		"conventional-changelog-cli": "^2.0.17",
 		"cross-env": "^5.2.0",
-		"dotenv": "^7.0.0",
+		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
 		"husky": "^2.3.0",
 		"jasmine-core": "^3.4.0",
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index db0aecde3..adb98c4db 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -1671,11 +1671,16 @@
     "@types/mongodb" "*"
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^11.9.3":
+"@types/node@*":
   version "11.13.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@^12.0.2":
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
+  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -5524,10 +5529,10 @@ dotenv@^6.0.0, dotenv@^6.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
   integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
-dotenv@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
-  integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
+dotenv@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
+  integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
 
 duplexer2@~0.1.4:
   version "0.1.4"
diff --git a/backend/api/package.json b/backend/api/package.json
index a1fe0d869..e72f62f40 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -76,7 +76,7 @@
 		"cors": "^2.8.5",
 		"cryptiles": "^4.1.3",
 		"destroy": "^1.0.4",
-		"dotenv": "^7.0.0",
+		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
 		"errorhandler": "^1.5.0",
 		"etag": "^1.8.1",
@@ -169,7 +169,7 @@
 		"@types/moment": "^2.13.0",
 		"@types/mongodb": "^3.1.25",
 		"@types/mongoose": "^5.3.26",
-		"@types/node": "^11.9.3",
+		"@types/node": "^12.0.2",
 		"@types/passport": "^1.0.0",
 		"@types/passport-jwt": "^3.0.1",
 		"@types/redis": "^2.8.12",
@@ -192,7 +192,7 @@
 		"husky": "^2.3.0",
 		"jest": "^24.7.1",
 		"nodemon": "^1.18.11",
-		"nyc": "^14.0.0",
+		"nyc": "^14.1.1",
 		"prettier": "^1.17.0",
 		"prettier-tslint": "^0.4.2",
 		"pretty-quick": "^1.10.0",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 26922c0dc..4be9948e2 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -60,6 +60,17 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+"@babel/generator@^7.4.0", "@babel/generator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
+  integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
+  dependencies:
+    "@babel/types" "^7.4.4"
+    jsesc "^2.5.1"
+    lodash "^4.17.11"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
 "@babel/helper-function-name@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
@@ -85,6 +96,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@babel/helper-split-export-declaration@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
+  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
+  dependencies:
+    "@babel/types" "^7.4.4"
+
 "@babel/helpers@^7.2.0":
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
@@ -116,6 +134,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.2.tgz#95cdeddfc3992a6ca2a1315191c1679ca32c55cd"
   integrity sha512-QzNUC2RO1gadg+fs21fi0Uu0OuGNzRKEmgCxoLNzbCdoprLwjfmZwzUrpUNfJPaVRwBpDY47A17yYEGWyRelnQ==
 
+"@babel/parser@^7.4.3", "@babel/parser@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.4.tgz#5977129431b8fe33471730d255ce8654ae1250b6"
+  integrity sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==
+
 "@babel/plugin-syntax-object-rest-spread@^7.0.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
@@ -131,6 +154,15 @@
     "@babel/parser" "^7.2.2"
     "@babel/types" "^7.2.2"
 
+"@babel/template@^7.4.0":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
+  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.4.4"
+    "@babel/types" "^7.4.4"
+
 "@babel/traverse@^7.0.0":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.2.tgz#961039de1f9bcb946d807efe2dba9c92e859d188"
@@ -160,6 +192,21 @@
     globals "^11.1.0"
     lodash "^4.17.10"
 
+"@babel/traverse@^7.4.3":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.4.tgz#0776f038f6d78361860b6823887d4f3937133fe8"
+  integrity sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.4.4"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/parser" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.11"
+
 "@babel/types@7.0.0-beta.38":
   version "7.0.0-beta.38"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.38.tgz#2ce2443f7dc6ad535a67db4940cbd34e64035a6f"
@@ -185,6 +232,15 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.4.0", "@babel/types@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
+  integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.11"
+    to-fast-properties "^2.0.0"
+
 "@captemulation/get-parameter-names@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@captemulation/get-parameter-names/-/get-parameter-names-1.2.0.tgz#b950bca7e6f1f9a2a4b6c847a88d78ff80cca23c"
@@ -1102,10 +1158,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
   integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==
 
-"@types/node@^11.9.3":
-  version "11.9.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.9.3.tgz#14adbb5ab8cd563f549fbae8dbe92e0b7d6e76cc"
-  integrity sha512-DMiqG51GwES/c4ScBY0u5bDlH44+oY8AeYHjY1SGCWidD7h08o1dfHue/TGK7REmif2KiJzaUskO+Q0eaeZ2fQ==
+"@types/node@^12.0.2":
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
+  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -3870,10 +3926,10 @@ dotenv@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
 
-dotenv@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
-  integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
+dotenv@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
+  integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
 
 double-ended-queue@^2.1.0-0:
   version "2.1.0-0"
@@ -6016,10 +6072,10 @@ istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.3:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#0b891e5ad42312c2b9488554f603795f9a2211ba"
   integrity sha512-dKWuzRGCs4G+67VfW9pBFFz2Jpi4vSp/k7zBcJ888ofV5Mi1g5CUML5GvMvV6u9Cjybftu+E8Cgp+k0dI1E5lw==
 
-istanbul-lib-coverage@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#927a354005d99dd43a24607bb8b33fd4e9aca1ad"
-  integrity sha512-LXTBICkMARVgo579kWDm8SqfB6nvSDKNqIOBEjmJRnL04JvoMHCYGWaMddQnseJYtkEuEvO/sIcOxPLk9gERug==
+istanbul-lib-coverage@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
 
 istanbul-lib-hook@^2.0.3:
   version "2.0.3"
@@ -6028,10 +6084,10 @@ istanbul-lib-hook@^2.0.3:
   dependencies:
     append-transform "^1.0.0"
 
-istanbul-lib-hook@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.6.tgz#5baa6067860a38290aef038b389068b225b01b7d"
-  integrity sha512-829DKONApZ7UCiPXcOYWSgkFXa4+vNYoNOt3F+4uDJLKL1OotAoVwvThoEj1i8jmOj7odbYcR3rnaHu+QroaXg==
+istanbul-lib-hook@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
+  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
   dependencies:
     append-transform "^1.0.0"
 
@@ -6060,17 +6116,17 @@ istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.1.0:
     istanbul-lib-coverage "^2.0.3"
     semver "^5.5.0"
 
-istanbul-lib-instrument@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.2.0.tgz#c549208da8a793f6622257a2da83e0ea96ae6a93"
-  integrity sha512-06IM3xShbNW4NgZv5AP4QH0oHqf1/ivFo8eFys0ZjPXHGldHJQWb3riYOKXqmOqfxXBfxu4B+g/iuhOPZH0RJg==
-  dependencies:
-    "@babel/generator" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    istanbul-lib-coverage "^2.0.4"
+istanbul-lib-instrument@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
+  dependencies:
+    "@babel/generator" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    istanbul-lib-coverage "^2.0.5"
     semver "^6.0.0"
 
 istanbul-lib-report@^2.0.4:
@@ -6082,14 +6138,14 @@ istanbul-lib-report@^2.0.4:
     make-dir "^1.3.0"
     supports-color "^6.0.0"
 
-istanbul-lib-report@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.7.tgz#370d80d433c4dbc7f58de63618f49599c74bd954"
-  integrity sha512-wLH6beJBFbRBLiTlMOBxmb85cnVM1Vyl36N48e4e/aTKSM3WbOx7zbVIH1SQ537fhhsPbX0/C5JB4qsmyRXXyA==
+istanbul-lib-report@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
+  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
   dependencies:
-    istanbul-lib-coverage "^2.0.4"
+    istanbul-lib-coverage "^2.0.5"
     make-dir "^2.1.0"
-    supports-color "^6.0.0"
+    supports-color "^6.1.0"
 
 istanbul-lib-source-maps@^3.0.1, istanbul-lib-source-maps@^3.0.2:
   version "3.0.2"
@@ -6102,15 +6158,15 @@ istanbul-lib-source-maps@^3.0.1, istanbul-lib-source-maps@^3.0.2:
     rimraf "^2.6.2"
     source-map "^0.6.1"
 
-istanbul-lib-source-maps@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.5.tgz#1d9ee9d94d2633f15611ee7aae28f9cac6d1aeb9"
-  integrity sha512-eDhZ7r6r1d1zQPVZehLc3D0K14vRba/eBYkz3rw16DLOrrTzve9RmnkcwrrkWVgO1FL3EK5knujVe5S8QHE9xw==
+istanbul-lib-source-maps@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
   dependencies:
     debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.4"
+    istanbul-lib-coverage "^2.0.5"
     make-dir "^2.1.0"
-    rimraf "^2.6.2"
+    rimraf "^2.6.3"
     source-map "^0.6.1"
 
 istanbul-reports@^2.1.1:
@@ -6120,12 +6176,12 @@ istanbul-reports@^2.1.1:
   dependencies:
     handlebars "^4.1.0"
 
-istanbul-reports@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.3.tgz#14e0d00ecbfa9387757999cf36599b88e9f2176e"
-  integrity sha512-T6EbPuc8Cb620LWAYyZ4D8SSn06dY9i1+IgUX2lTH8gbwflMc9Obd33zHTyNX653ybjpamAHS9toKS3E6cGhTw==
+istanbul-reports@^2.2.4:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
+  integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
   dependencies:
-    handlebars "^4.1.0"
+    handlebars "^4.1.2"
 
 iterall@1.1.3:
   version "1.1.3"
@@ -8061,10 +8117,10 @@ nwsapi@^2.0.7:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
 
-nyc@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-14.0.0.tgz#f9fc4b4d73afc976f76e72352e70f742bbfab829"
-  integrity sha512-R1zC6UZak6pzn5BZQorkSH5GdOGafrwyeja+eimS5Tu+KJ/hCgBc8qA1QWSzxQmT2FDl2lbpqPw7tBDbSvhAHg==
+nyc@^14.1.1:
+  version "14.1.1"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-14.1.1.tgz#151d64a6a9f9f5908a1b73233931e4a0a3075eeb"
+  integrity sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw==
   dependencies:
     archy "^1.0.0"
     caching-transform "^3.0.2"
@@ -8074,19 +8130,20 @@ nyc@^14.0.0:
     find-up "^3.0.0"
     foreground-child "^1.5.6"
     glob "^7.1.3"
-    istanbul-lib-coverage "^2.0.4"
-    istanbul-lib-hook "^2.0.6"
-    istanbul-lib-instrument "^3.2.0"
-    istanbul-lib-report "^2.0.7"
-    istanbul-lib-source-maps "^3.0.5"
-    istanbul-reports "^2.2.2"
+    istanbul-lib-coverage "^2.0.5"
+    istanbul-lib-hook "^2.0.7"
+    istanbul-lib-instrument "^3.3.0"
+    istanbul-lib-report "^2.0.8"
+    istanbul-lib-source-maps "^3.0.6"
+    istanbul-reports "^2.2.4"
+    js-yaml "^3.13.1"
     make-dir "^2.1.0"
     merge-source-map "^1.1.0"
     resolve-from "^4.0.0"
     rimraf "^2.6.3"
     signal-exit "^3.0.2"
     spawn-wrap "^1.4.2"
-    test-exclude "^5.2.2"
+    test-exclude "^5.2.3"
     uuid "^3.3.2"
     yargs "^13.2.2"
     yargs-parser "^13.0.0"
@@ -10865,10 +10922,10 @@ test-exclude@^5.0.0:
     read-pkg-up "^4.0.0"
     require-main-filename "^1.0.1"
 
-test-exclude@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.2.tgz#7322f8ab037b0b93ad2aab35fe9068baf997a4c4"
-  integrity sha512-N2pvaLpT8guUpb5Fe1GJlmvmzH3x+DAKmmyEQmFP792QcLYoGE1syxztSvPD1V8yPe6VrcCt6YGQVjSRjCASsA==
+test-exclude@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
+  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
   dependencies:
     glob "^7.1.3"
     minimatch "^3.0.4"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 40b74c9d7..25e387c68 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -179,7 +179,7 @@
 		"@types/leaflet": "^1.4.3",
 		"@types/mongodb": "^3.1.22",
 		"@types/mongoose": "^5.3.23",
-		"@types/node": "^11.9.3",
+		"@types/node": "^12.0.2",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/stripe": "^6.25.7",
@@ -189,7 +189,7 @@
 		"codelyzer": "^5.0.1",
 		"cpr": "^3.0.1",
 		"cross-env": "^5.2.0",
-		"dotenv": "^7.0.0",
+		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
 		"husky": "^2.3.0",
 		"ionic": "^4.12.0",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 718fb5381..5d9a17974 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -862,11 +862,16 @@
     "@types/mongodb" "*"
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^11.9.3":
+"@types/node@*":
   version "11.13.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@^12.0.2":
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
+  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
+
 "@types/node@^8.0.7":
   version "8.10.45"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.45.tgz#4c49ba34106bc7dced77ff6bae8eb6543cde8351"
@@ -3671,10 +3676,10 @@ dotenv@^6.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
   integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
-dotenv@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
-  integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
+dotenv@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
+  integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
 
 duplexer2@~0.1.0, duplexer2@~0.1.4:
   version "0.1.4"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index f64979b22..60bf4b30f 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -191,7 +191,7 @@
 		"@types/leaflet": "^1.4.3",
 		"@types/mongodb": "^3.1.22",
 		"@types/mongoose": "^5.3.22",
-		"@types/node": "^11.9.3",
+		"@types/node": "^12.0.2",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/stripe": "^6.25.7",
@@ -200,7 +200,7 @@
 		"codelyzer": "^5.0.1",
 		"cpr": "^3.0.1",
 		"cross-env": "^5.2.0",
-		"dotenv": "^7.0.0",
+		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
 		"husky": "^2.3.0",
 		"ionic": "^4.12.0",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 27ef0afab..b4f617030 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -880,11 +880,16 @@
     "@types/mongodb" "*"
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^11.9.3":
+"@types/node@*":
   version "11.13.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@^12.0.2":
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
+  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
+
 "@types/node@^8.0.7":
   version "8.10.45"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.45.tgz#4c49ba34106bc7dced77ff6bae8eb6543cde8351"
@@ -3670,10 +3675,10 @@ dotenv@^6.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
   integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
-dotenv@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
-  integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
+dotenv@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
+  integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
 
 duplexer2@~0.1.0, duplexer2@~0.1.4:
   version "0.1.4"
diff --git a/package.json b/package.json
index a919489b4..6af959b35 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
 		"@types/leaflet": "^1.4.4",
 		"@types/mongodb": "^3.1.25",
 		"@types/mongoose": "^5.3.26",
-		"@types/node": "^11.13.7",
+		"@types/node": "^12.0.2",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/stripe": "^6.25.12",
 		"@types/uuid": "^3.4.4",
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index cf65dc9ce..594b8cad5 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -167,7 +167,7 @@
 		"@types/leaflet": "^1.4.3",
 		"@types/mongodb": "^3.1.22",
 		"@types/mongoose": "^5.3.23",
-		"@types/node": "^11.9.3",
+		"@types/node": "^12.0.2",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/stripe": "^6.25.7",
@@ -177,7 +177,7 @@
 		"codelyzer": "^5.0.1",
 		"cpr": "^3.0.1",
 		"cross-env": "^5.2.0",
-		"dotenv": "^7.0.0",
+		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
 		"husky": "^2.3.0",
 		"ionic": "^4.12.0",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 09dbf6dd2..6648ff18c 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -862,11 +862,16 @@
     "@types/mongodb" "*"
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^11.9.3":
+"@types/node@*":
   version "11.13.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@^12.0.2":
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
+  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
+
 "@types/node@^8.0.7":
   version "8.10.45"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.45.tgz#4c49ba34106bc7dced77ff6bae8eb6543cde8351"
@@ -3624,10 +3629,10 @@ dotenv@^6.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
   integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
-dotenv@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"
-  integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==
+dotenv@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
+  integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
 
 duplexer2@~0.1.0, duplexer2@~0.1.4:
   version "0.1.4"
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 5a48b55a8..c82b4fdd5 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -163,7 +163,7 @@
 	"devDependencies": {
 		"@angular-devkit/build-angular": "^0.13.7",
 		"@angular-devkit/build-optimizer": "^0.13.7",
-		"@angular-extensions/testing-library": "^3.1.0",
+		"@angular-extensions/testing-library": "^4.0.3",
 		"@angular/cli": "^7.3.7",
 		"@angular/compiler": "^7.2.11",
 		"@angular/compiler-cli": "^7.2.11",
@@ -174,7 +174,7 @@
 		"@types/hammerjs": "^2.0.36",
 		"@types/jasmine": "^3.3.9",
 		"@types/mongoose": "^5.3.20",
-		"@types/node": "^11.9.3",
+		"@types/node": "^12.0.2",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/source-map": "^0.5.7",
 		"@types/stripe": "^6.25.7",
@@ -192,7 +192,7 @@
 		"cross-env": "^5.2.0",
 		"cryptiles": "^4.1.3",
 		"css-loader": "^2.1.0",
-		"dotenv": "^6.2.0",
+		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
 		"exports-loader": "^0.7.0",
 		"expose-loader": "^0.7.5",
@@ -230,7 +230,7 @@
 		"sass-loader": "^7.1.0",
 		"script-ext-html-webpack-plugin": "^2.1.3",
 		"source-map-loader": "^0.2.4",
-		"standard-version": "^5.0.1",
+		"standard-version": "^6.0.1",
 		"string-replace-loader": "^2.1.1",
 		"style-loader": "^0.23.1",
 		"to-string-loader": "^1.1.5",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index ed63b7650..69573762d 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -105,13 +105,15 @@
     "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-extensions/testing-library@^3.1.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@angular-extensions/testing-library/-/testing-library-3.2.0.tgz#989a155268b915de3648744cf9a74befb9d6b206"
-  integrity sha512-lFobw3XVD8kcU15c0eSVQOUZzwelltdkNve1P0j72JY5Hb5muzQ+RX+ESMtDlEfw6uiWudge14BbNVeh8ygxRg==
+"@angular-extensions/testing-library@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@angular-extensions/testing-library/-/testing-library-4.0.3.tgz#79ca0a9e8f8d03399315fbe8650864443696841c"
+  integrity sha512-RTVcFvi+JkZrzrLXjjaIGNbW1qd8z/BPQMrLGsUPLIPJUsX5jq9U52qa90Xqx7N8/8ZTClfijRMSnlX1J1ZLpA==
   dependencies:
-    dom-testing-library "^3.11.1"
+    "@phenomnomnominal/tsquery" "^3.0.0"
+    dom-testing-library "^4.0.1"
     tslib "^1.9.0"
+    tslint "^5.16.0"
 
 "@angular/animations@^7.2.11":
   version "7.2.12"
@@ -242,13 +244,36 @@
   dependencies:
     tslib "^1.9.0"
 
-"@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4":
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
+"@babel/runtime@^7.3.1":
   version "7.4.3"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
   integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.4.3":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.4.tgz#dc2e34982eb236803aa27a07fea6857af1b9171d"
+  integrity sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@compodoc/compodoc@^1.1.9":
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/@compodoc/compodoc/-/compodoc-1.1.9.tgz#b45593897fd54ca8a0996fb41e41e26f99da6c4f"
@@ -355,12 +380,13 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.17"
 
-"@jest/types@^24.7.0":
-  version "24.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.7.0.tgz#c4ec8d1828cdf23234d9b4ee31f5482a3f04f48b"
-  integrity sha512-ipJUa2rFWiKoBqMKP63Myb6h9+iT3FHRTF2M8OR6irxWzItisa8i4dcSg14IbvmXUnBlHBlUQPYUHWyX3UPpYA==
+"@jest/types@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
+  integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^12.0.9"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
@@ -401,6 +427,13 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
+"@phenomnomnominal/tsquery@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-3.0.0.tgz#6f2f4dbf6304ff52b12cc7a5b979f20c3794a22a"
+  integrity sha512-SW8lKitBHWJ9fAYkJ9kJivuctwNYCh3BUxLdH0+XiR1GPBiu+7qiZzh8p8jqlj1LgVC1TbvfNFroaEsmYlL8Iw==
+  dependencies:
+    esquery "^1.0.1"
+
 "@schematics/angular@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
@@ -484,11 +517,31 @@
   resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.3.tgz#b672cfaac25cbbc634a0fd92c515f66faa18dbca"
   integrity sha512-pGF/zvYOACZ/gLGWdQH8zSwteQS1epp68yRcVLJMgUck/MjEn/FBYmPub9pXT8C1e4a8YZfHo1CKyV8q1vKUnQ==
 
+"@types/istanbul-lib-coverage@*":
+  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==
+
 "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz#1eb8c033e98cf4e1a4cedcaf8bcafe8cb7591e85"
   integrity sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg==
 
+"@types/istanbul-lib-report@*":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
+  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^1.1.1":
+  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==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+    "@types/istanbul-lib-report" "*"
+
 "@types/jasmine@^3.3.9":
   version "3.3.12"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.12.tgz#bf282cb540e9ad7a0a04b742082c073b655eab39"
@@ -530,11 +583,16 @@
     "@types/mongodb" "*"
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^11.9.3":
+"@types/node@*":
   version "11.13.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@^12.0.2":
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
+  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -2214,7 +2272,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.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"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2620,10 +2678,15 @@ conventional-changelog-codemirror@^2.0.1:
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-conventionalcommits@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-1.1.1.tgz#322351f6a0422876d89ec54491365695b073a709"
-  integrity sha512-21BcbiSfvYIon7sF80Rwn6vnfhaiuZUyHHFYr9Zz8H2B+O/3grud5TbEYpU1/SFXD5aD48IdSme/KkJl9wCsCw==
+conventional-changelog-config-spec@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-config-spec/-/conventional-changelog-config-spec-1.0.0.tgz#fc17bf0ab7b7f2a6b0c91bccc1bd55819d3ee79e"
+  integrity sha512-RR3479x5Qw7XWkmNDYx/kOnsQJW+FZBIakURG/Dg7FkTaCrGjAkgfH96pQs9SyOEZI07USEXy7FjUDWYP8bt3Q==
+
+conventional-changelog-conventionalcommits@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-3.0.2.tgz#3a380a14ecd6f5056da6d460e30dd6c0c9f1aebe"
+  integrity sha512-w1+fQSDnm/7+sPKIYC5nfRVYDszt+6HdWizrigSqWFVIiiBVzkHGeqDLMSHc+Qq9qssHVAxAak5206epZyK87A==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -2704,15 +2767,15 @@ conventional-changelog-writer@^4.0.5:
     split "^1.0.0"
     through2 "^3.0.0"
 
-conventional-changelog@^3.0.6:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.3.tgz#decb10d89c46c838e74eb5160bcf4987992f7534"
-  integrity sha512-JBfdDSdSGasTNaBRZbOeFn8CJTIpP/sB/kiawmWAiLapLZ+wCDVDZR6Q+Hh9rjh3dxNAFR03bWTeqjKajXvPYA==
+conventional-changelog@3.1.8:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.8.tgz#091382b5a0820bf8ec8e75ad2664a3688c31b07d"
+  integrity sha512-fb3/DOLLrQdNqN0yYn/lT6HcNsAa9A+VTDBqlZBMQcEPPIeJIMI+DBs3yu+eiYOLi22w9oShq3nn/zN6qm1Hmw==
   dependencies:
     conventional-changelog-angular "^5.0.3"
     conventional-changelog-atom "^2.0.1"
     conventional-changelog-codemirror "^2.0.1"
-    conventional-changelog-conventionalcommits "^1.1.1"
+    conventional-changelog-conventionalcommits "^3.0.2"
     conventional-changelog-core "^3.2.2"
     conventional-changelog-ember "^2.0.2"
     conventional-changelog-eslint "^3.0.2"
@@ -2742,10 +2805,10 @@ conventional-commits-parser@^3.0.2:
     through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-recommended-bump@^4.0.4:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.1.1.tgz#37014fadeda267d0607e2fc81124da840a585127"
-  integrity sha512-JT2vKfSP9kR18RXXf55BRY1O3AHG8FPg5btP3l7LYfcWJsiXI6MCf30DepQ98E8Qhowvgv7a8iev0J1bEDkTFA==
+conventional-recommended-bump@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-5.0.0.tgz#019d45a1f3d2cc14a26e9bad1992406ded5baa23"
+  integrity sha512-CsfdICpbUe0pmM4MTG90GPUqnFgB1SWIR2HAh+vS+JhhJdPWvc0brs8oadWoYGhFOQpQwe57JnvzWEWU0m2OSg==
   dependencies:
     concat-stream "^2.0.0"
     conventional-changelog-preset-loader "^2.1.1"
@@ -3287,6 +3350,11 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
+detect-indent@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
+  integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
+
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -3294,20 +3362,15 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-indent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-  integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
-
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
-detect-newline@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
-  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
+detect-newline@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.0.0.tgz#8ae477c089e51872c264531cd6547719c0b86b2f"
+  integrity sha512-JAP22dVPAqvhdRFFxK1G5GViIokyUn0UWXRNW0ztK96fsqi9cuM8w8ESbSk+T2w5OVorcMcL6m7yUg1RrX+2CA==
 
 detect-node@^2.0.4:
   version "2.0.4"
@@ -3400,15 +3463,15 @@ dom-serializer@0, dom-serializer@~0.1.1:
     domelementtype "^1.3.0"
     entities "^1.1.1"
 
-dom-testing-library@^3.11.1:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-3.19.0.tgz#652ade2cd93ae98beb52b2878eeb9420d7599832"
-  integrity sha512-gkGXP5GevcjC24Tk6Y6RwrZ7Nz0Ul4bchXV4yHLcnMidMp/EdBCvtHEgHTsZ2yZ4DhUpLowGbJv/1u1Z7bPvtw==
+dom-testing-library@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-4.1.0.tgz#273264e62e9e63f4e404f7349ddd7b9356aacd23"
+  integrity sha512-654GHd0oPC31S+ll1bJH9NUOBRzcHcrf23/XzJh41o6g67uGUpF9tn23qmbcwjNauoRqKQfAdHCDwr/Ez/Ot7A==
   dependencies:
-    "@babel/runtime" "^7.3.4"
+    "@babel/runtime" "^7.4.3"
     "@sheerun/mutationobserver-shim" "^0.3.2"
-    pretty-format "^24.5.0"
-    wait-for-expect "^1.1.0"
+    pretty-format "^24.7.0"
+    wait-for-expect "^1.1.1"
 
 domain-browser@^1.1.1:
   version "1.2.0"
@@ -3465,7 +3528,12 @@ dotenv@^6.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
   integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
-dotgitignore@^2.1.0:
+dotenv@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
+  integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
+
+dotgitignore@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-2.1.0.tgz#a4b15a4e4ef3cf383598aaf1dfa4a04bcc089b7b"
   integrity sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==
@@ -3824,6 +3892,13 @@ esprima@~1.0.4:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
   integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
 
+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==
+  dependencies:
+    estraverse "^4.0.0"
+
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -3836,7 +3911,7 @@ estraverse@^1.9.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
   integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
@@ -4182,6 +4257,13 @@ figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
+figures@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.0.0.tgz#756275c964646163cc6f9197c7a0295dbfd04de9"
+  integrity sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -4283,6 +4365,13 @@ find-root@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
+find-up@3.0.0, find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -4298,13 +4387,6 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
 findit2@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/findit2/-/findit2-2.2.3.tgz#58a466697df8a6205cdfdbf395536b8bd777a5f6"
@@ -4430,7 +4512,7 @@ from@~0:
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
   integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
 
-fs-access@^1.0.0:
+fs-access@1.0.1, fs-access@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
   integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
@@ -4628,7 +4710,7 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^2.0.2:
+git-semver-tags@2.0.2, git-semver-tags@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3"
   integrity sha512-34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w==
@@ -5854,7 +5936,7 @@ js-base64@^2.1.8:
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
   integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
 
-"js-tokens@^3.0.0 || ^4.0.0":
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
@@ -8119,12 +8201,12 @@ pretty-error@^2.0.2:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-format@^24.5.0:
-  version "24.7.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.7.0.tgz#d23106bc2edcd776079c2daa5da02bcb12ed0c10"
-  integrity sha512-apen5cjf/U4dj7tHetpC7UEFCvtAgnNZnBDkfPv3fokzIqyOJckAG9OlAPC1BlFALnqT/lGB2tl9EJjlK6eCsA==
+pretty-format@^24.7.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2"
+  integrity sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==
   dependencies:
-    "@jest/types" "^24.7.0"
+    "@jest/types" "^24.8.0"
     ansi-regex "^4.0.0"
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
@@ -9023,7 +9105,7 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.2.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -9033,7 +9115,7 @@ semver@5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-semver@^6.0.0:
+semver@6.0.0, semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
   integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
@@ -9594,23 +9676,25 @@ ssri@^6.0.0, ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-standard-version@^5.0.1:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-5.0.2.tgz#39fc8ce9a2850cc70868a39f9a4c9661a4439beb"
-  integrity sha512-vvdWZySinwWU9UZhtgYUGGTkYzqrwYMw3c7CFJ17E7vMbAEqVSui/bm+ZcSukAAU2WmphPTWIKFmn8ni+lk4NA==
-  dependencies:
-    chalk "^2.4.1"
-    conventional-changelog "^3.0.6"
-    conventional-recommended-bump "^4.0.4"
-    detect-indent "^5.0.0"
-    detect-newline "^2.1.0"
-    dotgitignore "^2.1.0"
-    figures "^2.0.0"
-    fs-access "^1.0.0"
-    git-semver-tags "^2.0.2"
-    semver "^5.2.0"
-    stringify-package "^1.0.0"
-    yargs "^12.0.2"
+standard-version@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-6.0.1.tgz#ad50e9770b73090d2f8f692e520d906813a3cefe"
+  integrity sha512-+09AwTbyLKyUwefiZSccgarp24okvH9A229NOVSpYTKWcxBxqZqdYmtQaJ8UET9mjPXRxP84vonJU4YMqCyBTQ==
+  dependencies:
+    chalk "2.4.2"
+    conventional-changelog "3.1.8"
+    conventional-changelog-config-spec "1.0.0"
+    conventional-recommended-bump "5.0.0"
+    detect-indent "6.0.0"
+    detect-newline "3.0.0"
+    dotgitignore "2.1.0"
+    figures "3.0.0"
+    find-up "3.0.0"
+    fs-access "1.0.1"
+    git-semver-tags "2.0.2"
+    semver "6.0.0"
+    stringify-package "1.0.0"
+    yargs "13.2.2"
 
 static-eval@^2.0.0:
   version "2.0.2"
@@ -9793,7 +9877,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringify-package@^1.0.0:
+stringify-package@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
   integrity sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==
@@ -10277,6 +10361,25 @@ tslint@^5.13.1, tslint@^5.9.1:
     tslib "^1.8.0"
     tsutils "^2.29.0"
 
+tslint@^5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.16.0.tgz#ae61f9c5a98d295b9a4f4553b1b1e831c1984d67"
+  integrity sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    builtin-modules "^1.1.1"
+    chalk "^2.3.0"
+    commander "^2.12.1"
+    diff "^3.2.0"
+    glob "^7.1.1"
+    js-yaml "^3.13.0"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.8.0"
+    tsutils "^2.29.0"
+
 tsutils@^2.25.0, tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
@@ -10664,10 +10767,10 @@ void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
-wait-for-expect@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.1.1.tgz#9cd10e07d52810af9e0aaf509872e38f3c3d81ae"
-  integrity sha512-vd9JOqqEcBbCDhARWhW85ecjaEcfBLuXgVBqatfS3iw6oU4kzAcs+sCNjF+TC9YHPImCW7ypsuQc+htscIAQCw==
+wait-for-expect@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.2.0.tgz#fdab6a26e87d2039101db88bff3d8158e5c3e13f"
+  integrity sha512-EJhKpA+5UHixduMBEGhTFuLuVgQBKWxkFbefOdj2bbk2/OpA5Opsc4aUTGmF+qJ+v3kTGxDRNYwKaT4j6g5n8Q==
 
 watchpack@^1.5.0:
   version "1.6.0"
@@ -11212,7 +11315,7 @@ yargs@12.0.2:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
-yargs@12.0.5, yargs@^12.0.2, yargs@^12.0.5:
+yargs@12.0.5, yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
   integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
@@ -11230,6 +11333,23 @@ yargs@12.0.5, yargs@^12.0.2, yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
+yargs@13.2.2, yargs@^13.2.1:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
+  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+  dependencies:
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
+
 yargs@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
@@ -11249,23 +11369,6 @@ yargs@9.0.1:
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
 
-yargs@^13.2.1:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
-  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
-  dependencies:
-    cliui "^4.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.0.0"
-
 yargs@^4.8.1:
   version "4.8.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
diff --git a/yarn.lock b/yarn.lock
index 815e4d549..e2716776a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1094,10 +1094,10 @@
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
 
-"@types/node@^11.13.7":
-  version "11.13.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.7.tgz#85dbb71c510442d00c0631f99dae957ce44fd104"
-  integrity sha512-suFHr6hcA9mp8vFrZTgrmqW2ZU3mbWsryQtQlY/QvwTISCw7nw/j+bCQPPohqmskhmqa5wLNuMHTTsc+xf1MQg==
+"@types/node@^12.0.2":
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
+  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
 
 "@types/node@^9.3.0":
   version "9.6.40"

From bbf2c15845b2dcd79e049040046873732a35679a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 17 May 2019 11:33:32 +0300
Subject: [PATCH 309/382] chore: update more packages to the latest version
 lighthouse, @swimlane/ngx-charts, ngx-toastr, @nestjs/typeorm, stripe

---
 admin/website-angular/package.json |  4 +-
 admin/website-angular/yarn.lock    | 16 +++----
 backend/api/package.json           |  4 +-
 backend/api/yarn.lock              | 16 +++----
 carrier/mobile-ionic/package.json  |  2 +-
 carrier/mobile-ionic/yarn.lock     |  8 ++--
 merchant/tablet-ionic/package.json |  2 +-
 merchant/tablet-ionic/yarn.lock    |  8 ++--
 package.json                       |  6 +--
 shop/mobile-ionic/package.json     |  2 +-
 shop/mobile-ionic/yarn.lock        |  8 ++--
 shop/website-angular/package.json  |  4 +-
 shop/website-angular/yarn.lock     | 16 +++----
 yarn.lock                          | 73 ++++++++++++------------------
 14 files changed, 76 insertions(+), 93 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index a3ce08414..341ca3a5a 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -79,7 +79,7 @@
 		"@ng-select/ng-select": "^2.18.0",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
-		"@swimlane/ngx-charts": "^10.1.0",
+		"@swimlane/ngx-charts": "^11.1.0",
 		"angular-2-dropdown-multiselect": "^1.9.0",
 		"angular-tree-component": "^8.3.0",
 		"angular2-chartjs": "^0.5.1",
@@ -139,7 +139,7 @@
 		"rxjs-compat": "^6.5.1",
 		"socicon": "^3.0.5",
 		"socket.io-client": "^2.2.0",
-		"stripe": "^6.31.0",
+		"stripe": "^7.0.0",
 		"subscriptions-transport-ws": "^0.9.16",
 		"tinymce": "^5.0.4",
 		"tslib": "^1.9.3",
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index adb98c4db..f2d277c14 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -1549,10 +1549,10 @@
     telejson "^2.1.1"
     util-deprecate "^1.0.2"
 
-"@swimlane/ngx-charts@^10.1.0":
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/@swimlane/ngx-charts/-/ngx-charts-10.1.0.tgz#be139b770b85eda609961cc08dba815c4a0d0b32"
-  integrity sha512-0nZ3ub5o/qQfFMz+av89u/VKqsqiVhPFBDDOOPq2qimP83i+pcb0i3MEao7PSxIbKAEkL/pwRcEJw4KDZ8B67w==
+"@swimlane/ngx-charts@^11.1.0":
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/@swimlane/ngx-charts/-/ngx-charts-11.1.0.tgz#56e03e4b0b34f9015952e38e6901905fe09f09fa"
+  integrity sha512-RdeZChfkk+ZMIyxX17S+RC5dq69Dmh3lLj+avUtjDlrUIiD8wnGyJL+RtZuHdsxtCqa0cCNydtkA5f74xl1d9g==
   dependencies:
     d3 "^4.10.2"
     d3-array "^1.2.1"
@@ -12808,10 +12808,10 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-stripe@^6.31.0:
-  version "6.31.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.31.0.tgz#524ef6997a4473c5bf9ce684b5c39e3bc307a445"
-  integrity sha512-VHVGyfrnzKdqraRHKQ42LJysQdg2iUL8pFES3dsN9yZOiEY+kxBetL7Zq2WiA24Y5PnVIO9gB5VbvmYPhEOhyA==
+stripe@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-7.0.0.tgz#6761e7ef03e28f7c1d773abbdd6431c78b2b4fbb"
+  integrity sha512-2CzGN1oHqEoEYxo5H5t7/pd/3NdmK1f4ZJSXKa+mBfWh3yqTpKscxKU5ZbH9NpdvE7n5awkwj1oygaMwfi9dOw==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
diff --git a/backend/api/package.json b/backend/api/package.json
index e72f62f40..6883b6160 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -58,7 +58,7 @@
 		"@nestjs/platform-express": "^6.1.1",
 		"@nestjs/platform-socket.io": "^6.1.1",
 		"@nestjs/swagger": "^3.0.2",
-		"@nestjs/typeorm": "^6.1.0",
+		"@nestjs/typeorm": "^6.1.1",
 		"@nestjs/websockets": "^6.1.1",
 		"apollo-server-express": "^2.4.8",
 		"axios": "^0.18.0",
@@ -128,7 +128,7 @@
 		"socket.io": "^2.2.0",
 		"socket.io-client": "^2.2.0",
 		"source-map-support": "^0.5.12",
-		"stripe": "^6.31.0",
+		"stripe": "^7.0.0",
 		"subscriptions-transport-ws": "^0.9.16",
 		"swagger-ui-express": "^4.0.2",
 		"symbol": "^0.3.1",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 4be9948e2..836c5785c 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -660,10 +660,10 @@
   dependencies:
     optional "0.1.4"
 
-"@nestjs/typeorm@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-6.1.0.tgz#bfc97ab68032d4df4bb9e30495f10957b2d60575"
-  integrity sha512-bKZeL5IXr4Z9ZtPNiiriodF8nEcjoUEAO3ugEQXGRBcYqecMpj+6+1VBCDmTloamzrUiuBil9JxBwQUJ8u0Nag==
+"@nestjs/typeorm@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-6.1.1.tgz#bf1f45f79a2b498dd33b82c1f5bd04e7797cfec3"
+  integrity sha512-KCtRYiftUfvU4QE0mlhNUHEVfo9LmFHZ7QPcSxgmV00Tf62lGX0P2vJ0Ee6zHrgPuT4TzUn+SkX70ZdeQxio3Q==
   dependencies:
     uuid "3.3.2"
 
@@ -10717,10 +10717,10 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-stripe@^6.31.0:
-  version "6.31.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.31.0.tgz#524ef6997a4473c5bf9ce684b5c39e3bc307a445"
-  integrity sha512-VHVGyfrnzKdqraRHKQ42LJysQdg2iUL8pFES3dsN9yZOiEY+kxBetL7Zq2WiA24Y5PnVIO9gB5VbvmYPhEOhyA==
+stripe@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-7.0.0.tgz#6761e7ef03e28f7c1d773abbdd6431c78b2b4fbb"
+  integrity sha512-2CzGN1oHqEoEYxo5H5t7/pd/3NdmK1f4ZJSXKa+mBfWh3yqTpKscxKU5ZbH9NpdvE7n5awkwj1oygaMwfi9dOw==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 25e387c68..c606c05cd 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -146,7 +146,7 @@
 		"sass-loader": "^7.1.0",
 		"save": "^2.3.3",
 		"socket.io-client": "^2.2.0",
-		"stripe": "^6.28.0",
+		"stripe": "^7.0.0",
 		"sw-toolbox": "^3.6.0",
 		"swiper": "^4.5.0",
 		"tslib": "^1.9.3",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 5d9a17974..924a4958f 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -9926,10 +9926,10 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-stripe@^6.28.0:
-  version "6.28.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.28.0.tgz#81f2bf174efe9503b50f24930a7e1d195c60f810"
-  integrity sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==
+stripe@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-7.0.0.tgz#6761e7ef03e28f7c1d773abbdd6431c78b2b4fbb"
+  integrity sha512-2CzGN1oHqEoEYxo5H5t7/pd/3NdmK1f4ZJSXKa+mBfWh3yqTpKscxKU5ZbH9NpdvE7n5awkwj1oygaMwfi9dOw==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 60bf4b30f..92e68f0c3 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -160,7 +160,7 @@
 		"rxjs": "^6.4.0",
 		"rxjs-compat": "^6.4.0",
 		"socket.io-client": "^2.2.0",
-		"stripe": "^6.26.1",
+		"stripe": "^7.0.0",
 		"subscriptions-transport-ws": "^0.9.16",
 		"sw-toolbox": "^3.6.0",
 		"symbol-observable": "^1.2.0",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index b4f617030..bc8e2f31f 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -9780,10 +9780,10 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-stripe@^6.26.1:
-  version "6.28.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.28.0.tgz#81f2bf174efe9503b50f24930a7e1d195c60f810"
-  integrity sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==
+stripe@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-7.0.0.tgz#6761e7ef03e28f7c1d773abbdd6431c78b2b4fbb"
+  integrity sha512-2CzGN1oHqEoEYxo5H5t7/pd/3NdmK1f4ZJSXKa+mBfWh3yqTpKscxKU5ZbH9NpdvE7n5awkwj1oygaMwfi9dOw==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
diff --git a/package.json b/package.json
index 6af959b35..5559daed8 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
 		"@angular/platform-browser": "^7.2.14",
 		"@angular/platform-browser-dynamic": "^7.2.14",
 		"@captemulation/get-parameter-names": "^1.2.0",
-		"@nestjs/typeorm": "^6.1.0",
+		"@nestjs/typeorm": "^6.1.1",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
 		"angular2-logger": "^0.7.0",
@@ -63,7 +63,7 @@
 		"rxjs": "^6.5.1",
 		"rxjs-compat": "^6.5.1",
 		"socket.io-client": "^2.2.0",
-		"stripe": "^6.31.0",
+		"stripe": "^7.0.0",
 		"typeorm": "^0.2.16",
 		"uuid": "^3.3.2"
 	},
@@ -103,7 +103,7 @@
 		"karma-jasmine-html-reporter": "^1.4.2",
 		"lerna": "^3.13.4",
 		"lerna-changelog": "^0.8.2",
-		"lighthouse": "^4.3.0",
+		"lighthouse": "^5.0.0",
 		"lint-staged": "^8.1.5",
 		"npm-check-updates": "^3.1.8",
 		"prettier": "^1.17.0",
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 594b8cad5..a05cab2ea 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -135,7 +135,7 @@
 		"sass-loader": "^7.1.0",
 		"save": "^2.3.3",
 		"socket.io-client": "^2.2.0",
-		"stripe": "^6.28.0",
+		"stripe": "^7.0.0",
 		"subscriptions-transport-ws": "^0.9.16",
 		"swiper": "^4.5.0",
 		"tslib": "^1.9.3",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 6648ff18c..f9f2518c3 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -9754,10 +9754,10 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-stripe@^6.28.0:
-  version "6.28.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.28.0.tgz#81f2bf174efe9503b50f24930a7e1d195c60f810"
-  integrity sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==
+stripe@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-7.0.0.tgz#6761e7ef03e28f7c1d773abbdd6431c78b2b4fbb"
+  integrity sha512-2CzGN1oHqEoEYxo5H5t7/pd/3NdmK1f4ZJSXKa+mBfWh3yqTpKscxKU5ZbH9NpdvE7n5awkwj1oygaMwfi9dOw==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index c82b4fdd5..584958c3b 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -147,7 +147,7 @@
 		"ngx-drag-scroll": "^7.1.3",
 		"ngx-hm-carousel": "^1.6.5-bata.1",
 		"ngx-infinite-scroll": "^7.0.1",
-		"ngx-toastr": "~9.1.2",
+		"ngx-toastr": "^10.0.4",
 		"reflect-metadata": "^0.1.13",
 		"rxjs": "^6.4.0",
 		"rxjs-compat": "^6.4.0",
@@ -155,7 +155,7 @@
 		"sass-extract": "^2.1.0",
 		"sass-extract-loader": "^1.1.0",
 		"socket.io-client": "^2.2.0",
-		"stripe": "^6.25.1",
+		"stripe": "^7.0.0",
 		"uuid": "^3.3.2",
 		"web-animations-js": "^2.3.1",
 		"zone.js": "^0.8.29"
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 69573762d..f71f526e8 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -7079,10 +7079,10 @@ ngx-infinite-scroll@^7.0.1:
   dependencies:
     opencollective-postinstall "^2.0.2"
 
-ngx-toastr@~9.1.2:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-9.1.2.tgz#2e59cfc02255f94556cfe3690a36c57a6a209796"
-  integrity sha512-XhK3xA73ueF+YZawtqKs6+FQ1OMdx+EzCPihNTMSSXDthglfcgzDzia/OMSGjhx0h7/AK4N/BAbFau9L5RqVDg==
+ngx-toastr@^10.0.4:
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-10.0.4.tgz#cbc61b8d67d748194ea7a28542b01e39bf1fc6c2"
+  integrity sha512-iN+zr2Msae5wV334c1dytRhSYNdUz467jwv1NE91lMmllsMkpUzZlu8VdFCeTFt+/R4TWzz19xBRqhpp+OAuVA==
   dependencies:
     tslib "^1.9.0"
 
@@ -9949,10 +9949,10 @@ strip-url-auth@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-url-auth/-/strip-url-auth-1.0.1.tgz#22b0fa3a41385b33be3f331551bbb837fa0cd7ae"
   integrity sha1-IrD6OkE4WzO+PzMVUbu4N/oM164=
 
-stripe@^6.25.1:
-  version "6.28.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.28.0.tgz#81f2bf174efe9503b50f24930a7e1d195c60f810"
-  integrity sha512-4taF37geIr9DqvWEm3G9VCz2iJSV/DFc3PcElCQdQK5GUMI/MOj6XE0oJRYMOAHz0Oq8pT+4yDQmkh3SDI3nQA==
+stripe@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-7.0.0.tgz#6761e7ef03e28f7c1d773abbdd6431c78b2b4fbb"
+  integrity sha512-2CzGN1oHqEoEYxo5H5t7/pd/3NdmK1f4ZJSXKa+mBfWh3yqTpKscxKU5ZbH9NpdvE7n5awkwj1oygaMwfi9dOw==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"
diff --git a/yarn.lock b/yarn.lock
index e2716776a..8413600f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -902,10 +902,10 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nestjs/typeorm@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-6.1.0.tgz#bfc97ab68032d4df4bb9e30495f10957b2d60575"
-  integrity sha512-bKZeL5IXr4Z9ZtPNiiriodF8nEcjoUEAO3ugEQXGRBcYqecMpj+6+1VBCDmTloamzrUiuBil9JxBwQUJ8u0Nag==
+"@nestjs/typeorm@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-6.1.1.tgz#bf1f45f79a2b498dd33b82c1f5bd04e7797cfec3"
+  integrity sha512-KCtRYiftUfvU4QE0mlhNUHEVfo9LmFHZ7QPcSxgmV00Tf62lGX0P2vJ0Ee6zHrgPuT4TzUn+SkX70ZdeQxio3Q==
   dependencies:
     uuid "3.3.2"
 
@@ -1001,10 +1001,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/core-js@^0.9.41":
-  version "0.9.46"
-  resolved "https://registry.yarnpkg.com/@types/core-js/-/core-js-0.9.46.tgz#ea701ee34cbb6dfe6d100f1530319547c93c8d79"
-
 "@types/d3-color@^1.2.2":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.2.2.tgz#80cf7cfff7401587b8f89307ba36fe4a576bc7cf"
@@ -1062,10 +1058,6 @@
   dependencies:
     "@types/geojson" "*"
 
-"@types/mkdirp@^0.3.29":
-  version "0.3.29"
-  resolved "http://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.3.29.tgz#7f2ad7ec55f914482fc9b1ec4bb1ae6028d46066"
-
 "@types/mongodb@*":
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.4.tgz#f0f6dc8d509500c4a8213238066b68f0c8cb25a9"
@@ -1099,19 +1091,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
   integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
 
-"@types/node@^9.3.0":
-  version "9.6.40"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.40.tgz#2d69cefbc090cb0bb824542a4c575b14dde7d3aa"
-
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
   integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
 
-"@types/rimraf@^0.0.28":
-  version "0.0.28"
-  resolved "http://registry.npmjs.org/@types/rimraf/-/rimraf-0.0.28.tgz#5562519bc7963caca8abf7f128cae3b594d41d06"
-
 "@types/socket.io-client@^1.4.32":
   version "1.4.32"
   resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14"
@@ -1402,10 +1386,10 @@ aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
-axe-core@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-3.1.2.tgz#ca0aff897ebefca7552f97859dc1217c06c4f9e6"
-  integrity sha512-e1WVs0SQu3tM29J9a/mISGvlo2kdCStE+yffIAJF6eb42FS+eUFEVz9j4rgDeV2TAfPJmuOZdRetWYycIbK7Vg==
+axe-core@3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-3.2.2.tgz#b06d6e9ae4636d706068843272bfaeed3fe97362"
+  integrity sha512-gAy4kMSPpuRJV3mwictJqlg5LhE84Vw2CydKdC4tvrLhR6+G3KW51zbL/vYujcLA2jvWOq3HMHrVeNuw+mrLVA==
 
 axobject-query@^2.0.2:
   version "2.0.2"
@@ -1848,14 +1832,12 @@ chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
 
-chrome-launcher@^0.10.5:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.10.5.tgz#d0aa72c11f1653e6a60dfebea171522447470ef1"
+chrome-launcher@^0.10.7:
+  version "0.10.7"
+  resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.10.7.tgz#5e2a9e99f212e0501d9c7024802acd01a812f5d5"
+  integrity sha512-IoQLp64s2n8OQuvKZwt77CscVj3UlV2Dj7yZtd1EBMld9mSdGcsGy9fN5hd/r4vJuWZR09it78n1+A17gB+AIQ==
   dependencies:
-    "@types/core-js" "^0.9.41"
-    "@types/mkdirp" "^0.3.29"
-    "@types/node" "^9.3.0"
-    "@types/rimraf" "^0.0.28"
+    "@types/node" "*"
     is-wsl "^1.1.0"
     lighthouse-logger "^1.0.0"
     mkdirp "0.5.1"
@@ -4331,9 +4313,10 @@ jpeg-js@0.1.2, jpeg-js@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.1.2.tgz#135b992c0575c985cfa0f494a3227ed238583ece"
 
-js-library-detector@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/js-library-detector/-/js-library-detector-5.1.0.tgz#1e2e88b119bb91e6581b28f4a90018ea1320de73"
+js-library-detector@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/js-library-detector/-/js-library-detector-5.4.0.tgz#d1b08dfbdc3886258f888bd441801ef9e5b69567"
+  integrity sha512-lSTEC9Q3L/cXOhYIilW3GH/v4tOnPIN40NTIBHRcn2vxTwGhMyySQTQpJ0W68ISGzOgvwVe7KCfQ9PJi6MsOIw==
 
 js-tokens@^3.0.2:
   version "3.0.2"
@@ -4755,13 +4738,13 @@ lighthouse-logger@^1.0.0, lighthouse-logger@^1.2.0:
     debug "^2.6.8"
     marky "^1.2.0"
 
-lighthouse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lighthouse/-/lighthouse-4.3.0.tgz#5b6a89871ece5016103a3fb0c1c33d8976f80f80"
-  integrity sha512-gSekIsP+d2kT2Ly6vkjj+hpmeNbR47w+iKwlUUkp7pWA+VfLY4uihmm4scYb4Qw0g4UCoe13f1JrMCw4oXIeIw==
+lighthouse@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/lighthouse/-/lighthouse-5.0.0.tgz#bca0f2a3ca36877d44bef5ba6478b135820d1cfb"
+  integrity sha512-s9S2ZujnAYF+F5EqKKGL72H1PQ1tPf7YxEl79LmvF9QHXElrITjQfYgi+8ZmHrNrCkKra5aKPzKRN3IIfF5Q9w==
   dependencies:
-    axe-core "3.1.2"
-    chrome-launcher "^0.10.5"
+    axe-core "3.2.2"
+    chrome-launcher "^0.10.7"
     configstore "^3.1.1"
     cssstyle "1.2.1"
     details-element-polyfill "2.2.0"
@@ -4770,7 +4753,7 @@ lighthouse@^4.3.0:
     intl-messageformat "^2.2.0"
     intl-messageformat-parser "^1.4.0"
     jpeg-js "0.1.2"
-    js-library-detector "^5.1.0"
+    js-library-detector "^5.4.0"
     jsonld "^1.5.0"
     jsonlint-mod "^1.7.4"
     lighthouse-logger "^1.2.0"
@@ -7659,10 +7642,10 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-stripe@^6.31.0:
-  version "6.31.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-6.31.0.tgz#524ef6997a4473c5bf9ce684b5c39e3bc307a445"
-  integrity sha512-VHVGyfrnzKdqraRHKQ42LJysQdg2iUL8pFES3dsN9yZOiEY+kxBetL7Zq2WiA24Y5PnVIO9gB5VbvmYPhEOhyA==
+stripe@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-7.0.0.tgz#6761e7ef03e28f7c1d773abbdd6431c78b2b4fbb"
+  integrity sha512-2CzGN1oHqEoEYxo5H5t7/pd/3NdmK1f4ZJSXKa+mBfWh3yqTpKscxKU5ZbH9NpdvE7n5awkwj1oygaMwfi9dOw==
   dependencies:
     lodash.isplainobject "^4.0.6"
     qs "^6.6.0"

From 22240540a4282e95039969162b4182e03f034d1a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 17 May 2019 12:05:57 +0300
Subject: [PATCH 310/382] chore: update more packages to the latest version
 kafka-node, @types/stripe, @fortawesome/free-brands-svg-icons,

---
 admin/website-angular/package.json |  2 +-
 admin/website-angular/yarn.lock    |  8 ++++----
 backend/api/package.json           |  4 ++--
 backend/api/yarn.lock              | 16 ++++++++--------
 carrier/mobile-ionic/package.json  |  2 +-
 carrier/mobile-ionic/yarn.lock     |  8 ++++----
 merchant/tablet-ionic/package.json |  2 +-
 merchant/tablet-ionic/yarn.lock    |  8 ++++----
 package.json                       |  2 +-
 shop/mobile-ionic/package.json     |  2 +-
 shop/mobile-ionic/yarn.lock        |  8 ++++----
 shop/website-angular/package.json  |  4 ++--
 shop/website-angular/yarn.lock     | 23 ++++++++++++++---------
 yarn.lock                          |  8 ++++----
 14 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 341ca3a5a..567939ba6 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -178,7 +178,7 @@
 		"@types/mongoose": "^5.3.26",
 		"@types/node": "^12.0.2",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.25.12",
+		"@types/stripe": "^6.25.17",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
 		"babel-loader": "^8.0.5",
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index f2d277c14..e2f1186be 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -1706,10 +1706,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stripe@^6.25.12":
-  version "6.25.12"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.12.tgz#7d2299262968556de2b5d4854efccbc7acb49184"
-  integrity sha512-xnNajYeTdibtUfyedTv91QljDsRD+BYFI8aQKxRRU51OUBKef6Zg50kIWotgLjd4q5WHFn9fTfwPnyW2fB1xAQ==
+"@types/stripe@^6.25.17":
+  version "6.25.17"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.17.tgz#8d6bb4b1663bc0478405b4825122d8a86e1cb23f"
+  integrity sha512-CAlPYH2QVBHW22IHuqb1YGsOzcOlXGEwBRTrzhH4c6XlyrON8mJg2Pgfj1PTOlfJxHVLMcqJWu0Goa6uWVXz0A==
   dependencies:
     "@types/node" "*"
 
diff --git a/backend/api/package.json b/backend/api/package.json
index 6883b6160..34ab8d266 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -94,7 +94,7 @@
 		"inversify": "^5.0.1",
 		"ipstack": "^0.1.1",
 		"jsonwebtoken": "^8.5.1",
-		"kafka-node": "^4.1.1",
+		"kafka-node": "^4.1.3",
 		"lodash": "^4.17.11",
 		"method-override": "^3.0.0",
 		"mkdirp": "^0.5.1",
@@ -180,7 +180,7 @@
 		"@types/socket.io": "^2.1.2",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/source-map-support": "^0.5.0",
-		"@types/stripe": "^6.25.12",
+		"@types/stripe": "^6.25.17",
 		"@types/uuid": "^3.4.4",
 		"@types/ws": "^6.0.1",
 		"concurrently": "^4.1.0",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 836c5785c..8e4ff9c1c 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -1281,10 +1281,10 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
-"@types/stripe@^6.25.12":
-  version "6.25.12"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.12.tgz#7d2299262968556de2b5d4854efccbc7acb49184"
-  integrity sha512-xnNajYeTdibtUfyedTv91QljDsRD+BYFI8aQKxRRU51OUBKef6Zg50kIWotgLjd4q5WHFn9fTfwPnyW2fB1xAQ==
+"@types/stripe@^6.25.17":
+  version "6.25.17"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.17.tgz#8d6bb4b1663bc0478405b4825122d8a86e1cb23f"
+  integrity sha512-CAlPYH2QVBHW22IHuqb1YGsOzcOlXGEwBRTrzhH4c6XlyrON8mJg2Pgfj1PTOlfJxHVLMcqJWu0Goa6uWVXz0A==
   dependencies:
     "@types/node" "*"
 
@@ -6780,10 +6780,10 @@ jws@^3.2.2:
     jwa "^1.4.1"
     safe-buffer "^5.0.1"
 
-kafka-node@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/kafka-node/-/kafka-node-4.1.1.tgz#710246f78867e9f1eba9d70336c5884b8baf3702"
-  integrity sha512-Nsx1vdxWFU7mUI59etH210QmjBsMGWAN4lz0WRmzC1QwFK4hFLgoRM3F4RtxUeDVx8PsswMA1Z0T2eJTgoV9tQ==
+kafka-node@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/kafka-node/-/kafka-node-4.1.3.tgz#9e5fdf3a5562370ff0f82c5481bd14a6e39ad93d"
+  integrity sha512-C2WHksRCr7vIKmbxYaCk2c5Q1lnHIi6C0f3AioK3ARcRHGO9DpqErcoaS9d8PP62yzTnkYras+iAlmPsZHNSfw==
   dependencies:
     async "^2.6.2"
     binary "~0.3.0"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index c606c05cd..c8c87c8e8 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -182,7 +182,7 @@
 		"@types/node": "^12.0.2",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.25.7",
+		"@types/stripe": "^6.25.17",
 		"@types/swiper": "^4.4.2",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 924a4958f..db1687130 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -909,10 +909,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stripe@^6.25.7":
-  version "6.25.10"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
-  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
+"@types/stripe@^6.25.17":
+  version "6.25.17"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.17.tgz#8d6bb4b1663bc0478405b4825122d8a86e1cb23f"
+  integrity sha512-CAlPYH2QVBHW22IHuqb1YGsOzcOlXGEwBRTrzhH4c6XlyrON8mJg2Pgfj1PTOlfJxHVLMcqJWu0Goa6uWVXz0A==
   dependencies:
     "@types/node" "*"
 
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 92e68f0c3..1ce341822 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -194,7 +194,7 @@
 		"@types/node": "^12.0.2",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.25.7",
+		"@types/stripe": "^6.25.17",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
 		"codelyzer": "^5.0.1",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index bc8e2f31f..ae00ff103 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -917,10 +917,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stripe@^6.25.7":
-  version "6.25.10"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
-  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
+"@types/stripe@^6.25.17":
+  version "6.25.17"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.17.tgz#8d6bb4b1663bc0478405b4825122d8a86e1cb23f"
+  integrity sha512-CAlPYH2QVBHW22IHuqb1YGsOzcOlXGEwBRTrzhH4c6XlyrON8mJg2Pgfj1PTOlfJxHVLMcqJWu0Goa6uWVXz0A==
   dependencies:
     "@types/node" "*"
 
diff --git a/package.json b/package.json
index 5559daed8..3e462cec0 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
 		"@types/mongoose": "^5.3.26",
 		"@types/node": "^12.0.2",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.25.12",
+		"@types/stripe": "^6.25.17",
 		"@types/uuid": "^3.4.4",
 		"cloc": "^2.4.0",
 		"codelyzer": "^5.0.1",
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index a05cab2ea..464c86e31 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -170,7 +170,7 @@
 		"@types/node": "^12.0.2",
 		"@types/reflect-metadata": "^0.1.0",
 		"@types/socket.io-client": "^1.4.32",
-		"@types/stripe": "^6.25.7",
+		"@types/stripe": "^6.25.17",
 		"@types/swiper": "^4.4.2",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index f9f2518c3..2f5f59980 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -909,10 +909,10 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/stripe@^6.25.7":
-  version "6.25.10"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
-  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
+"@types/stripe@^6.25.17":
+  version "6.25.17"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.17.tgz#8d6bb4b1663bc0478405b4825122d8a86e1cb23f"
+  integrity sha512-CAlPYH2QVBHW22IHuqb1YGsOzcOlXGEwBRTrzhH4c6XlyrON8mJg2Pgfj1PTOlfJxHVLMcqJWu0Goa6uWVXz0A==
   dependencies:
     "@types/node" "*"
 
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 584958c3b..080e596c3 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -118,7 +118,7 @@
 		"@fortawesome/angular-fontawesome": "^0.3.0",
 		"@fortawesome/fontawesome-free": "^5.7.2",
 		"@fortawesome/fontawesome-svg-core": "^1.2.15",
-		"@fortawesome/free-brands-svg-icons": "^5.7.2",
+		"@fortawesome/free-brands-svg-icons": "^5.8.2",
 		"@fortawesome/free-regular-svg-icons": "^5.7.2",
 		"@fortawesome/free-solid-svg-icons": "^5.7.2",
 		"@ngx-translate/core": "^11.0.1",
@@ -177,7 +177,7 @@
 		"@types/node": "^12.0.2",
 		"@types/socket.io-client": "^1.4.32",
 		"@types/source-map": "^0.5.7",
-		"@types/stripe": "^6.25.7",
+		"@types/stripe": "^6.25.17",
 		"@types/stripe-node": "^4.7.1",
 		"@types/uglify-js": "^3.0.4",
 		"@types/uuid": "^3.4.4",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index f71f526e8..d0f5cb741 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -347,6 +347,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.17.tgz#d8c36e6f6f3b3415fa1f83eaffe4f41bd313715c"
   integrity sha512-DEYsEb/iiGVoMPQGjhG2uOylLVuMzTxOxysClkabZ5n80Q3oFDWGnshCLKvOvKoeClsgmKhWVrnnqvsMI1cAbw==
 
+"@fortawesome/fontawesome-common-types@^0.2.18":
+  version "0.2.18"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.18.tgz#c0d8f073a5116b2de0a2c8a7aba66093a6956ce7"
+  integrity sha512-834DrzO2Ne3upCW+mJJPC/E6BsFcj+2Z1HmPIhbpbj8UaKmXWum4NClqLpUiMetugRlHuG4jbIHNdv2/lc3c1Q==
+
 "@fortawesome/fontawesome-free@^5.7.2":
   version "5.8.1"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz#cbafbfe8894c4e3e3c3a9da6774e249ac1f2da8b"
@@ -359,12 +364,12 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.17"
 
-"@fortawesome/free-brands-svg-icons@^5.7.2":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.8.1.tgz#8f188a4699adb31e505abca64740d7046222b9a1"
-  integrity sha512-NN5Nap2D5e7Lusa5uarAUkcaO7PMbme5wmUF8kofZzPUZR753zDg/UFffi+LLE2Mi9zRXCJEYmIRfMON9SxLPg==
+"@fortawesome/free-brands-svg-icons@^5.8.2":
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.8.2.tgz#e68a509c986d5d197cc5bd9ae8d966eff513468d"
+  integrity sha512-nhEWctDOP6f+Ka10LXAFoF+6mtWidC2iQgTBGRGgydmhBtcIEwyxWVx5wQHa86A1zAMi5TnipDAYQs2qn7DD6A==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.17"
+    "@fortawesome/fontawesome-common-types" "^0.2.18"
 
 "@fortawesome/free-regular-svg-icons@^5.7.2":
   version "5.8.1"
@@ -640,10 +645,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/stripe@^6.25.7":
-  version "6.25.10"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.10.tgz#f558841c75c1b8a44d5408fc94c0ac14a5fef82e"
-  integrity sha512-dQzwRqYieySJdAy5rX0tQfoy21RVq0dnpVITN89IRqgO3I6z8alRq/GdOeCEaqFcILrPK4KZDpF3NIWSWCGpSw==
+"@types/stripe@^6.25.17":
+  version "6.25.17"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.17.tgz#8d6bb4b1663bc0478405b4825122d8a86e1cb23f"
+  integrity sha512-CAlPYH2QVBHW22IHuqb1YGsOzcOlXGEwBRTrzhH4c6XlyrON8mJg2Pgfj1PTOlfJxHVLMcqJWu0Goa6uWVXz0A==
   dependencies:
     "@types/node" "*"
 
diff --git a/yarn.lock b/yarn.lock
index 8413600f5..54fc40109 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1100,10 +1100,10 @@
   version "1.4.32"
   resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.32.tgz#988a65a0386c274b1c22a55377fab6a30789ac14"
 
-"@types/stripe@^6.25.12":
-  version "6.25.12"
-  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.12.tgz#7d2299262968556de2b5d4854efccbc7acb49184"
-  integrity sha512-xnNajYeTdibtUfyedTv91QljDsRD+BYFI8aQKxRRU51OUBKef6Zg50kIWotgLjd4q5WHFn9fTfwPnyW2fB1xAQ==
+"@types/stripe@^6.25.17":
+  version "6.25.17"
+  resolved "https://registry.yarnpkg.com/@types/stripe/-/stripe-6.25.17.tgz#8d6bb4b1663bc0478405b4825122d8a86e1cb23f"
+  integrity sha512-CAlPYH2QVBHW22IHuqb1YGsOzcOlXGEwBRTrzhH4c6XlyrON8mJg2Pgfj1PTOlfJxHVLMcqJWu0Goa6uWVXz0A==
   dependencies:
     "@types/node" "*"
 

From 425f9288d45ffa2539e478c45266b41311da55fc Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 17 May 2019 13:29:23 +0300
Subject: [PATCH 311/382] chore: update more packages to the latest version
 fortawesome packages and css-element-queries

---
 shop/website-angular/package.json             | 10 ++--
 .../+products/product/product.component.ts    |  2 +-
 shop/website-angular/yarn.lock                | 51 +++++++++----------
 3 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 080e596c3..65ac25761 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -116,11 +116,11 @@
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
 		"@fortawesome/angular-fontawesome": "^0.3.0",
-		"@fortawesome/fontawesome-free": "^5.7.2",
-		"@fortawesome/fontawesome-svg-core": "^1.2.15",
+		"@fortawesome/fontawesome-free": "^5.8.2",
+		"@fortawesome/fontawesome-svg-core": "^1.2.18",
 		"@fortawesome/free-brands-svg-icons": "^5.8.2",
-		"@fortawesome/free-regular-svg-icons": "^5.7.2",
-		"@fortawesome/free-solid-svg-icons": "^5.7.2",
+		"@fortawesome/free-regular-svg-icons": "^5.8.2",
+		"@fortawesome/free-solid-svg-icons": "^5.8.2",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
 		"@types/googlemaps": "^3.30.16",
@@ -135,7 +135,7 @@
 		"bson-objectid": "^1.2.4",
 		"classlist.js": "^1.1.20150312",
 		"core-js": "^2.6.5",
-		"css-element-queries": "^1.1.1",
+		"css-element-queries": "^1.2.0",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"hammerjs": "^2.0.8",
diff --git a/shop/website-angular/src/app/+products/product/product.component.ts b/shop/website-angular/src/app/+products/product/product.component.ts
index b24302a51..14a552eaa 100644
--- a/shop/website-angular/src/app/+products/product/product.component.ts
+++ b/shop/website-angular/src/app/+products/product/product.component.ts
@@ -16,7 +16,7 @@ import {
 } from '@angular/animations';
 import { Observable } from 'rxjs';
 import 'rxjs/add/observable/fromEvent';
-import { ElementQueries } from 'css-element-queries';
+import { ElementQueries } from 'css-element-queries/src/ElementQueries';
 import ProductInfo from '../../../modules/server.common/entities/ProductInfo';
 import { OrderRouter } from '../../../modules/client.common.angular2/routers/order-router.service';
 import { WarehouseOrdersRouter } from '../../../modules/client.common.angular2/routers/warehouse-orders-router.service';
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index d0f5cb741..861a64ce5 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -342,27 +342,22 @@
   dependencies:
     tslib "^1.9.0"
 
-"@fortawesome/fontawesome-common-types@^0.2.17":
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.17.tgz#d8c36e6f6f3b3415fa1f83eaffe4f41bd313715c"
-  integrity sha512-DEYsEb/iiGVoMPQGjhG2uOylLVuMzTxOxysClkabZ5n80Q3oFDWGnshCLKvOvKoeClsgmKhWVrnnqvsMI1cAbw==
-
 "@fortawesome/fontawesome-common-types@^0.2.18":
   version "0.2.18"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.18.tgz#c0d8f073a5116b2de0a2c8a7aba66093a6956ce7"
   integrity sha512-834DrzO2Ne3upCW+mJJPC/E6BsFcj+2Z1HmPIhbpbj8UaKmXWum4NClqLpUiMetugRlHuG4jbIHNdv2/lc3c1Q==
 
-"@fortawesome/fontawesome-free@^5.7.2":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz#cbafbfe8894c4e3e3c3a9da6774e249ac1f2da8b"
-  integrity sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA==
+"@fortawesome/fontawesome-free@^5.8.2":
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.2.tgz#fae4112c4fb47086f6ae167e32524b280000abd5"
+  integrity sha512-E4fDUF4fbu9AxKpaQQqCN3XBnNzb/5e0Gvd9OaQsYkK574LVI57v/EqqPfIm/mC7jYbxaPNrhvT5AF+Yzwyizg==
 
-"@fortawesome/fontawesome-svg-core@^1.2.15":
-  version "1.2.17"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.17.tgz#8fce4402e824ebe99a04b1949d56d696eeae2e6d"
-  integrity sha512-TORMW/wIX2QyyGBd4XwHGPir4/0U18Wxf+iDBAUW3EIJ0/VC/ZMpJOiyiCe1f8g9h0PPzA7sqVtl8JtTUtm4uA==
+"@fortawesome/fontawesome-svg-core@^1.2.18":
+  version "1.2.18"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.18.tgz#c26cbded461895ebe260f0dea771ca29d8cb3517"
+  integrity sha512-1vyLWVQqxQ8q8bA2zgZcljk3RkeELlDJ757ymLk+ebK019AFgEFH5kTnR5OMN1SFsTwW1OHlFQO3VufdeCg/Gg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.17"
+    "@fortawesome/fontawesome-common-types" "^0.2.18"
 
 "@fortawesome/free-brands-svg-icons@^5.8.2":
   version "5.8.2"
@@ -371,19 +366,19 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.18"
 
-"@fortawesome/free-regular-svg-icons@^5.7.2":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.8.1.tgz#9477a973fe3f681f871375fa95ff32a87dcb5111"
-  integrity sha512-U+tFjDyQpVdD0UPWoKRBVLhh0J1/q3iaWDrnxNMJKuKRmerc4d0jfiZdM2X7agOTcG7amvcllRBiWCu2FwYlMA==
+"@fortawesome/free-regular-svg-icons@^5.8.2":
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.8.2.tgz#f61c603c73695a41bcee9d6f9d44e2ca4829f151"
+  integrity sha512-499WODlsDcXA9hM+Y3ZqoWj1kKhVLCHS8PnJs3zEaoPr5W6yrE9Jnp3C9Hb9KpwnRMh3IRXZ3XqxyUaQFMMRFw==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.17"
+    "@fortawesome/fontawesome-common-types" "^0.2.18"
 
-"@fortawesome/free-solid-svg-icons@^5.7.2":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.8.1.tgz#086c70f95b34a4bcf6f50ff1078d46e53486eb52"
-  integrity sha512-FUcxR75PtMOo3ihRHJOZz64IsWIVdWgB2vCMLJjquTv487wVVCMH5H5gWa72et2oI9lKKD2jvjQ+y+7mxhscVQ==
+"@fortawesome/free-solid-svg-icons@^5.8.2":
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.8.2.tgz#aa2f042f73aca43eb4a26149907e63bf26d2e31c"
+  integrity sha512-5tF6WOFlqqO95zY5ukSB6jliDa3jnk1p5L4K/a58ccDFsbjSkhfGuvZkRkeWxH8uMms81pZd6yQTwQrkedeJmg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.17"
+    "@fortawesome/fontawesome-common-types" "^0.2.18"
 
 "@jest/types@^24.8.0":
   version "24.8.0"
@@ -3028,10 +3023,10 @@ crypto-js@^3.1.9-1:
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
   integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=
 
-css-element-queries@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.1.1.tgz#129e104ecb277aa6337b7302cbb6d511c2d1633a"
-  integrity sha512-/PX6Bkk77ShgbOx/mpawHdEvS3PGgy1mmMktcztDPndWdMJxcorcQiivrs+nEljqtBpvNEhAmQky9tQR6FSm8Q==
+css-element-queries@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.2.0.tgz#081373d7f30302adad46b7c29b83b85f8ef8f62c"
+  integrity sha512-4gaxpioSFueMcp9yj1TJFCLjfooGv38y6ZdwFUS3GuS+9NIVijdeiExXKwSIHoQDADfpgnaYSTzmJs+bV+Hehg==
 
 css-loader@^2.1.0:
   version "2.1.1"

From e6044303242ea75b1399c2cb325373446f4cb24e Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 17 May 2019 13:58:14 +0300
Subject: [PATCH 312/382] chore: update more packages to the latest version
 yargs, @types/lodash

---
 admin/website-angular/package.json            |  2 +-
 admin/website-angular/yarn.lock               | 40 ++++++++++-----
 backend/api/package.json                      |  2 +-
 .../GeoLocationsProductsService.ts            |  2 +-
 backend/api/yarn.lock                         |  8 +--
 carrier/mobile-ionic/package.json             |  2 +-
 carrier/mobile-ionic/yarn.lock                | 42 +++++++++++-----
 merchant/tablet-ionic/package.json            |  2 +-
 merchant/tablet-ionic/yarn.lock               | 42 +++++++++++-----
 shop/mobile-ionic/package.json                |  2 +-
 shop/mobile-ionic/yarn.lock                   | 42 +++++++++++-----
 shop/website-angular/package.json             |  2 +-
 .../+products/product/product.component.ts    |  2 +-
 shop/website-angular/yarn.lock                | 49 +++++++++++++++++--
 14 files changed, 177 insertions(+), 62 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 567939ba6..3e1b9eabe 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -206,7 +206,7 @@
 		"typescript": "~3.2.4",
 		"typescript-tslint-plugin": "^0.3.1",
 		"webpack-dev-server": "^3.3.1",
-		"yargs": "^13.2.2"
+		"yargs": "^13.2.4"
 	},
 	"engines": {
 		"node": ">=10.15.0",
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index e2f1186be..7415c787d 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -3945,6 +3945,15 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
@@ -12675,7 +12684,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -14262,6 +14271,15 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -14370,10 +14388,10 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
-  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+yargs-parser@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
+  integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -14447,12 +14465,12 @@ yargs@9.0.1:
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
 
-yargs@^13.2.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
-  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+yargs@^13.2.4:
+  version "13.2.4"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
   dependencies:
-    cliui "^4.0.0"
+    cliui "^5.0.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
     os-locale "^3.1.0"
@@ -14462,7 +14480,7 @@ yargs@^13.2.2:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.0.0"
+    yargs-parser "^13.1.0"
 
 yargs@^7.0.0:
   version "7.1.0"
diff --git a/backend/api/package.json b/backend/api/package.json
index 34ab8d266..46f2edb03 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -163,7 +163,7 @@
 		"@types/jest": "^24.0.11",
 		"@types/jsonwebtoken": "^8.3.2",
 		"@types/kafka-node": "^2.0.8",
-		"@types/lodash": "^4.14.123",
+		"@types/lodash": "^4.14.129",
 		"@types/method-override": "^0.0.31",
 		"@types/mkdirp": "^0.5.2",
 		"@types/moment": "^2.13.0",
diff --git a/backend/api/src/services/geo-locations/GeoLocationsProductsService.ts b/backend/api/src/services/geo-locations/GeoLocationsProductsService.ts
index 8609459c3..f352d49e2 100644
--- a/backend/api/src/services/geo-locations/GeoLocationsProductsService.ts
+++ b/backend/api/src/services/geo-locations/GeoLocationsProductsService.ts
@@ -173,7 +173,7 @@ export class GeoLocationsProductsService
 					});
 				})
 			)
-			.flatten<ProductInfo>()
+			.flatten()
 			.groupBy((productInfo) => productInfo.warehouseProduct.productId)
 			.map((productInfos: ProductInfo[], productId) => {
 				return _.minBy(
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 8e4ff9c1c..797ec07b3 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -1085,10 +1085,10 @@
   version "4.14.116"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.116.tgz#5ccf215653e3e8c786a58390751033a9adca0eb9"
 
-"@types/lodash@^4.14.123":
-  version "4.14.123"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.123.tgz#39be5d211478c8dd3bdae98ee75bb7efe4abfe4d"
-  integrity sha512-pQvPkc4Nltyx7G1Ww45OjVqUsJP4UsZm+GWJpigXgkikZqJgRm4c48g027o6tdgubWHwFRF15iFd+Y4Pmqv6+Q==
+"@types/lodash@^4.14.129":
+  version "4.14.129"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.129.tgz#9aaca391db126802482655c48dd79a814488202f"
+  integrity sha512-oYaV0eSlnOacOr7i4X1FFdH8ttSlb57gu3I9MuStIv2CYkISEY84dNHYsC3bF6sNH7qYcu1BtVrCtQ8Q4KPTfQ==
 
 "@types/long@^4.0.0":
   version "4.0.0"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index c8c87c8e8..a9b6f2f1c 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -209,7 +209,7 @@
 		"typescript": "~3.2.4",
 		"webpack-bundle-analyzer": "^3.1.0",
 		"webpack-merge": "^4.2.1",
-		"yargs": "^13.2.2"
+		"yargs": "^13.2.4"
 	},
 	"config": {
 		"ionic_webpack": "./config/webpack.config.js"
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index db1687130..79050c96d 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -2574,6 +2574,15 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
@@ -9839,7 +9848,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -9890,7 +9899,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -11077,6 +11086,15 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -11206,10 +11224,10 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
-  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+yargs-parser@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
+  integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -11283,12 +11301,12 @@ yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@^13.2.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
-  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+yargs@^13.2.4:
+  version "13.2.4"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
   dependencies:
-    cliui "^4.0.0"
+    cliui "^5.0.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
     os-locale "^3.1.0"
@@ -11298,7 +11316,7 @@ yargs@^13.2.2:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.0.0"
+    yargs-parser "^13.1.0"
 
 yargs@^7.0.0:
   version "7.1.0"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 1ce341822..6c39eca33 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -212,7 +212,7 @@
 		"typescript": "~3.2.4",
 		"webpack-bundle-analyzer": "^3.1.0",
 		"webpack-merge": "^4.2.1",
-		"yargs": "^13.2.2"
+		"yargs": "^13.2.4"
 	},
 	"cordova": {
 		"platforms": [
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index ae00ff103..67a749498 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -2590,6 +2590,15 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
@@ -9693,7 +9702,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -9744,7 +9753,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -10903,6 +10912,15 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -11047,10 +11065,10 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
-  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+yargs-parser@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
+  integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -11124,12 +11142,12 @@ yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@^13.2.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
-  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+yargs@^13.2.4:
+  version "13.2.4"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
   dependencies:
-    cliui "^4.0.0"
+    cliui "^5.0.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
     os-locale "^3.1.0"
@@ -11139,7 +11157,7 @@ yargs@^13.2.2:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.0.0"
+    yargs-parser "^13.1.0"
 
 yargs@^7.0.0:
   version "7.1.0"
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 464c86e31..dcc9a4f80 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -197,7 +197,7 @@
 		"typescript": "~3.2.4",
 		"webpack-bundle-analyzer": "^3.1.0",
 		"webpack-merge": "^4.2.1",
-		"yargs": "^13.2.2"
+		"yargs": "^13.2.4"
 	},
 	"cordova": {
 		"platforms": [
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 2f5f59980..bd1e6bdf1 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -2562,6 +2562,15 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
@@ -9667,7 +9676,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -9718,7 +9727,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -10903,6 +10912,15 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -11039,10 +11057,10 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
-  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+yargs-parser@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
+  integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -11116,12 +11134,12 @@ yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@^13.2.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
-  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+yargs@^13.2.4:
+  version "13.2.4"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
   dependencies:
-    cliui "^4.0.0"
+    cliui "^5.0.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
     os-locale "^3.1.0"
@@ -11131,7 +11149,7 @@ yargs@^13.2.2:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.0.0"
+    yargs-parser "^13.1.0"
 
 yargs@^7.0.0:
   version "7.1.0"
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 65ac25761..0667d6e59 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -249,7 +249,7 @@
 		"webpack-dev-server": "^3.2.1",
 		"webpack-inline-manifest-plugin": "^4.0.1",
 		"webpack-merge": "^4.2.1",
-		"yargs": "^13.2.1"
+		"yargs": "^13.2.4"
 	},
 	"engines": {
 		"node": ">=10.15.0",
diff --git a/shop/website-angular/src/app/+products/product/product.component.ts b/shop/website-angular/src/app/+products/product/product.component.ts
index 14a552eaa..069c22856 100644
--- a/shop/website-angular/src/app/+products/product/product.component.ts
+++ b/shop/website-angular/src/app/+products/product/product.component.ts
@@ -16,7 +16,7 @@ import {
 } from '@angular/animations';
 import { Observable } from 'rxjs';
 import 'rxjs/add/observable/fromEvent';
-import { ElementQueries } from 'css-element-queries/src/ElementQueries';
+import * as ElementQueries from 'css-element-queries/src/ElementQueries';
 import ProductInfo from '../../../modules/server.common/entities/ProductInfo';
 import { OrderRouter } from '../../../modules/client.common.angular2/routers/order-router.service';
 import { WarehouseOrdersRouter } from '../../../modules/client.common.angular2/routers/warehouse-orders-router.service';
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 861a64ce5..8a38a313b 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -2429,6 +2429,15 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
@@ -9840,7 +9849,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -9896,7 +9905,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -11171,6 +11180,15 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -11275,6 +11293,14 @@ yargs-parser@^13.0.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
+  integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
@@ -11333,7 +11359,7 @@ yargs@12.0.5, yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@13.2.2, yargs@^13.2.1:
+yargs@13.2.2:
   version "13.2.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
   integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
@@ -11369,6 +11395,23 @@ yargs@9.0.1:
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
 
+yargs@^13.2.4:
+  version "13.2.4"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.0"
+
 yargs@^4.8.1:
   version "4.8.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"

From aa8bbb5e7310a62c00a0925e7afdc7c0713ec361 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 17 May 2019 16:40:37 +0300
Subject: [PATCH 313/382] fix(ever-carrier): fixed wrong displayed distance

---
 .../mobile-ionic/src/pages/main/delivery/delivery.ts  | 11 ++++++-----
 .../main/drive-to-warehouse/drive-to-warehouse.ts     | 10 ++++++----
 .../pages/main/starting-delivery/starting-delivery.ts | 11 ++++++-----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts b/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts
index 53c08a8d1..b867e3ace 100644
--- a/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts
+++ b/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts
@@ -108,16 +108,17 @@ export class DeliveryPage implements AfterViewInit {
 			}
 		} as IGeoLocation;
 
-		this.carrierUserDistance = Utils.getDistance(
-			order.warehouse['geoLocation'],
-			dbGeoInput as GeoLocation
-		).toFixed(2);
-
 		const origin = new google.maps.LatLng(
 			position.coords.latitude,
 			position.coords.longitude
 		);
 		const userGeo = order.user['geoLocation'];
+
+		this.carrierUserDistance = Utils.getDistance(
+			userGeo,
+			dbGeoInput as GeoLocation
+		).toFixed(2);
+
 		const destination = new google.maps.LatLng(
 			userGeo.loc.coordinates[1],
 			userGeo.loc.coordinates[0]
diff --git a/carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.ts b/carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.ts
index bf0219642..72169ec07 100644
--- a/carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.ts
+++ b/carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.ts
@@ -79,10 +79,6 @@ export class DriveToWarehousePage {
 							this.workTaken =
 								order.carrierStatus !==
 								OrderCarrierStatus.NoCarrier;
-							this.carrierUserDistance = Utils.getDistance(
-								order.user.geoLocation,
-								dbGeoInput as GeoLocation
-							).toFixed(2);
 
 							const origin = new google.maps.LatLng(
 								position.coords.latitude,
@@ -90,6 +86,12 @@ export class DriveToWarehousePage {
 							);
 
 							const merchantGeo = order.warehouse['geoLocation'];
+
+							this.carrierUserDistance = Utils.getDistance(
+								merchantGeo,
+								dbGeoInput as GeoLocation
+							).toFixed(2);
+
 							const destination = new google.maps.LatLng(
 								merchantGeo.loc.coordinates[1],
 								merchantGeo.loc.coordinates[0]
diff --git a/carrier/mobile-ionic/src/pages/main/starting-delivery/starting-delivery.ts b/carrier/mobile-ionic/src/pages/main/starting-delivery/starting-delivery.ts
index 53ca7e2da..2dad3cd65 100644
--- a/carrier/mobile-ionic/src/pages/main/starting-delivery/starting-delivery.ts
+++ b/carrier/mobile-ionic/src/pages/main/starting-delivery/starting-delivery.ts
@@ -86,17 +86,18 @@ export class StartingDeliveryPage implements AfterViewInit {
 			}
 		} as IGeoLocation;
 
-		this.carrierUserDistance = Utils.getDistance(
-			this.selectedOrder.warehouse['geoLocation'],
-			dbGeoInput as GeoLocation
-		).toFixed(2);
-
 		const origin = new google.maps.LatLng(
 			position.coords.latitude,
 			position.coords.longitude
 		);
 
 		const userGeo = this.selectedOrder.user['geoLocation'];
+
+		this.carrierUserDistance = Utils.getDistance(
+			userGeo as GeoLocation,
+			dbGeoInput as GeoLocation
+		).toFixed(2);
+
 		const destination = new google.maps.LatLng(
 			userGeo.loc.coordinates[1],
 			userGeo.loc.coordinates[0]

From edb0c4deb4b03b84ff839966a5a9b66459ed6f7e Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 20 May 2019 10:17:02 +0300
Subject: [PATCH 314/382] feat: add PaymentGateways enum EV-1192

---
 .../payments/payments.component.html          |  2 +-
 shared/core/enums/PaymentGateways.ts          | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 shared/core/enums/PaymentGateways.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
index 45c0d37a4..b185e1e71 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
@@ -4,7 +4,7 @@
 	</nb-card-header>
 	<nb-card-body>
 		<div class="row m-0">
-			<div class="form-group offset-md-2 col-md-4">
+			<div class="form-group offset-md-2 col-md-10">
 				<nb-checkbox [(ngModel)]="isPaymentEnabled">
 					{{
 						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.ALLOW_ONLINE_PAYMENT'
diff --git a/shared/core/enums/PaymentGateways.ts b/shared/core/enums/PaymentGateways.ts
new file mode 100644
index 000000000..5757d35d4
--- /dev/null
+++ b/shared/core/enums/PaymentGateways.ts
@@ -0,0 +1,24 @@
+/**
+ * Payment Gateways
+ *
+ * @enum {number}
+ */
+enum PaymentGateways {
+	Stripe,
+	PayPal
+}
+
+export function paymentGatewaysToString(
+	paymentGateway: PaymentGateways
+): string {
+	switch (paymentGateway) {
+		case PaymentGateways.Stripe:
+			return 'Stripe';
+		case PaymentGateways.PayPal:
+			return 'PayPal';
+		default:
+			return 'BAD_PAYMENT_GATEWAY';
+	}
+}
+
+export default PaymentGateways;

From 58cf2d2173c7c9c7780795b9fa43b880cbf93ef2 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 20 May 2019 11:35:36 +0300
Subject: [PATCH 315/382] feat(ever-admin): initialize payment gateways
 components - Stripe and PayPal EV-1192

---
 .../components/components.module.ts           |  2 --
 .../payPal-gateway.component.html             |  1 +
 .../payPal-gateway.component.ts               | 13 ++++++++++++
 .../payment-gateways.component.html           |  2 ++
 .../payment-gateways.component.ts             |  7 +++++++
 .../payment-gateways.module.ts                | 18 +++++++++++++++++
 .../stripe-gateway.component.html             |  1 +
 .../stripe-gateway.component.ts               | 14 +++++++++++++
 .../payments/payments.component.html          |  7 ++++++-
 .../components/payments/payments.module.ts    | 20 +++++++++++++++++++
 .../+setup/+merchants/merchants.module.ts     |  2 ++
 11 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
 create mode 100644 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.module.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
index c8c5fcc45..f24be1345 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
@@ -8,7 +8,6 @@ import { MerchantsSetupInstructionsComponent } from './instructions/instructions
 import { SetupMerchantAccountComponent } from './account/account.component';
 import { SetupMerchantBasicInfoComponent } from './basic-info/basic-info.component';
 import { SetupMerchantContactInfoComponent } from './contact-info/contact-info.component';
-import { SetupMerchantPaymentsComponent } from './payments/payments.component';
 import { SetupMerchantManufacturingComponent } from './manufacturing/manufacturing.component';
 import { SetupMerchantOrdersSettingsComponent } from './settings/orders/orders.component';
 import { NbRadioModule } from '@nebular/theme';
@@ -22,7 +21,6 @@ const COMPONENTS = [
 	SetupMerchantBasicInfoComponent,
 	SetupMerchantContactInfoComponent,
 	MerchantsSetupInstructionsComponent,
-	SetupMerchantPaymentsComponent,
 	SetupMerchantManufacturingComponent,
 	SetupMerchantOrdersSettingsComponent,
 	SetupMerchantProductCategoriesComponent
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
new file mode 100644
index 000000000..6ede57c9a
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
@@ -0,0 +1 @@
+<h4>{{ name }} payment gateway</h4>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
new file mode 100644
index 000000000..25122b760
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import PaymentGateways, {
+	paymentGatewaysToString
+} from '@modules/server.common/enums/PaymentGateways';
+
+@Component({
+	selector: 'ea-payPal-gateway',
+	templateUrl: './payPal-gateway.component.html'
+})
+export class PayPalGatewayComponent {
+	name = paymentGatewaysToString(PaymentGateways.PayPal);
+	logo: 'https://www.worldlandtrust.org/wp-content/uploads/2019/03/PayPal_logo-385.jpg';
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
new file mode 100644
index 000000000..e23c62aaf
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
@@ -0,0 +1,2 @@
+<ea-stripe-gateway></ea-stripe-gateway>
+<ea-payPal-gateway></ea-payPal-gateway>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
new file mode 100644
index 000000000..5e0da5497
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+	selector: 'ea-payment-gateways',
+	templateUrl: './payment-gateways.component.html'
+})
+export class PaymentGatewaysComponent {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts
new file mode 100644
index 000000000..d762136a5
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { ThemeModule } from 'app/@theme';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+import { PaymentGatewaysComponent } from './payment-gateways.component';
+import { StripeGatewayComponent } from './stripe-gateway/stripe-gateway.component';
+import { PayPalGatewayComponent } from './payPal-gateway/payPal-gateway.component';
+
+@NgModule({
+	imports: [CommonModule, ThemeModule, TranslateModule.forChild()],
+	declarations: [
+		PaymentGatewaysComponent,
+		StripeGatewayComponent,
+		PayPalGatewayComponent
+	],
+	exports: [PaymentGatewaysComponent]
+})
+export class PaymentGatewaysModule {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
new file mode 100644
index 000000000..6ede57c9a
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
@@ -0,0 +1 @@
+<h4>{{ name }} payment gateway</h4>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
new file mode 100644
index 000000000..8bf6a8abe
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import PaymentGateways, {
+	paymentGatewaysToString
+} from '@modules/server.common/enums/PaymentGateways';
+
+@Component({
+	selector: 'ea-stripe-gateway',
+	templateUrl: './stripe-gateway.component.html'
+})
+export class StripeGatewayComponent {
+	name = paymentGatewaysToString(PaymentGateways.Stripe);
+	logo =
+		'https://www.chargekeep.com/wp-content/uploads/2018/02/stripe-logo.png';
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
index b185e1e71..32abe0211 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
@@ -4,7 +4,7 @@
 	</nb-card-header>
 	<nb-card-body>
 		<div class="row m-0">
-			<div class="form-group offset-md-2 col-md-10">
+			<div class="form-group offset-md-2 col-md-8">
 				<nb-checkbox [(ngModel)]="isPaymentEnabled">
 					{{
 						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.ALLOW_ONLINE_PAYMENT'
@@ -13,6 +13,11 @@
 				</nb-checkbox>
 			</div>
 		</div>
+		<div [hidden]="!isPaymentEnabled" class="row m-0">
+			<div class="form-group offset-md-2 col-md-8">
+				<ea-payment-gateways></ea-payment-gateways>
+			</div>
+		</div>
 	</nb-card-body>
 </nb-card>
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.module.ts
new file mode 100644
index 000000000..022d68afa
--- /dev/null
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.module.ts
@@ -0,0 +1,20 @@
+import { CommonModule } from '@angular/common';
+import { ThemeModule } from 'app/@theme';
+import { FormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+import { SetupMerchantPaymentsComponent } from './payments.component';
+import { NgModule } from '@angular/core';
+import { PaymentGatewaysModule } from './payment-gateways/payment-gateways.module';
+
+@NgModule({
+	imports: [
+		CommonModule,
+		ThemeModule,
+		FormsModule,
+		TranslateModule.forChild(),
+		PaymentGatewaysModule
+	],
+	declarations: [SetupMerchantPaymentsComponent],
+	exports: [SetupMerchantPaymentsComponent]
+})
+export class SetupMerchantsPaymentsModule {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
index 6bba671d0..5153f4632 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
@@ -10,6 +10,7 @@ import { SetupMerchantsLocationModule } from './components/location/location.mod
 import { SetupMerchantsDeliveryAndTakeawayModule } from './components/settings/delivery-takeaway/delivery-takeaway.module';
 import { ToasterModule } from 'angular2-toaster';
 import { SetupMerchantsProductsModule } from './components/products/products.module';
+import { SetupMerchantsPaymentsModule } from './components/payments/payments.module';
 
 const routes: Routes = [
 	{
@@ -29,6 +30,7 @@ const routes: Routes = [
 		SetupMerchantsLocationModule,
 		SetupMerchantsDeliveryAndTakeawayModule,
 		SetupMerchantsProductsModule,
+		SetupMerchantsPaymentsModule,
 		ToasterModule.forRoot()
 	],
 	declarations: [SetupMerchantsComponent]

From d5d6a1843b77f2a3ef440992c71beb45005746f4 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 20 May 2019 16:52:16 +0300
Subject: [PATCH 316/382] feat(ever-admin): add form for config Stripe gateway
 EV-1192

---
 .../src/app/@theme/styles/styles.scss         |  21 ++
 .../basic-info/basic-info.component.ts        |   2 +-
 .../payPal-gateway.component.html             |   9 +-
 .../payPal-gateway.component.ts               |   3 +-
 .../payment-gateways.component.html           |   2 +-
 .../payment-gateways.component.ts             |   7 +-
 .../payment-gateways.module.ts                |   8 +-
 .../stripe-gateway.component.html             | 182 +++++++++++++++++-
 .../stripe-gateway.component.ts               |  23 ++-
 .../payments/payments.component.html          |   4 +-
 .../components/payments/payments.component.ts |   5 +-
 .../+merchants/merchants.component.html       |   1 +
 12 files changed, 254 insertions(+), 13 deletions(-)

diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index d5b727bc6..3e66b02a8 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -206,3 +206,24 @@ nb-card.no-box-shadow {
 	box-shadow: none;
 	margin-bottom: 0;
 }
+
+.preview-img-container {
+	.preview-img {
+		padding-right: 16px;
+	}
+
+	.img-rounded {
+		margin-top: 3px;
+		max-height: 70px !important;
+	}
+
+	.remove-icon {
+		cursor: pointer;
+
+		span {
+			padding-right: 7px;
+			position: absolute;
+			font-size: 1.1em;
+		}
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index c541cff89..fe9b21a34 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -36,7 +36,7 @@ export class SetupMerchantBasicInfoComponent implements OnInit, OnDestroy {
 	uploaderPlaceholder: string = 'Photo (optional)';
 	barcodetDataUrl: string;
 	invalidUrl: boolean;
-	private basicInfoModel = {
+	basicInfoModel = {
 		name: '',
 		logo: '',
 		barcodeData: ''
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
index 6ede57c9a..c2c4d8369 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
@@ -1 +1,8 @@
-<h4>{{ name }} payment gateway</h4>
+<div class="row m-0">
+	<div class="form-group col-md-12 p-0">
+		<nb-checkbox [(ngModel)]="isPayPalEnabled">
+			<img src="{{ logo }}" width="20px" alt="" />
+			{{ name }}
+		</nb-checkbox>
+	</div>
+</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
index 25122b760..b98e9f17d 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
@@ -8,6 +8,7 @@ import PaymentGateways, {
 	templateUrl: './payPal-gateway.component.html'
 })
 export class PayPalGatewayComponent {
+	isPayPalEnabled: boolean;
 	name = paymentGatewaysToString(PaymentGateways.PayPal);
-	logo: 'https://www.worldlandtrust.org/wp-content/uploads/2019/03/PayPal_logo-385.jpg';
+	logo = 'https://avatars1.githubusercontent.com/u/476675?s=200&v=4';
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
index e23c62aaf..84063230b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
@@ -1,2 +1,2 @@
-<ea-stripe-gateway></ea-stripe-gateway>
+<ea-stripe-gateway [companyBrandLogo]="warehouseLogo"></ea-stripe-gateway>
 <ea-payPal-gateway></ea-payPal-gateway>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index 5e0da5497..c6e237d48 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -1,7 +1,10 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 
 @Component({
 	selector: 'ea-payment-gateways',
 	templateUrl: './payment-gateways.component.html'
 })
-export class PaymentGatewaysComponent {}
+export class PaymentGatewaysComponent {
+	@Input()
+	warehouseLogo: string;
+}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts
index d762136a5..e457a832e 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts
@@ -5,9 +5,15 @@ import { TranslateModule } from '@ngx-translate/core';
 import { PaymentGatewaysComponent } from './payment-gateways.component';
 import { StripeGatewayComponent } from './stripe-gateway/stripe-gateway.component';
 import { PayPalGatewayComponent } from './payPal-gateway/payPal-gateway.component';
+import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
 
 @NgModule({
-	imports: [CommonModule, ThemeModule, TranslateModule.forChild()],
+	imports: [
+		CommonModule,
+		ThemeModule,
+		TranslateModule.forChild(),
+		FileUploaderModule
+	],
 	declarations: [
 		PaymentGatewaysComponent,
 		StripeGatewayComponent,
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
index 6ede57c9a..86fb95038 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
@@ -1 +1,181 @@
-<h4>{{ name }} payment gateway</h4>
+<div class="row m-0">
+	<div class="form-group col-md-12 p-0">
+		<nb-checkbox [(ngModel)]="isStripeEnabled">
+			<img src="{{ logo }}" width="20px" alt="" />
+			{{ name }}
+		</nb-checkbox>
+	</div>
+</div>
+
+<form *ngIf="isStripeEnabled" #basicInfoForm="ngForm">
+	<div class="row m-0">
+		<div class="form-group col-md-6">
+			<label for="payButtontext">
+				Pay Button text
+			</label>
+			<input
+				nbInput
+				type="text"
+				class="form-control"
+				id="payButtontext"
+				name="pay-button-text"
+				placeholder="Pay Button text"
+				[(ngModel)]="configModel.payButtontext"
+				#payButtontext="ngModel"
+				[ngClass]="{
+					'input-danger':
+						payButtontext.invalid &&
+						(payButtontext.dirty || payButtontext.touched),
+					'input-success':
+						payButtontext.valid &&
+						(payButtontext.dirty || payButtontext.touched)
+				}"
+				required
+			/>
+			<small
+				class="text-danger"
+				*ngIf="
+					payButtontext.invalid &&
+					(payButtontext.dirty || payButtontext.touched)
+				"
+			>
+				<span *ngIf="payButtontext.errors.required">
+					Pay Button text is required
+				</span>
+			</small>
+		</div>
+
+		<div class="form-group col-md-6">
+			<label for="currency">
+				Currency
+			</label>
+			<input
+				nbInput
+				type="text"
+				class="form-control"
+				id="currency"
+				name="currency"
+				placeholder="Currency"
+				[(ngModel)]="configModel.currency"
+				#currency="ngModel"
+				[ngClass]="{
+					'input-danger':
+						currency.invalid &&
+						(currency.dirty || currency.touched),
+					'input-success':
+						currency.valid && (currency.dirty || currency.touched)
+				}"
+				required
+			/>
+			<small
+				class="text-danger"
+				*ngIf="currency.invalid && (currency.dirty || currency.touched)"
+			>
+				<span *ngIf="currency.errors.required">
+					Currency text is required
+				</span>
+			</small>
+		</div>
+	</div>
+
+	<div class="row mt-0 mr-0 ml-0 form-group">
+		<div class="col-md-12">
+			<label for="logo">
+				Company brand logo
+			</label>
+			<e-cu-file-uploader
+				[placeholder]="'Company brand logo'"
+				[fileUrl]="configModel.companyBrandLogo"
+				(uploadedImgUrl)="configModel.companyBrandLogo = $event"
+				[customClass]="
+					configModel.companyBrandLogo !== ''
+						? invalidUrl
+							? 'form-control-danger'
+							: 'form-control-success'
+						: ''
+				"
+			></e-cu-file-uploader>
+
+			<small
+				class="text-danger"
+				*ngIf="invalidUrl && configModel.companyBrandLogo !== ''"
+			>
+				<span *ngIf="invalidUrl">
+					Invalid logo url
+				</span>
+			</small>
+		</div>
+
+		<div
+			class="col-md-8 preview-img-container"
+			[hidden]="configModel.companyBrandLogo === '' || invalidUrl"
+		>
+			<div class="col-sm-10">
+				<div class="row preview-img">
+					<img
+						src="{{ configModel.companyBrandLogo }}"
+						alt="Invalid logo"
+						class="img-rounded"
+						(error)="invalidUrl = true"
+						(load)="invalidUrl = false"
+					/>
+					<div class="remove-icon" (click)="deleteImg()">
+						<span
+							class="ion-md-remove-circle text-danger pl-2"
+							title="Remove"
+						></span>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row m-0">
+		<div class="form-group col-md-12">
+			<label for="publishable-key">
+				Publishable key
+			</label>
+			<input
+				nbInput
+				type="text"
+				class="form-control"
+				id="publishableKey"
+				name="publishable-key"
+				placeholder="Publishable key"
+				[(ngModel)]="configModel.publishableKey"
+				#publishableKey="ngModel"
+				[ngClass]="{
+					'input-danger':
+						publishableKey.invalid &&
+						(publishableKey.dirty || publishableKey.touched),
+					'input-success':
+						publishableKey.valid &&
+						(publishableKey.dirty || publishableKey.touched)
+				}"
+				required
+			/>
+			<small
+				class="text-danger"
+				*ngIf="
+					publishableKey.invalid &&
+					(publishableKey.dirty || publishableKey.touched)
+				"
+			>
+				<span *ngIf="publishableKey.errors.required">
+					Publishable key is required
+				</span>
+			</small>
+		</div>
+	</div>
+
+	<div class="row m-0">
+		<div class="form-group col-md-8">
+			<nb-checkbox
+				name="remember-me"
+				[(ngModel)]="configModel.allowRememberMe"
+			>
+				Allow remember me?
+			</nb-checkbox>
+		</div>
+	</div>
+</form>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index 8bf6a8abe..828a6a791 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import PaymentGateways, {
 	paymentGatewaysToString
 } from '@modules/server.common/enums/PaymentGateways';
@@ -8,7 +8,24 @@ import PaymentGateways, {
 	templateUrl: './stripe-gateway.component.html'
 })
 export class StripeGatewayComponent {
+	isStripeEnabled: boolean;
 	name = paymentGatewaysToString(PaymentGateways.Stripe);
-	logo =
-		'https://www.chargekeep.com/wp-content/uploads/2018/02/stripe-logo.png';
+	logo = 'https://stripe.com/img/v3/home/twitter.png';
+	invalidUrl: boolean;
+
+	@Input()
+	set companyBrandLogo(logo: string) {
+		this.configModel.companyBrandLogo = logo;
+	}
+
+	configModel = {
+		payButtontext: '',
+		currency: '',
+		companyBrandLogo: '',
+		allowRememberMe: true
+	};
+
+	deleteImg() {
+		this.configModel.companyBrandLogo = '';
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
index 32abe0211..b8ff74a58 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
@@ -15,7 +15,9 @@
 		</div>
 		<div [hidden]="!isPaymentEnabled" class="row m-0">
 			<div class="form-group offset-md-2 col-md-8">
-				<ea-payment-gateways></ea-payment-gateways>
+				<ea-payment-gateways
+					[warehouseLogo]="warehouseLogo"
+				></ea-payment-gateways>
 			</div>
 		</div>
 	</nb-card-body>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
index 95db3be6a..e771b86f6 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import { Component, EventEmitter, Output, Input } from '@angular/core';
 
 @Component({
 	selector: 'ea-merchants-setup-payments',
@@ -11,5 +11,8 @@ export class SetupMerchantPaymentsComponent {
 	@Output()
 	nextStep: EventEmitter<boolean> = new EventEmitter<boolean>();
 
+	@Input()
+	warehouseLogo: string;
+
 	isPaymentEnabled: boolean;
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index e6a2ffb8e..ef255e214 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -62,6 +62,7 @@
 						>
 							<ea-merchants-setup-payments
 								#payments
+								[warehouseLogo]="basicInfo.basicInfoModel.logo"
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-payments>

From ad11c53fe903914c88c1fc7bafeca5790385caf8 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 20 May 2019 17:22:11 +0300
Subject: [PATCH 317/382] feat(ever-admin): add Currency entity and interface
 EV-1192

---
 .../stripe-gateway.component.html             |  2 +-
 shared/core/entities/Currency.ts              | 25 +++++++++++++++++++
 shared/core/interfaces/ICurrency.ts           | 11 ++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 shared/core/entities/Currency.ts
 create mode 100644 shared/core/interfaces/ICurrency.ts

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
index 86fb95038..60a1b50e4 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
@@ -132,7 +132,7 @@
 
 	<div class="row m-0">
 		<div class="form-group col-md-12">
-			<label for="publishable-key">
+			<label for="publishableKey">
 				Publishable key
 			</label>
 			<input
diff --git a/shared/core/entities/Currency.ts b/shared/core/entities/Currency.ts
new file mode 100644
index 000000000..4d0c9f6b6
--- /dev/null
+++ b/shared/core/entities/Currency.ts
@@ -0,0 +1,25 @@
+import { ModelName, DBObject, Types } from '@pyro/db';
+import { Entity, Column } from 'typeorm';
+import ICurrency, { ICurrencyCreateObject } from '../interfaces/ICurrency';
+
+/**
+ * @class Currency
+ * @extends {DBObject<ICurrency, ICurrencyCreateObject>}
+ * @implements {ICurrency}
+ */
+@ModelName('Currency')
+@Entity({ name: 'currencies' })
+class Currency extends DBObject<ICurrency, ICurrencyCreateObject>
+	implements ICurrency {
+	/**
+	 * Currency Code
+	 *
+	 * @type {string}
+	 * @memberof Currency
+	 */
+	@Types.String()
+	@Column()
+	currencyCode: string;
+}
+
+export default Currency;
diff --git a/shared/core/interfaces/ICurrency.ts b/shared/core/interfaces/ICurrency.ts
new file mode 100644
index 000000000..306412151
--- /dev/null
+++ b/shared/core/interfaces/ICurrency.ts
@@ -0,0 +1,11 @@
+import { DBCreateObject, DBRawObject, PyroObjectId } from '@pyro/db';
+
+export interface ICurrencyCreateObject extends DBCreateObject {
+	currencyCode: string;
+}
+
+interface ICurrency extends ICurrencyCreateObject, DBRawObject {
+	_id: PyroObjectId;
+}
+
+export default ICurrency;

From fdf13b516bd5c92bc873ce118e600869d828fba1 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 20 May 2019 17:48:16 +0300
Subject: [PATCH 318/382] feat(ever-admin): init Currency resolver EV-1192

---
 backend/api/src/app.module.ts                 |  4 +++-
 .../src/graphql/currency/currency.module.ts   |  7 +++++++
 .../src/graphql/currency/currency.resolver.ts | 20 +++++++++++++++++++
 .../graphql/currency/currency.types.graphql   | 16 +++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 backend/api/src/graphql/currency/currency.module.ts
 create mode 100644 backend/api/src/graphql/currency/currency.resolver.ts
 create mode 100644 backend/api/src/graphql/currency/currency.types.graphql

diff --git a/backend/api/src/app.module.ts b/backend/api/src/app.module.ts
index 7fbd2098e..84c12518e 100644
--- a/backend/api/src/app.module.ts
+++ b/backend/api/src/app.module.ts
@@ -44,6 +44,7 @@ import { GetAboutUsHandler } from './services/users';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ServicesModule } from './services/services.module';
 import { ServicesApp } from './services/services.app';
+import { CurrencyModule } from './graphql/currency/currency.module';
 
 const port = env.GQLPORT;
 
@@ -109,7 +110,8 @@ const entities = ServicesApp.getEntities();
 		WarehousesCarriersModule,
 		InvitesRequestsModule,
 		GeoLocationOrdersModule,
-		GeoLocationMerchantsModule
+		GeoLocationMerchantsModule,
+		CurrencyModule
 	]
 })
 export class ApplicationModule implements NestModule, OnModuleInit {
diff --git a/backend/api/src/graphql/currency/currency.module.ts b/backend/api/src/graphql/currency/currency.module.ts
new file mode 100644
index 000000000..bf92bde45
--- /dev/null
+++ b/backend/api/src/graphql/currency/currency.module.ts
@@ -0,0 +1,7 @@
+import { Module } from '@nestjs/common';
+import { CurrencyResolver } from './currency.resolver';
+
+@Module({
+	providers: [CurrencyResolver]
+})
+export class CurrencyModule {}
diff --git a/backend/api/src/graphql/currency/currency.resolver.ts b/backend/api/src/graphql/currency/currency.resolver.ts
new file mode 100644
index 000000000..688ed3df3
--- /dev/null
+++ b/backend/api/src/graphql/currency/currency.resolver.ts
@@ -0,0 +1,20 @@
+import { Resolver, Query, Mutation } from '@nestjs/graphql';
+import { ICurrencyCreateObject } from '@modules/server.common/interfaces/ICurrency';
+
+@Resolver('Currency')
+export class CurrencyResolver {
+	@Query('currencies')
+	async getCurrencies(_) {
+		// TODO get all currencies and return them
+		return [];
+	}
+
+	@Mutation()
+	async createCurrency(
+		_,
+		{ createInfo }: { createInfo: ICurrencyCreateObject }
+	) {
+		// TODO create currency in DB and return it
+		return;
+	}
+}
diff --git a/backend/api/src/graphql/currency/currency.types.graphql b/backend/api/src/graphql/currency/currency.types.graphql
new file mode 100644
index 000000000..1f4d1f4dc
--- /dev/null
+++ b/backend/api/src/graphql/currency/currency.types.graphql
@@ -0,0 +1,16 @@
+type Currency {
+	_id: String!
+	currencyCode: String!
+}
+
+type Query {
+	currencies: [Currency]
+}
+
+input CurrencyCreateInput {
+	currencyCode: String!
+}
+
+type Mutation {
+	createCurrency(createInput: CurrencyCreateInput!): Currency
+}

From e6fe18892f279c498b7687f0a1dc226565d0a1ca Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 21 May 2019 10:31:07 +0300
Subject: [PATCH 319/382] feat(ever-admin): add Service Currency, and used in
 Currency resolver for creating currency and get all EV-1192

---
 .../src/graphql/currency/currency.resolver.ts | 12 +++--
 .../graphql/currency/currency.types.graphql   |  8 +++-
 .../src/services/currency/CurrencyService.ts  | 46 +++++++++++++++++++
 backend/api/src/services/inversify.config.ts  |  4 +-
 shared/core/entities/Currency.ts              | 14 +++++-
 shared/core/interfaces/ICurrency.ts           |  2 +
 6 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 backend/api/src/services/currency/CurrencyService.ts

diff --git a/backend/api/src/graphql/currency/currency.resolver.ts b/backend/api/src/graphql/currency/currency.resolver.ts
index 688ed3df3..553f39065 100644
--- a/backend/api/src/graphql/currency/currency.resolver.ts
+++ b/backend/api/src/graphql/currency/currency.resolver.ts
@@ -1,20 +1,22 @@
 import { Resolver, Query, Mutation } from '@nestjs/graphql';
 import { ICurrencyCreateObject } from '@modules/server.common/interfaces/ICurrency';
+import { CurrenciesService } from '../../services/currency/CurrencyService';
+import Currency from '@modules/server.common/entities/Currency';
 
 @Resolver('Currency')
 export class CurrencyResolver {
+	constructor(private readonly _currenciesService: CurrenciesService) {}
+
 	@Query('currencies')
 	async getCurrencies(_) {
-		// TODO get all currencies and return them
-		return [];
+		return this._currenciesService.getAllCurrencies();
 	}
 
 	@Mutation()
 	async createCurrency(
 		_,
-		{ createInfo }: { createInfo: ICurrencyCreateObject }
+		{ createInput }: { createInput: ICurrencyCreateObject }
 	) {
-		// TODO create currency in DB and return it
-		return;
+		return this._currenciesService.createCurrency(createInput);
 	}
 }
diff --git a/backend/api/src/graphql/currency/currency.types.graphql b/backend/api/src/graphql/currency/currency.types.graphql
index 1f4d1f4dc..b12283fa3 100644
--- a/backend/api/src/graphql/currency/currency.types.graphql
+++ b/backend/api/src/graphql/currency/currency.types.graphql
@@ -11,6 +11,12 @@ input CurrencyCreateInput {
 	currencyCode: String!
 }
 
+type MutationResponse {
+	success: Boolean!
+	message: String
+	data: Currency
+}
+
 type Mutation {
-	createCurrency(createInput: CurrencyCreateInput!): Currency
+	createCurrency(createInput: CurrencyCreateInput!): MutationResponse
 }
diff --git a/backend/api/src/services/currency/CurrencyService.ts b/backend/api/src/services/currency/CurrencyService.ts
new file mode 100644
index 000000000..411dd528f
--- /dev/null
+++ b/backend/api/src/services/currency/CurrencyService.ts
@@ -0,0 +1,46 @@
+import Currency from '@modules/server.common/entities/Currency';
+import { injectable } from 'inversify';
+import { routerName } from '@pyro/io';
+import { DBService } from '@pyro/db-server';
+import IService from 'services/IService';
+import { ICurrencyCreateObject } from '@modules/server.common/interfaces/ICurrency';
+import { createEverLogger } from '../../helpers/Log';
+
+export interface CurrencyMutationRespone {
+	success: boolean;
+	message?: String;
+	data?: Currency;
+}
+
+@injectable()
+@routerName('currency')
+export class CurrenciesService extends DBService<Currency> implements IService {
+	public readonly DBObject = Currency;
+
+	protected readonly log = createEverLogger({ name: 'currenciesService' });
+
+	async createCurrency(
+		currency: ICurrencyCreateObject
+	): Promise<CurrencyMutationRespone> {
+		let success, message, data;
+
+		try {
+			data = await this.create(currency);
+			success = true;
+			message = `Successfully create currency ${data.currencyCode}`;
+		} catch (error) {
+			success = false;
+			message = error.message;
+		}
+
+		return { success, message, data };
+	}
+
+	async getAllCurrencies(): Promise<Currency[]> {
+		const currencies = await this.find({
+			isDeleted: { $eq: false }
+		});
+
+		return currencies;
+	}
+}
diff --git a/backend/api/src/services/inversify.config.ts b/backend/api/src/services/inversify.config.ts
index 50c8cf3e6..5509e48e4 100644
--- a/backend/api/src/services/inversify.config.ts
+++ b/backend/api/src/services/inversify.config.ts
@@ -38,6 +38,7 @@ import { getConnection, Repository } from 'typeorm';
 import Admin from '@modules/server.common/entities/Admin';
 import Device from '@modules/server.common/entities/Device';
 import { FakeOrdersService } from './fake-data/FakeOrdersService';
+import { CurrenciesService } from './currency/CurrencyService';
 
 function getRepository(t: any): any {
 	const conn = getConnection('typeorm');
@@ -86,7 +87,8 @@ const bindings = new ContainerModule((bind: interfaces.Bind) => {
 			WarehousesService,
 			UsersProductsService,
 			AuthenticationService,
-			FakeOrdersService
+			FakeOrdersService,
+			CurrenciesService
 		],
 		(Service: any) => {
 			bind(Service)
diff --git a/shared/core/entities/Currency.ts b/shared/core/entities/Currency.ts
index 4d0c9f6b6..88c4db4c6 100644
--- a/shared/core/entities/Currency.ts
+++ b/shared/core/entities/Currency.ts
@@ -1,4 +1,4 @@
-import { ModelName, DBObject, Types } from '@pyro/db';
+import { ModelName, DBObject, Types, Schema } from '@pyro/db';
 import { Entity, Column } from 'typeorm';
 import ICurrency, { ICurrencyCreateObject } from '../interfaces/ICurrency';
 
@@ -17,9 +17,19 @@ class Currency extends DBObject<ICurrency, ICurrencyCreateObject>
 	 * @type {string}
 	 * @memberof Currency
 	 */
-	@Types.String()
+	@Schema({ type: String, unique: true })
 	@Column()
 	currencyCode: string;
+
+	/**
+	 * Is Currency removed completely from the system
+	 *
+	 * @type {boolean}
+	 * @memberof Currency
+	 */
+	@Types.Boolean(false)
+	@Column()
+	isDeleted: boolean;
 }
 
 export default Currency;
diff --git a/shared/core/interfaces/ICurrency.ts b/shared/core/interfaces/ICurrency.ts
index 306412151..9736dc881 100644
--- a/shared/core/interfaces/ICurrency.ts
+++ b/shared/core/interfaces/ICurrency.ts
@@ -2,10 +2,12 @@ import { DBCreateObject, DBRawObject, PyroObjectId } from '@pyro/db';
 
 export interface ICurrencyCreateObject extends DBCreateObject {
 	currencyCode: string;
+	isDeleted?: boolean;
 }
 
 interface ICurrency extends ICurrencyCreateObject, DBRawObject {
 	_id: PyroObjectId;
+	isDeleted: boolean;
 }
 
 export default ICurrency;

From 5e1668f5a56474f03ad9b65dc4bcc3e807b13ce1 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 21 May 2019 11:36:31 +0300
Subject: [PATCH 320/382] feat(ever-admin): add Currencies service on the
 client, and used it to insert currencies list during fake data generation
 EV-1192

---
 .../src/app/@core/data/currencies.service.ts  | 65 +++++++++++++++++++
 .../app/pages/+fakeData/fakeData.component.ts | 26 +++++++-
 .../app/pages/+fakeData/fakeData.module.ts    |  4 +-
 .../src/graphql/currency/currency.resolver.ts |  1 -
 .../src/services/currency/CurrencyService.ts  |  2 +-
 5 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 admin/website-angular/src/app/@core/data/currencies.service.ts

diff --git a/admin/website-angular/src/app/@core/data/currencies.service.ts b/admin/website-angular/src/app/@core/data/currencies.service.ts
new file mode 100644
index 000000000..002aec67d
--- /dev/null
+++ b/admin/website-angular/src/app/@core/data/currencies.service.ts
@@ -0,0 +1,65 @@
+import { Injectable } from '@angular/core';
+import { Apollo } from 'apollo-angular';
+import { Observable } from 'rxjs';
+import Currency from '@modules/server.common/entities/Currency';
+import gql from 'graphql-tag';
+import { map, share } from 'rxjs/operators';
+
+export interface CurrencyMutationRespone {
+	success: boolean;
+	message?: string;
+	data?: Currency;
+}
+
+@Injectable()
+export class CurrenciesService {
+	constructor(private readonly apollo: Apollo) {}
+
+	private currencies$: Observable<Currency[]> = this.apollo
+		.watchQuery<{ currencies: Currency[] }>({
+			query: gql`
+				query allCurrencies {
+					currencies {
+						currencyCode
+					}
+				}
+			`,
+			pollInterval: 2000
+		})
+		.valueChanges.pipe(
+			map((result) => result.data.currencies),
+			share()
+		);
+
+	getCurrencies(): Observable<Currency[]> {
+		return this.currencies$;
+	}
+
+	create(createInput: {
+		currencyCode: string;
+	}): Observable<CurrencyMutationRespone> {
+		return this.apollo
+			.mutate<{ createCurrency: CurrencyMutationRespone }>({
+				mutation: gql`
+					mutation CreateCurrency(
+						$createInput: CurrencyCreateInput!
+					) {
+						createCurrency(createInput: $createInput) {
+							success
+							message
+							data {
+								currencyCode
+							}
+						}
+					}
+				`,
+				variables: {
+					createInput
+				}
+			})
+			.pipe(
+				map((result) => result.data.createCurrency),
+				share()
+			);
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+fakeData/fakeData.component.ts b/admin/website-angular/src/app/pages/+fakeData/fakeData.component.ts
index 13dd8a921..eb0bbe3f5 100644
--- a/admin/website-angular/src/app/pages/+fakeData/fakeData.component.ts
+++ b/admin/website-angular/src/app/pages/+fakeData/fakeData.component.ts
@@ -43,6 +43,7 @@ import { InvitesRequestsService } from 'app/@core/data/invites-requests.service'
 import { UsersService } from 'app/@core/data/users.service';
 import { environment } from 'environments/environment';
 import * as _ from 'lodash';
+import { CurrenciesService } from 'app/@core/data/currencies.service';
 
 const NEED_DEFAULT_SETTINGS_MESSAGE =
 	"Can't generate fake data without DEFAULT_LONGITUDE and DEFAULT_LATITUDE";
@@ -102,7 +103,8 @@ export class FakeDataComponent implements OnInit, OnDestroy {
 		private readonly _invitesService: InvitesService,
 		private readonly _inviteRequestsService: InvitesRequestsService,
 		private readonly _notifyService: NotifyService,
-		private readonly _usersService: UsersService
+		private readonly _usersService: UsersService,
+		private readonly _currenciesService: CurrenciesService
 	) {
 		this._setupButtonStatuses();
 		this._setupButtonLoading();
@@ -162,6 +164,10 @@ export class FakeDataComponent implements OnInit, OnDestroy {
 		this.isBtnDisabled.all = true;
 		this.loading.all = true;
 
+		if (!this.includeHardcodedData) {
+			await this._generateCurrencies();
+		}
+
 		await this.createInvite1();
 		await this.createInvite2();
 		await this.createInvite3();
@@ -212,6 +218,8 @@ export class FakeDataComponent implements OnInit, OnDestroy {
 		this.loading.hardcoded = true;
 		this.isBtnDisabled.hardcoded = true;
 
+		await this._generateCurrencies();
+
 		await this._createHardcodedInvites();
 		await this._createHardcodedWarehouses();
 		await this._generateProducts();
@@ -1145,6 +1153,22 @@ export class FakeDataComponent implements OnInit, OnDestroy {
 		return warehouseProductCreateObjects;
 	}
 
+	private async _generateCurrencies() {
+		const currenciesCodes = ['USD', 'ILS', 'EUR', 'BGN', 'RUB'];
+
+		for (const currencyCode of currenciesCodes) {
+			const res = await this._currenciesService
+				.create({ currencyCode })
+				.pipe(first())
+				.toPromise();
+
+			this.toasterService.pop(
+				res.success ? 'success' : 'warning',
+				res.message
+			);
+		}
+	}
+
 	ngOnDestroy() {
 		this._ngDestroy$.next();
 		this._ngDestroy$.complete();
diff --git a/admin/website-angular/src/app/pages/+fakeData/fakeData.module.ts b/admin/website-angular/src/app/pages/+fakeData/fakeData.module.ts
index 7a221db58..b353dc297 100644
--- a/admin/website-angular/src/app/pages/+fakeData/fakeData.module.ts
+++ b/admin/website-angular/src/app/pages/+fakeData/fakeData.module.ts
@@ -20,6 +20,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 import { InvitesService } from 'app/@core/data/invites.service';
 import { InvitesRequestsService } from 'app/@core/data/invites-requests.service';
 import { UsersService } from 'app/@core/data/users.service';
+import { CurrenciesService } from 'app/@core/data/currencies.service';
 
 export function HttpLoaderFactory(http: HttpClient) {
 	return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -52,7 +53,8 @@ export function HttpLoaderFactory(http: HttpClient) {
 		InvitesService,
 		InvitesRequestsService,
 		UsersService,
-		NotifyService
+		NotifyService,
+		CurrenciesService
 	]
 })
 export class FakeDataModule {
diff --git a/backend/api/src/graphql/currency/currency.resolver.ts b/backend/api/src/graphql/currency/currency.resolver.ts
index 553f39065..59656cab5 100644
--- a/backend/api/src/graphql/currency/currency.resolver.ts
+++ b/backend/api/src/graphql/currency/currency.resolver.ts
@@ -1,7 +1,6 @@
 import { Resolver, Query, Mutation } from '@nestjs/graphql';
 import { ICurrencyCreateObject } from '@modules/server.common/interfaces/ICurrency';
 import { CurrenciesService } from '../../services/currency/CurrencyService';
-import Currency from '@modules/server.common/entities/Currency';
 
 @Resolver('Currency')
 export class CurrencyResolver {
diff --git a/backend/api/src/services/currency/CurrencyService.ts b/backend/api/src/services/currency/CurrencyService.ts
index 411dd528f..5b301b585 100644
--- a/backend/api/src/services/currency/CurrencyService.ts
+++ b/backend/api/src/services/currency/CurrencyService.ts
@@ -8,7 +8,7 @@ import { createEverLogger } from '../../helpers/Log';
 
 export interface CurrencyMutationRespone {
 	success: boolean;
-	message?: String;
+	message?: string;
 	data?: Currency;
 }
 

From e82b55c6407a94e496af03970903b0f28ba63fb6 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Tue, 21 May 2019 12:03:15 +0300
Subject: [PATCH 321/382] feat(ever-admin): list currencies in dropdown on
 Payment step EV-1192

---
 .../payment-gateways.module.ts                |  4 ++-
 .../stripe-gateway.component.html             | 28 +++++++++----------
 .../stripe-gateway.component.ts               | 18 ++++++++++++
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts
index e457a832e..9933b1977 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.module.ts
@@ -6,6 +6,7 @@ import { PaymentGatewaysComponent } from './payment-gateways.component';
 import { StripeGatewayComponent } from './stripe-gateway/stripe-gateway.component';
 import { PayPalGatewayComponent } from './payPal-gateway/payPal-gateway.component';
 import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
+import { CurrenciesService } from 'app/@core/data/currencies.service';
 
 @NgModule({
 	imports: [
@@ -19,6 +20,7 @@ import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.modu
 		StripeGatewayComponent,
 		PayPalGatewayComponent
 	],
-	exports: [PaymentGatewaysComponent]
+	exports: [PaymentGatewaysComponent],
+	providers: [CurrenciesService]
 })
 export class PaymentGatewaysModule {}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
index 60a1b50e4..01abe0ab7 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
@@ -49,24 +49,22 @@
 			<label for="currency">
 				Currency
 			</label>
-			<input
-				nbInput
-				type="text"
-				class="form-control"
-				id="currency"
+			<select
+				#currency="ngModel"
 				name="currency"
-				placeholder="Currency"
 				[(ngModel)]="configModel.currency"
-				#currency="ngModel"
-				[ngClass]="{
-					'input-danger':
-						currency.invalid &&
-						(currency.dirty || currency.touched),
-					'input-success':
-						currency.valid && (currency.dirty || currency.touched)
-				}"
+				class="form-control"
 				required
-			/>
+			>
+				<option value="" disabled selected hidden
+					>Choose currency code</option
+				>
+				<option
+					*ngFor="let code of currenciesCodes"
+					value="{{ code }}"
+					>{{ code }}</option
+				>
+			</select>
 			<small
 				class="text-danger"
 				*ngIf="currency.invalid && (currency.dirty || currency.touched)"
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index 828a6a791..c04397ffc 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -2,6 +2,8 @@ import { Component, Input } from '@angular/core';
 import PaymentGateways, {
 	paymentGatewaysToString
 } from '@modules/server.common/enums/PaymentGateways';
+import { CurrenciesService } from 'app/@core/data/currencies.service';
+import { first } from 'rxjs/operators';
 
 @Component({
 	selector: 'ea-stripe-gateway',
@@ -12,6 +14,7 @@ export class StripeGatewayComponent {
 	name = paymentGatewaysToString(PaymentGateways.Stripe);
 	logo = 'https://stripe.com/img/v3/home/twitter.png';
 	invalidUrl: boolean;
+	currenciesCodes: string[] = [];
 
 	@Input()
 	set companyBrandLogo(logo: string) {
@@ -25,7 +28,22 @@ export class StripeGatewayComponent {
 		allowRememberMe: true
 	};
 
+	constructor(private currenciesService: CurrenciesService) {
+		this.loadCurrenciesCodes();
+	}
+
 	deleteImg() {
 		this.configModel.companyBrandLogo = '';
 	}
+
+	private async loadCurrenciesCodes() {
+		const res = await this.currenciesService
+			.getCurrencies()
+			.pipe(first())
+			.toPromise();
+
+		if (res) {
+			this.currenciesCodes = res.map((r) => r.currencyCode);
+		}
+	}
 }

From c3a4f69e57f126a1349f0b0a8114b8951b4ee1d3 Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Tue, 21 May 2019 15:06:55 +0300
Subject: [PATCH 322/382] feat(ever-admin): added live tracking, merchant
 filtering

---
 .../src/app/@core/data/warehouses.service.ts  | 25 +++++++
 .../warehouse-track.component.html            | 53 +++-----------
 .../warehouse-track.component.ts              | 71 ++++++++++++++++---
 3 files changed, 97 insertions(+), 52 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/warehouses.service.ts b/admin/website-angular/src/app/@core/data/warehouses.service.ts
index 6653e3238..21b1556e2 100644
--- a/admin/website-angular/src/app/@core/data/warehouses.service.ts
+++ b/admin/website-angular/src/app/@core/data/warehouses.service.ts
@@ -89,6 +89,31 @@ export class WarehousesService {
 			.pipe(map((res) => res.data.getAllStores));
 	}
 
+	getStoreLivePosition() {
+		return this._apollo
+			.watchQuery<{ getAllStores: Warehouse[] }>({
+				query: gql`
+					query GetAllStores {
+						getAllStores {
+							id
+							_createdAt
+							name
+							logo
+							geoLocation {
+								loc {
+									coordinates
+								}
+								city
+								countryId
+							}
+						}
+					}
+				`,
+				pollInterval: 5000
+			})
+			.valueChanges.pipe(map((res) => res.data.getAllStores));
+	}
+
 	getStores(pagingOptions?: IPagingOptions): Observable<Warehouse[]> {
 		return this._apollo
 			.watchQuery<{ warehouses: IWarehouse[] }>({
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
index a9b275e4b..989f062a5 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
@@ -20,16 +20,13 @@
 					<nb-card-body style="overflow:inherit;">
 						<div>
 							<ng-select
-								[items]="stores"
-								placeholder="{{
-									'DASHBOARD_VIEW.SELECT_COMPONENT.SELECT_STORE'
-										| translate
-								}}"
+								[items]="merchants"
+								placeholder="Filter by Name"
 								[clearable]="false"
-								bindLabel="id"
+								bindLabel="name"
 								style="width:100%;margin-bottom:30px;"
-								(change)="storeListener($event)"
-								[(ngModel)]="selectedStore"
+								[(ngModel)]="name"
+								(change)="filterByName($event)"
 							>
 								<ng-template ng-label-tmp let-item="item">
 									<img
@@ -41,45 +38,15 @@
 									/>
 									<b>{{ item.name }}</b>
 								</ng-template>
-								<ng-template
-									ng-option-tmp
-									let-item="item"
-									let-index="index"
-								>
-									<h6 class="card-title">
-										<img
-											*ngIf="item.logo"
-											height="40"
-											width="40"
-											class="mr-1"
-											[src]="item.logo"
-										/>
-										{{ item.name }}
-									</h6>
-								</ng-template>
 							</ng-select>
 							<ng-select
-								(change)="carrierListener($event)"
-								[items]="filteredCarriersList"
-								[(ngModel)]="selectedCarrier"
+								[items]="listOfCities"
+								[(ngModel)]="merchantCity"
 								[clearable]="false"
-								placeholder="{{
-									'CARRIERS_VIEW.CARRIER_PAGE.SELECT_CARRIER'
-										| translate
-								}}"
-								bindLabel="fullName"
+								placeholder="Filter by City"
+								bindLabel="city"
 								style="width:100%; margin-bottom:30px;"
 							>
-								<ng-template ng-label-tmp let-item="item">
-									<img
-										*ngIf="item.logo"
-										height="15"
-										width="15"
-										class="mr-2"
-										[src]="item.logo"
-									/>
-									{{ item.fullName }}
-								</ng-template>
 								<ng-template
 									ng-option-tmp
 									let-item="item"
@@ -93,7 +60,7 @@ <h6 class="card-title">
 											class="mr-1"
 											[src]="item.logo"
 										/>
-										{{ item.fullName }}
+										{{ item }}
 									</h6>
 								</ng-template>
 							</ng-select>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index a01e7a50b..971cc7583 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -2,6 +2,7 @@ import { Component, ViewChild, OnInit } from '@angular/core';
 import { WarehousesService } from 'app/@core/data/warehouses.service';
 import { environment } from 'environments/environment';
 import { Marker } from '@agm/core/services/google-maps-types';
+import Warehouse from '@modules/server.common/entities/Warehouse';
 
 @Component({
 	templateUrl: './warehouse-track.component.html',
@@ -13,22 +14,70 @@ export class WarehouseTrackComponent implements OnInit {
 	map: google.maps.Map;
 
 	merchantMarkers: any[] = [];
+	merchants: Warehouse[] = [];
+	listOfCities: string[] = [];
+	merchantCity: string = '';
+	merchantName: string = '';
 
 	constructor(private warehouseService: WarehousesService) {}
 
 	ngOnInit(): void {
 		this.showMap();
-		this.warehouseService.getAllStores().subscribe((store) => {
-			store.forEach((mer) => {
-				const coords = new google.maps.LatLng(
-					mer.geoLocation.loc.coordinates[1],
-					mer.geoLocation.loc.coordinates[0]
+
+		const warehouseService = this.warehouseService
+			.getStoreLivePosition()
+			.subscribe((store) => {
+				console.log(store);
+				this.merchants = store;
+				this.listOfCities = Array.from(
+					new Set(store.map((mer) => mer.geoLocation.city))
 				);
-				const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
-				const marker = this.addMarker(coords, this.map, storeIcon);
-				this.merchantMarkers.push(marker);
+				if (this.merchantMarkers.length === 0) {
+					store.forEach((mer) => {
+						const coords = new google.maps.LatLng(
+							mer.geoLocation.loc.coordinates[1],
+							mer.geoLocation.loc.coordinates[0]
+						);
+						const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
+						const marker = this.addMarker(
+							coords,
+							this.map,
+							storeIcon
+						);
+						this.merchantMarkers.push(marker);
+					});
+				} else if (store.length === this.merchantMarkers.length) {
+					store.forEach((mer, index) => {
+						const newCoords = new google.maps.LatLng(
+							mer.geoLocation.loc.coordinates[1],
+							mer.geoLocation.loc.coordinates[0]
+						);
+
+						const oldCoords = this.merchantMarkers[index].position;
+						if (!newCoords.equals(oldCoords)) {
+							this.merchantMarkers[index].setPosition(newCoords);
+						}
+					});
+				} else {
+					this.merchantMarkers.forEach((marker) => {
+						marker.setMap(null);
+					});
+					this.merchantMarkers = [];
+					store.forEach((mer) => {
+						const coords = new google.maps.LatLng(
+							mer.geoLocation.loc.coordinates[1],
+							mer.geoLocation.loc.coordinates[0]
+						);
+						const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
+						const marker = this.addMarker(
+							coords,
+							this.map,
+							storeIcon
+						);
+						this.merchantMarkers.push(marker);
+					});
+				}
 			});
-		});
 	}
 
 	showMap() {
@@ -40,6 +89,10 @@ export class WarehouseTrackComponent implements OnInit {
 		this.map = new google.maps.Map(this.gmapElement.nativeElement, mapProp);
 	}
 
+	filterByName(event) {
+		console.log(event);
+	}
+
 	addMarker(position, map, icon) {
 		return new google.maps.Marker({
 			position,

From 0f173ef9d642be222c570c45f603a897a8cad97c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 22 May 2019 14:13:16 +0300
Subject: [PATCH 323/382] feat(ever-admin): load default currency in Payment
 step EV-1192

---
 .../payment-gateways.component.html             |  5 ++++-
 .../payment-gateways.component.ts               |  3 +++
 .../stripe-gateway/stripe-gateway.component.ts  | 17 +++++++++++++++--
 .../components/payments/payments.component.html |  1 +
 .../components/payments/payments.component.ts   |  3 +++
 .../+setup/+merchants/merchants.component.html  |  1 +
 shared/core/entities/Currency.ts                |  7 +++++++
 7 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
index 84063230b..d7d203cc4 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
@@ -1,2 +1,5 @@
-<ea-stripe-gateway [companyBrandLogo]="warehouseLogo"></ea-stripe-gateway>
+<ea-stripe-gateway
+	[companyBrandLogo]="warehouseLogo"
+	[warehouseCountry]="warehouseCountry"
+></ea-stripe-gateway>
 <ea-payPal-gateway></ea-payPal-gateway>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index c6e237d48..7c97ea885 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input } from '@angular/core';
+import { Country } from '@modules/server.common/entities';
 
 @Component({
 	selector: 'ea-payment-gateways',
@@ -7,4 +8,6 @@ import { Component, Input } from '@angular/core';
 export class PaymentGatewaysComponent {
 	@Input()
 	warehouseLogo: string;
+	@Input()
+	warehouseCountry: Country;
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index c04397ffc..5692cd69a 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -1,21 +1,25 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnChanges } from '@angular/core';
 import PaymentGateways, {
 	paymentGatewaysToString
 } from '@modules/server.common/enums/PaymentGateways';
 import { CurrenciesService } from 'app/@core/data/currencies.service';
 import { first } from 'rxjs/operators';
+import { Country } from '@modules/server.common/entities';
+import { countriesDefaultCurrencies } from '@modules/server.common/entities/Currency';
 
 @Component({
 	selector: 'ea-stripe-gateway',
 	templateUrl: './stripe-gateway.component.html'
 })
-export class StripeGatewayComponent {
+export class StripeGatewayComponent implements OnChanges {
 	isStripeEnabled: boolean;
 	name = paymentGatewaysToString(PaymentGateways.Stripe);
 	logo = 'https://stripe.com/img/v3/home/twitter.png';
 	invalidUrl: boolean;
 	currenciesCodes: string[] = [];
 
+	@Input()
+	warehouseCountry: Country;
 	@Input()
 	set companyBrandLogo(logo: string) {
 		this.configModel.companyBrandLogo = logo;
@@ -32,6 +36,15 @@ export class StripeGatewayComponent {
 		this.loadCurrenciesCodes();
 	}
 
+	ngOnChanges(): void {
+		const cefaultCurrency =
+			countriesDefaultCurrencies[
+				Country[this.warehouseCountry].toString()
+			] || '';
+
+		this.configModel.currency = cefaultCurrency;
+	}
+
 	deleteImg() {
 		this.configModel.companyBrandLogo = '';
 	}
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
index b8ff74a58..a041ed346 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
@@ -17,6 +17,7 @@
 			<div class="form-group offset-md-2 col-md-8">
 				<ea-payment-gateways
 					[warehouseLogo]="warehouseLogo"
+					[warehouseCountry]="locationForm.countryId.value"
 				></ea-payment-gateways>
 			</div>
 		</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
index e771b86f6..a6380cb62 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Output, Input } from '@angular/core';
+import { LocationFormComponent } from 'app/@shared/forms/location';
 
 @Component({
 	selector: 'ea-merchants-setup-payments',
@@ -13,6 +14,8 @@ export class SetupMerchantPaymentsComponent {
 
 	@Input()
 	warehouseLogo: string;
+	@Input()
+	locationForm: LocationFormComponent;
 
 	isPaymentEnabled: boolean;
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
index ef255e214..0ab86aa89 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
@@ -63,6 +63,7 @@
 							<ea-merchants-setup-payments
 								#payments
 								[warehouseLogo]="basicInfo.basicInfoModel.logo"
+								[locationForm]="location.locationForm"
 								(previousStep)="nbStepper.previous()"
 								(nextStep)="nbStepper.next()"
 							></ea-merchants-setup-payments>
diff --git a/shared/core/entities/Currency.ts b/shared/core/entities/Currency.ts
index 88c4db4c6..36692165a 100644
--- a/shared/core/entities/Currency.ts
+++ b/shared/core/entities/Currency.ts
@@ -33,3 +33,10 @@ class Currency extends DBObject<ICurrency, ICurrencyCreateObject>
 }
 
 export default Currency;
+
+export const countriesDefaultCurrencies = {
+	IL: 'ILS',
+	RU: 'RUB',
+	US: 'USD',
+	BG: 'BGN'
+};

From c3cb5bb450b8a3b25181e8fbac0f8c8c0d613ebe Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Wed, 22 May 2019 15:14:44 +0300
Subject: [PATCH 324/382] feat(ever-admin): extended store filtering

---
 .../warehouse-track.component.html            |  33 +++-
 .../warehouse-track.component.ts              | 165 +++++++++++++-----
 2 files changed, 150 insertions(+), 48 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
index 989f062a5..77dc80feb 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
@@ -22,10 +22,10 @@
 							<ng-select
 								[items]="merchants"
 								placeholder="Filter by Name"
-								[clearable]="false"
+								[clearable]="true"
 								bindLabel="name"
+								[(ngModel)]="merchantName"
 								style="width:100%;margin-bottom:30px;"
-								[(ngModel)]="name"
 								(change)="filterByName($event)"
 							>
 								<ng-template ng-label-tmp let-item="item">
@@ -42,10 +42,37 @@
 							<ng-select
 								[items]="listOfCities"
 								[(ngModel)]="merchantCity"
-								[clearable]="false"
+								[clearable]="true"
 								placeholder="Filter by City"
 								bindLabel="city"
 								style="width:100%; margin-bottom:30px;"
+								(change)="filterByCity($event)"
+							>
+								<ng-template
+									ng-option-tmp
+									let-item="item"
+									let-index="index"
+								>
+									<h6 class="card-title">
+										<img
+											*ngIf="item.logo"
+											height="40"
+											width="40"
+											class="mr-1"
+											[src]="item.logo"
+										/>
+										{{ item }}
+									</h6>
+								</ng-template>
+							</ng-select>
+							<ng-select
+								[items]="listOfCountries"
+								[clearable]="true"
+								placeholder="Filter by City"
+								bindLabel="city"
+								[(ngModel)]="merchantCountry"
+								style="width:100%; margin-bottom:30px;"
+								(change)="filterByCountry($event)"
 							>
 								<ng-template
 									ng-option-tmp
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index 971cc7583..6927dd616 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -3,6 +3,10 @@ import { WarehousesService } from 'app/@core/data/warehouses.service';
 import { environment } from 'environments/environment';
 import { Marker } from '@agm/core/services/google-maps-types';
 import Warehouse from '@modules/server.common/entities/Warehouse';
+import {
+	getCountryName,
+	CountryName
+} from '@modules/server.common/entities/GeoLocation';
 
 @Component({
 	templateUrl: './warehouse-track.component.html',
@@ -16,8 +20,11 @@ export class WarehouseTrackComponent implements OnInit {
 	merchantMarkers: any[] = [];
 	merchants: Warehouse[] = [];
 	listOfCities: string[] = [];
-	merchantCity: string = '';
-	merchantName: string = '';
+	listOfCountries: CountryName[] = [];
+	merchantListDropDown: Warehouse;
+	merchantCity: string;
+	merchantName: string;
+	merchantCountry: CountryName;
 
 	constructor(private warehouseService: WarehousesService) {}
 
@@ -27,55 +34,36 @@ export class WarehouseTrackComponent implements OnInit {
 		const warehouseService = this.warehouseService
 			.getStoreLivePosition()
 			.subscribe((store) => {
-				console.log(store);
-				this.merchants = store;
-				this.listOfCities = Array.from(
-					new Set(store.map((mer) => mer.geoLocation.city))
-				);
+				if (
+					!(
+						this.merchantName ||
+						this.merchantCity ||
+						this.merchantCountry
+					)
+				) {
+					this.merchants = store;
+					this.listOfCities = Array.from(
+						new Set(store.map((mer) => mer.geoLocation.city))
+					).sort();
+					this.listOfCountries = Array.from(
+						new Set(
+							store.map((mer) =>
+								getCountryName(mer.geoLocation.countryId)
+							)
+						)
+					).sort();
+				}
+
 				if (this.merchantMarkers.length === 0) {
-					store.forEach((mer) => {
-						const coords = new google.maps.LatLng(
-							mer.geoLocation.loc.coordinates[1],
-							mer.geoLocation.loc.coordinates[0]
-						);
-						const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
-						const marker = this.addMarker(
-							coords,
-							this.map,
-							storeIcon
-						);
-						this.merchantMarkers.push(marker);
-					});
+					this.populateMarkers(store, this.merchantMarkers);
 				} else if (store.length === this.merchantMarkers.length) {
-					store.forEach((mer, index) => {
-						const newCoords = new google.maps.LatLng(
-							mer.geoLocation.loc.coordinates[1],
-							mer.geoLocation.loc.coordinates[0]
-						);
-
-						const oldCoords = this.merchantMarkers[index].position;
-						if (!newCoords.equals(oldCoords)) {
-							this.merchantMarkers[index].setPosition(newCoords);
-						}
-					});
+					this.updateMarkers(store, this.merchantMarkers);
 				} else {
 					this.merchantMarkers.forEach((marker) => {
 						marker.setMap(null);
 					});
 					this.merchantMarkers = [];
-					store.forEach((mer) => {
-						const coords = new google.maps.LatLng(
-							mer.geoLocation.loc.coordinates[1],
-							mer.geoLocation.loc.coordinates[0]
-						);
-						const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
-						const marker = this.addMarker(
-							coords,
-							this.map,
-							storeIcon
-						);
-						this.merchantMarkers.push(marker);
-					});
+					this.populateMarkers(store, this.merchantMarkers);
 				}
 			});
 	}
@@ -90,7 +78,94 @@ export class WarehouseTrackComponent implements OnInit {
 	}
 
 	filterByName(event) {
-		console.log(event);
+		if (event) {
+			this.merchantName = event;
+			this.merchantCity = undefined;
+			this.merchantCountry = undefined;
+
+			this.deleteMarkerStorage(this.merchantMarkers);
+
+			const coords = new google.maps.LatLng(
+				event.geoLocation.loc.coordinates[1],
+				event.geoLocation.loc.coordinates[0]
+			);
+			const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
+			const marker = this.addMarker(coords, this.map, storeIcon);
+			this.merchantMarkers.push(marker);
+		} else {
+			this.deleteMarkerStorage(this.merchantMarkers);
+
+			this.populateMarkers(this.merchants, this.merchantMarkers);
+		}
+	}
+
+	filterByCity(event) {
+		if (event) {
+			this.merchantCity = event;
+			this.merchantCountry = undefined;
+			this.merchantName = undefined;
+
+			this.deleteMarkerStorage(this.merchantMarkers);
+			const filteredMerchants = this.merchants.filter(
+				(mer) => mer.geoLocation.city === this.merchantCity
+			);
+			this.populateMarkers(filteredMerchants, this.merchantMarkers);
+		} else {
+			this.deleteMarkerStorage(this.merchantMarkers);
+			this.populateMarkers(this.merchants, this.merchantMarkers);
+		}
+	}
+
+	filterByCountry(event) {
+		if (event) {
+			this.merchantCountry = event;
+			this.merchantCity = undefined;
+			this.merchantName = undefined;
+
+			this.deleteMarkerStorage(this.merchantMarkers);
+			const filteredMerchants = this.merchants.filter(
+				(mer) =>
+					getCountryName(mer.geoLocation.countryId) ===
+					this.merchantCountry
+			);
+			this.populateMarkers(filteredMerchants, this.merchantMarkers);
+		} else {
+			this.deleteMarkerStorage(this.merchantMarkers);
+			this.populateMarkers(this.merchants, this.merchantMarkers);
+		}
+	}
+
+	populateMarkers(merchantArray, markerStorage) {
+		merchantArray.forEach((mer) => {
+			const coords = new google.maps.LatLng(
+				mer.geoLocation.loc.coordinates[1],
+				mer.geoLocation.loc.coordinates[0]
+			);
+			const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
+			const marker = this.addMarker(coords, this.map, storeIcon);
+			markerStorage.push(marker);
+		});
+	}
+
+	updateMarkers(merchantArray: Warehouse[], markerStorage: any[]) {
+		merchantArray.forEach((mer, index) => {
+			const newCoords = new google.maps.LatLng(
+				mer.geoLocation.loc.coordinates[1],
+				mer.geoLocation.loc.coordinates[0]
+			);
+
+			const oldCoords = markerStorage[index].position;
+			if (!newCoords.equals(oldCoords)) {
+				markerStorage[index].setPosition(newCoords);
+			}
+		});
+	}
+
+	deleteMarkerStorage(markerStorage) {
+		markerStorage.forEach((mar) => {
+			mar.setMap(null);
+		});
+		markerStorage = [];
 	}
 
 	addMarker(position, map, icon) {

From 571f0a598c4da40b627e04d2c385c725125e8b25 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 22 May 2019 16:44:17 +0300
Subject: [PATCH 325/382] feat(ever-admin): validation on Stripe form in
 Payments step EV-1192

---
 .../file-uploader.component.html              |  2 +-
 .../file-uploader/file-uploader.component.ts  | 12 ++++++++-
 .../payment-gateways.component.html           |  1 +
 .../payment-gateways.component.ts             | 17 ++++++++++++-
 .../stripe-gateway.component.html             | 19 ++++++++++----
 .../stripe-gateway.component.ts               | 25 ++++++++++++++++---
 .../payments/payments.component.html          |  3 ++-
 .../components/payments/payments.component.ts | 15 ++++++++++-
 8 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.html b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.html
index ee69b2e7e..99c6314a9 100644
--- a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.html
+++ b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.html
@@ -10,6 +10,7 @@
 	/>
 
 	<input
+		#shownInput="ngModel"
 		type="text"
 		class="form-control col-10"
 		[ngClass]="customClass"
@@ -17,7 +18,6 @@
 		(change)="imageUrlChanged()"
 		[(ngModel)]="fileUrl"
 	/>
-
 	<button
 		(click)="fileInput.click()"
 		class="btn btn-primary btn-rectangle col-2"
diff --git a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
index 2e70119bd..3f49678b0 100644
--- a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
+++ b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
@@ -1,8 +1,15 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import {
+	Component,
+	Input,
+	Output,
+	EventEmitter,
+	ViewChild
+} from '@angular/core';
 import { FileUploader, FileUploaderOptions } from 'ng2-file-upload';
 import { environment } from 'environment';
 import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
 import { IProductImage } from '@modules/server.common/interfaces/IProduct';
+import { NgModel } from '@angular/forms';
 
 @Component({
 	selector: 'e-cu-file-uploader',
@@ -10,6 +17,9 @@ import { IProductImage } from '@modules/server.common/interfaces/IProduct';
 	styleUrls: ['./file-uploader.component.scss']
 })
 export class FileUploaderComponent {
+	@ViewChild('shownInput')
+	shownInput: NgModel;
+
 	@Input()
 	placeholder: string;
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
index d7d203cc4..a72757612 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
@@ -1,4 +1,5 @@
 <ea-stripe-gateway
+	#stripeGateway
 	[companyBrandLogo]="warehouseLogo"
 	[warehouseCountry]="warehouseCountry"
 ></ea-stripe-gateway>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index 7c97ea885..df9292352 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -1,13 +1,28 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, ViewChild } from '@angular/core';
 import { Country } from '@modules/server.common/entities';
+import { StripeGatewayComponent } from './stripe-gateway/stripe-gateway.component';
 
 @Component({
 	selector: 'ea-payment-gateways',
 	templateUrl: './payment-gateways.component.html'
 })
 export class PaymentGatewaysComponent {
+	@ViewChild('stripeGateway')
+	stripeGateway: StripeGatewayComponent;
+
 	@Input()
 	warehouseLogo: string;
 	@Input()
 	warehouseCountry: Country;
+
+	get isValid(): boolean {
+		let valid = false;
+		if (this.stripeGateway.isStripeEnabled) {
+			if (this.stripeGateway.isStripeEnabled) {
+				valid = this.stripeGateway.isFormValid;
+			}
+		}
+
+		return valid;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
index 01abe0ab7..fd46087f9 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
@@ -7,7 +7,7 @@
 	</div>
 </div>
 
-<form *ngIf="isStripeEnabled" #basicInfoForm="ngForm">
+<form *ngIf="isStripeEnabled" #stripeConfigForm="ngForm">
 	<div class="row m-0">
 		<div class="form-group col-md-6">
 			<label for="payButtontext">
@@ -82,12 +82,14 @@
 				Company brand logo
 			</label>
 			<e-cu-file-uploader
+				#fileUploader
 				[placeholder]="'Company brand logo'"
 				[fileUrl]="configModel.companyBrandLogo"
 				(uploadedImgUrl)="configModel.companyBrandLogo = $event"
 				[customClass]="
-					configModel.companyBrandLogo !== ''
-						? invalidUrl
+					fileUploader.shownInput.dirty ||
+					fileUploader.shownInput.touched
+						? invalidUrl || configModel.companyBrandLogo === ''
 							? 'form-control-danger'
 							: 'form-control-success'
 						: ''
@@ -96,9 +98,16 @@
 
 			<small
 				class="text-danger"
-				*ngIf="invalidUrl && configModel.companyBrandLogo !== ''"
+				*ngIf="
+					fileUploader.shownInput.dirty ||
+					fileUploader.shownInput.touched
+				"
 			>
-				<span *ngIf="invalidUrl">
+				<span *ngIf="configModel.companyBrandLogo === ''">
+					Company brand logo is required
+				</span>
+
+				<span *ngIf="invalidUrl && configModel.companyBrandLogo !== ''">
 					Invalid logo url
 				</span>
 			</small>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index 5692cd69a..16b15d73c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges } from '@angular/core';
+import { Component, Input, OnChanges, ViewChild } from '@angular/core';
 import PaymentGateways, {
 	paymentGatewaysToString
 } from '@modules/server.common/enums/PaymentGateways';
@@ -6,12 +6,16 @@ import { CurrenciesService } from 'app/@core/data/currencies.service';
 import { first } from 'rxjs/operators';
 import { Country } from '@modules/server.common/entities';
 import { countriesDefaultCurrencies } from '@modules/server.common/entities/Currency';
+import { NgForm } from '@angular/forms';
 
 @Component({
 	selector: 'ea-stripe-gateway',
 	templateUrl: './stripe-gateway.component.html'
 })
 export class StripeGatewayComponent implements OnChanges {
+	@ViewChild('stripeConfigForm')
+	stripeConfigForm: NgForm;
+
 	isStripeEnabled: boolean;
 	name = paymentGatewaysToString(PaymentGateways.Stripe);
 	logo = 'https://stripe.com/img/v3/home/twitter.png';
@@ -36,13 +40,28 @@ export class StripeGatewayComponent implements OnChanges {
 		this.loadCurrenciesCodes();
 	}
 
+	get isFormValid(): boolean {
+		let isValid = false;
+
+		if (this.stripeConfigForm) {
+			isValid =
+				this.stripeConfigForm.touched &&
+				this.stripeConfigForm.dirty &&
+				this.stripeConfigForm.valid &&
+				!this.invalidUrl &&
+				this.configModel.companyBrandLogo !== '';
+		}
+
+		return isValid;
+	}
+
 	ngOnChanges(): void {
-		const cefaultCurrency =
+		const defaultCurrency =
 			countriesDefaultCurrencies[
 				Country[this.warehouseCountry].toString()
 			] || '';
 
-		this.configModel.currency = cefaultCurrency;
+		this.configModel.currency = defaultCurrency;
 	}
 
 	deleteImg() {
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
index a041ed346..922af8698 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
@@ -16,6 +16,7 @@
 		<div [hidden]="!isPaymentEnabled" class="row m-0">
 			<div class="form-group offset-md-2 col-md-8">
 				<ea-payment-gateways
+					#paymentGateways
 					[warehouseLogo]="warehouseLogo"
 					[warehouseCountry]="locationForm.countryId.value"
 				></ea-payment-gateways>
@@ -27,6 +28,6 @@
 <button nbButton (click)="previousStep.emit()">
 	{{ 'FAKE_DATA.SETUP_MERCHANTS.PREV' | translate }}
 </button>
-<button nbButton (click)="nextStep.emit()">
+<button nbButton [disabled]="!isPaymentValid" (click)="nextStep.emit()">
 	{{ 'FAKE_DATA.SETUP_MERCHANTS.NEXT' | translate }}
 </button>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
index a6380cb62..2c96735b1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -1,5 +1,12 @@
-import { Component, EventEmitter, Output, Input } from '@angular/core';
+import {
+	Component,
+	EventEmitter,
+	Output,
+	Input,
+	ViewChild
+} from '@angular/core';
 import { LocationFormComponent } from 'app/@shared/forms/location';
+import { PaymentGatewaysComponent } from './payment-gateways/payment-gateways.component';
 
 @Component({
 	selector: 'ea-merchants-setup-payments',
@@ -7,6 +14,8 @@ import { LocationFormComponent } from 'app/@shared/forms/location';
 	styleUrls: ['./payments.component.scss']
 })
 export class SetupMerchantPaymentsComponent {
+	@ViewChild('paymentGateways')
+	paymentGateways: PaymentGatewaysComponent;
 	@Output()
 	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
 	@Output()
@@ -18,4 +27,8 @@ export class SetupMerchantPaymentsComponent {
 	locationForm: LocationFormComponent;
 
 	isPaymentEnabled: boolean;
+
+	get isPaymentValid() {
+		return !this.isPaymentEnabled || this.paymentGateways.isValid;
+	}
 }

From fc7ac71c3d936aeb97ce9482b0f0872e60f91e1e Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 22 May 2019 17:21:56 +0300
Subject: [PATCH 326/382] feat(ever-admin): improved validation on the Payments
 step EV-1192

---
 .../payPal-gateway.component.ts               |  6 ++++++
 .../payment-gateways.component.html           |  2 +-
 .../payment-gateways.component.ts             | 21 ++++++++++++++++++-
 .../stripe-gateway.component.html             |  5 +++--
 .../stripe-gateway.component.ts               |  4 ++--
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
index b98e9f17d..15931cd80 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
@@ -11,4 +11,10 @@ export class PayPalGatewayComponent {
 	isPayPalEnabled: boolean;
 	name = paymentGatewaysToString(PaymentGateways.PayPal);
 	logo = 'https://avatars1.githubusercontent.com/u/476675?s=200&v=4';
+
+	get isFormValid(): boolean {
+		let isValid = false;
+
+		return isValid;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
index a72757612..c0cbdae57 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
@@ -3,4 +3,4 @@
 	[companyBrandLogo]="warehouseLogo"
 	[warehouseCountry]="warehouseCountry"
 ></ea-stripe-gateway>
-<ea-payPal-gateway></ea-payPal-gateway>
+<ea-payPal-gateway #payPalGateway></ea-payPal-gateway>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index df9292352..3679ab296 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input, ViewChild } from '@angular/core';
 import { Country } from '@modules/server.common/entities';
 import { StripeGatewayComponent } from './stripe-gateway/stripe-gateway.component';
+import { PayPalGatewayComponent } from './payPal-gateway/payPal-gateway.component';
 
 @Component({
 	selector: 'ea-payment-gateways',
@@ -10,6 +11,9 @@ export class PaymentGatewaysComponent {
 	@ViewChild('stripeGateway')
 	stripeGateway: StripeGatewayComponent;
 
+	@ViewChild('payPalGateway')
+	payPalGateway: PayPalGatewayComponent;
+
 	@Input()
 	warehouseLogo: string;
 	@Input()
@@ -17,9 +21,24 @@ export class PaymentGatewaysComponent {
 
 	get isValid(): boolean {
 		let valid = false;
-		if (this.stripeGateway.isStripeEnabled) {
+		if (
+			this.stripeGateway.isStripeEnabled ||
+			this.payPalGateway.isPayPalEnabled
+		) {
 			if (this.stripeGateway.isStripeEnabled) {
 				valid = this.stripeGateway.isFormValid;
+
+				if (!valid) {
+					return;
+				}
+			}
+
+			if (this.payPalGateway.isPayPalEnabled) {
+				valid = this.payPalGateway.isFormValid;
+
+				if (!valid) {
+					return;
+				}
 			}
 		}
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
index fd46087f9..74303d003 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
@@ -7,7 +7,7 @@
 	</div>
 </div>
 
-<form *ngIf="isStripeEnabled" #stripeConfigForm="ngForm">
+<form [hidden]="!isStripeEnabled" #stripeConfigForm="ngForm">
 	<div class="row m-0">
 		<div class="form-group col-md-6">
 			<label for="payButtontext">
@@ -88,7 +88,8 @@
 				(uploadedImgUrl)="configModel.companyBrandLogo = $event"
 				[customClass]="
 					fileUploader.shownInput.dirty ||
-					fileUploader.shownInput.touched
+					fileUploader.shownInput.touched ||
+					configModel.companyBrandLogo !== ''
 						? invalidUrl || configModel.companyBrandLogo === ''
 							? 'form-control-danger'
 							: 'form-control-success'
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index 16b15d73c..996c14295 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -45,8 +45,8 @@ export class StripeGatewayComponent implements OnChanges {
 
 		if (this.stripeConfigForm) {
 			isValid =
-				this.stripeConfigForm.touched &&
-				this.stripeConfigForm.dirty &&
+				(this.stripeConfigForm.touched ||
+					this.stripeConfigForm.dirty) &&
 				this.stripeConfigForm.valid &&
 				!this.invalidUrl &&
 				this.configModel.companyBrandLogo !== '';

From e52acbee66141a3191ffbadadaeccca583afc266 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 27 May 2019 11:36:22 +0300
Subject: [PATCH 327/382] feat(ever-api): added new object "PaymentGateway",
 and used as field in Warehouse EV-1192

---
 shared/core/entities/PaymentGateway.ts    | 43 +++++++++++++++++++++++
 shared/core/entities/Warehouse.ts         | 10 ++++++
 shared/core/interfaces/IPaymentGateway.ts | 17 +++++++++
 shared/core/interfaces/IWarehouse.ts      | 10 ++++++
 4 files changed, 80 insertions(+)
 create mode 100644 shared/core/entities/PaymentGateway.ts
 create mode 100644 shared/core/interfaces/IPaymentGateway.ts

diff --git a/shared/core/entities/PaymentGateway.ts b/shared/core/entities/PaymentGateway.ts
new file mode 100644
index 000000000..7ee6a24eb
--- /dev/null
+++ b/shared/core/entities/PaymentGateway.ts
@@ -0,0 +1,43 @@
+import { ModelName, DBObject, Types, Schema } from '@pyro/db';
+import IPaymentGatewayCreateObject, {
+	IPaymentGateway
+} from '../interfaces/IPaymentGateway';
+import PaymentGateways from '../enums/PaymentGateways';
+import { Column } from 'typeorm';
+
+/**
+ * Stores type of payment gateway and configuration object for such payment gateway
+ *
+ * @class PaymentGateway
+ * @extends {DBObject<IPaymentGateway, IPaymentGatewayCreateObject>}
+ * @implements {IPaymentGateway}
+ */
+@ModelName('PaymentGateway')
+class PaymentGateway
+	extends DBObject<IPaymentGateway, IPaymentGatewayCreateObject>
+	implements IPaymentGateway {
+	/**
+	 * Type of the payment gateway
+	 *
+	 * @type {PaymentGateways}
+	 * @memberof PaymentGateway
+	 */
+	@Types.Number()
+	@Column()
+	paymentGateway: PaymentGateways;
+
+	/**
+	 * Configuration object for such payment gateway.
+	 *
+	 * Note: this field has no concrete type, because different payment gateways
+	 * may have different fields in the configure object
+	 *
+	 * @type {any}
+	 * @memberof PaymentGateway
+	 */
+	@Schema({ type: Object })
+	@Column()
+	configureObject: any;
+}
+
+export default PaymentGateway;
diff --git a/shared/core/entities/Warehouse.ts b/shared/core/entities/Warehouse.ts
index 4ca347787..e0b5fbf22 100644
--- a/shared/core/entities/Warehouse.ts
+++ b/shared/core/entities/Warehouse.ts
@@ -7,6 +7,7 @@ import ForwardOrdersMethod from '../enums/ForwardOrdersMethod';
 import { Entity, Column } from 'typeorm';
 import IWarehouseProduct from '../interfaces/IWarehouseProduct';
 import OrderBarcodeTypes from '../enums/OrderBarcodeTypes';
+import PaymentGateway from './PaymentGateway';
 
 /**
  * Warehouse / Merchant / Store
@@ -282,6 +283,15 @@ class Warehouse extends DBObject<IWarehouse, IWarehouseCreateObject>
 	@Schema({ type: String, unique: true, sparse: true })
 	@Column()
 	barcodeData: string;
+
+	/**
+	 * Payment gateways
+	 *
+	 * @type {PaymentGateway[]}
+	 * @memberof Warehouse
+	 */
+	@Schema([getSchema(PaymentGateway)])
+	paymentGateways?: PaymentGateway[];
 }
 
 export type WithFullProducts = Warehouse & {
diff --git a/shared/core/interfaces/IPaymentGateway.ts b/shared/core/interfaces/IPaymentGateway.ts
new file mode 100644
index 000000000..94a4b6ea7
--- /dev/null
+++ b/shared/core/interfaces/IPaymentGateway.ts
@@ -0,0 +1,17 @@
+import PaymentGateways from '../enums/PaymentGateways';
+import { DBCreateObject, DBRawObject, PyroObjectId } from '@pyro/db';
+
+export interface IPaymentGatewayCreateObject extends DBCreateObject {
+	paymentGateway: PaymentGateways;
+	configureObject: any;
+}
+
+export interface IPaymentGateway
+	extends DBRawObject,
+		IPaymentGatewayCreateObject {
+	_id: PyroObjectId;
+	_createdAt: Date | string;
+	_updatedAt: Date | string;
+}
+
+export default IPaymentGatewayCreateObject;
diff --git a/shared/core/interfaces/IWarehouse.ts b/shared/core/interfaces/IWarehouse.ts
index d33500e4b..dfc59d693 100644
--- a/shared/core/interfaces/IWarehouse.ts
+++ b/shared/core/interfaces/IWarehouse.ts
@@ -5,6 +5,7 @@ import IGeoLocation, { IGeoLocationCreateObject } from './IGeoLocation';
 import { DBCreateObject, DBRawObject, PyroObjectId } from '../@pyro/db';
 import ForwardOrdersMethod from '../enums/ForwardOrdersMethod';
 import OrderBarcodeTypes from '../enums/OrderBarcodeTypes';
+import { IPaymentGateway } from './IPaymentGateway';
 
 export interface IWarehouseCreateObject extends DBCreateObject {
 	/**
@@ -109,6 +110,14 @@ export interface IWarehouseCreateObject extends DBCreateObject {
 	 */
 	hash?: string;
 
+	/**
+	 * Payment Gateways
+	 *
+	 * @type {IPaymentGateway[]}
+	 * @memberof IWarehouseCreateObject
+	 */
+	paymentGateways?: IPaymentGateway[];
+
 	productsDelivery?: boolean;
 	productsTakeaway?: boolean;
 	orderBarcodeType?: OrderBarcodeTypes;
@@ -126,6 +135,7 @@ interface IWarehouse extends IWarehouseCreateObject, DBRawObject {
 	usedCarriersIds: string[];
 	hasRestrictedCarriers: boolean;
 	barcodeData?: string;
+	paymentGateways?: IPaymentGateway[];
 }
 
 export default IWarehouse;

From d03143db11c5178ff21150334c3ef1aeeea13ffb Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 27 May 2019 12:18:28 +0300
Subject: [PATCH 328/382] feat(ever-admin): improved Payments step, save data
 for "Stripe" payment gateway as part of field "paymentGateways" in DB on
 Warehouse EV-1192

---
 .../payment-gateways/payment-gateways.component.ts  | 13 +++++++++++++
 .../stripe-gateway/stripe-gateway.component.ts      | 12 ++++++++++++
 .../components/payments/payments.component.ts       |  5 +++++
 .../pages/+setup/+merchants/merchants.component.ts  |  3 ++-
 shared/core/interfaces/IWarehouse.ts                |  8 +++++---
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index 3679ab296..e485f2c39 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -2,6 +2,7 @@ import { Component, Input, ViewChild } from '@angular/core';
 import { Country } from '@modules/server.common/entities';
 import { StripeGatewayComponent } from './stripe-gateway/stripe-gateway.component';
 import { PayPalGatewayComponent } from './payPal-gateway/payPal-gateway.component';
+import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaymentGateway';
 
 @Component({
 	selector: 'ea-payment-gateways',
@@ -44,4 +45,16 @@ export class PaymentGatewaysComponent {
 
 		return valid;
 	}
+
+	get paymentsGateways(): IPaymentGatewayCreateObject[] {
+		const paymentsGateways = [];
+
+		const stripeGatewayCreateObject = this.stripeGateway.createObject;
+
+		if (stripeGatewayCreateObject) {
+			paymentsGateways.push(stripeGatewayCreateObject);
+		}
+
+		return paymentsGateways;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index 996c14295..91a0b8ebe 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -7,6 +7,7 @@ import { first } from 'rxjs/operators';
 import { Country } from '@modules/server.common/entities';
 import { countriesDefaultCurrencies } from '@modules/server.common/entities/Currency';
 import { NgForm } from '@angular/forms';
+import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaymentGateway';
 
 @Component({
 	selector: 'ea-stripe-gateway',
@@ -55,6 +56,17 @@ export class StripeGatewayComponent implements OnChanges {
 		return isValid;
 	}
 
+	get createObject(): IPaymentGatewayCreateObject | null {
+		if (!this.isFormValid) {
+			return null;
+		}
+
+		return {
+			paymentGateway: PaymentGateways.Stripe,
+			configureObject: this.configModel
+		};
+	}
+
 	ngOnChanges(): void {
 		const defaultCurrency =
 			countriesDefaultCurrencies[
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
index 2c96735b1..d4c65f462 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -7,6 +7,7 @@ import {
 } from '@angular/core';
 import { LocationFormComponent } from 'app/@shared/forms/location';
 import { PaymentGatewaysComponent } from './payment-gateways/payment-gateways.component';
+import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaymentGateway';
 
 @Component({
 	selector: 'ea-merchants-setup-payments',
@@ -31,4 +32,8 @@ export class SetupMerchantPaymentsComponent {
 	get isPaymentValid() {
 		return !this.isPaymentEnabled || this.paymentGateways.isValid;
 	}
+
+	get paymentsGateways(): IPaymentGatewayCreateObject[] {
+		return this.paymentGateways.paymentsGateways;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
index 5235549da..cca86dafb 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
@@ -106,7 +106,8 @@ export class SetupMerchantsComponent {
 					0,
 				carriersIds: this.stepDeliveryAndTakeaway.restrictedCarriersIds,
 				orderBarcodeType: this.stepOrdersSettings.iorderBarcodeType,
-				isActive: true
+				isActive: true,
+				paymentGateways: this.stepPayments.paymentsGateways
 			};
 
 			password = accountModel.password;
diff --git a/shared/core/interfaces/IWarehouse.ts b/shared/core/interfaces/IWarehouse.ts
index dfc59d693..48410bfbb 100644
--- a/shared/core/interfaces/IWarehouse.ts
+++ b/shared/core/interfaces/IWarehouse.ts
@@ -5,7 +5,9 @@ import IGeoLocation, { IGeoLocationCreateObject } from './IGeoLocation';
 import { DBCreateObject, DBRawObject, PyroObjectId } from '../@pyro/db';
 import ForwardOrdersMethod from '../enums/ForwardOrdersMethod';
 import OrderBarcodeTypes from '../enums/OrderBarcodeTypes';
-import { IPaymentGateway } from './IPaymentGateway';
+import IPaymentGatewayCreateObject, {
+	IPaymentGateway
+} from './IPaymentGateway';
 
 export interface IWarehouseCreateObject extends DBCreateObject {
 	/**
@@ -113,10 +115,10 @@ export interface IWarehouseCreateObject extends DBCreateObject {
 	/**
 	 * Payment Gateways
 	 *
-	 * @type {IPaymentGateway[]}
+	 * @type {IPaymentGatewayCreateObject[]}
 	 * @memberof IWarehouseCreateObject
 	 */
-	paymentGateways?: IPaymentGateway[];
+	paymentGateways?: IPaymentGatewayCreateObject[];
 
 	productsDelivery?: boolean;
 	productsTakeaway?: boolean;

From dd79d6740a2c34ca33c813795e12e0de5edba237 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 27 May 2019 15:19:17 +0300
Subject: [PATCH 329/382] feat(ever-admin): improved Payments step, export
 duplicate code and initialize PayPal configuration form EV-1192

---
 .../payPal-gateway.component.html             | 167 ++++++++++++++++++
 .../payPal-gateway.component.ts               |  30 +++-
 .../payment-gateways.component.html           |   7 +-
 .../payment-gateways.component.ts             |  19 ++
 .../stripe-gateway.component.ts               |  20 +--
 5 files changed, 222 insertions(+), 21 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
index c2c4d8369..b106a6e53 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
@@ -6,3 +6,170 @@
 		</nb-checkbox>
 	</div>
 </div>
+
+<form [hidden]="!isPayPalEnabled" #payPalConfigForm="ngForm">
+	<div class="row m-0">
+		<div class="form-group col-md-6">
+			<label for="mode">
+				Mode
+			</label>
+			<select
+				#mode="ngModel"
+				name="mode"
+				[(ngModel)]="configModel.mode"
+				class="form-control"
+				required
+			>
+				<option value="" disabled selected hidden
+					>Choose PayPal mode</option
+				>
+				<option *ngFor="let type of payPalTypes" value="{{ type }}">{{
+					type
+				}}</option>
+			</select>
+		</div>
+
+		<div class="form-group col-md-6">
+			<label for="currency">
+				Currency
+			</label>
+			<select
+				#currency="ngModel"
+				name="currency"
+				[(ngModel)]="configModel.currency"
+				class="form-control"
+				required
+			>
+				<option value="" disabled selected hidden
+					>Choose currency code</option
+				>
+				<option
+					*ngFor="let code of currenciesCodes"
+					value="{{ code }}"
+					>{{ code }}</option
+				>
+			</select>
+			<small
+				class="text-danger"
+				*ngIf="currency.invalid && (currency.dirty || currency.touched)"
+			>
+				<span *ngIf="currency.errors.required">
+					Currency text is required
+				</span>
+			</small>
+		</div>
+	</div>
+
+	<div class="row m-0">
+		<div class="form-group col-md-12">
+			<label for="publishableKey">
+				Publishable key
+			</label>
+			<input
+				nbInput
+				type="text"
+				class="form-control"
+				id="publishableKey"
+				name="publishable-key"
+				placeholder="Publishable key"
+				[(ngModel)]="configModel.publishableKey"
+				#publishableKey="ngModel"
+				[ngClass]="{
+					'input-danger':
+						publishableKey.invalid &&
+						(publishableKey.dirty || publishableKey.touched),
+					'input-success':
+						publishableKey.valid &&
+						(publishableKey.dirty || publishableKey.touched)
+				}"
+				required
+			/>
+			<small
+				class="text-danger"
+				*ngIf="
+					publishableKey.invalid &&
+					(publishableKey.dirty || publishableKey.touched)
+				"
+			>
+				<span *ngIf="publishableKey.errors.required">
+					Publishable key is required
+				</span>
+			</small>
+		</div>
+	</div>
+
+	<div class="row m-0">
+		<div class="form-group col-md-12">
+			<label for="secretKey">
+				Secret key
+			</label>
+			<input
+				nbInput
+				type="text"
+				class="form-control"
+				id="secretKey"
+				name="secret-key"
+				placeholder="Secret key"
+				[(ngModel)]="configModel.secretKey"
+				#secretKey="ngModel"
+				[ngClass]="{
+					'input-danger':
+						secretKey.invalid &&
+						(secretKey.dirty || secretKey.touched),
+					'input-success':
+						secretKey.valid &&
+						(secretKey.dirty || secretKey.touched)
+				}"
+				required
+			/>
+			<small
+				class="text-danger"
+				*ngIf="
+					secretKey.invalid && (secretKey.dirty || secretKey.touched)
+				"
+			>
+				<span *ngIf="secretKey.errors.required">
+					Secret key is required
+				</span>
+			</small>
+		</div>
+	</div>
+
+	<div class="row m-0">
+		<div class="form-group col-md-12">
+			<label for="description">
+				Payment description
+			</label>
+			<input
+				nbInput
+				type="text"
+				class="form-control"
+				id="description"
+				name="description"
+				placeholder="Payment description"
+				[(ngModel)]="configModel.description"
+				#description="ngModel"
+				[ngClass]="{
+					'input-danger':
+						description.invalid &&
+						(description.dirty || description.touched),
+					'input-success':
+						description.valid &&
+						(description.dirty || description.touched)
+				}"
+				required
+			/>
+			<small
+				class="text-danger"
+				*ngIf="
+					description.invalid &&
+					(description.dirty || description.touched)
+				"
+			>
+				<span *ngIf="description.errors.required">
+					Payment description is required
+				</span>
+			</small>
+		</div>
+	</div>
+</form>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
index 15931cd80..12826812c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
@@ -1,20 +1,46 @@
-import { Component } from '@angular/core';
+import { Component, Input, OnChanges } from '@angular/core';
 import PaymentGateways, {
 	paymentGatewaysToString
 } from '@modules/server.common/enums/PaymentGateways';
+import { Country } from '@modules/server.common/entities';
+import { countriesDefaultCurrencies } from '@modules/server.common/entities/Currency';
 
 @Component({
 	selector: 'ea-payPal-gateway',
 	templateUrl: './payPal-gateway.component.html'
 })
-export class PayPalGatewayComponent {
+export class PayPalGatewayComponent implements OnChanges {
 	isPayPalEnabled: boolean;
 	name = paymentGatewaysToString(PaymentGateways.PayPal);
 	logo = 'https://avatars1.githubusercontent.com/u/476675?s=200&v=4';
 
+	@Input()
+	currenciesCodes: string[] = [];
+	@Input()
+	warehouseCountry: Country;
+
+	configModel = {
+		currency: '',
+		mode: '',
+		publishableKey: '',
+		secretKey: '',
+		description: ''
+	};
+
+	payPalTypes = ['sandbox', 'live'];
+
 	get isFormValid(): boolean {
 		let isValid = false;
 
 		return isValid;
 	}
+
+	ngOnChanges(): void {
+		const defaultCurrency =
+			countriesDefaultCurrencies[
+				Country[this.warehouseCountry].toString()
+			] || '';
+
+		this.configModel.currency = defaultCurrency;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
index c0cbdae57..8af8675ad 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.html
@@ -1,6 +1,11 @@
 <ea-stripe-gateway
 	#stripeGateway
+	[currenciesCodes]="currenciesCodes"
 	[companyBrandLogo]="warehouseLogo"
 	[warehouseCountry]="warehouseCountry"
 ></ea-stripe-gateway>
-<ea-payPal-gateway #payPalGateway></ea-payPal-gateway>
+<ea-payPal-gateway
+	#payPalGateway
+	[currenciesCodes]="currenciesCodes"
+	[warehouseCountry]="warehouseCountry"
+></ea-payPal-gateway>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index e485f2c39..120feae57 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -3,6 +3,8 @@ import { Country } from '@modules/server.common/entities';
 import { StripeGatewayComponent } from './stripe-gateway/stripe-gateway.component';
 import { PayPalGatewayComponent } from './payPal-gateway/payPal-gateway.component';
 import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaymentGateway';
+import { CurrenciesService } from 'app/@core/data/currencies.service';
+import { first } from 'rxjs/operators';
 
 @Component({
 	selector: 'ea-payment-gateways',
@@ -20,6 +22,12 @@ export class PaymentGatewaysComponent {
 	@Input()
 	warehouseCountry: Country;
 
+	currenciesCodes: string[] = [];
+
+	constructor(private currenciesService: CurrenciesService) {
+		this.loadCurrenciesCodes();
+	}
+
 	get isValid(): boolean {
 		let valid = false;
 		if (
@@ -57,4 +65,15 @@ export class PaymentGatewaysComponent {
 
 		return paymentsGateways;
 	}
+
+	private async loadCurrenciesCodes() {
+		const res = await this.currenciesService
+			.getCurrencies()
+			.pipe(first())
+			.toPromise();
+
+		if (res) {
+			this.currenciesCodes = res.map((r) => r.currencyCode);
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index 91a0b8ebe..1dd0a42c1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -2,8 +2,6 @@ import { Component, Input, OnChanges, ViewChild } from '@angular/core';
 import PaymentGateways, {
 	paymentGatewaysToString
 } from '@modules/server.common/enums/PaymentGateways';
-import { CurrenciesService } from 'app/@core/data/currencies.service';
-import { first } from 'rxjs/operators';
 import { Country } from '@modules/server.common/entities';
 import { countriesDefaultCurrencies } from '@modules/server.common/entities/Currency';
 import { NgForm } from '@angular/forms';
@@ -21,8 +19,9 @@ export class StripeGatewayComponent implements OnChanges {
 	name = paymentGatewaysToString(PaymentGateways.Stripe);
 	logo = 'https://stripe.com/img/v3/home/twitter.png';
 	invalidUrl: boolean;
-	currenciesCodes: string[] = [];
 
+	@Input()
+	currenciesCodes: string[] = [];
 	@Input()
 	warehouseCountry: Country;
 	@Input()
@@ -37,10 +36,6 @@ export class StripeGatewayComponent implements OnChanges {
 		allowRememberMe: true
 	};
 
-	constructor(private currenciesService: CurrenciesService) {
-		this.loadCurrenciesCodes();
-	}
-
 	get isFormValid(): boolean {
 		let isValid = false;
 
@@ -79,15 +74,4 @@ export class StripeGatewayComponent implements OnChanges {
 	deleteImg() {
 		this.configModel.companyBrandLogo = '';
 	}
-
-	private async loadCurrenciesCodes() {
-		const res = await this.currenciesService
-			.getCurrencies()
-			.pipe(first())
-			.toPromise();
-
-		if (res) {
-			this.currenciesCodes = res.map((r) => r.currencyCode);
-		}
-	}
 }

From 6d7f70b914b59bd409e965c766522e2a74a721f3 Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Mon, 27 May 2019 15:31:35 +0300
Subject: [PATCH 330/382] feat(ever-admin): fix filtering bugs

---
 .../warehouse-track.component.html            |  4 +-
 .../warehouse-track.component.ts              | 79 +++++++++++--------
 2 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
index 77dc80feb..860a67b93 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
@@ -20,7 +20,7 @@
 					<nb-card-body style="overflow:inherit;">
 						<div>
 							<ng-select
-								[items]="merchants"
+								[items]="listOfMerchants"
 								placeholder="Filter by Name"
 								[clearable]="true"
 								bindLabel="name"
@@ -36,7 +36,7 @@
 										class="mr-2"
 										[src]="item.logo"
 									/>
-									<b>{{ item.name }}</b>
+									<b>{{ item }}</b>
 								</ng-template>
 							</ng-select>
 							<ng-select
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index 6927dd616..4793ae391 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -21,7 +21,7 @@ export class WarehouseTrackComponent implements OnInit {
 	merchants: Warehouse[] = [];
 	listOfCities: string[] = [];
 	listOfCountries: CountryName[] = [];
-	merchantListDropDown: Warehouse;
+	listOfMerchants: string[];
 	merchantCity: string;
 	merchantName: string;
 	merchantCountry: CountryName;
@@ -34,14 +34,9 @@ export class WarehouseTrackComponent implements OnInit {
 		const warehouseService = this.warehouseService
 			.getStoreLivePosition()
 			.subscribe((store) => {
-				if (
-					!(
-						this.merchantName ||
-						this.merchantCity ||
-						this.merchantCountry
-					)
-				) {
-					this.merchants = store;
+				this.merchants = store;
+
+				if (this.merchantMarkers.length === 0) {
 					this.listOfCities = Array.from(
 						new Set(store.map((mer) => mer.geoLocation.city))
 					).sort();
@@ -52,22 +47,28 @@ export class WarehouseTrackComponent implements OnInit {
 							)
 						)
 					).sort();
-				}
-
-				if (this.merchantMarkers.length === 0) {
+					this.listOfMerchants = this.setSort(
+						store.map((mer) => mer.name)
+					);
 					this.populateMarkers(store, this.merchantMarkers);
 				} else if (store.length === this.merchantMarkers.length) {
 					this.updateMarkers(store, this.merchantMarkers);
 				} else {
-					this.merchantMarkers.forEach((marker) => {
-						marker.setMap(null);
-					});
-					this.merchantMarkers = [];
-					this.populateMarkers(store, this.merchantMarkers);
+					console.log(this.merchantMarkers);
+					this.updateMarkers(
+						store.filter((mer) =>
+							this.listOfMerchants.includes(mer.name)
+						),
+						this.merchantMarkers
+					);
 				}
 			});
 	}
 
+	setSort(arr: any): any[] {
+		return Array.from(new Set(arr)).sort();
+	}
+
 	showMap() {
 		const mapProp = {
 			center: new google.maps.LatLng(42.642941, 23.334149),
@@ -80,21 +81,14 @@ export class WarehouseTrackComponent implements OnInit {
 	filterByName(event) {
 		if (event) {
 			this.merchantName = event;
-			this.merchantCity = undefined;
-			this.merchantCountry = undefined;
 
 			this.deleteMarkerStorage(this.merchantMarkers);
-
-			const coords = new google.maps.LatLng(
-				event.geoLocation.loc.coordinates[1],
-				event.geoLocation.loc.coordinates[0]
+			const filteredMerchants = this.merchants.filter(
+				(mer) => mer.name === this.merchantName
 			);
-			const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
-			const marker = this.addMarker(coords, this.map, storeIcon);
-			this.merchantMarkers.push(marker);
+			this.populateMarkers(filteredMerchants, this.merchantMarkers);
 		} else {
 			this.deleteMarkerStorage(this.merchantMarkers);
-
 			this.populateMarkers(this.merchants, this.merchantMarkers);
 		}
 	}
@@ -102,14 +96,15 @@ export class WarehouseTrackComponent implements OnInit {
 	filterByCity(event) {
 		if (event) {
 			this.merchantCity = event;
-			this.merchantCountry = undefined;
 			this.merchantName = undefined;
-
 			this.deleteMarkerStorage(this.merchantMarkers);
 			const filteredMerchants = this.merchants.filter(
 				(mer) => mer.geoLocation.city === this.merchantCity
 			);
 			this.populateMarkers(filteredMerchants, this.merchantMarkers);
+			this.listOfMerchants = this.setSort(
+				filteredMerchants.map((mer) => mer.name)
+			);
 		} else {
 			this.deleteMarkerStorage(this.merchantMarkers);
 			this.populateMarkers(this.merchants, this.merchantMarkers);
@@ -128,6 +123,12 @@ export class WarehouseTrackComponent implements OnInit {
 					getCountryName(mer.geoLocation.countryId) ===
 					this.merchantCountry
 			);
+			this.listOfCities = this.setSort(
+				filteredMerchants.map((mer) => mer.geoLocation.city)
+			);
+			this.listOfMerchants = this.setSort(
+				filteredMerchants.map((mer) => mer.name)
+			);
 			this.populateMarkers(filteredMerchants, this.merchantMarkers);
 		} else {
 			this.deleteMarkerStorage(this.merchantMarkers);
@@ -143,7 +144,7 @@ export class WarehouseTrackComponent implements OnInit {
 			);
 			const storeIcon = environment.MAP_MERCHANT_ICON_LINK;
 			const marker = this.addMarker(coords, this.map, storeIcon);
-			markerStorage.push(marker);
+			markerStorage.push({ marker, id: mer.id });
 		});
 	}
 
@@ -153,17 +154,25 @@ export class WarehouseTrackComponent implements OnInit {
 				mer.geoLocation.loc.coordinates[1],
 				mer.geoLocation.loc.coordinates[0]
 			);
-
-			const oldCoords = markerStorage[index].position;
-			if (!newCoords.equals(oldCoords)) {
-				markerStorage[index].setPosition(newCoords);
+			let markerIndex;
+			const oldCoords = markerStorage.find((marker, i) => {
+				if (marker.id === mer.id) {
+					markerIndex = i;
+					return true;
+				} else {
+					return false;
+				}
+			});
+			console.log(markerIndex);
+			if (!newCoords.equals(oldCoords.marker.position)) {
+				markerStorage[index].marker.setPosition(newCoords);
 			}
 		});
 	}
 
 	deleteMarkerStorage(markerStorage) {
 		markerStorage.forEach((mar) => {
-			mar.setMap(null);
+			mar.marker.setMap(null);
 		});
 		markerStorage = [];
 	}

From 8d502d07cc151a9992b28e98d85a04a9877e39b2 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Mon, 27 May 2019 16:39:14 +0300
Subject: [PATCH 331/382] feat(ever-admin): improved Payments step, save data
 for "PayPal" payment gateway as part of field "paymentGateways" in DB on
 Warehouse EV-1192

---
 .../payPal-gateway.component.ts               | 25 ++++++++++++++++++-
 .../payment-gateways.component.ts             |  5 ++++
 .../stripe-gateway.component.ts               |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
index 12826812c..c2d80d60a 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
@@ -1,15 +1,20 @@
-import { Component, Input, OnChanges } from '@angular/core';
+import { Component, Input, OnChanges, ViewChild } from '@angular/core';
 import PaymentGateways, {
 	paymentGatewaysToString
 } from '@modules/server.common/enums/PaymentGateways';
 import { Country } from '@modules/server.common/entities';
 import { countriesDefaultCurrencies } from '@modules/server.common/entities/Currency';
+import { NgForm } from '@angular/forms';
+import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaymentGateway';
 
 @Component({
 	selector: 'ea-payPal-gateway',
 	templateUrl: './payPal-gateway.component.html'
 })
 export class PayPalGatewayComponent implements OnChanges {
+	@ViewChild('payPalConfigForm')
+	payPalConfigForm: NgForm;
+
 	isPayPalEnabled: boolean;
 	name = paymentGatewaysToString(PaymentGateways.PayPal);
 	logo = 'https://avatars1.githubusercontent.com/u/476675?s=200&v=4';
@@ -32,9 +37,27 @@ export class PayPalGatewayComponent implements OnChanges {
 	get isFormValid(): boolean {
 		let isValid = false;
 
+		if (this.payPalConfigForm) {
+			isValid =
+				(this.payPalConfigForm.touched ||
+					this.payPalConfigForm.dirty) &&
+				this.payPalConfigForm.valid;
+		}
+
 		return isValid;
 	}
 
+	get createObject(): IPaymentGatewayCreateObject | null {
+		if (!this.isFormValid || !this.isPayPalEnabled) {
+			return null;
+		}
+
+		return {
+			paymentGateway: PaymentGateways.PayPal,
+			configureObject: this.configModel
+		};
+	}
+
 	ngOnChanges(): void {
 		const defaultCurrency =
 			countriesDefaultCurrencies[
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index 120feae57..07d34bdc5 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -58,11 +58,16 @@ export class PaymentGatewaysComponent {
 		const paymentsGateways = [];
 
 		const stripeGatewayCreateObject = this.stripeGateway.createObject;
+		const payPalGatewayCreateObject = this.payPalGateway.createObject;
 
 		if (stripeGatewayCreateObject) {
 			paymentsGateways.push(stripeGatewayCreateObject);
 		}
 
+		if (payPalGatewayCreateObject) {
+			paymentsGateways.push(payPalGatewayCreateObject);
+		}
+
 		return paymentsGateways;
 	}
 
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index 1dd0a42c1..4c86bae0d 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -52,7 +52,7 @@ export class StripeGatewayComponent implements OnChanges {
 	}
 
 	get createObject(): IPaymentGatewayCreateObject | null {
-		if (!this.isFormValid) {
+		if (!this.isFormValid || !this.isStripeEnabled) {
 			return null;
 		}
 

From 0c72ac2ab136920dff5e8171c40170b5a39aa61e Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Tue, 28 May 2019 09:57:33 +0300
Subject: [PATCH 332/382] feat(ever-admin): tr store mutation form

---
 .../contact-info/contact-info-form.component.html    | 12 ++++++++++--
 admin/website-angular/src/assets/i18n/bg.json        |  4 ++++
 admin/website-angular/src/assets/i18n/en.json        |  4 ++++
 admin/website-angular/src/assets/i18n/he.json        |  4 ++++
 admin/website-angular/src/assets/i18n/ru.json        |  4 ++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html
index c9b54114f..1dbbfbb59 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/contact-info/contact-info-form.component.html
@@ -68,8 +68,12 @@
 				<nb-checkbox
 					[value]="forwardingEmail"
 					(change)="forwardingEmailChange()"
-					>Order Forwarding Email</nb-checkbox
 				>
+					{{
+						'WAREHOUSE_VIEW.MUTATION.CONTACT_INFO_TAB.ORDER_FORWARDING_EMAIL'
+							| translate
+					}}
+				</nb-checkbox>
 				<input
 					*ngIf="forwardingEmail"
 					type="email"
@@ -106,8 +110,12 @@
 				<nb-checkbox
 					[value]="forwardingPhone"
 					(change)="forwardingPhoneChange()"
-					>Order Forwarding Phone</nb-checkbox
 				>
+					{{
+						'WAREHOUSE_VIEW.MUTATION.CONTACT_INFO_TAB.ORDER_FORWARDING_PHONE'
+							| translate
+					}}
+				</nb-checkbox>
 				<input
 					*ngIf="forwardingPhone"
 					type="text"
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index e4ea9a680..ab327cd95 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -437,6 +437,10 @@
 				"BASIC_INFO": "Основна информация",
 				"CONTACT_INFO": "Информация за контакт",
 				"LOCATION": "Местоположение"
+			},
+			"CONTACT_INFO_TAB": {
+				"ORDER_FORWARDING_EMAIL": "Поръчка за изпращане на имейл",
+				"ORDER_FORWARDING_PHONE": "телефон за обратна връзка"
 			}
 		},
 		"NEW_PRODUCT": {
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index c47c0602a..4cb6c2488 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -434,6 +434,10 @@
 				"BASIC_INFO": "Basic Info",
 				"CONTACT_INFO": "Contact Info",
 				"LOCATION": "Location"
+			},
+			"CONTACT_INFO_TAB": {
+				"ORDER_FORWARDING_EMAIL": "Order Forwarding Email",
+				"ORDER_FORWARDING_PHONE": "Order Forwarding Phone"
 			}
 		},
 		"NEW_PRODUCT": {
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 9a3950fda..41d6770c9 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -436,6 +436,10 @@
 				"BASIC_INFO": "מידע בסיסי",
 				"CONTACT_INFO": "פרטים ליצירת קשר",
 				"LOCATION": "מקום"
+			},
+			"CONTACT_INFO_TAB": {
+				"ORDER_FORWARDING_EMAIL": "סדר העברת דואר אלקטרוני",
+				"ORDER_FORWARDING_PHONE": "הזמנת טלפון העברה"
 			}
 		},
 		"NEW_PRODUCT": {
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index bfc4b28ec..62138a9e7 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -436,6 +436,10 @@
 				"BASIC_INFO": "Базовая информация",
 				"CONTACT_INFO": "Контактная информация",
 				"LOCATION": "Место нахождения"
+			},
+			"CONTACT_INFO_TAB": {
+				"ORDER_FORWARDING_EMAIL": "Пересылка заказа по электронной почте",
+				"ORDER_FORWARDING_PHONE": "Заказать переадресацию телефона"
 			}
 		},
 		"NEW_PRODUCT": {

From 6db8334319a493284caa5d1e1748f75cd04d6824 Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Tue, 28 May 2019 12:05:38 +0300
Subject: [PATCH 333/382] feat(ever-admin): finished map filtering

---
 .../warehouse-track.component.ts              | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index 4793ae391..03dd344c5 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -52,15 +52,9 @@ export class WarehouseTrackComponent implements OnInit {
 					);
 					this.populateMarkers(store, this.merchantMarkers);
 				} else if (store.length === this.merchantMarkers.length) {
-					this.updateMarkers(store, this.merchantMarkers);
+					this.updateMarkers(store);
 				} else {
-					console.log(this.merchantMarkers);
-					this.updateMarkers(
-						store.filter((mer) =>
-							this.listOfMerchants.includes(mer.name)
-						),
-						this.merchantMarkers
-					);
+					this.updateMarkers(store);
 				}
 			});
 	}
@@ -82,13 +76,13 @@ export class WarehouseTrackComponent implements OnInit {
 		if (event) {
 			this.merchantName = event;
 
-			this.deleteMarkerStorage(this.merchantMarkers);
+			this.deleteMarkerStorage();
 			const filteredMerchants = this.merchants.filter(
 				(mer) => mer.name === this.merchantName
 			);
 			this.populateMarkers(filteredMerchants, this.merchantMarkers);
 		} else {
-			this.deleteMarkerStorage(this.merchantMarkers);
+			this.deleteMarkerStorage();
 			this.populateMarkers(this.merchants, this.merchantMarkers);
 		}
 	}
@@ -97,7 +91,7 @@ export class WarehouseTrackComponent implements OnInit {
 		if (event) {
 			this.merchantCity = event;
 			this.merchantName = undefined;
-			this.deleteMarkerStorage(this.merchantMarkers);
+			this.deleteMarkerStorage();
 			const filteredMerchants = this.merchants.filter(
 				(mer) => mer.geoLocation.city === this.merchantCity
 			);
@@ -106,7 +100,7 @@ export class WarehouseTrackComponent implements OnInit {
 				filteredMerchants.map((mer) => mer.name)
 			);
 		} else {
-			this.deleteMarkerStorage(this.merchantMarkers);
+			this.deleteMarkerStorage();
 			this.populateMarkers(this.merchants, this.merchantMarkers);
 		}
 	}
@@ -116,8 +110,7 @@ export class WarehouseTrackComponent implements OnInit {
 			this.merchantCountry = event;
 			this.merchantCity = undefined;
 			this.merchantName = undefined;
-
-			this.deleteMarkerStorage(this.merchantMarkers);
+			this.deleteMarkerStorage();
 			const filteredMerchants = this.merchants.filter(
 				(mer) =>
 					getCountryName(mer.geoLocation.countryId) ===
@@ -131,7 +124,7 @@ export class WarehouseTrackComponent implements OnInit {
 			);
 			this.populateMarkers(filteredMerchants, this.merchantMarkers);
 		} else {
-			this.deleteMarkerStorage(this.merchantMarkers);
+			this.deleteMarkerStorage();
 			this.populateMarkers(this.merchants, this.merchantMarkers);
 		}
 	}
@@ -148,33 +141,36 @@ export class WarehouseTrackComponent implements OnInit {
 		});
 	}
 
-	updateMarkers(merchantArray: Warehouse[], markerStorage: any[]) {
+	updateMarkers(merchantArray: Warehouse[]) {
 		merchantArray.forEach((mer, index) => {
 			const newCoords = new google.maps.LatLng(
 				mer.geoLocation.loc.coordinates[1],
 				mer.geoLocation.loc.coordinates[0]
 			);
 			let markerIndex;
-			const oldCoords = markerStorage.find((marker, i) => {
-				if (marker.id === mer.id) {
+			const marker = this.merchantMarkers.find((markerItem, i) => {
+				if (markerItem.id === mer.id) {
 					markerIndex = i;
 					return true;
 				} else {
 					return false;
 				}
 			});
-			console.log(markerIndex);
-			if (!newCoords.equals(oldCoords.marker.position)) {
-				markerStorage[index].marker.setPosition(newCoords);
+			if (marker) {
+				if (!newCoords.equals(marker.marker.getPosition())) {
+					this.merchantMarkers[markerIndex].marker.setPosition(
+						newCoords
+					);
+				}
 			}
 		});
 	}
 
-	deleteMarkerStorage(markerStorage) {
-		markerStorage.forEach((mar) => {
+	deleteMarkerStorage() {
+		this.merchantMarkers.forEach((mar) => {
 			mar.marker.setMap(null);
 		});
-		markerStorage = [];
+		this.merchantMarkers = [];
 	}
 
 	addMarker(position, map, icon) {

From 8ce41bd6bf46720471939f7f9161d523e0b5eb44 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Tue, 28 May 2019 12:19:31 +0300
Subject: [PATCH 334/382] feat(ever-admin): tr setup merchant payment stripe
 EV-1198

---
 .../stripe-gateway.component.html             | 74 +++++++++++++++----
 .../stripe-gateway.component.ts               | 25 +++++++
 admin/website-angular/src/assets/i18n/bg.json | 17 ++++-
 admin/website-angular/src/assets/i18n/en.json | 17 ++++-
 admin/website-angular/src/assets/i18n/he.json | 17 ++++-
 admin/website-angular/src/assets/i18n/ru.json | 17 ++++-
 6 files changed, 147 insertions(+), 20 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
index 74303d003..d398d093a 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.html
@@ -11,7 +11,10 @@
 	<div class="row m-0">
 		<div class="form-group col-md-6">
 			<label for="payButtontext">
-				Pay Button text
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.PAY_BUTTON_TEXT'
+						| translate
+				}}
 			</label>
 			<input
 				nbInput
@@ -19,7 +22,10 @@
 				class="form-control"
 				id="payButtontext"
 				name="pay-button-text"
-				placeholder="Pay Button text"
+				placeholder="{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.PAY_BUTTON_TEXT'
+						| translate
+				}}"
 				[(ngModel)]="configModel.payButtontext"
 				#payButtontext="ngModel"
 				[ngClass]="{
@@ -40,14 +46,20 @@
 				"
 			>
 				<span *ngIf="payButtontext.errors.required">
-					Pay Button text is required
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.PAY_BUTTON_TEXT_IS_REQUIRED'
+							| translate
+					}}
 				</span>
 			</small>
 		</div>
 
 		<div class="form-group col-md-6">
 			<label for="currency">
-				Currency
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.CURRENCY'
+						| translate
+				}}
 			</label>
 			<select
 				#currency="ngModel"
@@ -56,8 +68,11 @@
 				class="form-control"
 				required
 			>
-				<option value="" disabled selected hidden
-					>Choose currency code</option
+				<option value="" disabled selected hidden>
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.CHOOSE_CURRENCY_CODE'
+							| translate
+					}}</option
 				>
 				<option
 					*ngFor="let code of currenciesCodes"
@@ -70,7 +85,10 @@
 				*ngIf="currency.invalid && (currency.dirty || currency.touched)"
 			>
 				<span *ngIf="currency.errors.required">
-					Currency text is required
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.CURRENCY_TEXT_IS_REQUIRED'
+							| translate
+					}}
 				</span>
 			</small>
 		</div>
@@ -79,11 +97,14 @@
 	<div class="row mt-0 mr-0 ml-0 form-group">
 		<div class="col-md-12">
 			<label for="logo">
-				Company brand logo
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.CURRENCY_TEXT_IS_REQUIRED'
+						| translate
+				}}
 			</label>
 			<e-cu-file-uploader
 				#fileUploader
-				[placeholder]="'Company brand logo'"
+				[placeholder]="COMPANY_BRAND_LOGO"
 				[fileUrl]="configModel.companyBrandLogo"
 				(uploadedImgUrl)="configModel.companyBrandLogo = $event"
 				[customClass]="
@@ -105,11 +126,17 @@
 				"
 			>
 				<span *ngIf="configModel.companyBrandLogo === ''">
-					Company brand logo is required
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.COMPANY_BRAND_LOGO_IS_REQUIRED'
+							| translate
+					}}
 				</span>
 
 				<span *ngIf="invalidUrl && configModel.companyBrandLogo !== ''">
-					Invalid logo url
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.INVALID_LOGO_URL'
+							| translate
+					}}
 				</span>
 			</small>
 		</div>
@@ -130,7 +157,10 @@
 					<div class="remove-icon" (click)="deleteImg()">
 						<span
 							class="ion-md-remove-circle text-danger pl-2"
-							title="Remove"
+							title="{{
+								'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.REMOVE'
+									| translate
+							}}"
 						></span>
 					</div>
 				</div>
@@ -141,7 +171,10 @@
 	<div class="row m-0">
 		<div class="form-group col-md-12">
 			<label for="publishableKey">
-				Publishable key
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.PUBLISHABLE_KEY'
+						| translate
+				}}
 			</label>
 			<input
 				nbInput
@@ -149,7 +182,10 @@
 				class="form-control"
 				id="publishableKey"
 				name="publishable-key"
-				placeholder="Publishable key"
+				placeholder="{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.PUBLISHABLE_KEY'
+						| translate
+				}}"
 				[(ngModel)]="configModel.publishableKey"
 				#publishableKey="ngModel"
 				[ngClass]="{
@@ -170,7 +206,10 @@
 				"
 			>
 				<span *ngIf="publishableKey.errors.required">
-					Publishable key is required
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.PUBLISHABLE_KEY_IS_REQUIRED'
+							| translate
+					}}
 				</span>
 			</small>
 		</div>
@@ -182,7 +221,10 @@
 				name="remember-me"
 				[(ngModel)]="configModel.allowRememberMe"
 			>
-				Allow remember me?
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.ALLOW_REMEMBER_ME'
+						| translate
+				}}
 			</nb-checkbox>
 		</div>
 	</div>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index 4c86bae0d..8927088b7 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -6,6 +6,9 @@ import { Country } from '@modules/server.common/entities';
 import { countriesDefaultCurrencies } from '@modules/server.common/entities/Currency';
 import { NgForm } from '@angular/forms';
 import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaymentGateway';
+import { TranslateService } from '@ngx-translate/core';
+import { takeUntil } from 'rxjs/operators';
+import { Subject } from 'rxjs';
 
 @Component({
 	selector: 'ea-stripe-gateway',
@@ -20,6 +23,11 @@ export class StripeGatewayComponent implements OnChanges {
 	logo = 'https://stripe.com/img/v3/home/twitter.png';
 	invalidUrl: boolean;
 
+	private _ngDestroy$ = new Subject<void>();
+
+	COMPANY_BRAND_LOGO =
+		'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.STRIPE.COMPANY_BRAND_LOGO';
+
 	@Input()
 	currenciesCodes: string[] = [];
 	@Input()
@@ -29,6 +37,18 @@ export class StripeGatewayComponent implements OnChanges {
 		this.configModel.companyBrandLogo = logo;
 	}
 
+	constructor(private translateService: TranslateService) {
+		// https://github.com/ngx-translate/core/issues/835
+		// see how to translate words in the component(.ts) file
+
+		translateService
+			.stream(this.COMPANY_BRAND_LOGO)
+			.pipe(takeUntil(this._ngDestroy$))
+			.subscribe((text: string) => {
+				this.COMPANY_BRAND_LOGO = text;
+			});
+	}
+
 	configModel = {
 		payButtontext: '',
 		currency: '',
@@ -74,4 +94,9 @@ export class StripeGatewayComponent implements OnChanges {
 	deleteImg() {
 		this.configModel.companyBrandLogo = '';
 	}
+
+	ngOnDestroy() {
+		this._ngDestroy$.next();
+		this._ngDestroy$.complete();
+	}
 }
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index ab327cd95..1d96c26f4 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -277,7 +277,22 @@
 			},
 			"PAYMENTS": {
 				"PAYMENTS": "Плащания",
-				"ALLOW_ONLINE_PAYMENT": "Разрешаване на онлайн плащания?"
+				"ALLOW_ONLINE_PAYMENT": "Разрешаване на онлайн плащания?",
+				"STRIPE": {
+					"PAY_BUTTON_TEXT": "Текст на бутона за плащане",
+					"CURRENCY": "Валута",
+					"PAY_BUTTON_TEXT_IS_REQUIRED": "Изисква се текст на бутон за плащане",
+					"CHOOSE_CURRENCY_CODE": "Изберете кода на валутата",
+					"CURRENCY_TEXT_IS_REQUIRED": "Изберете кода на валутата",
+					"COMPANY_BRAND_LOGO": "Лого на фирмената марка",
+					"COMPANY_BRAND_LOGO_IS_REQUIRED": "Изисква се лого на фирмената марка",
+					"INVALID_LOGO_URL": "Невалиден URL адрес на логото",
+					"INVALID_LOGO": "Невалидно лого",
+					"PUBLISHABLE_KEY": "Публикуван ключ",
+					"PUBLISHABLE_KEY_IS_REQUIRED": "Изисква се издателски ключ",
+					"ALLOW_REMEMBER_ME": "Нека ме запамети?",
+					"REMOVE": "Премахни"
+				}
 			},
 			"MANUFACTURING": {
 				"MANUFACTURING": "Производство",
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 4cb6c2488..4f5d8cbd2 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -276,7 +276,22 @@
 			},
 			"PAYMENTS": {
 				"PAYMENTS": "Payments",
-				"ALLOW_ONLINE_PAYMENT": "Allow online payments?"
+				"ALLOW_ONLINE_PAYMENT": "Allow online payments?",
+				"STRIPE": {
+					"PAY_BUTTON_TEXT": "Pay Button text",
+					"CURRENCY": "Currency",
+					"PAY_BUTTON_TEXT_IS_REQUIRED": "Pay Button text is required",
+					"CHOOSE_CURRENCY_CODE": "Choose currency code",
+					"CURRENCY_TEXT_IS_REQUIRED": "Currency text is required",
+					"COMPANY_BRAND_LOGO": "Company brand logo",
+					"COMPANY_BRAND_LOGO_IS_REQUIRED": "Company brand logo is required",
+					"INVALID_LOGO_URL": "Invalid logo url",
+					"INVALID_LOGO": "Invalid logo",
+					"PUBLISHABLE_KEY": "Publishable key",
+					"PUBLISHABLE_KEY_IS_REQUIRED": "Publishable key is required",
+					"ALLOW_REMEMBER_ME": "Allow remember me?",
+					"REMOVE": "Remove"
+				}
 			},
 			"MANUFACTURING": {
 				"MANUFACTURING": "Manufacturing",
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 41d6770c9..b45a2744a 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -276,7 +276,22 @@
 			},
 			"PAYMENTS": {
 				"PAYMENTS": "תשלומים",
-				"ALLOW_ONLINE_PAYMENT": "האם לאפשר תשלומים מקוונים?"
+				"ALLOW_ONLINE_PAYMENT": "האם לאפשר תשלומים מקוונים?",
+				"STRIPE": {
+					"PAY_BUTTON_TEXT": "טקסט של לחצן 'תשלום'",
+					"CURRENCY": "מטבע",
+					"PAY_BUTTON_TEXT_IS_REQUIRED": "יש צורך בטקסט של לחצן שלם",
+					"CHOOSE_CURRENCY_CODE": "בחר קוד מטבע",
+					"CURRENCY_TEXT_IS_REQUIRED": "טקסט מטבע נדרש",
+					"COMPANY_BRAND_LOGO": "לוגו מותג החברה",
+					"COMPANY_BRAND_LOGO_IS_REQUIRED": "הלוגו של מותג החברה נדרש",
+					"INVALID_LOGO_URL": "כתובת אתר של לוגו לא חוקית",
+					"INVALID_LOGO": "לוגו לא חוקי",
+					"PUBLISHABLE_KEY": "מפתח ניתן לפרסום",
+					"PUBLISHABLE_KEY_IS_REQUIRED": "נדרש מפתח לפרסום",
+					"ALLOW_REMEMBER_ME": "אתה זוכר אותי?",
+					"REMOVE": "הסר"
+				}
 			},
 			"MANUFACTURING": {
 				"MANUFACTURING": "ייצור",
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 62138a9e7..cdb310758 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -276,7 +276,22 @@
 			},
 			"PAYMENTS": {
 				"PAYMENTS": "Плащания",
-				"ALLOW_ONLINE_PAYMENT": "Разрешаване на онлайн плащания?"
+				"ALLOW_ONLINE_PAYMENT": "Разрешаване на онлайн плащания?",
+				"STRIPE": {
+					"PAY_BUTTON_TEXT": "Текст кнопки оплаты",
+					"CURRENCY": "валюта",
+					"PAY_BUTTON_TEXT_IS_REQUIRED": "Текст кнопки оплаты требуется",
+					"CHOOSE_CURRENCY_CODE": "Выберите код валюты",
+					"CURRENCY_TEXT_IS_REQUIRED": "Текст валюты требуется",
+					"COMPANY_BRAND_LOGO": "Логотип бренда компании",
+					"COMPANY_BRAND_LOGO_IS_REQUIRED": "Требуется логотип компании",
+					"INVALID_LOGO_URL": "Неверный URL-адрес логотипа",
+					"INVALID_LOGO": "Неверный логотип",
+					"PUBLISHABLE_KEY": "Публикуемый ключ",
+					"PUBLISHABLE_KEY_IS_REQUIRED": "Требуется публикуемый ключ",
+					"ALLOW_REMEMBER_ME": "Разрешить запомнить меня?",
+					"REMOVE": "Удалить"
+				}
 			},
 			"MANUFACTURING": {
 				"MANUFACTURING": "Производство",

From 61d0a22d050b174a04bbd30bb0a4ea6b0332a2a2 Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Tue, 28 May 2019 13:28:55 +0300
Subject: [PATCH 335/382] feat(ever-admin): tr setup merchant payment PayPal
 EV-1198

---
 .../payPal-gateway.component.html             | 80 ++++++++++++++-----
 admin/website-angular/src/assets/i18n/bg.json | 14 ++++
 admin/website-angular/src/assets/i18n/en.json | 14 ++++
 admin/website-angular/src/assets/i18n/he.json | 14 ++++
 admin/website-angular/src/assets/i18n/ru.json | 14 ++++
 5 files changed, 116 insertions(+), 20 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
index b106a6e53..ed7cf47fb 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.html
@@ -11,7 +11,9 @@
 	<div class="row m-0">
 		<div class="form-group col-md-6">
 			<label for="mode">
-				Mode
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.MODE' | translate
+				}}
 			</label>
 			<select
 				#mode="ngModel"
@@ -20,18 +22,25 @@
 				class="form-control"
 				required
 			>
-				<option value="" disabled selected hidden
-					>Choose PayPal mode</option
-				>
-				<option *ngFor="let type of payPalTypes" value="{{ type }}">{{
-					type
+				<option value="" disabled selected hidden>{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.CHOOSE_PAYPAL_MODE'
+						| translate
 				}}</option>
+				<option *ngFor="let type of payPalTypes" value="{{ type }}">
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.TYPE'
+							| translate
+					}}
+				</option>
 			</select>
 		</div>
 
 		<div class="form-group col-md-6">
 			<label for="currency">
-				Currency
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.CURRENCY'
+						| translate
+				}}
 			</label>
 			<select
 				#currency="ngModel"
@@ -40,9 +49,10 @@
 				class="form-control"
 				required
 			>
-				<option value="" disabled selected hidden
-					>Choose currency code</option
-				>
+				<option value="" disabled selected hidden>{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.CHOOSE_CURRENCY_CODE'
+						| translate
+				}}</option>
 				<option
 					*ngFor="let code of currenciesCodes"
 					value="{{ code }}"
@@ -54,7 +64,10 @@
 				*ngIf="currency.invalid && (currency.dirty || currency.touched)"
 			>
 				<span *ngIf="currency.errors.required">
-					Currency text is required
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.CURRENCY_TEXT_IS_REQUIRED'
+							| translate
+					}}
 				</span>
 			</small>
 		</div>
@@ -63,7 +76,10 @@
 	<div class="row m-0">
 		<div class="form-group col-md-12">
 			<label for="publishableKey">
-				Publishable key
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.PUBLISHABLE_KEY'
+						| translate
+				}}
 			</label>
 			<input
 				nbInput
@@ -71,7 +87,10 @@
 				class="form-control"
 				id="publishableKey"
 				name="publishable-key"
-				placeholder="Publishable key"
+				placeholder="{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.PUBLISHABLE_KEY'
+						| translate
+				}}"
 				[(ngModel)]="configModel.publishableKey"
 				#publishableKey="ngModel"
 				[ngClass]="{
@@ -92,7 +111,10 @@
 				"
 			>
 				<span *ngIf="publishableKey.errors.required">
-					Publishable key is required
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.PUBLISHABLE_KEY_IS_REQUIRED'
+							| translate
+					}}
 				</span>
 			</small>
 		</div>
@@ -101,7 +123,10 @@
 	<div class="row m-0">
 		<div class="form-group col-md-12">
 			<label for="secretKey">
-				Secret key
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.SECRET_KEY'
+						| translate
+				}}
 			</label>
 			<input
 				nbInput
@@ -109,7 +134,10 @@
 				class="form-control"
 				id="secretKey"
 				name="secret-key"
-				placeholder="Secret key"
+				placeholder="{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.SECRET_KEY'
+						| translate
+				}}"
 				[(ngModel)]="configModel.secretKey"
 				#secretKey="ngModel"
 				[ngClass]="{
@@ -129,7 +157,10 @@
 				"
 			>
 				<span *ngIf="secretKey.errors.required">
-					Secret key is required
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.SECRET_KEY_IS_REQUIRED'
+							| translate
+					}}
 				</span>
 			</small>
 		</div>
@@ -138,7 +169,10 @@
 	<div class="row m-0">
 		<div class="form-group col-md-12">
 			<label for="description">
-				Payment description
+				{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.PAYMENT_DESCRIPTION'
+						| translate
+				}}
 			</label>
 			<input
 				nbInput
@@ -146,7 +180,10 @@
 				class="form-control"
 				id="description"
 				name="description"
-				placeholder="Payment description"
+				placeholder="{{
+					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.PAYMENT_DESCRIPTION'
+						| translate
+				}}"
 				[(ngModel)]="configModel.description"
 				#description="ngModel"
 				[ngClass]="{
@@ -167,7 +204,10 @@
 				"
 			>
 				<span *ngIf="description.errors.required">
-					Payment description is required
+					{{
+						'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.PAYPAL.PAYMENT_DESCRIPTION_IS_REQUIRED'
+							| translate
+					}}
 				</span>
 			</small>
 		</div>
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 1d96c26f4..3a98a35a5 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -292,6 +292,20 @@
 					"PUBLISHABLE_KEY_IS_REQUIRED": "Изисква се издателски ключ",
 					"ALLOW_REMEMBER_ME": "Нека ме запамети?",
 					"REMOVE": "Премахни"
+				},
+				"PAYPAL": {
+					"MODE": "Метод",
+					"CHOOSE_PAYPAL_MODE": "Избери PayPal метод",
+					"TYPE": "тип",
+					"CURRENCY": "Валута",
+					"CHOOSE_CURRENCY_CODE": "Изберете кода на валутата",
+					"CURRENCY_TEXT_IS_REQUIRED": "Необходим е текст на валутата",
+					"PUBLISHABLE_KEY": "Публикуван ключ",
+					"PUBLISHABLE_KEY_IS_REQUIRED": "Изисква се публичен ключ",
+					"SECRET_KEY": "Тайният ключ",
+					"SECRET_KEY_IS_REQUIRED": "Изисква се секретен ключ",
+					"PAYMENT_DESCRIPTION": "Описание на плащането",
+					"PAYMENT_DESCRIPTION_IS_REQUIRED": "Изисква се описание на плащането"
 				}
 			},
 			"MANUFACTURING": {
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 4f5d8cbd2..ea7d0f3f7 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -291,6 +291,20 @@
 					"PUBLISHABLE_KEY_IS_REQUIRED": "Publishable key is required",
 					"ALLOW_REMEMBER_ME": "Allow remember me?",
 					"REMOVE": "Remove"
+				},
+				"PAYPAL": {
+					"MODE": "Mode",
+					"CHOOSE_PAYPAL_MODE": "Choose PayPal mode",
+					"TYPE": "type",
+					"CURRENCY": "Currency",
+					"CHOOSE_CURRENCY_CODE": "Choose currency code",
+					"CURRENCY_TEXT_IS_REQUIRED": "Currency text is required",
+					"PUBLISHABLE_KEY": "Publishable key",
+					"PUBLISHABLE_KEY_IS_REQUIRED": "Publishable key is required",
+					"SECRET_KEY": "Secret key",
+					"SECRET_KEY_IS_REQUIRED": "Secret key is required",
+					"PAYMENT_DESCRIPTION": "Payment description",
+					"PAYMENT_DESCRIPTION_IS_REQUIRED": "Payment description is required"
 				}
 			},
 			"MANUFACTURING": {
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index b45a2744a..84eb77b22 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -291,6 +291,20 @@
 					"PUBLISHABLE_KEY_IS_REQUIRED": "נדרש מפתח לפרסום",
 					"ALLOW_REMEMBER_ME": "אתה זוכר אותי?",
 					"REMOVE": "הסר"
+				},
+				"PAYPAL": {
+					"MODE": "מצב",
+					"CHOOSE_PAYPAL_MODE": "בחר במצב PayPal",
+					"TYPE": "הקלד",
+					"CURRENCY": "מטבע",
+					"CHOOSE_CURRENCY_CODE": "בחר קוד מטבע",
+					"CURRENCY_TEXT_IS_REQUIRED": "טקסט מטבע נדרש",
+					"PUBLISHABLE_KEY": "מפתח ניתן לפרסום",
+					"PUBLISHABLE_KEY_IS_REQUIRED": "נדרש מפתח לפרסום",
+					"SECRET_KEY": "מפתח סודי",
+					"SECRET_KEY_IS_REQUIRED": "נדרש מפתח סודי",
+					"PAYMENT_DESCRIPTION": "תיאור התשלום",
+					"PAYMENT_DESCRIPTION_IS_REQUIRED": "תיאור התשלום נדרש"
 				}
 			},
 			"MANUFACTURING": {
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index cdb310758..915a1e201 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -291,6 +291,20 @@
 					"PUBLISHABLE_KEY_IS_REQUIRED": "Требуется публикуемый ключ",
 					"ALLOW_REMEMBER_ME": "Разрешить запомнить меня?",
 					"REMOVE": "Удалить"
+				},
+				"PAYPAL": {
+					"MODE": "Режим",
+					"CHOOSE_PAYPAL_MODE": "Выберите режим PayPal",
+					"TYPE": "тип",
+					"CURRENCY": "валюта",
+					"CHOOSE_CURRENCY_CODE": "Выберите код валюты",
+					"CURRENCY_TEXT_IS_REQUIRED": "Текст валюты требуется",
+					"PUBLISHABLE_KEY": "Публикуемый ключ",
+					"PUBLISHABLE_KEY_IS_REQUIRED": "Требуется публикуемый ключ",
+					"SECRET_KEY": "Секретный ключ",
+					"SECRET_KEY_IS_REQUIRED": "Требуется секретный ключ",
+					"PAYMENT_DESCRIPTION": "Описание оплаты",
+					"PAYMENT_DESCRIPTION_IS_REQUIRED": "Требуется описание платежа"
 				}
 			},
 			"MANUFACTURING": {

From be48811a98a4e98a37ee2f61884f2e1485e2e34a Mon Sep 17 00:00:00 2001
From: blagovest <blaje@abv.bg>
Date: Tue, 28 May 2019 14:29:32 +0300
Subject: [PATCH 336/382] feat(ever-admin): tr track carrier page EV-1229

---
 .../carrier-tracking.component.html           | 30 +++++++++++++++----
 admin/website-angular/src/assets/i18n/bg.json |  6 +++-
 admin/website-angular/src/assets/i18n/en.json |  6 +++-
 admin/website-angular/src/assets/i18n/he.json |  6 +++-
 admin/website-angular/src/assets/i18n/ru.json |  6 +++-
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
index 38c9ef094..439a54978 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
@@ -112,15 +112,24 @@ <h5>
 									</h5>
 									<ul>
 										<li>
-											Phone:
+											{{
+												'CARRIERS_VIEW.TRACK_PAGE.PHONE'
+													| translate
+											}}:
 											{{ selectedStore.contactPhone }}
 										</li>
 										<li>
-											Email:
+											{{
+												'CARRIERS_VIEW.TRACK_PAGE.EMAIL'
+													| translate
+											}}:
 											{{ selectedStore.contactEmail }}
 										</li>
 										<li>
-											Address:
+											{{
+												'CARRIERS_VIEW.TRACK_PAGE.ADDRESS'
+													| translate
+											}}:
 											{{
 												selectedStore.geoLocation
 													.streetAddress
@@ -134,16 +143,25 @@ <h5>
 									</h5>
 									<ul>
 										<li>
-											Delivery Count:
+											{{
+												'CARRIERS_VIEW.TRACK_PAGE.DELIVERY_COUNT'
+													| translate
+											}}:
 											{{
 												selectedCarrier.numberOfDeliveries
 											}}
 										</li>
 										<li>
-											Phone: {{ selectedCarrier.phone }}
+											{{
+												'CARRIERS_VIEW.TRACK_PAGE.PHONE'
+													| translate
+											}}: {{ selectedCarrier.phone }}
 										</li>
 										<li>
-											Address:
+											{{
+												'CARRIERS_VIEW.TRACK_PAGE.ADDRESS'
+													| translate
+											}}:
 											{{
 												selectedCarrier.geoLocation
 													.streetAddress
diff --git a/admin/website-angular/src/assets/i18n/bg.json b/admin/website-angular/src/assets/i18n/bg.json
index 3a98a35a5..101cfc65e 100644
--- a/admin/website-angular/src/assets/i18n/bg.json
+++ b/admin/website-angular/src/assets/i18n/bg.json
@@ -885,7 +885,11 @@
 		},
 		"TRACK_PAGE": {
 			"TRACK_ALL_WORKING_CARRIERS": "Проследете всички работещи превозвачи",
-			"FILTER_CARRIERS": "Филтрирай превозвачите"
+			"FILTER_CARRIERS": "Филтрирай превозвачите",
+			"PHONE": "Телефон",
+			"EMAIL": "Эл. адрес",
+			"ADDRESS": "Адрес",
+			"DELIVERY_COUNT": "Счетчик доставки"
 		}
 	},
 	"PRODUCT_TYPE_VIEW": {
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index ea7d0f3f7..781c30739 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -884,7 +884,11 @@
 		},
 		"TRACK_PAGE": {
 			"TRACK_ALL_WORKING_CARRIERS": "Track all working carriers",
-			"FILTER_CARRIERS": "Filter Carriers"
+			"FILTER_CARRIERS": "Filter Carriers",
+			"PHONE": "Phone",
+			"EMAIL": "Email",
+			"ADDRESS": "Address",
+			"DELIVERY_COUNT": "Delivery Count"
 		}
 	},
 	"PRODUCT_TYPE_VIEW": {
diff --git a/admin/website-angular/src/assets/i18n/he.json b/admin/website-angular/src/assets/i18n/he.json
index 84eb77b22..dbb1efe59 100644
--- a/admin/website-angular/src/assets/i18n/he.json
+++ b/admin/website-angular/src/assets/i18n/he.json
@@ -884,7 +884,11 @@
 		},
 		"TRACK_PAGE": {
 			"TRACK_ALL_WORKING_CARRIERS": "עקוב אחר כל ספקי השירות",
-			"FILTER_CARRIERS": "מסנני מסננים"
+			"FILTER_CARRIERS": "מסנני מסננים",
+			"PHONE": "מכשיר טלפון",
+			"EMAIL": "דוא'ל",
+			"ADDRESS": "כתובת",
+			"DELIVERY_COUNT": "ספירת משלוח"
 		}
 	},
 	"PRODUCT_TYPE_VIEW": {
diff --git a/admin/website-angular/src/assets/i18n/ru.json b/admin/website-angular/src/assets/i18n/ru.json
index 915a1e201..d05ed51bb 100644
--- a/admin/website-angular/src/assets/i18n/ru.json
+++ b/admin/website-angular/src/assets/i18n/ru.json
@@ -881,7 +881,11 @@
 		},
 		"TRACK_PAGE": {
 			"TRACK_ALL_WORKING_CARRIERS": "Отслеживание всех работающих перевозчиков",
-			"FILTER_CARRIERS": "Фильтр-носители"
+			"FILTER_CARRIERS": "Фильтр-носители",
+			"PHONE": "Телефон",
+			"EMAIL": "Эл. адрес",
+			"ADDRESS": "Адрес",
+			"DELIVERY_COUNT": "Счетчик доставки"
 		}
 	},
 	"PRODUCT_TYPE_VIEW": {

From 5fc70bf9802c8ed94e4b151b253712b4ecececfd Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Wed, 29 May 2019 11:26:44 +0300
Subject: [PATCH 337/382] fix(ever-shop-mobile): fixed error on switch the
 delivery type

---
 .../src/app/pages/+products/products.page.ts       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/shop/mobile-ionic/src/app/pages/+products/products.page.ts b/shop/mobile-ionic/src/app/pages/+products/products.page.ts
index 8b71969b2..c8baaea6e 100644
--- a/shop/mobile-ionic/src/app/pages/+products/products.page.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/products.page.ts
@@ -9,13 +9,12 @@ import { Store } from '../../services/store.service';
 import { Router } from '@angular/router';
 import { IOrderCreateInput } from '@modules/server.common/routers/IWarehouseOrdersRouter';
 import { OrderPage } from './+order/order.page';
-import { NavController, ModalController } from '@ionic/angular';
+import { ModalController } from '@ionic/angular';
 import { environment } from 'environment';
 import GeoLocation from '@modules/server.common/entities/GeoLocation';
 import { GeoLocationService } from '../../services/geo-location';
 import RegistrationSystem from '@modules/server.common/enums/RegistrationSystem';
 import DeliveryType from '@modules/server.common/enums/DeliveryType';
-
 import { OrderTakeawayInfoPopup } from './+order/takeaway/popup/popup.component';
 import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehouse-router.service';
 import Warehouse from '@modules/server.common/entities/Warehouse';
@@ -42,7 +41,6 @@ export class ProductsPage implements OnInit, OnDestroy {
 	merchant: Warehouse;
 	productsCount: number;
 	$areProductsLoaded = new EventEmitter<boolean>();
-
 	changePage: boolean;
 
 	private readonly ngDestroy$ = new Subject<void>();
@@ -60,7 +58,6 @@ export class ProductsPage implements OnInit, OnDestroy {
 		private router: Router,
 		private modalController: ModalController,
 		private geoLocationService: GeoLocationService,
-		private navCtrl: NavController,
 		private warehouseRouter: WarehouseRouter,
 		private warehouseProductsService: WarehouseProductsService
 	) {
@@ -246,23 +243,28 @@ export class ProductsPage implements OnInit, OnDestroy {
 
 		this.lastLoadProductsCount = count;
 		this.lastImageOrientation = imageOrientation;
-		this.areProductsLoaded = false;
+
 		let merchantIds = environment['MERCHANT_IDS'];
+
 		if ((!merchantIds || merchantIds.length === 0) && this.inStore) {
 			merchantIds = [this.inStore];
 		}
 
 		await this.loadProductsCount(merchantIds, imageOrientation);
+
 		this.changePage = false;
 
 		if (this.productsCount > this.products.length) {
 			if (this.getOrdersGeoObj) {
+				this.areProductsLoaded = false;
+
 				const isDeliveryRequired =
 					this.store.deliveryType === DeliveryType.Delivery;
 				const isTakeaway =
 					this.store.deliveryType === DeliveryType.Takeaway;
 
 				let loadProducts = true;
+
 				this.geoLocationProductsService
 					.geoLocationProductsByPaging(
 						this.getOrdersGeoObj,
@@ -300,6 +302,7 @@ export class ProductsPage implements OnInit, OnDestroy {
 						}
 
 						loadProducts = false;
+						this.areProductsLoaded = true;
 					});
 			} else {
 				this.store.registrationSystem = RegistrationSystem.Once;
@@ -308,7 +311,6 @@ export class ProductsPage implements OnInit, OnDestroy {
 		}
 
 		this.$areProductsLoaded.emit();
-		this.areProductsLoaded = true;
 	}
 
 	private async loadProductsCount(

From 7be4de177fc64c4139095236a4d538e5a99eadd6 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Wed, 29 May 2019 23:15:22 +0300
Subject: [PATCH 338/382] Update CONTRIBUTING.md

---
 .github/CONTRIBUTING.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index d12150b7d..19592737a 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,6 +6,13 @@ We would love for you to contribute to Ever Platform!
 
 If you're changing the structure of the repository please create an issue first.
 
+By default, when you submitting contributions with Pull Requests, we require electronic submission of individual [Contributor Assignment Agreement (CAA)](https://gist.github.com/evereq/95f74ae09510766ffa9379006715ccfd). In some cases (when contributions are very small, at our discretion) instead of CAA we may accept submission of individual [Contributor License Agreement (CLA)](https://gist.github.com/evereq/53ddec283243481344fb61df1706ec40). 
+
+If you submitting contribution on behalf of some legal entity, you need to submit Entity Contributor Assignment Agreement (CAA) or Entity Contributor License Agreement (CLA), which you can request by sending us an email to legal@ever.co.
+
+We are using open-source [CLA assistant](https://github.com/cla-assistant/cla-assistant) project to collect your signatures on CAA.  
+The templates for our CAA/CLA documents generated by http://www.harmonyagreements.org.
+
 ## Submitting bug reports
 
 Make sure you are on latest changes.
@@ -19,6 +26,6 @@ You are more than welcome to submit future requests here https://github.com/ever
 
 This is an open source project.  
 Contributions you make to this public Ever Platform repository are completely voluntary.  
-When you submit an issue, bug report, question, enhancement, pull request, etc., you are offering your contribution without expectation of payment,
-you expressly waive any future pay claims against the Ever Co. LTD related to your contribution, and you acknowledge that this does not create an obligation on the part of the Ever Co. LTD of any kind.  
-Furthermore, your contributing to this project does not create an employer-employee relationship between the Ever Co. LTD and the contributor.
+When you submit an issue, bug report, question, enhancement, pull request, etc., you are offering your contribution without expectation of payment, you expressly waive any future pay claims against the Ever Co. LTD related to your contribution, and you acknowledge that this does not create an obligation on the part of the Ever Co. LTD of any kind. Furthermore, your contributing to this project does not create an employer-employee relationship between the Ever Co. LTD and the contributor.
+
+See also "Submitting Pull Requests" section above for more information on CAA/CLA, required for any contributions.

From 11bccdb53729f66cde1e79121421fdd5661fc442 Mon Sep 17 00:00:00 2001
From: AdemHodzic <athos.blade@gmail.com>
Date: Wed, 29 May 2019 22:33:26 +0200
Subject: [PATCH 339/382] Feature/ban user (#541)

* feat(ever-admin): basic impplementation done

* feat(ever-admin): first implementation done, expecting feedback

* refactor(ever-admin): cleaned up code

* refactor(ever-admin): missed a console.error

* refactor(ever-admin): missed a console.error
---
 .../src/app/@core/data/users.service.ts       | 36 +++++++++++++
 .../ban-confirm/ban-confirm.component.html    | 37 ++++++++++++++
 .../ban-confirm/ban-confirm.component.scss    |  0
 .../user/ban-confirm/ban-confirm.component.ts | 15 ++++++
 .../user/ban-confirm/ban-confirm.module.ts    | 11 ++++
 .../src/app/@shared/user/ban-confirm/index.ts |  2 +
 .../pages/+customers/customers.component.html | 16 ++++++
 .../pages/+customers/customers.component.ts   | 50 ++++++++++++++++++-
 .../app/pages/+customers/customers.module.ts  |  4 +-
 admin/website-angular/src/assets/i18n/en.json |  2 +
 .../api/src/graphql/users/user.resolver.ts    | 10 ++++
 .../api/src/graphql/users/users.types.graphql |  6 +++
 .../api/src/services/users/UsersService.ts    | 10 ++++
 shared/core/entities/User.ts                  | 10 ++++
 shared/core/interfaces/IUser.ts               |  1 +
 15 files changed, 207 insertions(+), 3 deletions(-)
 create mode 100644 admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html
 create mode 100644 admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.scss
 create mode 100644 admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.ts
 create mode 100644 admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.module.ts
 create mode 100644 admin/website-angular/src/app/@shared/user/ban-confirm/index.ts

diff --git a/admin/website-angular/src/app/@core/data/users.service.ts b/admin/website-angular/src/app/@core/data/users.service.ts
index 9275b6cd2..984e371ce 100644
--- a/admin/website-angular/src/app/@core/data/users.service.ts
+++ b/admin/website-angular/src/app/@core/data/users.service.ts
@@ -58,6 +58,7 @@ export class UsersService {
 							email
 							apartment
 							phone
+							isBanned
 							geoLocation {
 								countryId
 								city
@@ -94,6 +95,7 @@ export class UsersService {
 							email
 							apartment
 							phone
+							isBanned
 							geoLocation {
 								streetAddress
 								city
@@ -145,6 +147,40 @@ export class UsersService {
 		return res.data['registerUser'];
 	}
 
+	async banUser(id: string) {
+		return this._apollo
+			.mutate({
+				mutation: gql`
+					mutation BanUser($id: String!) {
+						banUser(id: $id) {
+							id
+							firstName
+							lastName
+						}
+					}
+				`,
+				variables: { id }
+			})
+			.toPromise();
+	}
+
+	async unbanUser(id: string) {
+		return this._apollo
+			.mutate({
+				mutation: gql`
+					mutation UnbanUser($id: String!) {
+						unbanUser(id: $id) {
+							id
+							firstName
+							lastName
+						}
+					}
+				`,
+				variables: { id }
+			})
+			.toPromise();
+	}
+
 	async getCountOfUsers() {
 		const res = await this._apollo
 			.query({
diff --git a/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html
new file mode 100644
index 000000000..2fed58c1c
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html
@@ -0,0 +1,37 @@
+<div class="modal-header">
+	<h4 class="modal-title" id="modal-title">Profile Ban</h4>
+	<button
+		type="button"
+		class="close"
+		aria-label="Close button"
+		aria-describedby="modal-title"
+		(click)="modal.dismiss()"
+	>
+		<span aria-hidden="true">&times;</span>
+	</button>
+</div>
+<div class="modal-body">
+	<p>
+		<strong
+			>Are you sure you want to {{ user.isBanned ? 'unban' : 'ban' }}
+			<span class="text-primary">"{{ user.name }}"</span>?</strong
+		>
+	</p>
+</div>
+<div class="modal-footer">
+	<button
+		type="button"
+		class="btn btn-outline-secondary"
+		(click)="modal.dismiss()"
+	>
+		Cancel
+	</button>
+	<button
+		type="button"
+		ngbAutofocus
+		class="btn btn-danger"
+		(click)="modal.close(user.id)"
+	>
+		Ok
+	</button>
+</div>
diff --git a/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.scss b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.ts b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.ts
new file mode 100644
index 000000000..48f415ccd
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { CustomerViewModel } from 'app/pages/+customers/customers.component';
+
+@Component({
+	selector: 'ea-ban-confirm',
+	templateUrl: './ban-confirm.component.html',
+	styleUrls: ['./ban-confirm.component.scss']
+})
+export class BanConfirmComponent implements OnInit {
+	@Input() user: CustomerViewModel;
+	constructor(private readonly modal: NgbActiveModal) {}
+
+	ngOnInit() {}
+}
diff --git a/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.module.ts b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.module.ts
new file mode 100644
index 000000000..ab37af264
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.module.ts
@@ -0,0 +1,11 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { BanConfirmComponent } from './ban-confirm.component';
+
+@NgModule({
+	declarations: [BanConfirmComponent],
+	exports: [BanConfirmComponent],
+	entryComponents: [BanConfirmComponent],
+	imports: [CommonModule]
+})
+export class BanConfirmModule {}
diff --git a/admin/website-angular/src/app/@shared/user/ban-confirm/index.ts b/admin/website-angular/src/app/@shared/user/ban-confirm/index.ts
new file mode 100644
index 000000000..707c02d89
--- /dev/null
+++ b/admin/website-angular/src/app/@shared/user/ban-confirm/index.ts
@@ -0,0 +1,2 @@
+export * from './ban-confirm.module';
+export * from './ban-confirm.component';
diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.html b/admin/website-angular/src/app/pages/+customers/customers.component.html
index 8b766c625..17273ab6c 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.component.html
+++ b/admin/website-angular/src/app/pages/+customers/customers.component.html
@@ -32,6 +32,22 @@
 			<i class="ion-md-phone-portrait"></i>&nbsp;&nbsp;
 			{{ 'CUSTOMERS_VIEW.CUSTOMERS_DEVICES' | translate }}
 		</button>
+
+		<button
+			class="btn btn-danger mr-2 d-inline-block"
+			[disabled]="!isOnlyOneCustomerSelected"
+			(click)="banSelectedRows()"
+		>
+			<i class="ion-md-close-circle button-icon"></i>
+
+			<small _ngcontent-c55="" *ngIf="isUserBanned">{{
+				'CUSTOMERS_VIEW.UNBAN' | translate
+			}}</small>
+
+			<small _ngcontent-c55="" *ngIf="!isUserBanned">{{
+				'CUSTOMERS_VIEW.BAN' | translate
+			}}</small>
+		</button>
 	</nb-card-header>
 
 	<nb-card-body [nbSpinner]="loading">
diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.ts b/admin/website-angular/src/app/pages/+customers/customers.component.ts
index 89f23678f..ea167b8c2 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/customers.component.ts
@@ -21,6 +21,7 @@ import { NotifyService } from '../../@core/services/notify/notify.service';
 import { CustomerOrdersNumberComponent } from '../../@shared/render-component/customer-table/customer-orders-number/customer-orders-number.component';
 import { CustomerEmailComponent } from '../../@shared/render-component/customer-email/customer-email.component';
 import { CustomerPhoneComponent } from '../../@shared/render-component/customer-phone/customer-phone.component';
+import { BanConfirmComponent } from 'app/@shared/user/ban-confirm';
 
 export interface CustomerViewModel {
 	id: string;
@@ -32,6 +33,7 @@ export interface CustomerViewModel {
 	city: string;
 	address: string;
 	ordersQty: number;
+	isBanned: boolean;
 }
 
 const perPage = 7;
@@ -121,6 +123,40 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 		}
 	}
 
+	protected banSelectedRows() {
+		if (this.isUserBanned) {
+			this.showUnbanPopup();
+		} else {
+			this.showBanPopup();
+		}
+	}
+
+	private showUnbanPopup() {
+		const modal = this._modalService.open(BanConfirmComponent, {
+			size: 'lg',
+			container: 'nb-layout',
+			windowClass: 'ng-custom',
+			backdrop: 'static'
+		});
+		modal.componentInstance.user = this._selectedCustomers[0];
+		modal.result
+			.then((id) => this._usersService.unbanUser(id))
+			.catch(console.error);
+	}
+
+	private showBanPopup() {
+		const modal = this._modalService.open(BanConfirmComponent, {
+			size: 'lg',
+			container: 'nb-layout',
+			windowClass: 'ng-custom',
+			backdrop: 'static'
+		});
+		modal.componentInstance.user = this._selectedCustomers[0];
+		modal.result
+			.then((id) => this._usersService.banUser(id))
+			.catch(console.error);
+	}
+
 	private _loadSettingsSmartTable() {
 		const columnTitlePrefix = 'CUSTOMERS_VIEW.SMART_TABLE_COLUMNS.';
 		const getTranslate = (name: string): Observable<any> =>
@@ -242,7 +278,8 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 					address: `st. ${user.geoLocation.streetAddress ||
 						CustomersComponent.noInfoSign}, hse. № ${user
 						.geoLocation.house || CustomersComponent.noInfoSign}`,
-					ordersQty: userOrders ? userOrders.ordersCount : 0
+					ordersQty: userOrders ? userOrders.ordersCount : 0,
+					isBanned: user.isBanned
 				};
 			});
 
@@ -251,7 +288,6 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 			const usersData = new Array(this.dataCount);
 
 			usersData.splice(perPage * (page - 1), perPage, ...usersVM);
-
 			await this.sourceSmartTable.load(usersData);
 		};
 
@@ -300,6 +336,16 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 		this.dataCount = await this._usersService.getCountOfUsers();
 	}
 
+	public get isOnlyOneCustomerSelected(): boolean {
+		return this._selectedCustomers.length === 1;
+	}
+
+	public get isUserBanned() {
+		return (
+			this._selectedCustomers[0] && this._selectedCustomers[0].isBanned
+		);
+	}
+
 	ngOnDestroy() {
 		this.ngDestroy$.next();
 		this.ngDestroy$.complete();
diff --git a/admin/website-angular/src/app/pages/+customers/customers.module.ts b/admin/website-angular/src/app/pages/+customers/customers.module.ts
index 23fcea0af..031924d42 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.module.ts
+++ b/admin/website-angular/src/app/pages/+customers/customers.module.ts
@@ -13,6 +13,7 @@ import { UserMutationModule } from '../../@shared/user/user-mutation';
 import { CustomerTableModule } from '../../@shared/render-component/customer-table/customer-table.module';
 import { NbSpinnerModule } from '@nebular/theme';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
+import { BanConfirmModule } from 'app/@shared/user/ban-confirm';
 
 const routes: Routes = [
 	{
@@ -41,7 +42,8 @@ const routes: Routes = [
 		RenderComponentsModule,
 		UserMutationModule,
 		CustomerTableModule,
-		NbSpinnerModule
+		NbSpinnerModule,
+		BanConfirmModule
 	],
 	declarations: [CustomersComponent],
 	providers: [JsonPipe, GeoLocationService, NotifyService]
diff --git a/admin/website-angular/src/assets/i18n/en.json b/admin/website-angular/src/assets/i18n/en.json
index 781c30739..54d0c0b2f 100644
--- a/admin/website-angular/src/assets/i18n/en.json
+++ b/admin/website-angular/src/assets/i18n/en.json
@@ -706,6 +706,8 @@
 		"CREATE_CUSTOMER": "Create",
 		"DELETE": "DELETE",
 		"CREATE": "CREATE",
+		"BAN": "BAN",
+		"UNBAN": "UNBAN",
 		"MANAGE_CUSTOMER": "Manage customer",
 		"CUSTOMER": "Customer",
 		"CUSTOMERS_DEVICES": "Devices",
diff --git a/backend/api/src/graphql/users/user.resolver.ts b/backend/api/src/graphql/users/user.resolver.ts
index 6390ce057..87c9cea0e 100644
--- a/backend/api/src/graphql/users/user.resolver.ts
+++ b/backend/api/src/graphql/users/user.resolver.ts
@@ -196,4 +196,14 @@ export class UserResolver {
 	) {
 		return this._usersAuthService.addRegistrationInfo(id, registrationInfo);
 	}
+
+	@Mutation()
+	async banUser(_, { id }: { id: User['id'] }) {
+		return this._usersService.banUser(id);
+	}
+
+	@Mutation()
+	async unbanUser(_, { id }: { id: User['id'] }) {
+		return this._usersService.unbanUser(id);
+	}
 }
diff --git a/backend/api/src/graphql/users/users.types.graphql b/backend/api/src/graphql/users/users.types.graphql
index 8a8fdf4a4..ffe9a814d 100644
--- a/backend/api/src/graphql/users/users.types.graphql
+++ b/backend/api/src/graphql/users/users.types.graphql
@@ -18,6 +18,8 @@ type User {
 	fullAddress: String
 
 	createdAt: Date
+
+	isBanned: Boolean!
 }
 
 input UserCreateInput {
@@ -147,4 +149,8 @@ type Mutation {
 		id: String!
 		registrationInfo: AdditionalUserRegistrationInfo!
 	): Void
+
+	banUser(id: String!): User
+
+	unbanUser(id: String!): User
 }
diff --git a/backend/api/src/services/users/UsersService.ts b/backend/api/src/services/users/UsersService.ts
index f3180d03c..cfe80ff42 100644
--- a/backend/api/src/services/users/UsersService.ts
+++ b/backend/api/src/services/users/UsersService.ts
@@ -490,6 +490,16 @@ export class UsersService extends DBService<User>
 		return this.Model.insertMany(customersToCreate);
 	}
 
+	async banUser(id: string): Promise<User> {
+		await this.throwIfNotExists(id);
+		return this.update(id, { isBanned: true });
+	}
+
+	async unbanUser(id: string): Promise<User> {
+		await this.throwIfNotExists(id);
+		return this.update(id, { isBanned: false });
+	}
+
 	/**
 	 * Check if not deleted customer with given Id exists in DB and throw exception if it's not exists or deleted
 	 *
diff --git a/shared/core/entities/User.ts b/shared/core/entities/User.ts
index ed85d1fb6..e8abea8a2 100644
--- a/shared/core/entities/User.ts
+++ b/shared/core/entities/User.ts
@@ -149,6 +149,16 @@ class User extends DBObject<IUser, IUserCreateObject> implements IUser {
 	@Column()
 	isRegistrationCompleted: boolean;
 
+	/**
+	 * Is customer banned
+	 *
+	 * @type {boolean}
+	 * @memberof User
+	 */
+	@Types.Boolean(false)
+	@Column()
+	isBanned: boolean;
+
 	@Types.Boolean(false)
 	@Column()
 	isDeleted: boolean;
diff --git a/shared/core/interfaces/IUser.ts b/shared/core/interfaces/IUser.ts
index b157a7b20..e819d53da 100644
--- a/shared/core/interfaces/IUser.ts
+++ b/shared/core/interfaces/IUser.ts
@@ -10,6 +10,7 @@ export interface IUserInitializeObject extends DBCreateObject {
 	socialIds?: string[];
 	isRegistrationCompleted?: boolean;
 	hash?: string;
+	isBanned?: boolean;
 }
 
 export interface IUserCreateObject extends IUserInitializeObject {

From ff34e0bdec928499a782b9a50a4ab312bea9581e Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Thu, 30 May 2019 10:10:01 +0300
Subject: [PATCH 340/382] feat(ever-shop-web): fixed text overlap

---
 .../app/+orders/order/order.component.html    | 86 +++++++++++--------
 .../app/+orders/order/order.component.scss    | 51 ++++++-----
 .../src/app/+orders/order/order.component.ts  |  3 +
 .../src/app/+orders/orders.component.scss     |  4 +-
 .../app/+orders/orders.container.component.ts |  1 +
 5 files changed, 84 insertions(+), 61 deletions(-)

diff --git a/shop/website-angular/src/app/+orders/order/order.component.html b/shop/website-angular/src/app/+orders/order/order.component.html
index 66c348499..eb04b9356 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.html
+++ b/shop/website-angular/src/app/+orders/order/order.component.html
@@ -1,52 +1,62 @@
 <mat-card class="order">
 	<div class="order-info">
-		<div class="warehouse-logo-container">
-			<warehouse-logo
-				[logo]="warehouse?.logo"
-				[border]="true"
-			></warehouse-logo>
-		</div>
-
 		<div class="product-info">
 			<h1 class="product-name">
 				{{ title }} <span class="product-price">${{ price }}</span>
 			</h1>
 			<h2 class="product-description">{{ description }}</h2>
 		</div>
-		<button
-			(click)="openDialog()"
-			mat-raised-button
-			color="accent"
-			class="cancel-button"
-		>
-			<svg viewBox="0 0 24 24">
-				<path
-					d="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z"
-				/>
-			</svg>
-			{{ 'ORDER_VIEW.CANCEL' | translate }}
-		</button>
-
-		<div class="order-status-container">
-			<p class="order-status-text">
-				{{ 'ORDER_VIEW.ORDER_ID' | translate }} {{ orderNumber }}
-			</p>
-			<p class="order-status-text">
-				{{ createdAt | date: 'yyyy-MM-dd HH:mm:ss' }}
-			</p>
-
-			<svg class="order-status-icon" viewBox="0 0 24 24">
-				<path
-					d="M12,18H6V14H12M21,14V12L20,7H4L3,12V14H4V20H14V14H18V20H20V14M20,4H4V6H20V4Z"
-				/>
-			</svg>
-
-			<p class="order-status-text">
-				{{ orderStatusTextTranslates | translate }}
-			</p>
+		<div class="order-options">
+			<button
+				(click)="openDialog()"
+				mat-raised-button
+				color="accent"
+				class="cancel-button"
+			>
+				<svg viewBox="0 0 24 24">
+					<path
+						d="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z"
+					/>
+				</svg>
+				{{ 'ORDER_VIEW.CANCEL' | translate }}
+			</button>
+			<button mat-raised-button color="accent">
+				Pay
+			</button>
 		</div>
 	</div>
+	<div class="order-status-container">
+		<p class="order-status-text">
+			{{ 'ORDER_VIEW.ORDER_ID' | translate }} {{ orderNumber }}
+		</p>
+		<p class="order-status-text">
+			{{ createdAt | date: 'yyyy-MM-dd HH:mm:ss' }}
+		</p>
+		<div class="order-status-text">
+			{{ order.orderType ? 'Takeout' : 'Delivery' }}
+		</div>
+
+		<svg class="order-status-icon" viewBox="0 0 24 24">
+			<path
+				d="M12,18H6V14H12M21,14V12L20,7H4L3,12V14H4V20H14V14H18V20H20V14M20,4H4V6H20V4Z"
+			/>
+		</svg>
 
+		<p class="order-status-text">
+			{{ orderStatusTextTranslates | translate }}
+		</p>
+	</div>
+	<div class="warehouse-logo-container">
+		<warehouse-logo
+			[logo]="warehouse?.logo"
+			[border]="true"
+		></warehouse-logo>
+	</div>
+	<div class="warehouse-info" *ngIf="warehouse">
+		<span>{{ warehouse.name }}</span>
+		<span>{{ warehouse.contactPhone }}</span>
+		<span>{{ warehouse.geoLocation.streetAddress }}</span>
+	</div>
 	<img
 		*ngIf="order.products.length"
 		class="order-picture h-100"
diff --git a/shop/website-angular/src/app/+orders/order/order.component.scss b/shop/website-angular/src/app/+orders/order/order.component.scss
index a5cef0ec5..4664c8428 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.scss
+++ b/shop/website-angular/src/app/+orders/order/order.component.scss
@@ -3,8 +3,10 @@
 	width: 100%;
 	padding: 0;
 	display: flex;
-	align-items: flex-start;
+	justify-content: space-between;
 	height: 240px;
+	box-sizing: border-box;
+	padding: 20px;
 
 	.no-product-img {
 		border-left: 1px solid #95989a;
@@ -12,14 +14,21 @@
 }
 
 .order-info {
-	padding: 50px 40px;
-	flex-grow: 1;
+	height: 100%;
+	width: 60%;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
 }
 
-.product-name {
-	margin-top: 0;
-	margin-bottom: 10px;
+.order-options {
+	display: flex;
+	button {
+		margin-left: 20px;
+	}
+}
 
+.product-name {
 	font-family: 'Roboto', 'Helvetica Neue Light', 'HelveticaNeue-Light',
 		'Helvetica Neue', Calibri, Helvetica, Arial, sans-serif;
 	font-weight: normal;
@@ -28,8 +37,6 @@
 }
 
 .product-price {
-	margin-top: 0;
-
 	font-family: 'Segoe UI', 'Helvetica Neue Light', 'HelveticaNeue-Light',
 		'Helvetica Neue', Calibri, Helvetica, Arial, sans-serif;
 	font-weight: 200;
@@ -38,9 +45,6 @@
 }
 
 .product-description {
-	margin-top: 0;
-	margin-bottom: 0;
-
 	font-family: 'Roboto', 'Helvetica Neue Light', 'HelveticaNeue-Light',
 		'Helvetica Neue', Calibri, Helvetica, Arial, sans-serif;
 	font-weight: normal;
@@ -48,9 +52,16 @@
 	font-size: 18px;
 }
 
+.warehouse-info {
+	display: flex;
+	flex-direction: column;
+	font-size: 0.8em;
+	span:first-child {
+		font-size: 1em;
+		font-weight: bold;
+	}
+}
 .cancel-button {
-	position: absolute;
-	bottom: 30px;
 }
 
 .cancel-button svg {
@@ -67,10 +78,9 @@
 }
 
 .warehouse-logo-container {
-	position: relative;
-	float: right;
-	left: calc(40px + 23px);
-	bottom: 15px;
+	position: absolute;
+	right: 109px;
+	top: 20%;
 }
 
 .warehouse-logo-container warehouse-logo {
@@ -83,10 +93,10 @@
 }
 
 .order-status-container {
-	float: right;
-	margin-top: -65px;
-	margin-right: 20px;
 	text-align: center;
+	display: flex;
+	align-items: center;
+	flex-direction: column;
 }
 
 .order-status-icon {
@@ -95,7 +105,6 @@
 }
 
 .order-status-text {
-	margin-top: -5px;
 	font-size: 12px;
 	font-weight: normal;
 	line-height: 14px;
diff --git a/shop/website-angular/src/app/+orders/order/order.component.ts b/shop/website-angular/src/app/+orders/order/order.component.ts
index 3cd882382..becdfaa61 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.ts
+++ b/shop/website-angular/src/app/+orders/order/order.component.ts
@@ -39,6 +39,7 @@ export class OrderComponent implements OnInit {
 	public img: string;
 	public orderStatusText: string;
 	public orderNumber: number;
+	public orderType: number;
 	public createdAt: Date;
 	public createdAtConverted: string;
 	public warehouse: Warehouse;
@@ -112,11 +113,13 @@ export class OrderComponent implements OnInit {
 		this.orderStatusTextTranslates =
 			this.PREFIX_ORDER_STATUS + this.orderStatusText;
 		this.orderNumber = this.order.orderNumber;
+		this.orderType = this.order.orderType;
 		this.createdAt = this.order.createdAt;
 		this.warehouse = await this.warehouseRouter
 			.get(this.order.warehouseId, false)
 			.pipe(first())
 			.toPromise();
+		console.log(this.warehouse);
 	}
 
 	protected localeTranslate(member: ILocaleMember[]): string {
diff --git a/shop/website-angular/src/app/+orders/orders.component.scss b/shop/website-angular/src/app/+orders/orders.component.scss
index 687052555..7f752d99c 100644
--- a/shop/website-angular/src/app/+orders/orders.component.scss
+++ b/shop/website-angular/src/app/+orders/orders.component.scss
@@ -1,6 +1,6 @@
 .orders {
-	padding-top: 50px;
-	padding-bottom: 50px;
+	padding-top: 10px;
+	padding-bottom: 10px;
 
 	margin: auto;
 	width: 50vw;
diff --git a/shop/website-angular/src/app/+orders/orders.container.component.ts b/shop/website-angular/src/app/+orders/orders.container.component.ts
index cc1072f95..33fb80ebb 100644
--- a/shop/website-angular/src/app/+orders/orders.container.component.ts
+++ b/shop/website-angular/src/app/+orders/orders.container.component.ts
@@ -20,6 +20,7 @@ export class OrdersContainerComponent {
 		const userId = store.userId;
 		// During testing: this.userOrdersRouter.getOrderedProducts('23');
 		this.userOrdersRouter.get(userId).subscribe((res) => {
+			console.log(res);
 			this.orders = res.filter((r) => !r.isCancelled);
 			res = res.filter((r) => !r.isCancelled);
 			console.log(res);

From 697c886f4c73fac4ebd984883dd58d7079f6ba96 Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Fri, 31 May 2019 07:48:24 +0300
Subject: [PATCH 341/382] feat(ever-shop-web): started order redesign

---
 .../app/+orders/order/order.component.html    | 128 ++++++++++--------
 .../app/+orders/order/order.component.scss    | 106 +++++++++------
 .../src/app/+orders/order/order.component.ts  |  11 +-
 .../app/+orders/orders.container.component.ts |   2 -
 4 files changed, 144 insertions(+), 103 deletions(-)

diff --git a/shop/website-angular/src/app/+orders/order/order.component.html b/shop/website-angular/src/app/+orders/order/order.component.html
index eb04b9356..affe8b8c8 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.html
+++ b/shop/website-angular/src/app/+orders/order/order.component.html
@@ -1,69 +1,83 @@
 <mat-card class="order">
-	<div class="order-info">
-		<div class="product-info">
-			<h1 class="product-name">
-				{{ title }} <span class="product-price">${{ price }}</span>
-			</h1>
-			<h2 class="product-description">{{ description }}</h2>
+	<div class="order-header">
+		<div class="warehouse-logo-container">
+			<warehouse-logo
+				[logo]="warehouse?.logo"
+				[border]="true"
+			></warehouse-logo>
 		</div>
-		<div class="order-options">
-			<button
-				(click)="openDialog()"
-				mat-raised-button
-				color="accent"
-				class="cancel-button"
-			>
-				<svg viewBox="0 0 24 24">
+		<div class="order-status-container">
+			<p class="order-status-text">
+				{{ 'ORDER_VIEW.ORDER_ID' | translate }} {{ orderNumber }}
+			</p>
+			<!-- <p class="order-status-text">
+				{{ createdAt | date: 'yyyy-MM-dd HH:mm:ss' }}
+			</p> -->
+			<div class="order-status-text">
+				{{ order.orderType ? 'Takeout' : 'Delivery' }}
+			</div>
+
+			<p class="order-status-text">
+				{{ orderStatusTextTranslates | translate
+				}}<svg class="order-status-icon" viewBox="0 0 24 24">
 					<path
-						d="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z"
+						d="M12,18H6V14H12M21,14V12L20,7H4L3,12V14H4V20H14V14H18V20H20V14M20,4H4V6H20V4Z"
 					/>
 				</svg>
-				{{ 'ORDER_VIEW.CANCEL' | translate }}
-			</button>
-			<button mat-raised-button color="accent">
-				Pay
-			</button>
+			</p>
 		</div>
 	</div>
-	<div class="order-status-container">
-		<p class="order-status-text">
-			{{ 'ORDER_VIEW.ORDER_ID' | translate }} {{ orderNumber }}
-		</p>
-		<p class="order-status-text">
-			{{ createdAt | date: 'yyyy-MM-dd HH:mm:ss' }}
-		</p>
-		<div class="order-status-text">
-			{{ order.orderType ? 'Takeout' : 'Delivery' }}
+	<div class="order-details">
+		<div class="side-container">
+			<div class="warehouse-info" *ngIf="warehouse">
+				<h3>{{ warehouse.name }}</h3>
+				<span>{{ warehouse.contactPhone }}</span>
+				<span>{{ warehouse.geoLocation.streetAddress }}</span>
+			</div>
+			<div class="warehouse-info" *ngIf="carrier">
+				<h3>{{ carrier.username }}</h3>
+				<span>{{ carrier.phone }}</span>
+				<span>{{ carrier.geoLocation.streetAddress }}</span>
+			</div>
 		</div>
 
-		<svg class="order-status-icon" viewBox="0 0 24 24">
-			<path
-				d="M12,18H6V14H12M21,14V12L20,7H4L3,12V14H4V20H14V14H18V20H20V14M20,4H4V6H20V4Z"
-			/>
-		</svg>
-
-		<p class="order-status-text">
-			{{ orderStatusTextTranslates | translate }}
-		</p>
-	</div>
-	<div class="warehouse-logo-container">
-		<warehouse-logo
-			[logo]="warehouse?.logo"
-			[border]="true"
-		></warehouse-logo>
+		<div class="order-info">
+			<div class="product-info">
+				<h1 class="product-name">
+					{{ title }} <span class="product-price">${{ price }}</span>
+				</h1>
+				<h2 class="product-description">{{ description }}</h2>
+			</div>
+			<div class="order-options">
+				<button
+					(click)="openDialog()"
+					mat-raised-button
+					color="accent"
+					class="cancel-button"
+				>
+					<svg viewBox="0 0 24 24">
+						<path
+							d="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z"
+						/>
+					</svg>
+					{{ 'ORDER_VIEW.CANCEL' | translate }}
+				</button>
+				<button mat-raised-button color="accent">
+					Pay
+				</button>
+			</div>
+		</div>
 	</div>
-	<div class="warehouse-info" *ngIf="warehouse">
-		<span>{{ warehouse.name }}</span>
-		<span>{{ warehouse.contactPhone }}</span>
-		<span>{{ warehouse.geoLocation.streetAddress }}</span>
+
+	<div class="order-images">
+		<img
+			*ngIf="order.products.length"
+			class="order-picture h-100"
+			src="{{ img }}"
+		/>
+		<span
+			*ngIf="!order.products.length"
+			class="no-product-img order-picture h-100"
+		></span>
 	</div>
-	<img
-		*ngIf="order.products.length"
-		class="order-picture h-100"
-		src="{{ img }}"
-	/>
-	<span
-		*ngIf="!order.products.length"
-		class="no-product-img order-picture h-100"
-	></span>
 </mat-card>
diff --git a/shop/website-angular/src/app/+orders/order/order.component.scss b/shop/website-angular/src/app/+orders/order/order.component.scss
index 4664c8428..4ebfcd97d 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.scss
+++ b/shop/website-angular/src/app/+orders/order/order.component.scss
@@ -4,25 +4,81 @@
 	padding: 0;
 	display: flex;
 	justify-content: space-between;
-	height: 240px;
+	flex-direction: column;
+	height: 440px;
 	box-sizing: border-box;
-	padding: 20px;
 
 	.no-product-img {
 		border-left: 1px solid #95989a;
 	}
 }
 
-.order-info {
-	height: 100%;
-	width: 60%;
+.order-header {
+	background: #2a2c39;
+	height: 85px;
+	max-height: 85px;
+	width: 100%;
 	display: flex;
-	flex-direction: column;
+	align-items: center;
 	justify-content: space-between;
+	box-sizing: border-box;
+	padding-right: 20px;
+
+	.order-status-container {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		justify-content: space-between;
+	}
+
+	.order-status-icon {
+		height: 35px;
+		fill: white;
+	}
+
+	.order-status-text {
+		font-size: 12px;
+		font-weight: normal;
+		text-align: center;
+		color: white;
+		margin: 0px;
+	}
+
+	.warehouse-logo-container {
+		margin-right: 15px;
+	}
+
+	.warehouse-logo-container warehouse-logo {
+		width: 46px;
+		height: 46px;
+	}
+
+	.warehouse-logo-container warehouse-logo img {
+		opacity: 1;
+	}
+}
+
+.order-details {
+	display: flex;
+	width: 100%;
+	height: 70%;
+
+	.side-container {
+		width: 25%;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.order-info {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+	}
 }
 
 .order-options {
 	display: flex;
+
 	button {
 		margin-left: 20px;
 	}
@@ -56,13 +112,12 @@
 	display: flex;
 	flex-direction: column;
 	font-size: 0.8em;
+
 	span:first-child {
 		font-size: 1em;
 		font-weight: bold;
 	}
 }
-.cancel-button {
-}
 
 .cancel-button svg {
 	position: relative;
@@ -76,38 +131,3 @@
 	width: 140px;
 	user-select: none;
 }
-
-.warehouse-logo-container {
-	position: absolute;
-	right: 109px;
-	top: 20%;
-}
-
-.warehouse-logo-container warehouse-logo {
-	width: 46px;
-	height: 46px;
-}
-
-.warehouse-logo-container warehouse-logo img {
-	opacity: 1;
-}
-
-.order-status-container {
-	text-align: center;
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-}
-
-.order-status-icon {
-	height: 80px;
-	fill: #2a2c39;
-}
-
-.order-status-text {
-	font-size: 12px;
-	font-weight: normal;
-	line-height: 14px;
-	text-align: center;
-	color: rgba(0, 0, 0, 0.7);
-}
diff --git a/shop/website-angular/src/app/+orders/order/order.component.ts b/shop/website-angular/src/app/+orders/order/order.component.ts
index becdfaa61..482101bf5 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.ts
+++ b/shop/website-angular/src/app/+orders/order/order.component.ts
@@ -16,6 +16,7 @@ import { MatDialog } from '@angular/material';
 import { MessagePopUpComponent } from 'app/shared/message-pop-up/message-pop-up.component';
 import { first } from 'rxjs/operators';
 import Warehouse from '@modules/server.common/entities/Warehouse';
+import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-router.service';
 
 @Component({
 	selector: 'order',
@@ -44,6 +45,7 @@ export class OrderComponent implements OnInit {
 	public createdAtConverted: string;
 	public warehouse: Warehouse;
 	public totalPrice;
+	public carrier;
 
 	public PREFIX_ORDER_STATUS: string = 'ORDER_CARRIER_STATUS.';
 	public orderStatusTextTranslates: string;
@@ -56,6 +58,7 @@ export class OrderComponent implements OnInit {
 	constructor(
 		private warehouseOrdersRouter: WarehouseOrdersRouter,
 		private readonly warehouseRouter: WarehouseRouter,
+		private readonly carrierRouter: CarrierRouter,
 		private readonly _productLocalesService: ProductLocalesService,
 		private translateService: TranslateService,
 		private dialog: MatDialog
@@ -119,7 +122,13 @@ export class OrderComponent implements OnInit {
 			.get(this.order.warehouseId, false)
 			.pipe(first())
 			.toPromise();
-		console.log(this.warehouse);
+
+		if (this.order.carrierId) {
+			this.carrier = await this.carrierRouter
+				.get(this.order.carrierId)
+				.pipe(first())
+				.toPromise();
+		}
 	}
 
 	protected localeTranslate(member: ILocaleMember[]): string {
diff --git a/shop/website-angular/src/app/+orders/orders.container.component.ts b/shop/website-angular/src/app/+orders/orders.container.component.ts
index 33fb80ebb..da8688d89 100644
--- a/shop/website-angular/src/app/+orders/orders.container.component.ts
+++ b/shop/website-angular/src/app/+orders/orders.container.component.ts
@@ -20,10 +20,8 @@ export class OrdersContainerComponent {
 		const userId = store.userId;
 		// During testing: this.userOrdersRouter.getOrderedProducts('23');
 		this.userOrdersRouter.get(userId).subscribe((res) => {
-			console.log(res);
 			this.orders = res.filter((r) => !r.isCancelled);
 			res = res.filter((r) => !r.isCancelled);
-			console.log(res);
 		});
 	}
 }

From df96673bda380447fbcc44cd4ecda64ef05fa34d Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 31 May 2019 10:58:45 +0300
Subject: [PATCH 342/382] chore: update packages to the latest version core-js,
 terser, typescript-tslint-plugin, validator, mini-css-extract-plugin

---
 admin/website-angular/package.json            |  4 +-
 admin/website-angular/yarn.lock               | 15 +++--
 backend/api/package.json                      |  4 +-
 backend/api/yarn.lock                         | 13 +++--
 carrier/mobile-ionic/package.json             |  4 +-
 carrier/mobile-ionic/yarn.lock                | 19 ++++--
 merchant/tablet-ionic/package.json            |  4 +-
 merchant/tablet-ionic/yarn.lock               | 19 ++++--
 shop/mobile-ionic/package.json                |  4 +-
 shop/mobile-ionic/yarn.lock                   | 19 ++++--
 shop/website-angular/package.json             |  4 +-
 shop/website-angular/src/polyfills.browser.ts |  6 +-
 shop/website-angular/yarn.lock                | 58 +++++++------------
 13 files changed, 96 insertions(+), 77 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 3e1b9eabe..d26c7da53 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -99,7 +99,7 @@
 		"chart.js": "^2.8.0",
 		"ckeditor": "^4.11.4",
 		"classlist.js": "1.1.20150312",
-		"core-js": "^3.0.1",
+		"core-js": "^3.1.3",
 		"cryptiles": "^4.1.3",
 		"echarts": "^4.2.1",
 		"eva-icons": "^1.1.1",
@@ -204,7 +204,7 @@
 		"ts-node": "^8.1.0",
 		"tslint": "^5.16.0",
 		"typescript": "~3.2.4",
-		"typescript-tslint-plugin": "^0.3.1",
+		"typescript-tslint-plugin": "^0.4.0",
 		"webpack-dev-server": "^3.3.1",
 		"yargs": "^13.2.4"
 	},
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 7415c787d..1c9e18977 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -4439,7 +4439,7 @@ core-js-pure@3.0.1:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.0.1.tgz#37358fb0d024e6b86d443d794f4e37e949098cbe"
   integrity sha512-mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g==
 
-core-js@3.0.1, core-js@^3.0.1:
+core-js@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
   integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
@@ -4454,6 +4454,11 @@ core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
+core-js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
+  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -13478,10 +13483,10 @@ typeface-exo@^0.0.61:
   resolved "https://registry.yarnpkg.com/typeface-exo/-/typeface-exo-0.0.61.tgz#10c6113292da354cb9f26ee9d0b0c996f1a7a3bd"
   integrity sha512-AH3bMVYnVpg2G+CJbgtogTuJpWGS0zspHJzzVR8cCgTtkbUI0pj8WBB+RFo14CHbF5MmZgYe7TVoWz+j4Yo6Jg==
 
-typescript-tslint-plugin@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.3.1.tgz#d86ae0342c9e8f9ecfcbcc47f7a7c2b5ab0e86f9"
-  integrity sha512-h8HEPBm36UEs901ld1x6m5eY/UFb4mF+A0nvERr4BWMww5wnV5nfcm9ZFt18foYL0GQ5NVMt1Tb3466WUU8dRQ==
+typescript-tslint-plugin@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.4.0.tgz#af1729e72b770489b2b912809694f46c3281bb72"
+  integrity sha512-83zipyk5bCqu/LHifaWPmJ7Xnl6lLn/3KmWINgr+XND79BrVWmkV8CudKc+a9Jhjs2opvVKq0n0P4O4NhHOixw==
   dependencies:
     minimatch "^3.0.4"
     mock-require "^3.0.2"
diff --git a/backend/api/package.json b/backend/api/package.json
index 46f2edb03..8c0061613 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -138,7 +138,7 @@
 		"underscore.string": "^3.3.5",
 		"upath": "^1.1.2",
 		"uuid": "^3.3.2",
-		"validator": "^10.11.0",
+		"validator": "^11.0.0",
 		"ws": "^7.0.0"
 	},
 	"devDependencies": {
@@ -185,7 +185,7 @@
 		"@types/ws": "^6.0.1",
 		"concurrently": "^4.1.0",
 		"conventional-changelog": "^3.1.4",
-		"core-js": "^3.0.1",
+		"core-js": "^3.1.3",
 		"coveralls": "^3.0.3",
 		"cross-env": "^5.2.0",
 		"cz-conventional-changelog": "^2.1.0",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 797ec07b3..3d5bb0f7c 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -3359,10 +3359,10 @@ core-js@^2.5.7:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
-core-js@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
-  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+core-js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
+  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -11579,6 +11579,11 @@ validator@^10.11.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
   integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==
 
+validator@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-11.0.0.tgz#fb10128bfb1fd14ce4ed36b79fc94289eae70667"
+  integrity sha512-+wnGLYqaKV2++nUv60uGzUJyJQwYVOin6pn1tgEiFCeCQO60yeu3Og9/yPccbBX574kxIcEJicogkzx6s6eyag==
+
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index a9b6f2f1c..2226b19bf 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -123,7 +123,7 @@
 		"cordova-plugin-uniquedeviceid": "^1.3.2",
 		"cordova-plugin-vibration": "^3.1.0",
 		"cordova-plugin-whitelist": "^1.3.3",
-		"core-js": "^3.0.0",
+		"core-js": "^3.1.3",
 		"cryptiles": "^4.1.3",
 		"es6-promise-plugin": "^4.2.2",
 		"font-awesome": "^4.7.0",
@@ -202,7 +202,7 @@
 		"karma-jasmine-html-reporter": "^1.4.0",
 		"protractor": "^5.4.2",
 		"rxjs-tslint": "0.1.5",
-		"terser": "^3.17.0",
+		"terser": "^4.0.0",
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 79050c96d..9c3d15e56 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -3069,10 +3069,10 @@ core-js@^2.2.0, core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
-core-js@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
-  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+core-js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
+  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -10130,7 +10130,7 @@ terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser@^3.16.1, terser@^3.17.0:
+terser@^3.16.1:
   version "3.17.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
   integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
@@ -10139,6 +10139,15 @@ terser@^3.16.1, terser@^3.17.0:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
+terser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374"
+  integrity sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
 through2@^2.0.0, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6c39eca33..44c2abcbd 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -132,7 +132,7 @@
 		"cordova-plugin-uniquedeviceid": "^1.3.2",
 		"cordova-plugin-vibration": "^3.1.0",
 		"cordova-plugin-whitelist": "^1.3.3",
-		"core-js": "^3.0.0",
+		"core-js": "^3.1.3",
 		"cryptiles": "^4.1.3",
 		"es6-promise-plugin": "^4.2.2",
 		"font-awesome": "^4.7.0",
@@ -205,7 +205,7 @@
 		"husky": "^2.3.0",
 		"ionic": "^4.12.0",
 		"rxjs-tslint": "0.1.5",
-		"terser": "^3.17.0",
+		"terser": "^4.0.0",
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 67a749498..67254f1f9 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -3098,10 +3098,10 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
-core-js@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
-  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+core-js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
+  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -9987,7 +9987,7 @@ terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser@^3.16.1, terser@^3.17.0:
+terser@^3.16.1:
   version "3.17.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
   integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
@@ -9996,6 +9996,15 @@ terser@^3.16.1, terser@^3.17.0:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
+terser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374"
+  integrity sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
 through2@^2.0.0, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index dcc9a4f80..9060b79eb 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -116,7 +116,7 @@
 		"cordova-plugin-uniquedeviceid": "^1.3.2",
 		"cordova-plugin-vibration": "^3.1.0",
 		"cordova-plugin-whitelist": "^1.3.3",
-		"core-js": "^3.0.0",
+		"core-js": "^3.1.3",
 		"cryptiles": "^4.1.3",
 		"font-awesome": "^4.7.0",
 		"graphql": "^14.1.1",
@@ -190,7 +190,7 @@
 		"karma-jasmine-html-reporter": "^1.4.0",
 		"protractor": "^5.4.2",
 		"rxjs-tslint": "0.1.5",
-		"terser": "^3.17.0",
+		"terser": "^4.0.0",
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index bd1e6bdf1..f6fc34cdc 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -3022,10 +3022,10 @@ core-js@^2.2.0, core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
-core-js@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
-  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+core-js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
+  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -9961,7 +9961,7 @@ terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser@^3.16.1, terser@^3.17.0:
+terser@^3.16.1:
   version "3.17.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
   integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
@@ -9970,6 +9970,15 @@ terser@^3.16.1, terser@^3.17.0:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
+terser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374"
+  integrity sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
 through2@^2.0.0, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 0667d6e59..0d8b5d201 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -134,7 +134,7 @@
 		"browser-detect": "^0.2.28",
 		"bson-objectid": "^1.2.4",
 		"classlist.js": "^1.1.20150312",
-		"core-js": "^2.6.5",
+		"core-js": "^3.1.3",
 		"css-element-queries": "^1.2.0",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
@@ -214,7 +214,7 @@
 		"karma-remap-coverage": "^0.1.5",
 		"karma-sourcemap-loader": "^0.3.7",
 		"karma-webpack": "^3.0.5",
-		"mini-css-extract-plugin": "^0.6.0",
+		"mini-css-extract-plugin": "^0.7.0",
 		"ng-router-loader": "^2.1.0",
 		"ngc-webpack": "~4.1.2",
 		"node-sass": "^4.11.0",
diff --git a/shop/website-angular/src/polyfills.browser.ts b/shop/website-angular/src/polyfills.browser.ts
index 6d9ba16a9..67f475770 100644
--- a/shop/website-angular/src/polyfills.browser.ts
+++ b/shop/website-angular/src/polyfills.browser.ts
@@ -41,9 +41,9 @@
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 // Evergreen browsers require these.
-import 'core-js/es6/reflect';
-import 'core-js/es7/reflect';
-
+// import 'core-js/es6/reflect';
+// import 'core-js/es7/reflect';
+import 'core-js/proposals/reflect-metadata';
 /**
  * Required to support Web Animations `@angular/animation`.
  * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 8a38a313b..5e7bc42df 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -2893,11 +2893,16 @@ copy-webpack-plugin@^5.0.0:
     serialize-javascript "^1.4.0"
     webpack-log "^2.0.0"
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7, core-js@^2.6.5:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
+core-js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
+  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -6800,13 +6805,13 @@ mini-css-extract-plugin@0.5.0:
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
-mini-css-extract-plugin@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
-  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
+mini-css-extract-plugin@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz#5ba8290fbb4179a43dd27cca444ba150bee743a0"
+  integrity sha512-RQIw6+7utTYn8DBGsf/LpRgZCJMpZt+kuawJ/fju0KiOL6nAaTBNmCJwS7HtwSCXfS47gCkmtBFS7HdsquhdxQ==
   dependencies:
     loader-utils "^1.1.0"
-    normalize-url "^2.0.1"
+    normalize-url "1.9.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -7266,7 +7271,7 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-url@^1.0.0:
+normalize-url@1.9.1, normalize-url@^1.0.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
   integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
@@ -7276,15 +7281,6 @@ normalize-url@^1.0.0:
     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"
-
 npm-bundled@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
@@ -8192,11 +8188,6 @@ 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@^1.16.4:
   version "1.16.4"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
@@ -8419,15 +8410,6 @@ 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"
@@ -8942,7 +8924,14 @@ rxjs@6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.1.0, rxjs@^6.4.0:
+rxjs@^6.1.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
@@ -9447,13 +9436,6 @@ 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"

From 1e3281d5cdf785a7268f7f39aeb7354069a15fc6 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 31 May 2019 11:40:09 +0300
Subject: [PATCH 343/382] chore: update packages to the latest version
 @ionic/lab, axios, @commitlint/cli

---
 backend/api/package.json           |   4 +-
 backend/api/yarn.lock              | 176 ++++++++++++++++++++++++++---
 carrier/mobile-ionic/package.json  |   2 +-
 carrier/mobile-ionic/yarn.lock     | 143 +++++++++++++++++++++--
 merchant/tablet-ionic/package.json |   2 +-
 merchant/tablet-ionic/yarn.lock    | 143 +++++++++++++++++++++--
 package.json                       |   2 +-
 shop/mobile-ionic/package.json     |   2 +-
 shop/mobile-ionic/yarn.lock        | 143 +++++++++++++++++++++--
 shop/website-angular/package.json  |   4 +-
 shop/website-angular/yarn.lock     |  26 ++++-
 yarn.lock                          | 151 +++++++++++++++++++++++--
 12 files changed, 747 insertions(+), 51 deletions(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index 8c0061613..823459260 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -61,7 +61,7 @@
 		"@nestjs/typeorm": "^6.1.1",
 		"@nestjs/websockets": "^6.1.1",
 		"apollo-server-express": "^2.4.8",
-		"axios": "^0.18.0",
+		"axios": "^0.19.0",
 		"bcrypt": "^3.0.4",
 		"bluebird": "^3.5.4",
 		"body-parser": "^1.19.0",
@@ -142,7 +142,7 @@
 		"ws": "^7.0.0"
 	},
 	"devDependencies": {
-		"@commitlint/cli": "^7.5.2",
+		"@commitlint/cli": "^8.0.0",
 		"@commitlint/config-conventional": "^7.5.0",
 		"@commitlint/config-lerna-scopes": "^7.5.1",
 		"@commitlint/travis-cli": "^7.5.2",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 3d5bb0f7c..c4e1d4ddb 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -273,6 +273,23 @@
     resolve-from "4.0.0"
     resolve-global "0.1.0"
 
+"@commitlint/cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-8.0.0.tgz#1be7aa14fecbcf71317a8187fbb5210760d4ca61"
+  integrity sha512-wFu+g9v73I2rMRTv27ItIbcrhWqge0ZpUNUIJ9fw8TF7XpmhaUFvGqa2kU6st1F0TyEOrq5ZMzwI8kQZNVLuXg==
+  dependencies:
+    "@commitlint/format" "^8.0.0"
+    "@commitlint/lint" "^8.0.0"
+    "@commitlint/load" "^8.0.0"
+    "@commitlint/read" "^8.0.0"
+    babel-polyfill "6.26.0"
+    chalk "2.3.1"
+    get-stdin "7.0.0"
+    lodash "4.17.11"
+    meow "5.0.0"
+    resolve-from "5.0.0"
+    resolve-global "1.0.0"
+
 "@commitlint/config-conventional@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-7.5.0.tgz#3afd4e3e34e5c2f6ec6af03e78ae924fed883ce7"
@@ -294,6 +311,13 @@
   dependencies:
     lodash "4.17.11"
 
+"@commitlint/ensure@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-8.0.0.tgz#67a3e72755a0dfa5f4216efd05238f62ff132110"
+  integrity sha512-rhBO79L9vXeb26JU+14cxZQq46KyyVqlo31C33VIe7oJndUtWrDhZTvMjJeB1pdXh4EU4XWdMo+yzBmuypFgig==
+  dependencies:
+    lodash "4.17.11"
+
 "@commitlint/execute-rule@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-7.5.0.tgz#c9cfbab71eb962e1c46e78d76375e32754ab1e38"
@@ -301,6 +325,13 @@
   dependencies:
     babel-runtime "6.26.0"
 
+"@commitlint/execute-rule@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-8.0.0.tgz#df2a9893f162fc561ca4e95a34bd782469dd7f8b"
+  integrity sha512-E/A2xHqx3syclXAFl8vJY2o/+xtL9axrqbFFF42Bzke+Eflf0mOJviPxDodu2xP0wXMRQ9UokAi/reK9dMtA/A==
+  dependencies:
+    babel-runtime "6.26.0"
+
 "@commitlint/format@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-7.5.0.tgz#57a2b92dc58a3409b2be67c4c8c10bd1b28e9fe8"
@@ -309,6 +340,13 @@
     babel-runtime "^6.23.0"
     chalk "^2.0.1"
 
+"@commitlint/format@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-8.0.0.tgz#f7c858d9057e1da6856be211ad049c5b9a66185b"
+  integrity sha512-dFxKGLp1T4obi7+YZ2NcSAebJA/dBQwnerRJGz0hWtsO6pheJRe+qC50+GCb2fYGWUc5lIWawaRts0m7RkFGUw==
+  dependencies:
+    chalk "^2.0.1"
+
 "@commitlint/is-ignored@^7.5.1":
   version "7.5.1"
   resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-7.5.1.tgz#c4f7ffc1c8b4cf9dc3204d22ef8e78ff82536d67"
@@ -316,6 +354,13 @@
   dependencies:
     semver "5.6.0"
 
+"@commitlint/is-ignored@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-8.0.0.tgz#eba06c9a6227288574f544a1705583d965f0ed65"
+  integrity sha512-geWr/NXGMrZ3qc3exDM+S1qV+nMDxp1LwN3rLpEN2gXTwW3rIXq49RQQUkn0n3BHcpqJJ9EBhjqFoMU1TYx7Ng==
+  dependencies:
+    semver "6.0.0"
+
 "@commitlint/lint@^7.5.2":
   version "7.5.2"
   resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-7.5.2.tgz#26cb819c74f8770413c4f6ef1e7abf1b739eda77"
@@ -327,6 +372,17 @@
     babel-runtime "^6.23.0"
     lodash "4.17.11"
 
+"@commitlint/lint@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-8.0.0.tgz#3defb3b1a900ba966c64a51b497bf1fcff5fc9f2"
+  integrity sha512-5nKiJpBDR2iei+fre4+6M7FUrSX1cIMoxXKdrnb1GMOXkw9CsZSF5OvdrX08zHAFmOAeDaohoCV+XN/UN/vWYg==
+  dependencies:
+    "@commitlint/is-ignored" "^8.0.0"
+    "@commitlint/parse" "^8.0.0"
+    "@commitlint/rules" "^8.0.0"
+    babel-runtime "^6.23.0"
+    lodash "4.17.11"
+
 "@commitlint/load@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-7.5.0.tgz#2b225b97d631c2235d8b2084bc2fefb4d4d66719"
@@ -339,11 +395,28 @@
     lodash "4.17.11"
     resolve-from "^4.0.0"
 
+"@commitlint/load@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-8.0.0.tgz#5eacfb96635e9aeac8f1a0674491f29483348872"
+  integrity sha512-JXC3YjO7hN7Rv2Z/SaYz+oIvShsQWLL7gnOCe8+YgI1EusBqjV4mPI0HnBXVe9volfdxbl+Af/GoQZs2dvyOFA==
+  dependencies:
+    "@commitlint/execute-rule" "^8.0.0"
+    "@commitlint/resolve-extends" "^8.0.0"
+    babel-runtime "^6.23.0"
+    cosmiconfig "^5.2.0"
+    lodash "4.17.11"
+    resolve-from "^5.0.0"
+
 "@commitlint/message@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-7.5.0.tgz#2572fad648c769dd210374c8b95fb37124302bc5"
   integrity sha512-5YOhsqy/MgHH7vyDsmmzO6Jr3ygr1pXbCm9NR3XB51wjg55Kd6/6dVlkhS/FmDp99pfwTdHb0TyeDFEjP98waw==
 
+"@commitlint/message@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-8.0.0.tgz#bbb02fb78490808e36157d675acc544fafd7942b"
+  integrity sha512-2oGUV8630nzsj17t6akq3mFguzWePADO069IwKJi+CN5L0YRBQj9zGRCB0P+zvh4EngjqMnuMwhEhaBEM8TTzA==
+
 "@commitlint/parse@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-7.5.0.tgz#d9374266493e5229ec61d92316d28e02419c600f"
@@ -353,6 +426,15 @@
     conventional-commits-parser "^2.1.0"
     lodash "^4.17.11"
 
+"@commitlint/parse@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-8.0.0.tgz#4b5fa19ab8bdb2c6452b7dbdf1d7adf52386ae60"
+  integrity sha512-6CyweJrBkI+Jqx7qkpYgVx2muBMoUZAZHWhUTgqHIDDmI+3d4UPZ2plGS2G0969KkHCgjtlwnwTjWqA9HLMwPA==
+  dependencies:
+    conventional-changelog-angular "^1.3.3"
+    conventional-commits-parser "^2.1.0"
+    lodash "^4.17.11"
+
 "@commitlint/read@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-7.5.0.tgz#35d563b0f3075da2ce6945978996b16fb4acb0f8"
@@ -363,6 +445,16 @@
     babel-runtime "^6.23.0"
     git-raw-commits "^1.3.0"
 
+"@commitlint/read@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-8.0.0.tgz#5149fcb2550a07e7eb6a9f50b88df742780fa1e8"
+  integrity sha512-IhNMiKPqkB5yxphe/FiOKgX2uCysbR8fGK6KOXON3uJaVND0dctxnfdv+vY9gDv2CtjIXgNFO+v6FLnqMfIvwA==
+  dependencies:
+    "@commitlint/top-level" "^8.0.0"
+    "@marionebl/sander" "^0.6.0"
+    babel-runtime "^6.23.0"
+    git-raw-commits "^1.3.0"
+
 "@commitlint/resolve-extends@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-7.5.0.tgz#d95a3058e83ddbaef5e3045835b9a3a1fba3422c"
@@ -374,6 +466,17 @@
     resolve-from "^4.0.0"
     resolve-global "^0.1.0"
 
+"@commitlint/resolve-extends@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-8.0.0.tgz#dc606cecb0f392d57905cfd690d8f736ad26eec2"
+  integrity sha512-SPkH+dXMCpYboVwpIhtOhpg1xYdE7L77fuHmEJWveXSmgfi0GosFm4aJ7Cer9DjNjW+KbD0TUfzZU0TrYUESjQ==
+  dependencies:
+    babel-runtime "6.26.0"
+    import-fresh "^3.0.0"
+    lodash "4.17.11"
+    resolve-from "^5.0.0"
+    resolve-global "^1.0.0"
+
 "@commitlint/rules@^7.5.2":
   version "7.5.2"
   resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-7.5.2.tgz#da03d754625b2e67c0a6b8b9ab89eae1952a4f2e"
@@ -384,11 +487,26 @@
     "@commitlint/to-lines" "^7.5.0"
     babel-runtime "^6.23.0"
 
+"@commitlint/rules@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-8.0.0.tgz#26ef50fedb5a88a2ad2af43677e5bb7c32fb5f14"
+  integrity sha512-s9BehZQP5uAc/V4lMaUxwxFabVZTw5fZ18Ase1e5tbMKVIwq/7E00Ny1czN7xSFXfgffukWznsexpfFXYpbVsg==
+  dependencies:
+    "@commitlint/ensure" "^8.0.0"
+    "@commitlint/message" "^8.0.0"
+    "@commitlint/to-lines" "^8.0.0"
+    babel-runtime "^6.23.0"
+
 "@commitlint/to-lines@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-7.5.0.tgz#a24410d25bb85a5fff3b8d610277b3145f899766"
   integrity sha512-ZQ3LxPNuQ/J7q42hkiPWN5fUIjWae85H2HHoBB+/Rw1fo+oehvr4Xyt+Oa9Mx5WbBnev/wXnUFjXgoadv1RZ5A==
 
+"@commitlint/to-lines@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-8.0.0.tgz#9f7d7938404bdbb345c23c8665293e051c4dc243"
+  integrity sha512-qqgNeyj+NJ1Xffwv6hGsipKlVFj30NmfPup751MS/me0GV8IBd//njTjiqHvf/3sKm/OcGn4Re4D7YXwTcC2RA==
+
 "@commitlint/top-level@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-7.5.0.tgz#01e740167e3d15110794192cd754f49f27d4a16d"
@@ -396,6 +514,13 @@
   dependencies:
     find-up "^2.1.0"
 
+"@commitlint/top-level@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-8.0.0.tgz#3d998ba1e13be939f4227202eebae7f1dbb472a9"
+  integrity sha512-If9hwfISHV8HXGKeXUKsUvOo4DuISWiU/VC2qHsKpeHSREAxkWESmQzzwYvOtyBjMiOTfAXfzgth18g36Fz2ow==
+  dependencies:
+    find-up "^2.1.0"
+
 "@commitlint/travis-cli@^7.5.2":
   version "7.5.2"
   resolved "https://registry.yarnpkg.com/@commitlint/travis-cli/-/travis-cli-7.5.2.tgz#f82ca57296eb913b6557124b80eac9773dcbbf1d"
@@ -2044,7 +2169,7 @@ aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
-axios@0.18.0, axios@^0.18.0:
+axios@0.18.0:
   version "0.18.0"
   resolved "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
   dependencies:
@@ -2058,6 +2183,14 @@ axios@^0.16.2:
     follow-redirects "^1.2.3"
     is-buffer "^1.1.5"
 
+axios@^0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
+  integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
+  dependencies:
+    follow-redirects "1.5.10"
+    is-buffer "^2.0.2"
+
 babel-code-frame@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -4698,7 +4831,7 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
-follow-redirects@^1.2.3:
+follow-redirects@1.5.10, follow-redirects@^1.2.3:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
   dependencies:
@@ -4895,15 +5028,15 @@ get-stdin@5.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
   integrity sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-
-get-stdin@^7.0.0:
+get-stdin@7.0.0, get-stdin@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
   integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
 
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
 get-stream@^2.2.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
@@ -5057,7 +5190,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^0.1.0:
+global-dirs@^0.1.0, global-dirs@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
   dependencies:
@@ -5764,6 +5897,11 @@ is-buffer@^1.0.2, is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
+is-buffer@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
+  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
+
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -9542,6 +9680,11 @@ resolve-from@4.0.0, resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
 
+resolve-from@5.0.0, resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-from@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
@@ -9557,6 +9700,13 @@ resolve-global@0.1.0, resolve-global@^0.1.0:
   dependencies:
     global-dirs "^0.1.0"
 
+resolve-global@1.0.0, resolve-global@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255"
+  integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==
+  dependencies:
+    global-dirs "^0.1.1"
+
 resolve-pkg@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-1.0.0.tgz#e19a15e78aca2e124461dc92b2e3943ef93494d9"
@@ -9837,16 +9987,16 @@ semver@5.6.0, semver@^5.5, semver@^5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@6.0.0, semver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
 semver@^5.5.1:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-semver@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
-  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
-
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 2226b19bf..ab8792cdd 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -169,7 +169,7 @@
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.1",
 		"@ionic/app-scripts": "^3.2.3",
-		"@ionic/lab": "^1.0.24",
+		"@ionic/lab": "^2.0.0",
 		"@schematics/angular": "^7.3.8",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 9c3d15e56..ea44d4c0a 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -609,6 +609,33 @@
     wrap-ansi "^4.0.0"
     write-file-atomic "^2.3.0"
 
+"@ionic/cli-framework@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-2.0.0.tgz#0fa5de4b97d9473b97cca8076b307ac40ca0c8d2"
+  integrity sha512-AovnYq4bH1eFKiAiuaze3YXK9DeOGq1ODn6bUPOquYrQeXpMQmxbYYleLlJ2sKj1UTr7VpfdoO1dJARkyRayOQ==
+  dependencies:
+    "@ionic/utils-array" "1.0.0"
+    "@ionic/utils-fs" "2.0.0"
+    "@ionic/utils-object" "1.0.0"
+    "@ionic/utils-process" "1.0.0"
+    "@ionic/utils-stream" "1.0.0"
+    "@ionic/utils-subprocess" "1.0.0"
+    "@ionic/utils-terminal" "1.0.0"
+    chalk "^2.3.0"
+    debug "^4.0.0"
+    inquirer "^6.0.0"
+    lodash "^4.17.5"
+    log-update "^3.2.0"
+    minimist "^1.2.0"
+    rimraf "^2.6.2"
+    slice-ansi "^2.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^5.2.0"
+    tslib "^1.9.0"
+    untildify "^4.0.0"
+    wrap-ansi "^5.1.0"
+    write-file-atomic "^2.3.0"
+
 "@ionic/core@4.2.0":
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.2.0.tgz#9b71c4b22a6b58cfe1bd3b1e24142b462ed9b480"
@@ -626,13 +653,13 @@
     tslib "^1.9.0"
     ws "^6.0.0"
 
-"@ionic/lab@^1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-1.0.24.tgz#31e61fe6eb8048025d8928b7834b6bb06ef36149"
-  integrity sha512-sXUx0MZKC43bZ5ZJ1IRQ+yuvCgNGGJ6QPREI1AeHXZpkZRixrh0w14SLgxEzjxvFgW6ypQkdKlymY0nRoU8Gng==
+"@ionic/lab@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-2.0.0.tgz#f879730fcea9b6b974dd19bf90ac2478d18253fc"
+  integrity sha512-XbgkR94fdZ/WhWb39vcY+3+YttPEp4iIKys8TFWX5Dp6eNdKFu9Zg1hXVnn/ZcMYaPn5cSXFraSelKM9/WiwYA==
   dependencies:
-    "@ionic/cli-framework" "1.7.0"
-    "@ionic/utils-fs" "1.2.0"
+    "@ionic/cli-framework" "2.0.0"
+    "@ionic/utils-fs" "2.0.0"
     chalk "^2.3.0"
     express "^4.16.2"
     tslib "^1.9.0"
@@ -659,6 +686,14 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-array@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-1.0.0.tgz#f9967f4cf121c3d16d88943116564aac4df1dd47"
+  integrity sha512-W0wTuUCmQ7ZDfnIOJ11gmszXlv9xYNO3z99TqbNKBQHyr4dm3mRhAKrfZslPQ202VTvh9/e0Nwx8znu+zUMaJQ==
+  dependencies:
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-fs@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-1.2.0.tgz#bc4492c5d57f910dedac2d3a33026d71ff3a51d5"
@@ -669,6 +704,16 @@
     through2 "^3.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-fs@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-2.0.0.tgz#f5188f17d63c4d70d8b1af095f2f60c70c4bcb16"
+  integrity sha512-WKIwS7WNsxabq2fpbkoDFKvNfPnkoFtdmxFuD5qztBG/tGD8zCE8ON1dui9DjKVDIR4lr6rkovmdVu2SCVM3rA==
+  dependencies:
+    debug "^4.0.0"
+    fs-extra "^7.0.1"
+    through2 "^3.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-network@0.0.8":
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/@ionic/utils-network/-/utils-network-0.0.8.tgz#371b3bbc1d7ee770fbcbc5759fdcdf215d8865c6"
@@ -685,6 +730,14 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-object@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-1.0.0.tgz#2783cf44d99164087688054bc41f6a453535f2a2"
+  integrity sha512-Bn8X+3LLKLX2HT1jjcZvavKB7W5JAm8gWW+NybClO2D8S6Py0Fr0ckB5XKrYnNmk2C/Dr7n+Ga5dMypei/xAxA==
+  dependencies:
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-process@0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-0.1.0.tgz#35263b7e2cc5b05b6e21ab7105eb8ccf78befadd"
@@ -697,6 +750,18 @@
     tree-kill "1.2.1"
     tslib "^1.9.0"
 
+"@ionic/utils-process@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-1.0.0.tgz#4a5ade9ec59a728c84f913557d2625d6e91ece67"
+  integrity sha512-4YMbpT4CAe+GdgW1GTxbzOze8q/7yCnjtqQJyLMzRIGSEdOeXx6I8GRf5Y6IDJhhdf7QVYUZXoeFpNASQXiSPA==
+  dependencies:
+    "@ionic/utils-object" "1.0.0"
+    "@ionic/utils-terminal" "1.0.0"
+    debug "^4.0.0"
+    lodash "^4.17.5"
+    tree-kill "1.2.1"
+    tslib "^1.9.0"
+
 "@ionic/utils-stream@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-0.0.1.tgz#f73808262b77be2e6a3c2fbedb69cc185d6f3b69"
@@ -706,6 +771,15 @@
     stream-combiner2 "^1.1.1"
     tslib "^1.9.0"
 
+"@ionic/utils-stream@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-1.0.0.tgz#2cf66bb2c8f49e0ad5ae5151c02d90505d93854e"
+  integrity sha512-kW8MX33YlvP/JXo9qs6fZ3ghbtHX+R0twAZuyuF1WeBWq4eDwJeOaNv80PHr+wm+DBwYPhXmve/d20z/trgm/Q==
+  dependencies:
+    debug "^4.0.0"
+    stream-combiner2 "^1.1.1"
+    tslib "^1.9.0"
+
 "@ionic/utils-subprocess@0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz#3f2fc1d829e06d8c5ed66faad2ce8d9c7a3a1d9b"
@@ -719,6 +793,20 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-subprocess@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-1.0.0.tgz#e3714d69f7b7ef3577e8832a67ea8630ef0c3ad7"
+  integrity sha512-iHjs7voSlOauNv3kICfBtlyAHYfh/DsWaxucLaQ2IXcYknqqzr8H1FbW2dH+TxorG1g7YPWEnbjY7UeeiavnqQ==
+  dependencies:
+    "@ionic/utils-array" "1.0.0"
+    "@ionic/utils-fs" "2.0.0"
+    "@ionic/utils-process" "1.0.0"
+    "@ionic/utils-stream" "1.0.0"
+    "@ionic/utils-terminal" "1.0.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-terminal@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz#3ffd2d18cf5039c5944768cb259d649e962ecba7"
@@ -727,6 +815,14 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-terminal@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-1.0.0.tgz#e7477abf9fc4e0ce27afdf515ac0a331215244d2"
+  integrity sha512-8NVfY+ZyKajfsXj/bzKe5QduDJy0T0I/GPgaPKRZzFHQyUDbcUKZqKfVnAEUCm8l54v13drXovy08jP/6ulKXw==
+  dependencies:
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -3772,6 +3868,11 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -5732,6 +5833,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -6599,6 +6705,15 @@ log-update@^2.3.0:
     cli-cursor "^2.0.0"
     wrap-ansi "^3.0.1"
 
+log-update@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-3.2.0.tgz#719f24293250d65d0165f4e2ec2ed805ff062eec"
+  integrity sha512-KJ6zAPIHWo7Xg1jYror6IUDFJBq1bQ4Bi4wAEp2y/0ScjBBVi/g0thr0sUVhuvuXauWzczt7T2QHghPDNnKBuw==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    cli-cursor "^2.1.0"
+    wrap-ansi "^5.0.0"
+
 log4js@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.1.0.tgz#57983c6a443546a8c8607e9cb045d2a117c27644"
@@ -9857,6 +9972,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
+  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^5.2.0"
+
 string.prototype.trim@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
@@ -10599,6 +10723,11 @@ untildify@^3.0.2:
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
   integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
 
+untildify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
+
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
@@ -11095,7 +11224,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrap-ansi@^5.1.0:
+wrap-ansi@^5.0.0, wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
   integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 44c2abcbd..fe3912b95 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -182,7 +182,7 @@
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.1",
 		"@ionic/app-scripts": "^3.2.3",
-		"@ionic/lab": "^1.0.24",
+		"@ionic/lab": "^2.0.0",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
 		"@types/graphql": "^14.0.7",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 67254f1f9..53b2c28cd 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -549,6 +549,33 @@
     wrap-ansi "^4.0.0"
     write-file-atomic "^2.3.0"
 
+"@ionic/cli-framework@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-2.0.0.tgz#0fa5de4b97d9473b97cca8076b307ac40ca0c8d2"
+  integrity sha512-AovnYq4bH1eFKiAiuaze3YXK9DeOGq1ODn6bUPOquYrQeXpMQmxbYYleLlJ2sKj1UTr7VpfdoO1dJARkyRayOQ==
+  dependencies:
+    "@ionic/utils-array" "1.0.0"
+    "@ionic/utils-fs" "2.0.0"
+    "@ionic/utils-object" "1.0.0"
+    "@ionic/utils-process" "1.0.0"
+    "@ionic/utils-stream" "1.0.0"
+    "@ionic/utils-subprocess" "1.0.0"
+    "@ionic/utils-terminal" "1.0.0"
+    chalk "^2.3.0"
+    debug "^4.0.0"
+    inquirer "^6.0.0"
+    lodash "^4.17.5"
+    log-update "^3.2.0"
+    minimist "^1.2.0"
+    rimraf "^2.6.2"
+    slice-ansi "^2.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^5.2.0"
+    tslib "^1.9.0"
+    untildify "^4.0.0"
+    wrap-ansi "^5.1.0"
+    write-file-atomic "^2.3.0"
+
 "@ionic/core@4.2.0":
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.2.0.tgz#9b71c4b22a6b58cfe1bd3b1e24142b462ed9b480"
@@ -566,13 +593,13 @@
     tslib "^1.9.0"
     ws "^6.0.0"
 
-"@ionic/lab@^1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-1.0.24.tgz#31e61fe6eb8048025d8928b7834b6bb06ef36149"
-  integrity sha512-sXUx0MZKC43bZ5ZJ1IRQ+yuvCgNGGJ6QPREI1AeHXZpkZRixrh0w14SLgxEzjxvFgW6ypQkdKlymY0nRoU8Gng==
+"@ionic/lab@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-2.0.0.tgz#f879730fcea9b6b974dd19bf90ac2478d18253fc"
+  integrity sha512-XbgkR94fdZ/WhWb39vcY+3+YttPEp4iIKys8TFWX5Dp6eNdKFu9Zg1hXVnn/ZcMYaPn5cSXFraSelKM9/WiwYA==
   dependencies:
-    "@ionic/cli-framework" "1.7.0"
-    "@ionic/utils-fs" "1.2.0"
+    "@ionic/cli-framework" "2.0.0"
+    "@ionic/utils-fs" "2.0.0"
     chalk "^2.3.0"
     express "^4.16.2"
     tslib "^1.9.0"
@@ -599,6 +626,14 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-array@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-1.0.0.tgz#f9967f4cf121c3d16d88943116564aac4df1dd47"
+  integrity sha512-W0wTuUCmQ7ZDfnIOJ11gmszXlv9xYNO3z99TqbNKBQHyr4dm3mRhAKrfZslPQ202VTvh9/e0Nwx8znu+zUMaJQ==
+  dependencies:
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-fs@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-1.2.0.tgz#bc4492c5d57f910dedac2d3a33026d71ff3a51d5"
@@ -609,6 +644,16 @@
     through2 "^3.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-fs@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-2.0.0.tgz#f5188f17d63c4d70d8b1af095f2f60c70c4bcb16"
+  integrity sha512-WKIwS7WNsxabq2fpbkoDFKvNfPnkoFtdmxFuD5qztBG/tGD8zCE8ON1dui9DjKVDIR4lr6rkovmdVu2SCVM3rA==
+  dependencies:
+    debug "^4.0.0"
+    fs-extra "^7.0.1"
+    through2 "^3.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-network@0.0.8":
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/@ionic/utils-network/-/utils-network-0.0.8.tgz#371b3bbc1d7ee770fbcbc5759fdcdf215d8865c6"
@@ -625,6 +670,14 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-object@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-1.0.0.tgz#2783cf44d99164087688054bc41f6a453535f2a2"
+  integrity sha512-Bn8X+3LLKLX2HT1jjcZvavKB7W5JAm8gWW+NybClO2D8S6Py0Fr0ckB5XKrYnNmk2C/Dr7n+Ga5dMypei/xAxA==
+  dependencies:
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-process@0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-0.1.0.tgz#35263b7e2cc5b05b6e21ab7105eb8ccf78befadd"
@@ -637,6 +690,18 @@
     tree-kill "1.2.1"
     tslib "^1.9.0"
 
+"@ionic/utils-process@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-1.0.0.tgz#4a5ade9ec59a728c84f913557d2625d6e91ece67"
+  integrity sha512-4YMbpT4CAe+GdgW1GTxbzOze8q/7yCnjtqQJyLMzRIGSEdOeXx6I8GRf5Y6IDJhhdf7QVYUZXoeFpNASQXiSPA==
+  dependencies:
+    "@ionic/utils-object" "1.0.0"
+    "@ionic/utils-terminal" "1.0.0"
+    debug "^4.0.0"
+    lodash "^4.17.5"
+    tree-kill "1.2.1"
+    tslib "^1.9.0"
+
 "@ionic/utils-stream@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-0.0.1.tgz#f73808262b77be2e6a3c2fbedb69cc185d6f3b69"
@@ -646,6 +711,15 @@
     stream-combiner2 "^1.1.1"
     tslib "^1.9.0"
 
+"@ionic/utils-stream@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-1.0.0.tgz#2cf66bb2c8f49e0ad5ae5151c02d90505d93854e"
+  integrity sha512-kW8MX33YlvP/JXo9qs6fZ3ghbtHX+R0twAZuyuF1WeBWq4eDwJeOaNv80PHr+wm+DBwYPhXmve/d20z/trgm/Q==
+  dependencies:
+    debug "^4.0.0"
+    stream-combiner2 "^1.1.1"
+    tslib "^1.9.0"
+
 "@ionic/utils-subprocess@0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz#3f2fc1d829e06d8c5ed66faad2ce8d9c7a3a1d9b"
@@ -659,6 +733,20 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-subprocess@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-1.0.0.tgz#e3714d69f7b7ef3577e8832a67ea8630ef0c3ad7"
+  integrity sha512-iHjs7voSlOauNv3kICfBtlyAHYfh/DsWaxucLaQ2IXcYknqqzr8H1FbW2dH+TxorG1g7YPWEnbjY7UeeiavnqQ==
+  dependencies:
+    "@ionic/utils-array" "1.0.0"
+    "@ionic/utils-fs" "2.0.0"
+    "@ionic/utils-process" "1.0.0"
+    "@ionic/utils-stream" "1.0.0"
+    "@ionic/utils-terminal" "1.0.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-terminal@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz#3ffd2d18cf5039c5944768cb259d649e962ecba7"
@@ -667,6 +755,14 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-terminal@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-1.0.0.tgz#e7477abf9fc4e0ce27afdf515ac0a331215244d2"
+  integrity sha512-8NVfY+ZyKajfsXj/bzKe5QduDJy0T0I/GPgaPKRZzFHQyUDbcUKZqKfVnAEUCm8l54v13drXovy08jP/6ulKXw==
+  dependencies:
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -3778,6 +3874,11 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -5717,6 +5818,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -6437,6 +6543,15 @@ log-update@^2.3.0:
     cli-cursor "^2.0.0"
     wrap-ansi "^3.0.1"
 
+log-update@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-3.2.0.tgz#719f24293250d65d0165f4e2ec2ed805ff062eec"
+  integrity sha512-KJ6zAPIHWo7Xg1jYror6IUDFJBq1bQ4Bi4wAEp2y/0ScjBBVi/g0thr0sUVhuvuXauWzczt7T2QHghPDNnKBuw==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    cli-cursor "^2.1.0"
+    wrap-ansi "^5.0.0"
+
 loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
@@ -9711,6 +9826,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
+  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^5.2.0"
+
 string.prototype.trim@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
@@ -10449,6 +10573,11 @@ untildify@^3.0.2:
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
   integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
 
+untildify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
+
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
@@ -10921,7 +11050,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrap-ansi@^5.1.0:
+wrap-ansi@^5.0.0, wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
   integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
diff --git a/package.json b/package.json
index 3e462cec0..22d7f92d7 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
 		"uuid": "^3.3.2"
 	},
 	"devDependencies": {
-		"@commitlint/cli": "^7.5.2",
+		"@commitlint/cli": "^8.0.0",
 		"@commitlint/config-conventional": "^7.5.0",
 		"@commitlint/config-lerna-scopes": "^7.5.1",
 		"@commitlint/travis-cli": "^7.5.2",
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 9060b79eb..d30fbd23f 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -157,7 +157,7 @@
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.1",
 		"@ionic/app-scripts": "^3.2.3",
-		"@ionic/lab": "^1.0.24",
+		"@ionic/lab": "^2.0.0",
 		"@schematics/angular": "^7.3.8",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index f6fc34cdc..1756742ab 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -609,6 +609,33 @@
     wrap-ansi "^4.0.0"
     write-file-atomic "^2.3.0"
 
+"@ionic/cli-framework@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-2.0.0.tgz#0fa5de4b97d9473b97cca8076b307ac40ca0c8d2"
+  integrity sha512-AovnYq4bH1eFKiAiuaze3YXK9DeOGq1ODn6bUPOquYrQeXpMQmxbYYleLlJ2sKj1UTr7VpfdoO1dJARkyRayOQ==
+  dependencies:
+    "@ionic/utils-array" "1.0.0"
+    "@ionic/utils-fs" "2.0.0"
+    "@ionic/utils-object" "1.0.0"
+    "@ionic/utils-process" "1.0.0"
+    "@ionic/utils-stream" "1.0.0"
+    "@ionic/utils-subprocess" "1.0.0"
+    "@ionic/utils-terminal" "1.0.0"
+    chalk "^2.3.0"
+    debug "^4.0.0"
+    inquirer "^6.0.0"
+    lodash "^4.17.5"
+    log-update "^3.2.0"
+    minimist "^1.2.0"
+    rimraf "^2.6.2"
+    slice-ansi "^2.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^5.2.0"
+    tslib "^1.9.0"
+    untildify "^4.0.0"
+    wrap-ansi "^5.1.0"
+    write-file-atomic "^2.3.0"
+
 "@ionic/core@4.2.0":
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.2.0.tgz#9b71c4b22a6b58cfe1bd3b1e24142b462ed9b480"
@@ -626,13 +653,13 @@
     tslib "^1.9.0"
     ws "^6.0.0"
 
-"@ionic/lab@^1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-1.0.24.tgz#31e61fe6eb8048025d8928b7834b6bb06ef36149"
-  integrity sha512-sXUx0MZKC43bZ5ZJ1IRQ+yuvCgNGGJ6QPREI1AeHXZpkZRixrh0w14SLgxEzjxvFgW6ypQkdKlymY0nRoU8Gng==
+"@ionic/lab@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-2.0.0.tgz#f879730fcea9b6b974dd19bf90ac2478d18253fc"
+  integrity sha512-XbgkR94fdZ/WhWb39vcY+3+YttPEp4iIKys8TFWX5Dp6eNdKFu9Zg1hXVnn/ZcMYaPn5cSXFraSelKM9/WiwYA==
   dependencies:
-    "@ionic/cli-framework" "1.7.0"
-    "@ionic/utils-fs" "1.2.0"
+    "@ionic/cli-framework" "2.0.0"
+    "@ionic/utils-fs" "2.0.0"
     chalk "^2.3.0"
     express "^4.16.2"
     tslib "^1.9.0"
@@ -659,6 +686,14 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-array@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-1.0.0.tgz#f9967f4cf121c3d16d88943116564aac4df1dd47"
+  integrity sha512-W0wTuUCmQ7ZDfnIOJ11gmszXlv9xYNO3z99TqbNKBQHyr4dm3mRhAKrfZslPQ202VTvh9/e0Nwx8znu+zUMaJQ==
+  dependencies:
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-fs@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-1.2.0.tgz#bc4492c5d57f910dedac2d3a33026d71ff3a51d5"
@@ -669,6 +704,16 @@
     through2 "^3.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-fs@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-2.0.0.tgz#f5188f17d63c4d70d8b1af095f2f60c70c4bcb16"
+  integrity sha512-WKIwS7WNsxabq2fpbkoDFKvNfPnkoFtdmxFuD5qztBG/tGD8zCE8ON1dui9DjKVDIR4lr6rkovmdVu2SCVM3rA==
+  dependencies:
+    debug "^4.0.0"
+    fs-extra "^7.0.1"
+    through2 "^3.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-network@0.0.8":
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/@ionic/utils-network/-/utils-network-0.0.8.tgz#371b3bbc1d7ee770fbcbc5759fdcdf215d8865c6"
@@ -685,6 +730,14 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-object@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-1.0.0.tgz#2783cf44d99164087688054bc41f6a453535f2a2"
+  integrity sha512-Bn8X+3LLKLX2HT1jjcZvavKB7W5JAm8gWW+NybClO2D8S6Py0Fr0ckB5XKrYnNmk2C/Dr7n+Ga5dMypei/xAxA==
+  dependencies:
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-process@0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-0.1.0.tgz#35263b7e2cc5b05b6e21ab7105eb8ccf78befadd"
@@ -697,6 +750,18 @@
     tree-kill "1.2.1"
     tslib "^1.9.0"
 
+"@ionic/utils-process@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-1.0.0.tgz#4a5ade9ec59a728c84f913557d2625d6e91ece67"
+  integrity sha512-4YMbpT4CAe+GdgW1GTxbzOze8q/7yCnjtqQJyLMzRIGSEdOeXx6I8GRf5Y6IDJhhdf7QVYUZXoeFpNASQXiSPA==
+  dependencies:
+    "@ionic/utils-object" "1.0.0"
+    "@ionic/utils-terminal" "1.0.0"
+    debug "^4.0.0"
+    lodash "^4.17.5"
+    tree-kill "1.2.1"
+    tslib "^1.9.0"
+
 "@ionic/utils-stream@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-0.0.1.tgz#f73808262b77be2e6a3c2fbedb69cc185d6f3b69"
@@ -706,6 +771,15 @@
     stream-combiner2 "^1.1.1"
     tslib "^1.9.0"
 
+"@ionic/utils-stream@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-1.0.0.tgz#2cf66bb2c8f49e0ad5ae5151c02d90505d93854e"
+  integrity sha512-kW8MX33YlvP/JXo9qs6fZ3ghbtHX+R0twAZuyuF1WeBWq4eDwJeOaNv80PHr+wm+DBwYPhXmve/d20z/trgm/Q==
+  dependencies:
+    debug "^4.0.0"
+    stream-combiner2 "^1.1.1"
+    tslib "^1.9.0"
+
 "@ionic/utils-subprocess@0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz#3f2fc1d829e06d8c5ed66faad2ce8d9c7a3a1d9b"
@@ -719,6 +793,20 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-subprocess@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-1.0.0.tgz#e3714d69f7b7ef3577e8832a67ea8630ef0c3ad7"
+  integrity sha512-iHjs7voSlOauNv3kICfBtlyAHYfh/DsWaxucLaQ2IXcYknqqzr8H1FbW2dH+TxorG1g7YPWEnbjY7UeeiavnqQ==
+  dependencies:
+    "@ionic/utils-array" "1.0.0"
+    "@ionic/utils-fs" "2.0.0"
+    "@ionic/utils-process" "1.0.0"
+    "@ionic/utils-stream" "1.0.0"
+    "@ionic/utils-terminal" "1.0.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@ionic/utils-terminal@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz#3ffd2d18cf5039c5944768cb259d649e962ecba7"
@@ -727,6 +815,14 @@
     debug "^4.0.0"
     tslib "^1.9.0"
 
+"@ionic/utils-terminal@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-1.0.0.tgz#e7477abf9fc4e0ce27afdf515ac0a331215244d2"
+  integrity sha512-8NVfY+ZyKajfsXj/bzKe5QduDJy0T0I/GPgaPKRZzFHQyUDbcUKZqKfVnAEUCm8l54v13drXovy08jP/6ulKXw==
+  dependencies:
+    debug "^4.0.0"
+    tslib "^1.9.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -3725,6 +3821,11 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -5675,6 +5776,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -6550,6 +6656,15 @@ log-update@^2.3.0:
     cli-cursor "^2.0.0"
     wrap-ansi "^3.0.1"
 
+log-update@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-3.2.0.tgz#719f24293250d65d0165f4e2ec2ed805ff062eec"
+  integrity sha512-KJ6zAPIHWo7Xg1jYror6IUDFJBq1bQ4Bi4wAEp2y/0ScjBBVi/g0thr0sUVhuvuXauWzczt7T2QHghPDNnKBuw==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    cli-cursor "^2.1.0"
+    wrap-ansi "^5.0.0"
+
 log4js@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.1.0.tgz#57983c6a443546a8c8607e9cb045d2a117c27644"
@@ -9685,6 +9800,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
+  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^5.2.0"
+
 string.prototype.trim@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
@@ -10430,6 +10554,11 @@ untildify@^3.0.2:
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
   integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
 
+untildify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
+
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
@@ -10921,7 +11050,7 @@ wrap-ansi@^4.0.0:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrap-ansi@^5.1.0:
+wrap-ansi@^5.0.0, wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
   integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 0d8b5d201..2223fe0e3 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -115,7 +115,7 @@
 		"@angular/platform-server": "^7.2.11",
 		"@angular/router": "^7.2.11",
 		"@angular/service-worker": "^7.2.11",
-		"@fortawesome/angular-fontawesome": "^0.3.0",
+		"@fortawesome/angular-fontawesome": "~0.3.0",
 		"@fortawesome/fontawesome-free": "^5.8.2",
 		"@fortawesome/fontawesome-svg-core": "^1.2.18",
 		"@fortawesome/free-brands-svg-icons": "^5.8.2",
@@ -169,7 +169,7 @@
 		"@angular/compiler-cli": "^7.2.11",
 		"@angular/language-service": "^7.2.9",
 		"@compodoc/compodoc": "^1.1.9",
-		"@ngtools/webpack": "^7.3.4",
+		"@ngtools/webpack": "~7.3.4",
 		"@types/googlemaps": "^3.30.16",
 		"@types/hammerjs": "^2.0.36",
 		"@types/jasmine": "^3.3.9",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 5e7bc42df..cb8bf8f2e 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -97,6 +97,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@7.3.9":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.9.tgz#bef2aaa0be7219c546fb99ea0ba9dd3a6dcd288a"
+  integrity sha512-SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
@@ -335,7 +346,7 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
-"@fortawesome/angular-fontawesome@^0.3.0":
+"@fortawesome/angular-fontawesome@~0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.3.0.tgz#380492f186469ce03d6fdbb3ec719810f771bf62"
   integrity sha512-wXvyPI7GidoNiqeMz2re9iemUMFH4zBmuv94CfXlaanQ8+kMP/fYs/k69PLVN1KsebQY4kRA9GHmc1U1ndBkJg==
@@ -397,7 +408,7 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.8", "@ngtools/webpack@^7.3.4":
+"@ngtools/webpack@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
   integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
@@ -408,6 +419,17 @@
     tree-kill "1.2.1"
     webpack-sources "1.3.0"
 
+"@ngtools/webpack@~7.3.4":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.9.tgz#db115dba8cc0886d8d822723be4119d3849fb4e3"
+  integrity sha512-+ROpqfCXLdQwfP+UNDLk4p959ZrocpStkdd2Iy9CeOJ8yDkityqpstTwQC3oHzzu/95BiyZ0hrHbM6AsPPIvJg==
+  dependencies:
+    "@angular-devkit/core" "7.3.9"
+    enhanced-resolve "4.1.0"
+    rxjs "6.3.3"
+    tree-kill "1.2.1"
+    webpack-sources "1.3.0"
+
 "@ngx-translate/core@^11.0.1":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-11.0.1.tgz#cecefad41f06368f5859dac48fec8fcc4485615f"
diff --git a/yarn.lock b/yarn.lock
index 54fc40109..d348d08cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -133,6 +133,23 @@
     resolve-from "4.0.0"
     resolve-global "0.1.0"
 
+"@commitlint/cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-8.0.0.tgz#1be7aa14fecbcf71317a8187fbb5210760d4ca61"
+  integrity sha512-wFu+g9v73I2rMRTv27ItIbcrhWqge0ZpUNUIJ9fw8TF7XpmhaUFvGqa2kU6st1F0TyEOrq5ZMzwI8kQZNVLuXg==
+  dependencies:
+    "@commitlint/format" "^8.0.0"
+    "@commitlint/lint" "^8.0.0"
+    "@commitlint/load" "^8.0.0"
+    "@commitlint/read" "^8.0.0"
+    babel-polyfill "6.26.0"
+    chalk "2.3.1"
+    get-stdin "7.0.0"
+    lodash "4.17.11"
+    meow "5.0.0"
+    resolve-from "5.0.0"
+    resolve-global "1.0.0"
+
 "@commitlint/config-conventional@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-7.5.0.tgz#3afd4e3e34e5c2f6ec6af03e78ae924fed883ce7"
@@ -154,6 +171,13 @@
   dependencies:
     lodash "4.17.11"
 
+"@commitlint/ensure@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-8.0.0.tgz#67a3e72755a0dfa5f4216efd05238f62ff132110"
+  integrity sha512-rhBO79L9vXeb26JU+14cxZQq46KyyVqlo31C33VIe7oJndUtWrDhZTvMjJeB1pdXh4EU4XWdMo+yzBmuypFgig==
+  dependencies:
+    lodash "4.17.11"
+
 "@commitlint/execute-rule@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-7.5.0.tgz#c9cfbab71eb962e1c46e78d76375e32754ab1e38"
@@ -161,6 +185,13 @@
   dependencies:
     babel-runtime "6.26.0"
 
+"@commitlint/execute-rule@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-8.0.0.tgz#df2a9893f162fc561ca4e95a34bd782469dd7f8b"
+  integrity sha512-E/A2xHqx3syclXAFl8vJY2o/+xtL9axrqbFFF42Bzke+Eflf0mOJviPxDodu2xP0wXMRQ9UokAi/reK9dMtA/A==
+  dependencies:
+    babel-runtime "6.26.0"
+
 "@commitlint/format@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-7.5.0.tgz#57a2b92dc58a3409b2be67c4c8c10bd1b28e9fe8"
@@ -169,6 +200,13 @@
     babel-runtime "^6.23.0"
     chalk "^2.0.1"
 
+"@commitlint/format@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-8.0.0.tgz#f7c858d9057e1da6856be211ad049c5b9a66185b"
+  integrity sha512-dFxKGLp1T4obi7+YZ2NcSAebJA/dBQwnerRJGz0hWtsO6pheJRe+qC50+GCb2fYGWUc5lIWawaRts0m7RkFGUw==
+  dependencies:
+    chalk "^2.0.1"
+
 "@commitlint/is-ignored@^7.5.1":
   version "7.5.1"
   resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-7.5.1.tgz#c4f7ffc1c8b4cf9dc3204d22ef8e78ff82536d67"
@@ -176,6 +214,13 @@
   dependencies:
     semver "5.6.0"
 
+"@commitlint/is-ignored@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-8.0.0.tgz#eba06c9a6227288574f544a1705583d965f0ed65"
+  integrity sha512-geWr/NXGMrZ3qc3exDM+S1qV+nMDxp1LwN3rLpEN2gXTwW3rIXq49RQQUkn0n3BHcpqJJ9EBhjqFoMU1TYx7Ng==
+  dependencies:
+    semver "6.0.0"
+
 "@commitlint/lint@^7.5.2":
   version "7.5.2"
   resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-7.5.2.tgz#26cb819c74f8770413c4f6ef1e7abf1b739eda77"
@@ -187,6 +232,17 @@
     babel-runtime "^6.23.0"
     lodash "4.17.11"
 
+"@commitlint/lint@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-8.0.0.tgz#3defb3b1a900ba966c64a51b497bf1fcff5fc9f2"
+  integrity sha512-5nKiJpBDR2iei+fre4+6M7FUrSX1cIMoxXKdrnb1GMOXkw9CsZSF5OvdrX08zHAFmOAeDaohoCV+XN/UN/vWYg==
+  dependencies:
+    "@commitlint/is-ignored" "^8.0.0"
+    "@commitlint/parse" "^8.0.0"
+    "@commitlint/rules" "^8.0.0"
+    babel-runtime "^6.23.0"
+    lodash "4.17.11"
+
 "@commitlint/load@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-7.5.0.tgz#2b225b97d631c2235d8b2084bc2fefb4d4d66719"
@@ -199,11 +255,28 @@
     lodash "4.17.11"
     resolve-from "^4.0.0"
 
+"@commitlint/load@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-8.0.0.tgz#5eacfb96635e9aeac8f1a0674491f29483348872"
+  integrity sha512-JXC3YjO7hN7Rv2Z/SaYz+oIvShsQWLL7gnOCe8+YgI1EusBqjV4mPI0HnBXVe9volfdxbl+Af/GoQZs2dvyOFA==
+  dependencies:
+    "@commitlint/execute-rule" "^8.0.0"
+    "@commitlint/resolve-extends" "^8.0.0"
+    babel-runtime "^6.23.0"
+    cosmiconfig "^5.2.0"
+    lodash "4.17.11"
+    resolve-from "^5.0.0"
+
 "@commitlint/message@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-7.5.0.tgz#2572fad648c769dd210374c8b95fb37124302bc5"
   integrity sha512-5YOhsqy/MgHH7vyDsmmzO6Jr3ygr1pXbCm9NR3XB51wjg55Kd6/6dVlkhS/FmDp99pfwTdHb0TyeDFEjP98waw==
 
+"@commitlint/message@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-8.0.0.tgz#bbb02fb78490808e36157d675acc544fafd7942b"
+  integrity sha512-2oGUV8630nzsj17t6akq3mFguzWePADO069IwKJi+CN5L0YRBQj9zGRCB0P+zvh4EngjqMnuMwhEhaBEM8TTzA==
+
 "@commitlint/parse@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-7.5.0.tgz#d9374266493e5229ec61d92316d28e02419c600f"
@@ -213,6 +286,15 @@
     conventional-commits-parser "^2.1.0"
     lodash "^4.17.11"
 
+"@commitlint/parse@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-8.0.0.tgz#4b5fa19ab8bdb2c6452b7dbdf1d7adf52386ae60"
+  integrity sha512-6CyweJrBkI+Jqx7qkpYgVx2muBMoUZAZHWhUTgqHIDDmI+3d4UPZ2plGS2G0969KkHCgjtlwnwTjWqA9HLMwPA==
+  dependencies:
+    conventional-changelog-angular "^1.3.3"
+    conventional-commits-parser "^2.1.0"
+    lodash "^4.17.11"
+
 "@commitlint/read@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-7.5.0.tgz#35d563b0f3075da2ce6945978996b16fb4acb0f8"
@@ -223,6 +305,16 @@
     babel-runtime "^6.23.0"
     git-raw-commits "^1.3.0"
 
+"@commitlint/read@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-8.0.0.tgz#5149fcb2550a07e7eb6a9f50b88df742780fa1e8"
+  integrity sha512-IhNMiKPqkB5yxphe/FiOKgX2uCysbR8fGK6KOXON3uJaVND0dctxnfdv+vY9gDv2CtjIXgNFO+v6FLnqMfIvwA==
+  dependencies:
+    "@commitlint/top-level" "^8.0.0"
+    "@marionebl/sander" "^0.6.0"
+    babel-runtime "^6.23.0"
+    git-raw-commits "^1.3.0"
+
 "@commitlint/resolve-extends@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-7.5.0.tgz#d95a3058e83ddbaef5e3045835b9a3a1fba3422c"
@@ -234,6 +326,17 @@
     resolve-from "^4.0.0"
     resolve-global "^0.1.0"
 
+"@commitlint/resolve-extends@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-8.0.0.tgz#dc606cecb0f392d57905cfd690d8f736ad26eec2"
+  integrity sha512-SPkH+dXMCpYboVwpIhtOhpg1xYdE7L77fuHmEJWveXSmgfi0GosFm4aJ7Cer9DjNjW+KbD0TUfzZU0TrYUESjQ==
+  dependencies:
+    babel-runtime "6.26.0"
+    import-fresh "^3.0.0"
+    lodash "4.17.11"
+    resolve-from "^5.0.0"
+    resolve-global "^1.0.0"
+
 "@commitlint/rules@^7.5.2":
   version "7.5.2"
   resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-7.5.2.tgz#da03d754625b2e67c0a6b8b9ab89eae1952a4f2e"
@@ -244,11 +347,26 @@
     "@commitlint/to-lines" "^7.5.0"
     babel-runtime "^6.23.0"
 
+"@commitlint/rules@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-8.0.0.tgz#26ef50fedb5a88a2ad2af43677e5bb7c32fb5f14"
+  integrity sha512-s9BehZQP5uAc/V4lMaUxwxFabVZTw5fZ18Ase1e5tbMKVIwq/7E00Ny1czN7xSFXfgffukWznsexpfFXYpbVsg==
+  dependencies:
+    "@commitlint/ensure" "^8.0.0"
+    "@commitlint/message" "^8.0.0"
+    "@commitlint/to-lines" "^8.0.0"
+    babel-runtime "^6.23.0"
+
 "@commitlint/to-lines@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-7.5.0.tgz#a24410d25bb85a5fff3b8d610277b3145f899766"
   integrity sha512-ZQ3LxPNuQ/J7q42hkiPWN5fUIjWae85H2HHoBB+/Rw1fo+oehvr4Xyt+Oa9Mx5WbBnev/wXnUFjXgoadv1RZ5A==
 
+"@commitlint/to-lines@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-8.0.0.tgz#9f7d7938404bdbb345c23c8665293e051c4dc243"
+  integrity sha512-qqgNeyj+NJ1Xffwv6hGsipKlVFj30NmfPup751MS/me0GV8IBd//njTjiqHvf/3sKm/OcGn4Re4D7YXwTcC2RA==
+
 "@commitlint/top-level@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-7.5.0.tgz#01e740167e3d15110794192cd754f49f27d4a16d"
@@ -256,6 +374,13 @@
   dependencies:
     find-up "^2.1.0"
 
+"@commitlint/top-level@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-8.0.0.tgz#3d998ba1e13be939f4227202eebae7f1dbb472a9"
+  integrity sha512-If9hwfISHV8HXGKeXUKsUvOo4DuISWiU/VC2qHsKpeHSREAxkWESmQzzwYvOtyBjMiOTfAXfzgth18g36Fz2ow==
+  dependencies:
+    find-up "^2.1.0"
+
 "@commitlint/travis-cli@^7.5.2":
   version "7.5.2"
   resolved "https://registry.yarnpkg.com/@commitlint/travis-cli/-/travis-cli-7.5.2.tgz#f82ca57296eb913b6557124b80eac9773dcbbf1d"
@@ -3382,6 +3507,11 @@ get-stdin@5.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
   integrity sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=
 
+get-stdin@7.0.0, get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
+
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -3390,11 +3520,6 @@ get-stdin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
 
-get-stdin@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
-  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
-
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -3502,7 +3627,7 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^0.1.0:
+global-dirs@^0.1.0, global-dirs@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
   dependencies:
@@ -6939,6 +7064,11 @@ resolve-from@4.0.0, resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
 
+resolve-from@5.0.0, resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-from@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
@@ -6955,6 +7085,13 @@ resolve-global@0.1.0, resolve-global@^0.1.0:
   dependencies:
     global-dirs "^0.1.0"
 
+resolve-global@1.0.0, resolve-global@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255"
+  integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==
+  dependencies:
+    global-dirs "^0.1.1"
+
 resolve-pkg@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-1.0.0.tgz#e19a15e78aca2e124461dc92b2e3943ef93494d9"
@@ -7141,7 +7278,7 @@ semver@5.6.0, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, se
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-semver@^6.0.0:
+semver@6.0.0, semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
   integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==

From f9b68b8f2a9747080ac4ac9c9a003004cab6f529 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 31 May 2019 12:00:09 +0300
Subject: [PATCH 344/382] chore: update packages to the latest version
 @commitlint/config-conventional, @commitlint/config-lerna-scopes,
 @commitlint/travis-cli

---
 backend/api/package.json |   6 +-
 backend/api/yarn.lock    | 221 ++++++--------------------------------
 package.json             |   6 +-
 yarn.lock                | 223 ++++++---------------------------------
 4 files changed, 75 insertions(+), 381 deletions(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index 823459260..2fc1106ab 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -143,9 +143,9 @@
 	},
 	"devDependencies": {
 		"@commitlint/cli": "^8.0.0",
-		"@commitlint/config-conventional": "^7.5.0",
-		"@commitlint/config-lerna-scopes": "^7.5.1",
-		"@commitlint/travis-cli": "^7.5.2",
+		"@commitlint/config-conventional": "^8.0.0",
+		"@commitlint/config-lerna-scopes": "^8.0.0",
+		"@commitlint/travis-cli": "^8.0.0",
 		"@nestjs/testing": "^6.1.1",
 		"@types/bcrypt": "^3.0.0",
 		"@types/bluebird": "^3.5.26",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index c4e1d4ddb..292d7f8f3 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -256,23 +256,6 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@commitlint/cli@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-7.5.2.tgz#2475cd8f7ed3b2f9c2ab96c06bc24d61d23f8716"
-  integrity sha512-UQdW/wNb+XeANoYYLyuKEDIfWKSzdhJkPQZ8ie/IjfMNnsP+B23bkX4Ati+6U8zgz0yyngoxWl+3lfExiIL4hQ==
-  dependencies:
-    "@commitlint/format" "^7.5.0"
-    "@commitlint/lint" "^7.5.2"
-    "@commitlint/load" "^7.5.0"
-    "@commitlint/read" "^7.5.0"
-    babel-polyfill "6.26.0"
-    chalk "2.3.1"
-    get-stdin "5.0.1"
-    lodash "4.17.11"
-    meow "5.0.0"
-    resolve-from "4.0.0"
-    resolve-global "0.1.0"
-
 "@commitlint/cli@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-8.0.0.tgz#1be7aa14fecbcf71317a8187fbb5210760d4ca61"
@@ -290,26 +273,19 @@
     resolve-from "5.0.0"
     resolve-global "1.0.0"
 
-"@commitlint/config-conventional@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-7.5.0.tgz#3afd4e3e34e5c2f6ec6af03e78ae924fed883ce7"
-  integrity sha512-odLgBfQ5xntFAmMfAmDY2C4EWhW+cSTbvbsRS7seb55DCa3IaxxSHHC9eXrR+hN/BdUT5vqAxdX1PkR996sq9Q==
-
-"@commitlint/config-lerna-scopes@^7.5.1":
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/config-lerna-scopes/-/config-lerna-scopes-7.5.1.tgz#b4747e9cc7558f14a0fc9d59715e771d73a63caa"
-  integrity sha512-llv08M+b/VSemUfDsKFo8Dv1LHGVTMPsA8J1/ISMAlJCayTCCkgnJS812E8HPOVVQlMxBmqXvMmSOhvp3gFkZQ==
-  dependencies:
-    import-from "2.1.0"
-    resolve-pkg "1.0.0"
-    semver "5.6.0"
+"@commitlint/config-conventional@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-8.0.0.tgz#f45349cab9dcfc08a30fbcf2b6317506e17bc8e6"
+  integrity sha512-umg1irroowOV+x8oZPBw8woCogZO5MFKUYQq+fRZvhowoSwDHXYILP3ETcdHUgvytw/K/a8Xvu7iCypK6oZQ+g==
 
-"@commitlint/ensure@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-7.5.2.tgz#57bb7dcbf1e9913e27c3b294325d0d68dd14cebf"
-  integrity sha512-ZMJKHhSJC789chKy0kWp8EWbCpLPy6vKa+fopUVx+tWL7H8AeBbibXlqAnybg+HWNcb/RD7ORROx0IsgrK4IYA==
+"@commitlint/config-lerna-scopes@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/config-lerna-scopes/-/config-lerna-scopes-8.0.0.tgz#131fc1deb940228be09779047598c1ccf9443b1b"
+  integrity sha512-eeXDMj/daff8QNM8WnWNo+cbv6hC+PiSwSniehTAeD++Tq68Ne3UEvkCafquVCFQhTeMxV34kZfpqzgVT/nDPg==
   dependencies:
-    lodash "4.17.11"
+    import-from "3.0.0"
+    resolve-pkg "2.0.0"
+    semver "6.0.0"
 
 "@commitlint/ensure@^8.0.0":
   version "8.0.0"
@@ -318,13 +294,6 @@
   dependencies:
     lodash "4.17.11"
 
-"@commitlint/execute-rule@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-7.5.0.tgz#c9cfbab71eb962e1c46e78d76375e32754ab1e38"
-  integrity sha512-K66aoly8mxSHmBA/Y8bKSPPcCAR4GpJEsvHaLDYOG7GsyChu8NgCD53L8GUqPW8lBCWwnmCiSL+RlOkNHJ0Gag==
-  dependencies:
-    babel-runtime "6.26.0"
-
 "@commitlint/execute-rule@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-8.0.0.tgz#df2a9893f162fc561ca4e95a34bd782469dd7f8b"
@@ -332,14 +301,6 @@
   dependencies:
     babel-runtime "6.26.0"
 
-"@commitlint/format@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-7.5.0.tgz#57a2b92dc58a3409b2be67c4c8c10bd1b28e9fe8"
-  integrity sha512-DEeQXfTLUm9kARliCBfw3SlQRAYjK2aXeRAUMs1HPhLA2tjNFFGv6LOpFFNdiu/WV+o1ojcgIvBBjpHaVT+Tvw==
-  dependencies:
-    babel-runtime "^6.23.0"
-    chalk "^2.0.1"
-
 "@commitlint/format@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-8.0.0.tgz#f7c858d9057e1da6856be211ad049c5b9a66185b"
@@ -347,13 +308,6 @@
   dependencies:
     chalk "^2.0.1"
 
-"@commitlint/is-ignored@^7.5.1":
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-7.5.1.tgz#c4f7ffc1c8b4cf9dc3204d22ef8e78ff82536d67"
-  integrity sha512-8JZCgy6bWSnjOT5cTTiyEAGp+Y4+5CUknhVbyiPxTRbjy6yF0aMKs1gMTfHrNHTKsasgmkCyPQd4C2eOPceuKA==
-  dependencies:
-    semver "5.6.0"
-
 "@commitlint/is-ignored@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-8.0.0.tgz#eba06c9a6227288574f544a1705583d965f0ed65"
@@ -361,17 +315,6 @@
   dependencies:
     semver "6.0.0"
 
-"@commitlint/lint@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-7.5.2.tgz#26cb819c74f8770413c4f6ef1e7abf1b739eda77"
-  integrity sha512-DY/UfGFDquMno+5c6+tE50rMxpjdQK3CRG+nktgYlVz1UAqeUD+bRc3pvX5HwAsuGvyDrWAjtszHtEDeYJKcjw==
-  dependencies:
-    "@commitlint/is-ignored" "^7.5.1"
-    "@commitlint/parse" "^7.5.0"
-    "@commitlint/rules" "^7.5.2"
-    babel-runtime "^6.23.0"
-    lodash "4.17.11"
-
 "@commitlint/lint@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-8.0.0.tgz#3defb3b1a900ba966c64a51b497bf1fcff5fc9f2"
@@ -383,18 +326,6 @@
     babel-runtime "^6.23.0"
     lodash "4.17.11"
 
-"@commitlint/load@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-7.5.0.tgz#2b225b97d631c2235d8b2084bc2fefb4d4d66719"
-  integrity sha512-fhBER/rzPsteM6zq5qqMiOi+A2bHKCE/0PKmOzYgaqTKcG9c1SsOle9phPemW85to8Gxd2YgUOVLsZkCMltLtA==
-  dependencies:
-    "@commitlint/execute-rule" "^7.5.0"
-    "@commitlint/resolve-extends" "^7.5.0"
-    babel-runtime "^6.23.0"
-    cosmiconfig "^4.0.0"
-    lodash "4.17.11"
-    resolve-from "^4.0.0"
-
 "@commitlint/load@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-8.0.0.tgz#5eacfb96635e9aeac8f1a0674491f29483348872"
@@ -407,25 +338,11 @@
     lodash "4.17.11"
     resolve-from "^5.0.0"
 
-"@commitlint/message@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-7.5.0.tgz#2572fad648c769dd210374c8b95fb37124302bc5"
-  integrity sha512-5YOhsqy/MgHH7vyDsmmzO6Jr3ygr1pXbCm9NR3XB51wjg55Kd6/6dVlkhS/FmDp99pfwTdHb0TyeDFEjP98waw==
-
 "@commitlint/message@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-8.0.0.tgz#bbb02fb78490808e36157d675acc544fafd7942b"
   integrity sha512-2oGUV8630nzsj17t6akq3mFguzWePADO069IwKJi+CN5L0YRBQj9zGRCB0P+zvh4EngjqMnuMwhEhaBEM8TTzA==
 
-"@commitlint/parse@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-7.5.0.tgz#d9374266493e5229ec61d92316d28e02419c600f"
-  integrity sha512-hWASM8SBFTBtlFkKrEtD1qW6yTe2BsfoRiMKuYyRCTd+739TUF17og5vgQVuWttbGP0gXaciW44NygS2YjZmfA==
-  dependencies:
-    conventional-changelog-angular "^1.3.3"
-    conventional-commits-parser "^2.1.0"
-    lodash "^4.17.11"
-
 "@commitlint/parse@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-8.0.0.tgz#4b5fa19ab8bdb2c6452b7dbdf1d7adf52386ae60"
@@ -435,16 +352,6 @@
     conventional-commits-parser "^2.1.0"
     lodash "^4.17.11"
 
-"@commitlint/read@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-7.5.0.tgz#35d563b0f3075da2ce6945978996b16fb4acb0f8"
-  integrity sha512-uqGFCKZGnBUCTkxoCCJp4MfWUkegXkyT0T0RVM9diyG6uNWPWlMH1509sjLFlyeJKG+cSyYGG/d6T103ScMb4Q==
-  dependencies:
-    "@commitlint/top-level" "^7.5.0"
-    "@marionebl/sander" "^0.6.0"
-    babel-runtime "^6.23.0"
-    git-raw-commits "^1.3.0"
-
 "@commitlint/read@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-8.0.0.tgz#5149fcb2550a07e7eb6a9f50b88df742780fa1e8"
@@ -455,17 +362,6 @@
     babel-runtime "^6.23.0"
     git-raw-commits "^1.3.0"
 
-"@commitlint/resolve-extends@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-7.5.0.tgz#d95a3058e83ddbaef5e3045835b9a3a1fba3422c"
-  integrity sha512-FRIyPuqGvGa03OT4VgOHakizcw8YR5rdm77JsZff1rSnpxk6i+025I6qMeHqCIr5FaVIA0kR3FlC+MJFUs165A==
-  dependencies:
-    babel-runtime "6.26.0"
-    import-fresh "^3.0.0"
-    lodash "4.17.11"
-    resolve-from "^4.0.0"
-    resolve-global "^0.1.0"
-
 "@commitlint/resolve-extends@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-8.0.0.tgz#dc606cecb0f392d57905cfd690d8f736ad26eec2"
@@ -477,16 +373,6 @@
     resolve-from "^5.0.0"
     resolve-global "^1.0.0"
 
-"@commitlint/rules@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-7.5.2.tgz#da03d754625b2e67c0a6b8b9ab89eae1952a4f2e"
-  integrity sha512-eDN1UFPcBOjdnlI3syuo7y99SjGH/dUV6S9NvBocAye8ln5dfKiI2shhWochJhl36r/kYWU8Wrvl2NZJL3c52g==
-  dependencies:
-    "@commitlint/ensure" "^7.5.2"
-    "@commitlint/message" "^7.5.0"
-    "@commitlint/to-lines" "^7.5.0"
-    babel-runtime "^6.23.0"
-
 "@commitlint/rules@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-8.0.0.tgz#26ef50fedb5a88a2ad2af43677e5bb7c32fb5f14"
@@ -497,23 +383,11 @@
     "@commitlint/to-lines" "^8.0.0"
     babel-runtime "^6.23.0"
 
-"@commitlint/to-lines@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-7.5.0.tgz#a24410d25bb85a5fff3b8d610277b3145f899766"
-  integrity sha512-ZQ3LxPNuQ/J7q42hkiPWN5fUIjWae85H2HHoBB+/Rw1fo+oehvr4Xyt+Oa9Mx5WbBnev/wXnUFjXgoadv1RZ5A==
-
 "@commitlint/to-lines@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-8.0.0.tgz#9f7d7938404bdbb345c23c8665293e051c4dc243"
   integrity sha512-qqgNeyj+NJ1Xffwv6hGsipKlVFj30NmfPup751MS/me0GV8IBd//njTjiqHvf/3sKm/OcGn4Re4D7YXwTcC2RA==
 
-"@commitlint/top-level@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-7.5.0.tgz#01e740167e3d15110794192cd754f49f27d4a16d"
-  integrity sha512-oTu185GufTYHjTXPHu6k6HL7iuASOvDOtQizZWRSxj0VXuoki6e0HzvGZsRsycDTOn04Q9hVu+PhF83IUwRpeg==
-  dependencies:
-    find-up "^2.1.0"
-
 "@commitlint/top-level@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-8.0.0.tgz#3d998ba1e13be939f4227202eebae7f1dbb472a9"
@@ -521,12 +395,12 @@
   dependencies:
     find-up "^2.1.0"
 
-"@commitlint/travis-cli@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/travis-cli/-/travis-cli-7.5.2.tgz#f82ca57296eb913b6557124b80eac9773dcbbf1d"
-  integrity sha512-kbkn8TIjRtGWcKOJBM/fbT9yRPjbLTybetRH5mkAQdX9ratkV9+N3akaOSmv5eemNfHsOM1cdrWkcjZbSqZV2A==
+"@commitlint/travis-cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/travis-cli/-/travis-cli-8.0.0.tgz#488f863e96ff2c5d494274e2b25c171666733463"
+  integrity sha512-PSCrOEom3ciiuDv0eAnTS0B0Bz8y7gaSPsaWdRt7yW+hbI4SLy9Pf0MM5F/X2EqHij31Ij2sb13i/NkrWr8k+w==
   dependencies:
-    "@commitlint/cli" "^7.5.2"
+    "@commitlint/cli" "^8.0.0"
     babel-runtime "6.26.0"
     execa "0.9.0"
 
@@ -3516,16 +3390,6 @@ cors@^2.8.4:
     object-assign "^4"
     vary "^1"
 
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
-
 cosmiconfig@^5.0.2:
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
@@ -5023,11 +4887,6 @@ get-port@^4.2.0:
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
   integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
 
-get-stdin@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
-  integrity sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=
-
 get-stdin@7.0.0, get-stdin@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
@@ -5727,12 +5586,12 @@ import-fresh@^3.0.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-from@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
+import-from@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
+  integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
   dependencies:
-    resolve-from "^3.0.0"
+    resolve-from "^5.0.0"
 
 import-lazy@^2.1.0:
   version "2.1.0"
@@ -9624,11 +9483,6 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
-require-from-string@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
 require-in-the-middle@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-3.0.0.tgz#cd6c2b955ee39a71f7b99f90074252e29d14decb"
@@ -9676,10 +9530,6 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
-resolve-from@4.0.0, resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-
 resolve-from@5.0.0, resolve-from@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
@@ -9693,12 +9543,9 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
-resolve-global@0.1.0, resolve-global@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-0.1.0.tgz#8fb02cfd5b7db20118e886311f15af95bd15fbd9"
-  integrity sha1-j7As/Vt9sgEY6IYxHxWvlb0V+9k=
-  dependencies:
-    global-dirs "^0.1.0"
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
 
 resolve-global@1.0.0, resolve-global@^1.0.0:
   version "1.0.0"
@@ -9707,12 +9554,12 @@ resolve-global@1.0.0, resolve-global@^1.0.0:
   dependencies:
     global-dirs "^0.1.1"
 
-resolve-pkg@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-1.0.0.tgz#e19a15e78aca2e124461dc92b2e3943ef93494d9"
-  integrity sha1-4ZoV54rKLhJEYdySsuOUPvk0lNk=
+resolve-pkg@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-2.0.0.tgz#ac06991418a7623edc119084edc98b0e6bf05a41"
+  integrity sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==
   dependencies:
-    resolve-from "^2.0.0"
+    resolve-from "^5.0.0"
 
 resolve-url@^0.2.1:
   version "0.2.1"
@@ -9982,16 +9829,16 @@ semver@5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-semver@5.6.0, semver@^5.5, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
 semver@6.0.0, semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
   integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
 
+semver@^5.5, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
 semver@^5.5.1:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
diff --git a/package.json b/package.json
index 22d7f92d7..c89d90265 100644
--- a/package.json
+++ b/package.json
@@ -69,9 +69,9 @@
 	},
 	"devDependencies": {
 		"@commitlint/cli": "^8.0.0",
-		"@commitlint/config-conventional": "^7.5.0",
-		"@commitlint/config-lerna-scopes": "^7.5.1",
-		"@commitlint/travis-cli": "^7.5.2",
+		"@commitlint/config-conventional": "^8.0.0",
+		"@commitlint/config-lerna-scopes": "^8.0.0",
+		"@commitlint/travis-cli": "^8.0.0",
 		"@types/async": "^2.4.1",
 		"@types/d3-color": "^1.2.2",
 		"@types/faker": "^4.1.5",
diff --git a/yarn.lock b/yarn.lock
index d348d08cf..48a77dcfb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -116,23 +116,6 @@
     debug "^2.6.3"
     regenerator-runtime "^0.10.3"
 
-"@commitlint/cli@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-7.5.2.tgz#2475cd8f7ed3b2f9c2ab96c06bc24d61d23f8716"
-  integrity sha512-UQdW/wNb+XeANoYYLyuKEDIfWKSzdhJkPQZ8ie/IjfMNnsP+B23bkX4Ati+6U8zgz0yyngoxWl+3lfExiIL4hQ==
-  dependencies:
-    "@commitlint/format" "^7.5.0"
-    "@commitlint/lint" "^7.5.2"
-    "@commitlint/load" "^7.5.0"
-    "@commitlint/read" "^7.5.0"
-    babel-polyfill "6.26.0"
-    chalk "2.3.1"
-    get-stdin "5.0.1"
-    lodash "4.17.11"
-    meow "5.0.0"
-    resolve-from "4.0.0"
-    resolve-global "0.1.0"
-
 "@commitlint/cli@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-8.0.0.tgz#1be7aa14fecbcf71317a8187fbb5210760d4ca61"
@@ -150,26 +133,19 @@
     resolve-from "5.0.0"
     resolve-global "1.0.0"
 
-"@commitlint/config-conventional@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-7.5.0.tgz#3afd4e3e34e5c2f6ec6af03e78ae924fed883ce7"
-  integrity sha512-odLgBfQ5xntFAmMfAmDY2C4EWhW+cSTbvbsRS7seb55DCa3IaxxSHHC9eXrR+hN/BdUT5vqAxdX1PkR996sq9Q==
-
-"@commitlint/config-lerna-scopes@^7.5.1":
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/config-lerna-scopes/-/config-lerna-scopes-7.5.1.tgz#b4747e9cc7558f14a0fc9d59715e771d73a63caa"
-  integrity sha512-llv08M+b/VSemUfDsKFo8Dv1LHGVTMPsA8J1/ISMAlJCayTCCkgnJS812E8HPOVVQlMxBmqXvMmSOhvp3gFkZQ==
-  dependencies:
-    import-from "2.1.0"
-    resolve-pkg "1.0.0"
-    semver "5.6.0"
+"@commitlint/config-conventional@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-8.0.0.tgz#f45349cab9dcfc08a30fbcf2b6317506e17bc8e6"
+  integrity sha512-umg1irroowOV+x8oZPBw8woCogZO5MFKUYQq+fRZvhowoSwDHXYILP3ETcdHUgvytw/K/a8Xvu7iCypK6oZQ+g==
 
-"@commitlint/ensure@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-7.5.2.tgz#57bb7dcbf1e9913e27c3b294325d0d68dd14cebf"
-  integrity sha512-ZMJKHhSJC789chKy0kWp8EWbCpLPy6vKa+fopUVx+tWL7H8AeBbibXlqAnybg+HWNcb/RD7ORROx0IsgrK4IYA==
+"@commitlint/config-lerna-scopes@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/config-lerna-scopes/-/config-lerna-scopes-8.0.0.tgz#131fc1deb940228be09779047598c1ccf9443b1b"
+  integrity sha512-eeXDMj/daff8QNM8WnWNo+cbv6hC+PiSwSniehTAeD++Tq68Ne3UEvkCafquVCFQhTeMxV34kZfpqzgVT/nDPg==
   dependencies:
-    lodash "4.17.11"
+    import-from "3.0.0"
+    resolve-pkg "2.0.0"
+    semver "6.0.0"
 
 "@commitlint/ensure@^8.0.0":
   version "8.0.0"
@@ -178,13 +154,6 @@
   dependencies:
     lodash "4.17.11"
 
-"@commitlint/execute-rule@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-7.5.0.tgz#c9cfbab71eb962e1c46e78d76375e32754ab1e38"
-  integrity sha512-K66aoly8mxSHmBA/Y8bKSPPcCAR4GpJEsvHaLDYOG7GsyChu8NgCD53L8GUqPW8lBCWwnmCiSL+RlOkNHJ0Gag==
-  dependencies:
-    babel-runtime "6.26.0"
-
 "@commitlint/execute-rule@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-8.0.0.tgz#df2a9893f162fc561ca4e95a34bd782469dd7f8b"
@@ -192,14 +161,6 @@
   dependencies:
     babel-runtime "6.26.0"
 
-"@commitlint/format@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-7.5.0.tgz#57a2b92dc58a3409b2be67c4c8c10bd1b28e9fe8"
-  integrity sha512-DEeQXfTLUm9kARliCBfw3SlQRAYjK2aXeRAUMs1HPhLA2tjNFFGv6LOpFFNdiu/WV+o1ojcgIvBBjpHaVT+Tvw==
-  dependencies:
-    babel-runtime "^6.23.0"
-    chalk "^2.0.1"
-
 "@commitlint/format@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-8.0.0.tgz#f7c858d9057e1da6856be211ad049c5b9a66185b"
@@ -207,13 +168,6 @@
   dependencies:
     chalk "^2.0.1"
 
-"@commitlint/is-ignored@^7.5.1":
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-7.5.1.tgz#c4f7ffc1c8b4cf9dc3204d22ef8e78ff82536d67"
-  integrity sha512-8JZCgy6bWSnjOT5cTTiyEAGp+Y4+5CUknhVbyiPxTRbjy6yF0aMKs1gMTfHrNHTKsasgmkCyPQd4C2eOPceuKA==
-  dependencies:
-    semver "5.6.0"
-
 "@commitlint/is-ignored@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-8.0.0.tgz#eba06c9a6227288574f544a1705583d965f0ed65"
@@ -221,17 +175,6 @@
   dependencies:
     semver "6.0.0"
 
-"@commitlint/lint@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-7.5.2.tgz#26cb819c74f8770413c4f6ef1e7abf1b739eda77"
-  integrity sha512-DY/UfGFDquMno+5c6+tE50rMxpjdQK3CRG+nktgYlVz1UAqeUD+bRc3pvX5HwAsuGvyDrWAjtszHtEDeYJKcjw==
-  dependencies:
-    "@commitlint/is-ignored" "^7.5.1"
-    "@commitlint/parse" "^7.5.0"
-    "@commitlint/rules" "^7.5.2"
-    babel-runtime "^6.23.0"
-    lodash "4.17.11"
-
 "@commitlint/lint@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-8.0.0.tgz#3defb3b1a900ba966c64a51b497bf1fcff5fc9f2"
@@ -243,18 +186,6 @@
     babel-runtime "^6.23.0"
     lodash "4.17.11"
 
-"@commitlint/load@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-7.5.0.tgz#2b225b97d631c2235d8b2084bc2fefb4d4d66719"
-  integrity sha512-fhBER/rzPsteM6zq5qqMiOi+A2bHKCE/0PKmOzYgaqTKcG9c1SsOle9phPemW85to8Gxd2YgUOVLsZkCMltLtA==
-  dependencies:
-    "@commitlint/execute-rule" "^7.5.0"
-    "@commitlint/resolve-extends" "^7.5.0"
-    babel-runtime "^6.23.0"
-    cosmiconfig "^4.0.0"
-    lodash "4.17.11"
-    resolve-from "^4.0.0"
-
 "@commitlint/load@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-8.0.0.tgz#5eacfb96635e9aeac8f1a0674491f29483348872"
@@ -267,25 +198,11 @@
     lodash "4.17.11"
     resolve-from "^5.0.0"
 
-"@commitlint/message@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-7.5.0.tgz#2572fad648c769dd210374c8b95fb37124302bc5"
-  integrity sha512-5YOhsqy/MgHH7vyDsmmzO6Jr3ygr1pXbCm9NR3XB51wjg55Kd6/6dVlkhS/FmDp99pfwTdHb0TyeDFEjP98waw==
-
 "@commitlint/message@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-8.0.0.tgz#bbb02fb78490808e36157d675acc544fafd7942b"
   integrity sha512-2oGUV8630nzsj17t6akq3mFguzWePADO069IwKJi+CN5L0YRBQj9zGRCB0P+zvh4EngjqMnuMwhEhaBEM8TTzA==
 
-"@commitlint/parse@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-7.5.0.tgz#d9374266493e5229ec61d92316d28e02419c600f"
-  integrity sha512-hWASM8SBFTBtlFkKrEtD1qW6yTe2BsfoRiMKuYyRCTd+739TUF17og5vgQVuWttbGP0gXaciW44NygS2YjZmfA==
-  dependencies:
-    conventional-changelog-angular "^1.3.3"
-    conventional-commits-parser "^2.1.0"
-    lodash "^4.17.11"
-
 "@commitlint/parse@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-8.0.0.tgz#4b5fa19ab8bdb2c6452b7dbdf1d7adf52386ae60"
@@ -295,16 +212,6 @@
     conventional-commits-parser "^2.1.0"
     lodash "^4.17.11"
 
-"@commitlint/read@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-7.5.0.tgz#35d563b0f3075da2ce6945978996b16fb4acb0f8"
-  integrity sha512-uqGFCKZGnBUCTkxoCCJp4MfWUkegXkyT0T0RVM9diyG6uNWPWlMH1509sjLFlyeJKG+cSyYGG/d6T103ScMb4Q==
-  dependencies:
-    "@commitlint/top-level" "^7.5.0"
-    "@marionebl/sander" "^0.6.0"
-    babel-runtime "^6.23.0"
-    git-raw-commits "^1.3.0"
-
 "@commitlint/read@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-8.0.0.tgz#5149fcb2550a07e7eb6a9f50b88df742780fa1e8"
@@ -315,17 +222,6 @@
     babel-runtime "^6.23.0"
     git-raw-commits "^1.3.0"
 
-"@commitlint/resolve-extends@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-7.5.0.tgz#d95a3058e83ddbaef5e3045835b9a3a1fba3422c"
-  integrity sha512-FRIyPuqGvGa03OT4VgOHakizcw8YR5rdm77JsZff1rSnpxk6i+025I6qMeHqCIr5FaVIA0kR3FlC+MJFUs165A==
-  dependencies:
-    babel-runtime "6.26.0"
-    import-fresh "^3.0.0"
-    lodash "4.17.11"
-    resolve-from "^4.0.0"
-    resolve-global "^0.1.0"
-
 "@commitlint/resolve-extends@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-8.0.0.tgz#dc606cecb0f392d57905cfd690d8f736ad26eec2"
@@ -337,16 +233,6 @@
     resolve-from "^5.0.0"
     resolve-global "^1.0.0"
 
-"@commitlint/rules@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-7.5.2.tgz#da03d754625b2e67c0a6b8b9ab89eae1952a4f2e"
-  integrity sha512-eDN1UFPcBOjdnlI3syuo7y99SjGH/dUV6S9NvBocAye8ln5dfKiI2shhWochJhl36r/kYWU8Wrvl2NZJL3c52g==
-  dependencies:
-    "@commitlint/ensure" "^7.5.2"
-    "@commitlint/message" "^7.5.0"
-    "@commitlint/to-lines" "^7.5.0"
-    babel-runtime "^6.23.0"
-
 "@commitlint/rules@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-8.0.0.tgz#26ef50fedb5a88a2ad2af43677e5bb7c32fb5f14"
@@ -357,23 +243,11 @@
     "@commitlint/to-lines" "^8.0.0"
     babel-runtime "^6.23.0"
 
-"@commitlint/to-lines@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-7.5.0.tgz#a24410d25bb85a5fff3b8d610277b3145f899766"
-  integrity sha512-ZQ3LxPNuQ/J7q42hkiPWN5fUIjWae85H2HHoBB+/Rw1fo+oehvr4Xyt+Oa9Mx5WbBnev/wXnUFjXgoadv1RZ5A==
-
 "@commitlint/to-lines@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-8.0.0.tgz#9f7d7938404bdbb345c23c8665293e051c4dc243"
   integrity sha512-qqgNeyj+NJ1Xffwv6hGsipKlVFj30NmfPup751MS/me0GV8IBd//njTjiqHvf/3sKm/OcGn4Re4D7YXwTcC2RA==
 
-"@commitlint/top-level@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-7.5.0.tgz#01e740167e3d15110794192cd754f49f27d4a16d"
-  integrity sha512-oTu185GufTYHjTXPHu6k6HL7iuASOvDOtQizZWRSxj0VXuoki6e0HzvGZsRsycDTOn04Q9hVu+PhF83IUwRpeg==
-  dependencies:
-    find-up "^2.1.0"
-
 "@commitlint/top-level@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-8.0.0.tgz#3d998ba1e13be939f4227202eebae7f1dbb472a9"
@@ -381,12 +255,12 @@
   dependencies:
     find-up "^2.1.0"
 
-"@commitlint/travis-cli@^7.5.2":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@commitlint/travis-cli/-/travis-cli-7.5.2.tgz#f82ca57296eb913b6557124b80eac9773dcbbf1d"
-  integrity sha512-kbkn8TIjRtGWcKOJBM/fbT9yRPjbLTybetRH5mkAQdX9ratkV9+N3akaOSmv5eemNfHsOM1cdrWkcjZbSqZV2A==
+"@commitlint/travis-cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@commitlint/travis-cli/-/travis-cli-8.0.0.tgz#488f863e96ff2c5d494274e2b25c171666733463"
+  integrity sha512-PSCrOEom3ciiuDv0eAnTS0B0Bz8y7gaSPsaWdRt7yW+hbI4SLy9Pf0MM5F/X2EqHij31Ij2sb13i/NkrWr8k+w==
   dependencies:
-    "@commitlint/cli" "^7.5.2"
+    "@commitlint/cli" "^8.0.0"
     babel-runtime "6.26.0"
     execa "0.9.0"
 
@@ -2525,16 +2399,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
-
 cosmiconfig@^5.0.2:
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
@@ -3502,11 +3366,6 @@ get-proxy@^2.1.0:
   dependencies:
     npm-conf "^1.1.0"
 
-get-stdin@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
-  integrity sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=
-
 get-stdin@7.0.0, get-stdin@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
@@ -3927,12 +3786,12 @@ import-fresh@^3.0.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-from@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
+import-from@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
+  integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
   dependencies:
-    resolve-from "^3.0.0"
+    resolve-from "^5.0.0"
 
 import-lazy@^2.1.0:
   version "2.1.0"
@@ -7022,7 +6881,7 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
-require-from-string@^2.0.1, require-from-string@^2.0.2:
+require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
@@ -7060,30 +6919,18 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
-resolve-from@4.0.0, resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-
 resolve-from@5.0.0, resolve-from@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve-from@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
-  integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
-resolve-global@0.1.0, resolve-global@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-0.1.0.tgz#8fb02cfd5b7db20118e886311f15af95bd15fbd9"
-  integrity sha1-j7As/Vt9sgEY6IYxHxWvlb0V+9k=
-  dependencies:
-    global-dirs "^0.1.0"
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
 
 resolve-global@1.0.0, resolve-global@^1.0.0:
   version "1.0.0"
@@ -7092,12 +6939,12 @@ resolve-global@1.0.0, resolve-global@^1.0.0:
   dependencies:
     global-dirs "^0.1.1"
 
-resolve-pkg@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-1.0.0.tgz#e19a15e78aca2e124461dc92b2e3943ef93494d9"
-  integrity sha1-4ZoV54rKLhJEYdySsuOUPvk0lNk=
+resolve-pkg@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-2.0.0.tgz#ac06991418a7623edc119084edc98b0e6bf05a41"
+  integrity sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==
   dependencies:
-    resolve-from "^2.0.0"
+    resolve-from "^5.0.0"
 
 resolve-url@^0.2.1:
   version "0.2.1"
@@ -7273,16 +7120,16 @@ semver-utils@^1.1.4:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
-semver@5.6.0, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
 semver@6.0.0, semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
   integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
 
+"semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

From 92e950ab93b3e375aecbe80ad876159b28f3d851 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 31 May 2019 12:24:08 +0300
Subject: [PATCH 345/382] chore: update @types/google-maps to the latest
 version

---
 backend/api/package.json | 2 +-
 backend/api/yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index 2fc1106ab..b3ef13802 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -157,7 +157,7 @@
 		"@types/express": "^4.16.1",
 		"@types/faker": "^4.1.5",
 		"@types/form-data": "^2.2.1",
-		"@types/google-maps": "^3.2.0",
+		"@types/google-maps": "^3.2.1",
 		"@types/handlebars": "^4.1.0",
 		"@types/inversify": "^2.0.33",
 		"@types/jest": "^24.0.11",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 292d7f8f3..07c8ecd23 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -1007,9 +1007,10 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/google-maps@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@types/google-maps/-/google-maps-3.2.0.tgz#804a3ae9ac9265b4e0d1508b5b9b894867974f82"
+"@types/google-maps@^3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@types/google-maps/-/google-maps-3.2.1.tgz#68b84f74773960fbf4c76e2d2bc62838b8cd5026"
+  integrity sha512-0JeYMqVUeolC2hC1v8s49vjg5zt/tQXDzzcZfWxzx8Kcu1xDSpULFkhI33CIUZ/r8PmGvrud9EEZqFhJlOE4/A==
   dependencies:
     "@types/googlemaps" "*"
 

From 981bdce43a87b4393ba6664676473d0421a9926d Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 31 May 2019 13:38:30 +0300
Subject: [PATCH 346/382] chore: update fstream to the latest version

---
 backend/api/package.json           |  1 +
 backend/api/yarn.lock              | 10 ++++++++++
 carrier/mobile-ionic/package.json  |  1 +
 carrier/mobile-ionic/yarn.lock     | 10 ++++++++++
 merchant/tablet-ionic/package.json |  1 +
 merchant/tablet-ionic/yarn.lock    | 10 ++++++++++
 package.json                       |  1 +
 shop/mobile-ionic/package.json     |  1 +
 shop/mobile-ionic/yarn.lock        | 10 ++++++++++
 shop/website-angular/package.json  |  1 +
 shop/website-angular/yarn.lock     | 10 ++++++++++
 yarn.lock                          | 10 ++++++++++
 12 files changed, 66 insertions(+)

diff --git a/backend/api/package.json b/backend/api/package.json
index b3ef13802..f0724627e 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -84,6 +84,7 @@
 		"express": "^4.16.4",
 		"express-handlebars": "^3.0.2",
 		"faker": "^4.1.0",
+		"fstream": "^1.0.12",
 		"graphql": "^14.2.1",
 		"graphql-playground-middleware-express": "^1.7.12",
 		"graphql-subscriptions": "^1.1.0",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index 07c8ecd23..ffac18bbb 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -4833,6 +4833,16 @@ fstream@^1.0.0, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index ab8792cdd..bccd2533b 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -127,6 +127,7 @@
 		"cryptiles": "^4.1.3",
 		"es6-promise-plugin": "^4.2.2",
 		"font-awesome": "^4.7.0",
+		"fstream": "^1.0.12",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"hooks-fixed": "^2.0.2",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index ea44d4c0a..6f9f78198 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -4859,6 +4859,16 @@ fstream@^1.0.0, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index fe3912b95..c05002fe0 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -136,6 +136,7 @@
 		"cryptiles": "^4.1.3",
 		"es6-promise-plugin": "^4.2.2",
 		"font-awesome": "^4.7.0",
+		"fstream": "^1.0.12",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"imagesloaded": "^4.1.4",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 53b2c28cd..13fbb1363 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -4835,6 +4835,16 @@ fstream@^1.0.0, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
diff --git a/package.json b/package.json
index c89d90265..9df95aa0d 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
 		"angular2-logger": "^0.7.0",
+		"fstream": "^1.0.12",
 		"npm": "^6.9.0",
 		"rxjs": "^6.5.1",
 		"rxjs-compat": "^6.5.1",
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index d30fbd23f..3d70da98e 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -119,6 +119,7 @@
 		"core-js": "^3.1.3",
 		"cryptiles": "^4.1.3",
 		"font-awesome": "^4.7.0",
+		"fstream": "^1.0.12",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"ionicons": "^4.5.5",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 1756742ab..7361b3b93 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -4807,6 +4807,16 @@ fstream@^1.0.0, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 2223fe0e3..b93938ba3 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -136,6 +136,7 @@
 		"classlist.js": "^1.1.20150312",
 		"core-js": "^3.1.3",
 		"css-element-queries": "^1.2.0",
+		"fstream": "^1.0.12",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"hammerjs": "^2.0.8",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index cb8bf8f2e..a179f614f 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -4622,6 +4622,16 @@ fstream@^1.0.0, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
diff --git a/yarn.lock b/yarn.lock
index 48a77dcfb..101119f22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3288,6 +3288,16 @@ fstream@^1.0.0, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"

From ae6f3930c6fc7067aa2a2608eed4ce6e4c463039 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 31 May 2019 17:29:49 +0300
Subject: [PATCH 347/382] chore: updated lot of packages to Angular 8

---
 admin/website-angular/package.json            |   38 +-
 .../carrier-mutation.component.ts             |    4 +-
 .../basic-info/basic-info-form.component.ts   |    2 +-
 .../file-uploader/file-uploader.component.ts  |    2 +-
 .../forms/google-map/google-map.component.ts  |    2 +-
 .../forms/location/location-form.component.ts |    2 +-
 .../invite-request-modal.component.ts         |    2 +-
 .../carreir-location/carreir-location.ts      |    2 +-
 .../user-warehouse-map/user-warehouse-map.ts  |    2 +-
 .../category-image.component.ts               |    2 +-
 .../basic-info/basic-info-form.component.ts   |    2 +-
 .../basic-info/basic-info-form.component.ts   |    4 +-
 .../product-create.component.ts               |    2 +-
 .../render-component/created.component.ts     |    2 +-
 .../created/created.component.ts              |    2 +-
 .../warehouse-table/elapsed.component.ts      |    2 +-
 .../elapsed/elapsed.component.ts              |    2 +-
 .../basic-info/basic-info-form.component.ts   |    2 +-
 .../user-mutation/user-mutation.component.ts  |    4 +-
 .../warehouse-product-create.component.ts     |   12 +-
 .../basic-info/basic-info-form.component.ts   |    2 +-
 ...se-manage-tabs-delivery-areas.component.ts |    2 +-
 ...warehouse-manage-tabs-details.component.ts |    4 +-
 .../warehouse-manage-tabs.component.ts        |   10 +-
 .../warehouse-mutation.component.ts           |    6 +-
 .../search-input/search-input.component.ts    |   29 +-
 .../theme-switcher.component.ts               |    2 +-
 .../+carrier-edit/carrier-edit.component.ts   |    4 +-
 .../carrier-map/carrier-map.component.ts      |    2 +-
 .../+carriers/+carrier/carrier.component.ts   |    2 +-
 .../location/carrier-location.component.ts    |    2 +-
 .../app/pages/+carriers/carriers.component.ts |    2 +-
 .../carrier-tracking.component.ts             |    2 +-
 .../+customer-edit/customer-edit.component.ts |    4 +-
 .../ea-customer-location.component.ts         |    2 +-
 .../chart-panel-header.component.ts           |    2 +-
 .../charts-panel/charts-panel.component.ts    |    6 +-
 .../+categories/categories.component.ts       |    2 +-
 .../product-edit/product-edit.component.ts    |    2 +-
 .../app/pages/+products/products.component.ts |    2 +-
 .../components/account/account.component.ts   |    2 +-
 .../basic-info/basic-info.component.ts        |    4 +-
 .../contact-info/contact-info.component.ts    |    2 +-
 .../components/location/location.component.ts |    2 +-
 .../payPal-gateway.component.ts               |    2 +-
 .../payment-gateways.component.ts             |    4 +-
 .../stripe-gateway.component.ts               |    2 +-
 .../components/payments/payments.component.ts |    2 +-
 .../product-categories.component.ts           |    4 +-
 .../add-products/add-products.component.ts    |    2 +-
 .../product-mutation.component.ts             |    2 +-
 .../products-catalog.component.ts             |    2 +-
 .../components/products/products.component.ts |    8 +-
 .../add-new-carrier.component.ts              |    2 +-
 .../delivery-takeaway.component.ts            |    6 +-
 .../shared-carriers.component.ts              |    2 +-
 .../+setup/+merchants/merchants.component.ts  |   18 +-
 .../+simulation/order/order.component.ts      |    2 +-
 .../pages/+simulation/simulation.component.ts |    4 +-
 .../warehouse-track.component.ts              |    2 +-
 .../warehouse-manage.component.ts             |    6 +-
 .../warehouse-order.component.ts              |    8 +-
 .../products-table.component.ts               |    2 +-
 .../warehouse-order-view.component.ts         |    2 +-
 .../+warehouse/warehouse.component.ts         |    4 +-
 .../search-map/search/search.component.ts     |   37 +-
 admin/website-angular/yarn.lock               | 1185 ++++++---------
 carrier/mobile-ionic/package.json             |   40 +-
 .../pages/main/common/map/map.component.ts    |    2 +-
 .../src/pages/main/delivery/delivery.ts       |    2 +-
 .../drive-to-warehouse/drive-to-warehouse.ts  |    2 +-
 .../mobile-ionic/src/pages/main/home/home.ts  |    2 +-
 .../starting-delivery/starting-delivery.ts    |    2 +-
 carrier/mobile-ionic/yarn.lock                |  389 +++--
 merchant/tablet-ionic/package.json            |   22 +-
 .../google-map/google-map.component.ts        |    2 +-
 .../forms/location/location-form.component.ts |    2 +-
 .../user/mutation/user-mutation.component.ts  |    4 +-
 .../order-map-popup/order-map-popup.ts        |    2 +-
 .../location/location.ts                      |    2 +-
 .../add-carriers-popup/add-carriers-popup.ts  |   12 +-
 .../add-new-carrier/add-new-carrier.ts        |    6 +-
 .../location/location-form.component.ts       |    2 +-
 .../carrier-addr-popup/carrier-addr-popup.ts  |    2 +-
 .../carrier-edit-popup/carrier-edit-popup.ts  |    6 +-
 .../location/location-form.component.ts       |    2 +-
 .../carrier-track-popup.ts                    |    2 +-
 .../customer-addr-popup.ts                    |    2 +-
 .../tablet-ionic/src/pages/+track/track.ts    |   18 +-
 .../create-product-type-popup.ts              |    4 +-
 .../edit-product-type-popup.ts                |    4 +-
 merchant/tablet-ionic/yarn.lock               |  159 +-
 .../ngx-barcode/ngx-barcode.component.ts      |    2 +-
 shop/mobile-ionic/package.json                |   22 +-
 .../+order/+order-info/order-info.page.ts     |    2 +-
 .../user-warehouse-map/user-warehouse-map.ts  |    2 +-
 .../carreir-location/carreir-location.ts      |    2 +-
 .../app/pages/+products/+order/order.page.ts  |    2 +-
 .../+page/store-info/store-info.component.ts  |    2 +-
 .../takeaway/+page/takeaway-page.page.ts      |    2 +-
 .../+order/takeaway/popup/popup.component.ts  |    2 +-
 .../slides-view/slides-view.component.ts      |    2 +-
 shop/mobile-ionic/yarn.lock                   |  159 +-
 shop/website-angular/package.json             |   43 +-
 .../+login/byLocation/byLocation.component.ts |    2 +-
 .../google-map/google-map.component.ts        |    2 +-
 .../byLocation/location/location.component.ts |    2 +-
 .../src/app/+login/login.component.ts         |    2 +-
 .../src/app/+products/products.component.ts   |    2 +-
 .../views/list/list-view.component.ts         |    2 +-
 shop/website-angular/src/app/app.component.ts |    2 +-
 .../location-popup.component.ts               |    2 +-
 .../src/app/toolbar/toolbar.component.ts      |    2 +-
 .../bold-input/mat-bold-input.component.ts    |    4 +-
 .../search/mat-search.component.ts            |    6 +-
 shop/website-angular/yarn.lock                | 1324 ++++++-----------
 116 files changed, 1671 insertions(+), 2114 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index d26c7da53..cd4a88b30 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -59,16 +59,16 @@
 	},
 	"dependencies": {
 		"@agm/core": "^1.0.0-beta.5",
-		"@angular/animations": "^7.2.14",
-		"@angular/cdk": "^7.3.7",
-		"@angular/common": "^7.2.14",
-		"@angular/compiler": "^7.2.14",
-		"@angular/core": "^7.2.14",
-		"@angular/forms": "^7.2.14",
-		"@angular/http": "^7.2.14",
-		"@angular/platform-browser": "^7.2.14",
-		"@angular/platform-browser-dynamic": "^7.2.14",
-		"@angular/router": "^7.2.14",
+		"@angular/animations": "^8.0.0",
+		"@angular/cdk": "^8.0.0",
+		"@angular/common": "^8.0.0",
+		"@angular/compiler": "^8.0.0",
+		"@angular/core": "^8.0.0",
+		"@angular/forms": "^8.0.0",
+		"@angular/http": "^7.2.15",
+		"@angular/platform-browser": "^8.0.0",
+		"@angular/platform-browser-dynamic": "^8.0.0",
+		"@angular/router": "^8.0.0",
 		"@asymmetrik/ngx-leaflet": "^5.0.2",
 		"@fortawesome/fontawesome-free": "^5.8.1",
 		"@nebular/auth": "^3.5.0",
@@ -150,14 +150,14 @@
 		"zone.js": "^0.9.0"
 	},
 	"devDependencies": {
-		"@angular-devkit/architect": "^0.13.8",
-		"@angular-devkit/build-angular": "^0.13.8",
-		"@angular-devkit/build-webpack": "^0.13.8",
-		"@angular-devkit/core": "^7.3.8",
-		"@angular-devkit/schematics": "^7.3.8",
-		"@angular/cli": "^7.3.8",
-		"@angular/compiler-cli": "^7.2.14",
-		"@angular/language-service": "^7.2.14",
+		"@angular-devkit/architect": "^0.800.1",
+		"@angular-devkit/build-angular": "^0.800.1",
+		"@angular-devkit/build-webpack": "^0.800.1",
+		"@angular-devkit/core": "~7.3.8",
+		"@angular-devkit/schematics": "^8.0.1",
+		"@angular/cli": "^8.0.1",
+		"@angular/compiler-cli": "^8.0.0",
+		"@angular/language-service": "^8.0.0",
 		"@babel/core": "^7.4.3",
 		"@compodoc/compodoc": "^1.1.9",
 		"@storybook/addon-actions": "^5.0.10",
@@ -203,7 +203,7 @@
 		"stylelint": "^10.0.1",
 		"ts-node": "^8.1.0",
 		"tslint": "^5.16.0",
-		"typescript": "~3.2.4",
+		"typescript": "3.4.5",
 		"typescript-tslint-plugin": "^0.4.0",
 		"webpack-dev-server": "^3.3.1",
 		"yargs": "^13.2.4"
diff --git a/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts b/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts
index 9e0d6de93..ecb27792f 100644
--- a/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts
@@ -17,10 +17,10 @@ import { TranslateService } from '@ngx-translate/core';
 	styleUrls: ['./carrier-mutation.component.scss']
 })
 export class CarrierMutationComponent {
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	readonly form: FormGroup = this.formBuilder.group({
diff --git a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
index fa7af5195..afc2d5b05 100644
--- a/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
@@ -38,7 +38,7 @@ export type CarrierBasicInfo = Pick<
 	styleUrls: ['basic-info-form.component.scss']
 })
 export class BasicInfoFormComponent implements OnInit, AfterViewInit {
-	@ViewChild('logoImagePreview')
+	@ViewChild('logoImagePreview', { static: false })
 	logoImagePreview: ElementRef;
 
 	uploaderPlaceholder: string;
diff --git a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
index 3f49678b0..d848f1d9b 100644
--- a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
+++ b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
@@ -17,7 +17,7 @@ import { NgModel } from '@angular/forms';
 	styleUrls: ['./file-uploader.component.scss']
 })
 export class FileUploaderComponent {
-	@ViewChild('shownInput')
+	@ViewChild('shownInput', { static: false })
 	shownInput: NgModel;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts b/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
index 1015490a9..2fb6122f7 100644
--- a/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
+++ b/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
@@ -10,7 +10,7 @@ import { takeUntil } from 'rxjs/operators';
 	`
 })
 export class GoogleMapComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	mapElement: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/forms/location/location-form.component.ts b/admin/website-angular/src/app/@shared/forms/location/location-form.component.ts
index 574ad5c22..6d4894f96 100644
--- a/admin/website-angular/src/app/@shared/forms/location/location-form.component.ts
+++ b/admin/website-angular/src/app/@shared/forms/location/location-form.component.ts
@@ -51,7 +51,7 @@ export class LocationFormComponent implements AfterViewInit {
 		google.maps.places.PlaceGeometry | google.maps.GeocoderGeometry
 	>();
 
-	@ViewChild('autocomplete')
+	@ViewChild('autocomplete', { static: false })
 	searchElement: ElementRef;
 
 	public showCoordinates: boolean = false;
diff --git a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
index bc593a6d1..164fa651c 100644
--- a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
+++ b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
@@ -12,7 +12,7 @@ import { InviteRequestRouter } from '@modules/client.common.angular2/routers/inv
 	styleUrls: ['/invite-request-modal.component.scss']
 })
 export class InviteRequestModalComponent {
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts b/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
index 99ecb5cea..f756a2f76 100644
--- a/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
+++ b/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
@@ -16,7 +16,7 @@ import { environment } from 'environments/environment';
 	`
 })
 export class CarrierLocationComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 	public map: google.maps.Map;
 	private directionsDisplay = new google.maps.DirectionsRenderer();
diff --git a/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts b/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
index 0146b2704..975cad233 100644
--- a/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
+++ b/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
@@ -22,7 +22,7 @@ const userIcon = environment.MAP_USER_ICON_LINK;
 })
 export class UserWarehouseLocationComponent
 	implements AfterViewInit, OnDestroy, OnChanges {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 
 	public map: google.maps.Map;
diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
index 1173cc4fd..fd9567f1e 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
@@ -12,7 +12,7 @@ export class CategoryImageComponent implements ViewCell, OnInit {
 	value: string;
 	rowData: any;
 
-	@ViewChild('image')
+	@ViewChild('image', { static: false })
 	image: ElementRef;
 
 	ngOnInit() {
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
index f47d69661..da5ddb500 100644
--- a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
@@ -24,7 +24,7 @@ import { IProductsCategoryCreateObject } from '@modules/server.common/interfaces
 	styleUrls: ['basic-info-form.component.scss']
 })
 export class BasicInfoFormComponent implements OnInit, AfterViewInit {
-	@ViewChild('imagePreview')
+	@ViewChild('imagePreview', { static: false })
 	imagePreviewElement: ElementRef;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
index e377f6a87..7e9e6a9c3 100644
--- a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
@@ -35,9 +35,9 @@ import { TranslateService } from '@ngx-translate/core';
 	templateUrl: 'basic-info-form.component.html'
 })
 export class BasicInfoFormComponent implements OnDestroy, OnInit {
-	@ViewChild('fileInput')
+	@ViewChild('fileInput', { static: false })
 	fileInput: any;
-	@ViewChild('productImagePreview')
+	@ViewChild('productImagePreview', { static: false })
 	productImagePreview: ElementRef;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
index 46199aba6..d649a0cd5 100644
--- a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
+++ b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
@@ -14,7 +14,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	styleUrls: ['./product-create.component.scss']
 })
 export class ProductCreateComponent implements OnInit {
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
 	public loading: boolean;
diff --git a/admin/website-angular/src/app/@shared/render-component/created.component.ts b/admin/website-angular/src/app/@shared/render-component/created.component.ts
index f72352bea..1b99257f9 100644
--- a/admin/website-angular/src/app/@shared/render-component/created.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/created.component.ts
@@ -25,7 +25,7 @@ import OrderStatus from '@modules/server.common/enums/OrderStatus';
 	`
 })
 export class CreatedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('createdTimer')
+	@ViewChild('createdTimer', { static: false })
 	createdTimer: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/created/created.component.ts b/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
index cf863b501..76501213d 100644
--- a/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
@@ -16,7 +16,7 @@ import OrderStatus from '@modules/server.common/enums/OrderStatus';
 	templateUrl: './created.component.html'
 })
 export class CreatedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('createdTimer')
+	@ViewChild('createdTimer', { static: false })
 	createdTimer: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
index b6df365d5..71a32b5e9 100644
--- a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
@@ -20,7 +20,7 @@ import OrderWarehouseStatus from '@modules/server.common/enums/OrderWarehouseSta
 	`
 })
 export class ElapsedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('elapsedTime')
+	@ViewChild('elapsedTime', { static: false })
 	elapsedTime: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
index aedefff93..9fd653fab 100644
--- a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
@@ -20,7 +20,7 @@ import OrderWarehouseStatus from '@modules/server.common/enums/OrderWarehouseSta
 	`
 })
 export class ElapsedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('elapsedTime')
+	@ViewChild('elapsedTime', { static: false })
 	elapsedTime: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/user/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/user/forms/basic-info/basic-info-form.component.ts
index 437f18f08..cff38f76e 100644
--- a/admin/website-angular/src/app/@shared/user/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/user/forms/basic-info/basic-info-form.component.ts
@@ -35,7 +35,7 @@ export type CustomerBasicInfo = Pick<
 })
 export class BasicInfoFormComponent
 	implements OnInit, OnDestroy, AfterViewInit {
-	@ViewChild('logoImagePreview')
+	@ViewChild('logoImagePreview', { static: false })
 	logoImagePreview: ElementRef;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts b/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts
index cc77301fb..9709db525 100644
--- a/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts
@@ -13,10 +13,10 @@ import { TranslateService } from '@ngx-translate/core';
 	styleUrls: ['/user-mutation.component.scss']
 })
 export class UserMutationComponent {
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
index 98f799b59..281cad797 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
@@ -41,22 +41,22 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 	perPage: number;
 	choiced: string;
 
-	@ViewChild('warehouseAddChoice')
+	@ViewChild('warehouseAddChoice', { static: false })
 	warehouseAddChoice: WarehouseAddChoiceComponent;
 
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('productsTable')
+	@ViewChild('productsTable', { static: false })
 	productsTable: ProductsTableComponent;
 
-	@ViewChild('addWarehouseProductsTable')
+	@ViewChild('addWarehouseProductsTable', { static: false })
 	addWarehouseProductsTable: AddWarehouseProductsComponent;
 
-	@ViewChild('wizzardFrom')
+	@ViewChild('wizzardFrom', { static: false })
 	wizzardFrom: WizardComponent;
 
-	@ViewChild('wizzardFromStep1')
+	@ViewChild('wizzardFromStep1', { static: false })
 	wizzardFromStep1: any;
 
 	hasSelectedProducts = () => false;
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
index bd755b23a..e44febcb1 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
@@ -32,7 +32,7 @@ export type WarehouseBasicInfo = Pick<
 	templateUrl: 'basic-info-form.component.html'
 })
 export class BasicInfoFormComponent implements OnInit {
-	@ViewChild('fileInput')
+	@ViewChild('fileInput', { static: false })
 	fileInput: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
index 361291ffe..159e43efe 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
@@ -10,7 +10,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 })
 export class WarehouseManageTabsDeliveryAreasComponent
 	implements OnInit, OnDestroy {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	mapElement: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
index 65cd3f902..112251044 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
@@ -41,9 +41,9 @@ export type WarehouseManageTabsDetails = Pick<
 })
 export class WarehouseManageTabsDetailsComponent
 	implements OnInit, AfterViewInit {
-	@ViewChild('fileInput')
+	@ViewChild('fileInput', { static: false })
 	fileInput: ElementRef;
-	@ViewChild('logoPreview')
+	@ViewChild('logoPreview', { static: false })
 	logoPreviewElement: ElementRef;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
index 288a8ecc6..5acee8cbe 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
@@ -39,19 +39,19 @@ export class WarehouseManageTabsComponent {
 	@Input()
 	readonly form: FormGroup;
 
-	@ViewChild('detailsComponent')
+	@ViewChild('detailsComponent', { static: false })
 	readonly detailsComponent: WarehouseManageTabsDetailsComponent;
 
-	@ViewChild('accountComponent')
+	@ViewChild('accountComponent', { static: false })
 	readonly accountComponent: WarehouseManageTabsAccountComponent;
 
-	@ViewChild('contactInfoForm')
+	@ViewChild('contactInfoForm', { static: false })
 	readonly contactInfoForm: ContactInfoFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	readonly locationForm: LocationFormComponent;
 
-	@ViewChild('tabSet')
+	@ViewChild('tabSet', { static: false })
 	readonly tabSet;
 
 	mapCoordEmitter = new EventEmitter<number[]>();
diff --git a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
index a65695b3d..420008e97 100644
--- a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
@@ -24,13 +24,13 @@ export class WarehouseMutationComponent implements AfterViewInit {
 	public BUTTON_NEXT: string = 'BUTTON_NEXT';
 	public BUTTON_PREV: string = 'BUTTON_PREV';
 
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('contactInfoForm')
+	@ViewChild('contactInfoForm', { static: false })
 	contactInfoForm: ContactInfoFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	mapCoordEmitter = new EventEmitter<number[]>();
diff --git a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
index 05a20e9e9..f14a7de7e 100644
--- a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
+++ b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
@@ -1,20 +1,27 @@
-import { Component, ElementRef, EventEmitter, Output, ViewChild } from '@angular/core';
+import {
+	Component,
+	ElementRef,
+	EventEmitter,
+	Output,
+	ViewChild
+} from '@angular/core';
 
 @Component({
 	selector: 'ngx-search-input',
-	styleUrls: [ './search-input.component.scss' ],
+	styleUrls: ['./search-input.component.scss'],
 	template: `
-    <i class="control-icon ion ion-ios-search"
-       (click)="showInput()"></i>
-    <input placeholder="Type your search request here..."
-           #input
-           [class.hidden]="!isInputShown"
-           (blur)="hideInput()"
-           (input)="onInput($event)">
-  `
+		<i class="control-icon ion ion-ios-search" (click)="showInput()"></i>
+		<input
+			placeholder="Type your search request here..."
+			#input
+			[class.hidden]="!isInputShown"
+			(blur)="hideInput()"
+			(input)="onInput($event)"
+		/>
+	`
 })
 export class SearchInputComponent {
-	@ViewChild('input') input: ElementRef;
+	@ViewChild('input', { static: false }) input: ElementRef;
 
 	@Output() search: EventEmitter<string> = new EventEmitter<string>();
 
diff --git a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
index 0dfabc159..9ecf57c4a 100644
--- a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
+++ b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
@@ -10,7 +10,7 @@ import { AnalyticsService } from 'app/@core/utils/analytics.service';
 	styleUrls: ['./theme-switcher.component.scss']
 })
 export class ThemeSwitcherComponent {
-	@ViewChild(NbPopoverDirective)
+	@ViewChild(NbPopoverDirective, { static: false })
 	popover: NbPopoverDirective;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts
index 3b0717ebf..17e4fcab6 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts
@@ -15,10 +15,10 @@ import { first, map, switchMap } from 'rxjs/operators';
 	styleUrls: ['./carrier-edit.component.scss']
 })
 export class CarrierEditComponent implements OnInit {
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
index 59a81729b..b0bdf0459 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
@@ -26,7 +26,7 @@ export class CarrierMapComponent {
 	private ngDestroy$ = new Subject();
 	public carrierId: string;
 
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
index f824d0e26..f7c2bcb55 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
@@ -19,7 +19,7 @@ import { CarrierOrdersComponent } from './carrier-orders/carrier-orders.componen
 	styleUrls: ['./carrier.component.scss']
 })
 export class CarrierComponent implements OnInit, OnDestroy {
-	@ViewChild('carrierOrders')
+	@ViewChild('carrierOrders', { static: false })
 	public carrierOrders: CarrierOrdersComponent;
 
 	private ngDestroy$ = new Subject();
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
index 03b86b907..d5ec41ed0 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
@@ -22,7 +22,7 @@ const directionsService = new google.maps.DirectionsService();
 export class CarrierLocationComponent implements OnDestroy, OnInit {
 	private ngDestroy$ = new Subject();
 
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
index 707a41bf5..127c9f13d 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
@@ -20,7 +20,7 @@ const perPage = 5;
 	styleUrls: ['carriers.component.scss']
 })
 export class CarriersComponent implements OnDestroy, AfterViewInit {
-	@ViewChild('carriersTable')
+	@ViewChild('carriersTable', { static: false })
 	carriersTable: CarriersSmartTableComponent;
 
 	loading: boolean;
diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
index da94e47a2..e0e0f9136 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
@@ -34,7 +34,7 @@ export class CarrierTrackingComponent implements OnInit, OnDestroy {
 	private ngDestroy$ = new Subject();
 	public carrierId: string;
 
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts
index b689c74dd..3f1bc4b61 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts
@@ -14,10 +14,10 @@ import User from '@modules/server.common/entities/User';
 	styleUrls: ['./customer-edit.component.scss']
 })
 export class CustomerEditComponent implements OnInit {
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
index 2da25e830..62a21addd 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
@@ -10,7 +10,7 @@ declare var google: any;
 	templateUrl: './ea-customer-location.component.html'
 })
 export class CustomerLocationComponent implements OnDestroy, OnInit {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 	marker: any;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
index 57c15b962..c5ad4bcb4 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
@@ -48,7 +48,7 @@ export class ChartPanelHeaderComponent implements OnInit, OnDestroy {
 		daysDiff: number;
 	}>();
 
-	@ViewChild('customDateRangeButton')
+	@ViewChild('customDateRangeButton', { static: false })
 	customDateRangeButton: ElementRef;
 
 	isDateRangeSelected = false;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
index a182205b8..47a2447d5 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
@@ -40,11 +40,11 @@ export class ChartsPanelComponent implements OnInit, OnDestroy {
 	ordersChartData: OrdersChart;
 	profitChartData: ProfitChart;
 
-	@ViewChild('ordersChart')
+	@ViewChild('ordersChart', { static: false })
 	ordersChart: OrdersChartComponent;
-	@ViewChild('profitChart')
+	@ViewChild('profitChart', { static: false })
 	profitChart: ProfitChartComponent;
-	@ViewChild('ordersProfitTab')
+	@ViewChild('ordersProfitTab', { static: false })
 	ordersProfitTab: any;
 
 	private _ordersToday: IOrdersChartModel;
diff --git a/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts b/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
index d2342de13..49c1ab60d 100644
--- a/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
+++ b/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
@@ -15,7 +15,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	styleUrls: ['/categories.component.scss']
 })
 export class CategoriesComponent implements OnDestroy {
-	@ViewChild('categoriesTable')
+	@ViewChild('categoriesTable', { static: false })
 	categoriesTable: CategoriesTableComponent;
 
 	protected settingsSmartTable: object;
diff --git a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
index 8b4417c3b..abc3a1c2d 100644
--- a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
@@ -17,7 +17,7 @@ import 'rxjs/add/operator/switchMap';
 export class ProductEditComponent implements OnInit, OnDestroy {
 	private ngDestroy$ = new Subject<void>();
 
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	public basicInfoForm: BasicInfoFormComponent;
 
 	public readonly form: FormGroup = this.formBuilder.group({
diff --git a/admin/website-angular/src/app/pages/+products/products.component.ts b/admin/website-angular/src/app/pages/+products/products.component.ts
index 5c9698679..8ec304d19 100644
--- a/admin/website-angular/src/app/pages/+products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+products/products.component.ts
@@ -18,7 +18,7 @@ const perPage = 5;
 	styleUrls: ['/products.component.scss']
 })
 export class ProductsComponent implements OnDestroy, AfterViewInit {
-	@ViewChild('productsTable')
+	@ViewChild('productsTable', { static: false })
 	protected productsTable: ProductsTableComponent;
 
 	public productsCategories: any;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
index 221052ac1..041c42527 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
@@ -7,7 +7,7 @@ import { NgForm } from '@angular/forms';
 	styleUrls: ['./account.component.scss']
 })
 export class SetupMerchantAccountComponent {
-	@ViewChild('accountForm')
+	@ViewChild('accountForm', { static: false })
 	accountForm: NgForm;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index fe9b21a34..40ceec21c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -19,10 +19,10 @@ import { getDummyImage } from '@modules/server.common/utils';
 	styleUrls: ['./basic-info.component.scss']
 })
 export class SetupMerchantBasicInfoComponent implements OnInit, OnDestroy {
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: NgForm;
 
-	@ViewChild('name')
+	@ViewChild('name', { static: false })
 	name: NgModel;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
index 97e572934..3da546ea1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
@@ -7,7 +7,7 @@ import { NgForm } from '@angular/forms';
 	styleUrls: ['./contact-info.component.scss']
 })
 export class SetupMerchantContactInfoComponent {
-	@ViewChild('contactInfoForm')
+	@ViewChild('contactInfoForm', { static: false })
 	contactInfoForm: NgForm;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
index 82e02391a..61e9b5151 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
@@ -8,7 +8,7 @@ import { FormBuilder } from '@angular/forms';
 	styleUrls: ['./location.component.scss']
 })
 export class SetupMerchantLocationComponent {
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
index c2d80d60a..b84fda026 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
@@ -12,7 +12,7 @@ import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaym
 	templateUrl: './payPal-gateway.component.html'
 })
 export class PayPalGatewayComponent implements OnChanges {
-	@ViewChild('payPalConfigForm')
+	@ViewChild('payPalConfigForm', { static: false })
 	payPalConfigForm: NgForm;
 
 	isPayPalEnabled: boolean;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index 07d34bdc5..3c75c97ff 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -11,10 +11,10 @@ import { first } from 'rxjs/operators';
 	templateUrl: './payment-gateways.component.html'
 })
 export class PaymentGatewaysComponent {
-	@ViewChild('stripeGateway')
+	@ViewChild('stripeGateway', { static: false })
 	stripeGateway: StripeGatewayComponent;
 
-	@ViewChild('payPalGateway')
+	@ViewChild('payPalGateway', { static: false })
 	payPalGateway: PayPalGatewayComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index 8927088b7..a78802901 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -15,7 +15,7 @@ import { Subject } from 'rxjs';
 	templateUrl: './stripe-gateway.component.html'
 })
 export class StripeGatewayComponent implements OnChanges {
-	@ViewChild('stripeConfigForm')
+	@ViewChild('stripeConfigForm', { static: false })
 	stripeConfigForm: NgForm;
 
 	isStripeEnabled: boolean;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
index d4c65f462..adbb901e8 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -15,7 +15,7 @@ import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaym
 	styleUrls: ['./payments.component.scss']
 })
 export class SetupMerchantPaymentsComponent {
-	@ViewChild('paymentGateways')
+	@ViewChild('paymentGateways', { static: false })
 	paymentGateways: PaymentGatewaysComponent;
 	@Output()
 	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
index 8c84c07c5..30230883d 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
@@ -14,10 +14,10 @@ import { CategoriesTableComponent } from 'app/@shared/product/categories/categor
 	styleUrls: ['./product-categories.component.scss']
 })
 export class SetupMerchantProductCategoriesComponent {
-	@ViewChild('basicInfo')
+	@ViewChild('basicInfo', { static: false })
 	basicInfo: BasicInfoFormComponent;
 
-	@ViewChild('categoriesTable')
+	@ViewChild('categoriesTable', { static: false })
 	categoriesTable: CategoriesTableComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
index 6f9359a21..642860c29 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
@@ -17,7 +17,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	templateUrl: './add-products.component.html'
 })
 export class SetupMerchantAddProductsComponent implements OnInit {
-	@ViewChild('addWarehouseProductsTable')
+	@ViewChild('addWarehouseProductsTable', { static: false })
 	addWarehouseProductsTable: AddWarehouseProductsComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
index 57ce8ccb0..0a06ef1b8 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
@@ -21,7 +21,7 @@ import Product from '@modules/server.common/entities/Product';
 	templateUrl: './product-mutation.component.html'
 })
 export class SetupMerchantProductMutationComponent {
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
index 759d47768..d0d0f75d7 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
@@ -10,7 +10,7 @@ import { Subject } from 'rxjs';
 })
 export class SetupMerchantProductsCatalogComponent
 	implements OnInit, OnDestroy {
-	@ViewChild('productsTable')
+	@ViewChild('productsTable', { static: false })
 	productsTable: ProductsTableComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index 0711c3457..54e144771 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -26,13 +26,13 @@ import { Router } from '@angular/router';
 	styleUrls: ['./products.component.scss']
 })
 export class SetupMerchantProductsComponent implements OnChanges, OnDestroy {
-	@ViewChild('productsCatalog')
+	@ViewChild('productsCatalog', { static: false })
 	productsCatalog: SetupMerchantProductsCatalogComponent;
-	@ViewChild('addProducts')
+	@ViewChild('addProducts', { static: false })
 	addProducts: SetupMerchantAddProductsComponent;
-	@ViewChild('productsTable')
+	@ViewChild('productsTable', { static: false })
 	productsTable: WarehouseProductsComponent;
-	@ViewChild('productMutation')
+	@ViewChild('productMutation', { static: false })
 	productMutation: SetupMerchantProductMutationComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
index 6d54135a7..6fbe200db 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
@@ -16,7 +16,7 @@ import { first } from 'rxjs/operators';
 })
 export class SetupMerchantAddNewCarrierComponent
 	implements AfterViewInit, OnInit {
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index ccb6636cc..472f08021 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -24,11 +24,11 @@ import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-r
 })
 export class SetupMerchantDeliveryAndTakeawayComponent
 	implements AfterViewInit, OnDestroy {
-	@ViewChild('newCarrier')
+	@ViewChild('newCarrier', { static: false })
 	newCarrier: SetupMerchantAddNewCarrierComponent;
-	@ViewChild('sharedCarriers')
+	@ViewChild('sharedCarriers', { static: false })
 	sharedCarriers: SetupMerchantSharedCarriersComponent;
-	@ViewChild('carriersTable')
+	@ViewChild('carriersTable', { static: false })
 	carriersTable: CarriersSmartTableComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
index c4dcfd61a..c3d4d2ccf 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
@@ -21,7 +21,7 @@ const perPage = 5;
 })
 export class SetupMerchantSharedCarriersComponent
 	implements OnDestroy, AfterViewInit {
-	@ViewChild('carriersTable')
+	@ViewChild('carriersTable', { static: false })
 	carriersTable: CarriersSmartTableComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
index cca86dafb..144fc92cd 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
@@ -19,24 +19,24 @@ import Warehouse from '@modules/server.common/entities/Warehouse';
 	templateUrl: './merchants.component.html'
 })
 export class SetupMerchantsComponent {
-	@ViewChild('nbStepper')
+	@ViewChild('nbStepper', { static: false })
 	nbStepper: NbStepperComponent;
 
-	@ViewChild('account')
+	@ViewChild('account', { static: false })
 	stepAccount: SetupMerchantAccountComponent;
-	@ViewChild('basicInfo')
+	@ViewChild('basicInfo', { static: false })
 	stepBasicInfo: SetupMerchantBasicInfoComponent;
-	@ViewChild('contactInfo')
+	@ViewChild('contactInfo', { static: false })
 	stepContactInfo: SetupMerchantContactInfoComponent;
-	@ViewChild('location')
+	@ViewChild('location', { static: false })
 	stepLocation: SetupMerchantLocationComponent;
-	@ViewChild('payments')
+	@ViewChild('payments', { static: false })
 	stepPayments: SetupMerchantPaymentsComponent;
-	@ViewChild('manufacturing')
+	@ViewChild('manufacturing', { static: false })
 	stepManufacturing: SetupMerchantManufacturingComponent;
-	@ViewChild('deliveryAndTakeaway')
+	@ViewChild('deliveryAndTakeaway', { static: false })
 	stepDeliveryAndTakeaway: SetupMerchantDeliveryAndTakeawayComponent;
-	@ViewChild('ordersSettings')
+	@ViewChild('ordersSettings', { static: false })
 	stepOrdersSettings: SetupMerchantOrdersSettingsComponent;
 
 	currentStore: Warehouse;
diff --git a/admin/website-angular/src/app/pages/+simulation/order/order.component.ts b/admin/website-angular/src/app/pages/+simulation/order/order.component.ts
index 8fd79d388..209642b76 100644
--- a/admin/website-angular/src/app/pages/+simulation/order/order.component.ts
+++ b/admin/website-angular/src/app/pages/+simulation/order/order.component.ts
@@ -22,7 +22,7 @@ export enum DeliveryStatus {
 	styleUrls: ['./order.component.scss']
 })
 export class SimulationOrderComponent implements OnDestroy, OnInit {
-	@ViewChild('elapsedTime')
+	@ViewChild('elapsedTime', { static: false })
 	elapsedTime: ElapsedTimeComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+simulation/simulation.component.ts b/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
index 14c500f04..a54c5835f 100644
--- a/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
+++ b/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
@@ -36,10 +36,10 @@ import { IOrderCreateInput } from '@modules/server.common/routers/IWarehouseOrde
 	styleUrls: ['/simulation.component.scss']
 })
 export class SimulationComponent implements OnDestroy, OnInit {
-	@ViewChild('productsTable')
+	@ViewChild('productsTable', { static: false })
 	productsTable: SimulationProductsComponent;
 
-	@ViewChild('instructions')
+	@ViewChild('instructions', { static: false })
 	instructions: SimulationInstructionsComponent;
 
 	public hasProductsForOrder: boolean;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index 03dd344c5..5d1400323 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -13,7 +13,7 @@ import {
 	styleUrls: ['./warehouse-track.component.scss']
 })
 export class WarehouseTrackComponent implements OnInit {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
index 42eccf26a..c1117c1da 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
@@ -18,13 +18,13 @@ import 'rxjs/add/operator/withLatestFrom';
 export class WarehouseManageComponent implements OnInit {
 	loading: boolean;
 
-	@ViewChild('warehouseManageTabs')
+	@ViewChild('warehouseManageTabs', { static: false })
 	warehouseManageTabs: WarehouseManageTabsComponent;
 
-	@ViewChild('contactInfoForm')
+	@ViewChild('contactInfoForm', { static: false })
 	contactInfoForm: ContactInfoFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	readonly form: FormGroup = this._formBuilder.group({
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
index c403bb51f..11adad435 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
@@ -45,16 +45,16 @@ export class WarehouseOrderComponent implements OnInit, OnDestroy {
 	createUserEmitter = new EventEmitter<void>();
 	orderFinishedEmitter = new EventEmitter<void>();
 
-	@ViewChild('wizardForm')
+	@ViewChild('wizardForm', { static: false })
 	private _wizardForm: WizardComponent;
 
-	@ViewChild('wizardFormStepTwo')
+	@ViewChild('wizardFormStepTwo', { static: false })
 	public wizardFormStepTwo: WizardComponent;
 
-	@ViewChild('warehouseOrderCreateUser')
+	@ViewChild('warehouseOrderCreateUser', { static: false })
 	private _warehouseOrderCreateUser: WarehouseOrderCreateUserComponent;
 
-	@ViewChild('warehouseOrderModal')
+	@ViewChild('warehouseOrderModal', { static: false })
 	private _warehouseOrderModal: WarehouseOrderModalComponent;
 
 	private _userIdToOrder: string;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
index 26463a80f..c06651569 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
@@ -30,7 +30,7 @@ import {
 	styleUrls: ['./products-table.component.scss']
 })
 export class ProductsTableComponent implements OnDestroy {
-	@ViewChild('productsTable')
+	@ViewChild('productsTable', { static: false })
 	productsTable: WarehouseProductsComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
index 5f2260f84..58df0b683 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
@@ -30,7 +30,7 @@ export class WarehouseOrderViewComponent
 	selectedOrder: Order;
 	@Input()
 	hideHeader: boolean;
-	@ViewChild('slideshow')
+	@ViewChild('slideshow', { static: false })
 	slideshow: any;
 
 	isSelectedOrderActionsAvailable: boolean = true;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
index ef5dc061b..6084e2c37 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
@@ -42,10 +42,10 @@ const perPage = 3;
 export class WarehouseComponent implements OnDestroy, AfterViewInit, OnChanges {
 	private ngDestroy$ = new Subject<void>();
 
-	@ViewChild('productsTable')
+	@ViewChild('productsTable', { static: false })
 	public productsTable: ProductsTableComponent;
 
-	@ViewChild('warehouseSelectView')
+	@ViewChild('warehouseSelectView', { static: false })
 	public warehouseSelectView: WarehouseSelectViewComponent;
 
 	public filterMode: OrdersFilterModes = 'all';
diff --git a/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts b/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
index 96e483117..4441d5ee8 100644
--- a/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
+++ b/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
@@ -1,4 +1,12 @@
-import { Component, ElementRef, EventEmitter, NgZone, OnInit, Output, ViewChild } from '@angular/core';
+import {
+	Component,
+	ElementRef,
+	EventEmitter,
+	NgZone,
+	OnInit,
+	Output,
+	ViewChild
+} from '@angular/core';
 import { MapsAPILoader } from '@agm/core';
 import { Location } from '../entity/Location';
 
@@ -7,32 +15,32 @@ import { Location } from '../entity/Location';
 	templateUrl: './search.component.html'
 })
 export class SearchComponent implements OnInit {
-
 	@Output() positionChanged = new EventEmitter<Location>();
 
-	@ViewChild('search')
+	@ViewChild('search', { static: false })
 	public searchElementRef: ElementRef;
 
-	constructor(
-		private mapsAPILoader: MapsAPILoader,
-		private ngZone: NgZone
-	) {
-
-	}
+	constructor(private mapsAPILoader: MapsAPILoader, private ngZone: NgZone) {}
 
 	ngOnInit() {
 		// load Places Autocomplete
 		this.mapsAPILoader.load().then(() => {
-			const autocomplete = new google.maps.places.Autocomplete(this.searchElementRef.nativeElement, {
-				types: [ 'address' ]
-			});
+			const autocomplete = new google.maps.places.Autocomplete(
+				this.searchElementRef.nativeElement,
+				{
+					types: ['address']
+				}
+			);
 			autocomplete.addListener('place_changed', () => {
 				this.ngZone.run(() => {
 					// get the place result
 					const place: google.maps.places.PlaceResult = autocomplete.getPlace();
 
 					// verify result
-					if (place.geometry === undefined || place.geometry === null) {
+					if (
+						place.geometry === undefined ||
+						place.geometry === null
+					) {
 						return;
 					}
 
@@ -40,7 +48,8 @@ export class SearchComponent implements OnInit {
 						new Location(
 							place.geometry.location.lat(),
 							place.geometry.location.lng()
-						));
+						)
+					);
 				});
 			});
 		});
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 1c9e18977..97333d2d2 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -7,89 +7,104 @@
   resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.5.tgz#6dbceb666b2dbc4a868b97e1340a3faceb5f2113"
   integrity sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ==
 
-"@angular-devkit/architect@0.13.8", "@angular-devkit/architect@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
-  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
-  dependencies:
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
-
-"@angular-devkit/build-angular@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
-  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
-  dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/build-optimizer" "0.13.8"
-    "@angular-devkit/build-webpack" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@ngtools/webpack" "7.3.8"
-    ajv "6.9.1"
-    autoprefixer "9.4.6"
+"@angular-devkit/architect@0.800.1", "@angular-devkit/architect@^0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.1.tgz#decff7e973b9459834ec256f4329a49420757c1f"
+  integrity sha512-zDueOtGo8q9zAUWL2baLIwc5hlLkNtSr5ud1yTuhS4EmYbXJOvV2BPyXx4d77iL+SK4AMG/FyDsi1ZUxXubHIA==
+  dependencies:
+    "@angular-devkit/core" "8.0.1"
+    rxjs "6.4.0"
+
+"@angular-devkit/build-angular@^0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.1.tgz#1c203c37a7cdf0f47215ad9b74aa4d4c6ec27d69"
+  integrity sha512-woZH0gJb9aGZjJx5Z7ai8FtT2HAcsMNZ+u5pfKn8qmSspbc0DobTeHQ/giTTHY+kfphXuxNeCEWC/lJIEcbBDA==
+  dependencies:
+    "@angular-devkit/architect" "0.800.1"
+    "@angular-devkit/build-optimizer" "0.800.1"
+    "@angular-devkit/build-webpack" "0.800.1"
+    "@angular-devkit/core" "8.0.1"
+    "@ngtools/webpack" "8.0.1"
+    ajv "6.10.0"
+    autoprefixer "9.5.1"
+    browserslist "4.5.5"
+    caniuse-api "3.0.0"
     circular-dependency-plugin "5.0.2"
     clean-css "4.2.1"
-    copy-webpack-plugin "4.6.0"
+    copy-webpack-plugin "5.0.2"
+    core-js "3.0.1"
     file-loader "3.0.1"
     glob "7.1.3"
     istanbul-instrumenter-loader "3.0.1"
-    karma-source-map-support "1.3.0"
+    karma-source-map-support "1.4.0"
     less "3.9.0"
     less-loader "4.1.0"
-    license-webpack-plugin "2.1.0"
+    license-webpack-plugin "2.1.1"
     loader-utils "1.2.3"
-    mini-css-extract-plugin "0.5.0"
+    mini-css-extract-plugin "0.6.0"
     minimatch "3.0.4"
-    open "6.0.0"
+    open "6.2.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
     postcss-loader "3.0.0"
     raw-loader "1.0.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
+    sass "1.19.0"
     sass-loader "7.1.0"
-    semver "5.6.0"
+    semver "6.0.0"
     source-map-loader "0.2.4"
-    source-map-support "0.5.10"
+    source-map-support "0.5.12"
     speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
     stylus-loader "3.0.2"
-    terser-webpack-plugin "1.2.2"
+    terser-webpack-plugin "1.2.3"
     tree-kill "1.2.1"
-    webpack "4.29.0"
-    webpack-dev-middleware "3.5.1"
-    webpack-dev-server "3.1.14"
+    webpack "4.30.0"
+    webpack-dev-middleware "3.6.2"
+    webpack-dev-server "3.3.1"
     webpack-merge "4.2.1"
     webpack-sources "1.3.0"
     webpack-subresource-integrity "1.1.0-rc.6"
-  optionalDependencies:
-    node-sass "4.11.0"
+    worker-plugin "3.1.0"
 
-"@angular-devkit/build-optimizer@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
-  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
+"@angular-devkit/build-optimizer@0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.1.tgz#9300232f3aa2bd3e39b624ba0dad1873353f2a55"
+  integrity sha512-JES4aXyLDtuI2mXZOkrVD3WRLgicC+/ub13j0sIW3ceBJ4VCuPOJnCVb5To8hEy6E4uKJGFe9dXDQjOis7rmeg==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
-    typescript "3.2.4"
+    typescript "3.4.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.8", "@angular-devkit/build-webpack@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
-  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
+"@angular-devkit/build-webpack@0.800.1", "@angular-devkit/build-webpack@^0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.1.tgz#e9924b98da51ee5271d4b04a83c394deef96be90"
+  integrity sha512-tJda9/vnYsg2CY2i9RiP/W63m5VIAbIRznD7Jn+cCiPrIyCDnpgqbccHMeo8LGv3jIVwdlNKidG1AtzTx3jczg==
   dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
+    "@angular-devkit/architect" "0.800.1"
+    "@angular-devkit/core" "8.0.1"
+    rxjs "6.4.0"
+    webpack-merge "4.2.1"
+
+"@angular-devkit/core@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.1.tgz#4a38141006deefa2f60f105b458d32885ffc1bec"
+  integrity sha512-GQtspR2umZeuTUDTLy2dpUstvQfK7oAwE0o+rWSa8mx0DyhYssrfBbvfE4GzUzKp6OSz1sbZAatSO+iimZjbQw==
+  dependencies:
+    ajv "6.10.0"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
+    source-map "0.7.3"
 
-"@angular-devkit/core@7.3.8", "@angular-devkit/core@^7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
-  integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
+"@angular-devkit/core@~7.3.8":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.9.tgz#bef2aaa0be7219c546fb99ea0ba9dd3a6dcd288a"
+  integrity sha512-SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw==
   dependencies:
     ajv "6.9.1"
     chokidar "2.0.4"
@@ -97,60 +112,64 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
-  integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
+"@angular-devkit/schematics@8.0.1", "@angular-devkit/schematics@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.1.tgz#1f0f616681eb451de31fa5f2d848f5ecbc6226d4"
+  integrity sha512-AbE/Gt0h/6pGu/sQ2oMXZo5ZMDeUhkdU32Nq5styh+B5nVXzGuZK4CGqyDNttdnzebhHt4Bi5ZtF2Avlwt+KEA==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
+    "@angular-devkit/core" "8.0.1"
+    rxjs "6.4.0"
 
-"@angular/animations@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.14.tgz#06ec2feac31e58f53429e673bc4c7f780a9d0710"
-  integrity sha512-K+wdq7TslmvDhrbwy65x7owE8wezI0fDdO+8SO9RU4m/w6R6vo4QS3uSdc5I2pxwm4QSXSc5eKhoWJkq0muTbQ==
+"@angular/animations@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
+  integrity sha512-hggSRi83rmocLwzrKZtmFcqPdivKSJqp2yiYaiNmJ2yQWJ1JW/Lurypv9H347RWxmwCCwC2kV8embTGbOXIFDQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.3.7":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.7.tgz#ce1ad53ba04beb9c8e950acc5691ea0143753764"
-  integrity sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==
+"@angular/cdk@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.0.0.tgz#34ca95e71d71780b29b5ba07318c88c4577bdc25"
+  integrity sha512-2vsRWEHNARe0iRmqgzvM67gwfRy+aKvdef4Qu9L+ndSsTrrZT3tSgG8SMn1v9SfBHnx5G8mo4d1AMquXG69AuQ==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@^7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
-  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
-  dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    "@schematics/angular" "7.3.8"
-    "@schematics/update" "0.13.8"
+"@angular/cli@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.1.tgz#7982f3297ba324d8865ac72b581f2cd4d7953089"
+  integrity sha512-V8U4jNE9khQd7ykzewTpGcB7AjRhWIGb3opPfYux5umQsVhlhQqj/jVgGMu+kN9Jl7KkjFzQTjsJws7wODP6MA==
+  dependencies:
+    "@angular-devkit/architect" "0.800.1"
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
+    "@schematics/angular" "8.0.1"
+    "@schematics/update" "0.800.1"
     "@yarnpkg/lockfile" "1.1.0"
+    debug "^4.1.1"
     ini "1.3.5"
-    inquirer "6.2.1"
+    inquirer "6.3.1"
     npm-package-arg "6.1.0"
-    open "6.0.0"
-    pacote "9.4.0"
-    semver "5.6.0"
+    open "6.2.0"
+    pacote "9.5.0"
+    read-package-tree "5.2.2"
+    semver "6.0.0"
     symbol-observable "1.2.0"
+    universal-analytics "^0.4.20"
+    uuid "^3.3.2"
 
-"@angular/common@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.14.tgz#6477b87a203af918e6a00b8238c29198322456f2"
-  integrity sha512-c2QBhVpbQhg1FDhOQkyVdFvU11mfvYHW5ZaXzxdCpq2rZXCureYiCSnlv++EsIAKqi22+2a6GACHF9Gh8kBmSg==
+"@angular/common@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0.tgz#700aeda9be8af96692fce0ea6bf6157f7c874c0e"
+  integrity sha512-iOAJZ0+1zTRHnHE/5G30+4Q66W1pfZkSkxZIXvgijZ+wtuNloYdWNy/IdZ/m7ayBI7A6FsYEhyMUoWz2HVEJNw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.14.tgz#6deba7f804d1c6d423f1db135ac77204389021ef"
-  integrity sha512-w5qn1nIPjiCP3WdbqicofpKpiRlh6NMYjWhe6mJysSBnVd34aSuGisYW/gVPQrmD46E1gmfpWTnWPeABVnjj6w==
+"@angular/compiler-cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0.tgz#b53ebb5accc34a68bf7a63d16130ca7c568f8a51"
+  integrity sha512-Z0U0Ih8A7V3J1gq7AXnXbrGAD2ERmz7JbREJJRHDWiUNxIqGQiV3Odo1V8FL5n/cKvLwSYM2Ubvk10gb0+3njA==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -162,59 +181,59 @@
     shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
-    yargs "9.0.1"
+    yargs "13.1.0"
 
-"@angular/compiler@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.14.tgz#39abf41a0250a43c6a00e3501088ecee83c536e6"
-  integrity sha512-Idhs+5HIzx+1+hrXIDaRpSqobMB7UvSvPlvCvtb3EDYjmltTNG68TtwMzGM8W2jdayliYuFOjFrnw1wCTkK3Ag==
+"@angular/compiler@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0.tgz#302c987737e1473db3a113ff70fbbb315aa41b58"
+  integrity sha512-4rKsVFMNykF83tPL1VE1+j9kZ3cWHUsLOAB/VqmF64EcR/GsbjKog2v23rSso5kqUtPiVq/FWGYllW6qMdxtJA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.14.tgz#b78c936d284223c1c5a4c4b02cd0d5fd6d03ec91"
-  integrity sha512-XeZZJCyBKSKo0E/7Ef0SfJejmn+E7uBXa5cR1QapafS0Hnrq/hZu/NI039IDU/51NoycMDH2vTV19SmKu9Mkow==
+"@angular/core@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0.tgz#bf7a582b818e9181d830219907470e2b865ba32f"
+  integrity sha512-mrkP1PTzqCmZGLYll+TDyawLXHzi+FcRPqSuRxCmDMthUUE93SLXT2yISDkx9aMPtFKgFr6KfrIkKuCz16BP/g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.14.tgz#7df70df357b9e1ae4aa8a0d008bf7ec753ccc03d"
-  integrity sha512-jL5YbTk7VZmz4l0++iFVUNa1vGM+nnALjHKi1Ub8VWioRDRboYUsHyxzlgWW9gZRbHpnLEXFiUz1td+v7TouJw==
+"@angular/forms@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0.tgz#6d636c4f83004290e1a5732a05e87148aaf6ed64"
+  integrity sha512-T6XdG3mALWzvnrN3fA1hAmfwvraiF1SPMWNXgPk2riuMf8CFdoro+tQZ4eo1islHrTTw5QzmqN8JJALfhAG6bg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.14.tgz#13a0e71133296e2bb1c0b68d48281a70a5f233b5"
-  integrity sha512-rSdH2JojApDU83qVm7RabIlNo3Ni3yr2gwsmQWs4XZ7SC8jLNnDkzdUbQ6T0vfuVX3v/FtAuMJl0yaVcG3EUJg==
+"@angular/http@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.15.tgz#a32bea9e67e99eef88150085aeebbe7aeecd39eb"
+  integrity sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.14.tgz#f0c90e030fbb3777293a2946c2cb4b79c152856f"
-  integrity sha512-YTU4ePAKikbIxNae9Qta8qaDArPgek7nhLEW9QfvrUAnpF7BkVboEI+7yLX5+NTfGf9cQ9cUfQ0TEreV+tMs7A==
+"@angular/language-service@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0.tgz#1ee4ce5003897cad53597da28f4c94fe30519bfb"
+  integrity sha512-vGk14oWroEo6ycO4cooznx57nn2sASmCQ/sdE8UVwySUKl940TsVzijgaGqapTepFof9sMqN77y2G15eRKQeAQ==
 
-"@angular/platform-browser-dynamic@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.14.tgz#ae055ab0d3246c0f2d27d40a46cd99c012aa199d"
-  integrity sha512-lmTCBiDRbOPtniIqBjm1n5jl1TdyQM0qWQdBcoCsKpMNS/6/RacRcQsJZApAMdWm6gIVuLgmRQzaCLkSoekfYA==
+"@angular/platform-browser-dynamic@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0.tgz#c15f394579ff44f3752033de58edc1afa5065d59"
+  integrity sha512-dx7W7JoSFbsveexjZ/BPlsXbMDLWVLmRCo7IqLvibMrTbdpaaOCNJIXJk1X+f7JJrQ7SwlZaVkoLCMoDWw6fmA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.14.tgz#9b259c335eb0dda64bc79409fa8dbb8fbb6bd818"
-  integrity sha512-yAq2+3W4J4B48HEmZYQucdEb9AHwRnv72q9CC/SxU7g59vaLhl1nv7cAWGJ4XFaJTbB7aB4Y4rLffuR+Gxkn7A==
+"@angular/platform-browser@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0.tgz#fc7c55a0483e67e5606e499c129fda60ae8d4363"
+  integrity sha512-fTD+pTMbq+On9Uv3VXiei2lfuX7GX31dngm/Y4yWTFeW6eXy0+7kkfflzpLOb0hykCZvcXzarqCuEBBYNLrrOg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/router@^7.2.14":
-  version "7.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.14.tgz#c8994ce10e6df3d5ada06e409a6a0b00ae9536d4"
-  integrity sha512-uqg0SKy79voEOIOvzVbCzFDD9XOAfZWkYt01ca2qLFXMx+6jWeVQIDuXc8Dmz5udIXNK5Ae//9R+nt5UZUZrSA==
+"@angular/router@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0.tgz#26094fd473e17441b0ae8af4883ec1b4ea3ad569"
+  integrity sha512-DGUTb8qpndE5m716xh00GxuC8o7qamlqbUruGB+SQD6ynU7s5yLGxtKffxqb1BT63+YewpsVxc2Koruvb1qjDw==
   dependencies:
     tslib "^1.9.0"
 
@@ -1144,14 +1163,14 @@
   dependencies:
     tslib "^1.9.0"
 
-"@ngtools/webpack@7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
-  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
+"@ngtools/webpack@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.1.tgz#892ca23277e2602447fc093380dae585782d1557"
+  integrity sha512-ly+KyzD5S8dVbwDv4pWt8+NNevPskmdXYJVxa068nE1dQV+CCK4mi6aR0GqrRR9zPvhgRoQKK8tMbN6WDCJS7g==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/core" "8.0.1"
     enhanced-resolve "4.1.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
     tree-kill "1.2.1"
     webpack-sources "1.3.0"
 
@@ -1185,27 +1204,26 @@
     react-lifecycles-compat "^3.0.4"
     warning "^3.0.0"
 
-"@schematics/angular@7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
-  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
+"@schematics/angular@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
+  integrity sha512-/FyFJbHuxWfvVgTBSnEa0fiDgeLhAmfK7NeT8Owj2xDAqvVMxfSxupfdr7a9cDr82WImW09SX7PUlv2EomcGLA==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    typescript "3.2.4"
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
 
-"@schematics/update@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
-  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
+"@schematics/update@0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.1.tgz#73497d3a0a763119ec30e50823c8e87866d6e540"
+  integrity sha512-1Bnn6RJ7tzlaZRpvE6oQl7oem0zMMtNn2ygiMb2FxW97FHvW4hLIDrP31V3s5n8Ku+RBFMgr1z1P+GBZnbaubg==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
-    pacote "9.4.0"
-    rxjs "6.3.3"
-    semver "5.6.0"
+    pacote "9.5.0"
+    rxjs "6.4.0"
+    semver "6.0.0"
     semver-intersect "1.4.0"
 
 "@storybook/addon-actions@^5.0.10":
@@ -1768,15 +1786,6 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
-"@webassemblyjs/ast@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
-  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
@@ -1786,43 +1795,21 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
     "@webassemblyjs/wast-parser" "1.8.5"
 
-"@webassemblyjs/floating-point-hex-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
-  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
-
 "@webassemblyjs/floating-point-hex-parser@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
   integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
 
-"@webassemblyjs/helper-api-error@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
-  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
-
 "@webassemblyjs/helper-api-error@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
   integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
 
-"@webassemblyjs/helper-buffer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
-  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
-
 "@webassemblyjs/helper-buffer@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
   integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
 
-"@webassemblyjs/helper-code-frame@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
-  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.11"
-
 "@webassemblyjs/helper-code-frame@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
@@ -1830,21 +1817,11 @@
   dependencies:
     "@webassemblyjs/wast-printer" "1.8.5"
 
-"@webassemblyjs/helper-fsm@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
-  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
-
 "@webassemblyjs/helper-fsm@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
   integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
 
-"@webassemblyjs/helper-module-context@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
-  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
-
 "@webassemblyjs/helper-module-context@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
@@ -1853,26 +1830,11 @@
     "@webassemblyjs/ast" "1.8.5"
     mamacro "^0.0.3"
 
-"@webassemblyjs/helper-wasm-bytecode@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
-  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
-
 "@webassemblyjs/helper-wasm-bytecode@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
   integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
 
-"@webassemblyjs/helper-wasm-section@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
-  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-
 "@webassemblyjs/helper-wasm-section@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
@@ -1883,13 +1845,6 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
     "@webassemblyjs/wasm-gen" "1.8.5"
 
-"@webassemblyjs/ieee754@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
-  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
 "@webassemblyjs/ieee754@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
@@ -1897,13 +1852,6 @@
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
-  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
 "@webassemblyjs/leb128@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
@@ -1911,30 +1859,11 @@
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
-  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
-
 "@webassemblyjs/utf8@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
   integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
 
-"@webassemblyjs/wasm-edit@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
-  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/helper-wasm-section" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-opt" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    "@webassemblyjs/wast-printer" "1.7.11"
-
 "@webassemblyjs/wasm-edit@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
@@ -1949,17 +1878,6 @@
     "@webassemblyjs/wasm-parser" "1.8.5"
     "@webassemblyjs/wast-printer" "1.8.5"
 
-"@webassemblyjs/wasm-gen@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
-  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
 "@webassemblyjs/wasm-gen@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
@@ -1971,16 +1889,6 @@
     "@webassemblyjs/leb128" "1.8.5"
     "@webassemblyjs/utf8" "1.8.5"
 
-"@webassemblyjs/wasm-opt@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
-  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-
 "@webassemblyjs/wasm-opt@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
@@ -1991,18 +1899,6 @@
     "@webassemblyjs/wasm-gen" "1.8.5"
     "@webassemblyjs/wasm-parser" "1.8.5"
 
-"@webassemblyjs/wasm-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
-  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
 "@webassemblyjs/wasm-parser@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
@@ -2015,18 +1911,6 @@
     "@webassemblyjs/leb128" "1.8.5"
     "@webassemblyjs/utf8" "1.8.5"
 
-"@webassemblyjs/wast-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
-  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-code-frame" "1.7.11"
-    "@webassemblyjs/helper-fsm" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
 "@webassemblyjs/wast-parser@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
@@ -2039,15 +1923,6 @@
     "@webassemblyjs/helper-fsm" "1.8.5"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
-  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
 "@webassemblyjs/wast-printer@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
@@ -2062,11 +1937,6 @@
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
-
 "@xtuc/long@4.2.2":
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
@@ -2178,6 +2048,16 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
+ajv@6.10.0, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
@@ -2198,16 +2078,6 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -2634,7 +2504,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-asap@~2.0.3:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -2696,7 +2566,12 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-async-each@^1.0.0, async-each@^1.0.1:
+async-each@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
+async-each@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
   integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
@@ -2733,19 +2608,7 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.6:
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
-  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
-  dependencies:
-    browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000929"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.13"
-    postcss-value-parser "^3.3.1"
-
-autoprefixer@^9.4.7, autoprefixer@^9.5.1:
+autoprefixer@9.5.1, autoprefixer@^9.4.7, autoprefixer@^9.5.1:
   version "9.5.1"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
   integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
@@ -3440,7 +3303,25 @@ browserslist@4.4.1:
     electron-to-chromium "^1.3.103"
     node-releases "^1.1.3"
 
-browserslist@^4.4.1, browserslist@^4.5.2, browserslist@^4.5.4:
+browserslist@4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
+  integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
+  dependencies:
+    caniuse-lite "^1.0.30000960"
+    electron-to-chromium "^1.3.124"
+    node-releases "^1.1.14"
+
+browserslist@^4.0.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
+  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
+  dependencies:
+    caniuse-lite "^1.0.30000971"
+    electron-to-chromium "^1.3.137"
+    node-releases "^1.1.21"
+
+browserslist@^4.5.2, browserslist@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
   integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
@@ -3531,26 +3412,7 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
-
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.2:
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.1, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -3666,6 +3528,21 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
+caniuse-api@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000960, caniuse-lite@^1.0.30000971:
+  version "1.0.30000971"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
+  integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
+
 caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.30000957:
   version "1.0.30000957"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
@@ -3829,7 +3706,7 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1, chownr@^1.1.1:
+chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -4136,7 +4013,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.38.0 < 2"
 
-compression@^1.5.2, compression@^1.7.4:
+compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -4172,7 +4049,7 @@ config-chain@^1.1.12:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-connect-history-api-fallback@^1.3.0, connect-history-api-fallback@^1.6.0:
+connect-history-api-fallback@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
@@ -4410,19 +4287,22 @@ copy-to-clipboard@^3.0.8:
   dependencies:
     toggle-selection "^1.0.6"
 
-copy-webpack-plugin@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
-  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
+copy-webpack-plugin@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
+  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
   dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
+    cacache "^11.3.1"
+    find-cache-dir "^2.0.0"
+    glob-parent "^3.1.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^1.1.0"
     minimatch "^3.0.4"
-    p-limit "^1.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^2.1.0"
     serialize-javascript "^1.4.0"
+    webpack-log "^2.0.0"
 
 core-js-compat@^3.0.0:
   version "3.0.1"
@@ -5142,13 +5022,18 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5162,13 +5047,6 @@ decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -5204,14 +5082,6 @@ deepmerge@^2.0.1:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
   integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
 
-default-gateway@^2.6.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
-  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
-  dependencies:
-    execa "^0.10.0"
-    ip-regex "^2.1.0"
-
 default-gateway@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
@@ -5269,18 +5139,6 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
-  dependencies:
-    globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
-
 del@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/del/-/del-4.1.0.tgz#049543b8290e1a9293e2bd150ab3a06f637322b8"
@@ -5364,6 +5222,14 @@ detect-port@^1.2.3:
     address "^1.0.1"
     debug "^2.6.0"
 
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 dfa@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.1.0.tgz#d30218bd10d030fa421df3ebbc82285463a31781"
@@ -5610,6 +5476,11 @@ electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.122:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
+electron-to-chromium@^1.3.124, electron-to-chromium@^1.3.137:
+  version "1.3.141"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.141.tgz#5858d3a74ceafe71e7824e7c809ea2cc59c8e104"
+  integrity sha512-DdQaeP8yQNYFdivOrp37UNAZMvyZP//+SWYMVJD31A/3gbI1J6olQs8tuRaHL2ij7dubhCDXhlE4F97mrT8KGQ==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -5965,19 +5836,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -6034,7 +5892,7 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-express@^4.16.2, express@^4.16.3, express@^4.16.4:
+express@^4.16.3, express@^4.16.4:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -6333,15 +6191,6 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
 find-cache-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -6589,7 +6438,15 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.2, fsevents@^1.2.7:
+fsevents@^1.2.2:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
+  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
+  dependencies:
+    nan "^2.12.1"
+    node-pre-gyp "^0.12.0"
+
+fsevents@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
   integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
@@ -7232,17 +7089,7 @@ http-proxy-middleware@^0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy-middleware@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
-  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
-  dependencies:
-    http-proxy "^1.16.2"
-    is-glob "^4.0.0"
-    lodash "^4.17.5"
-    micromatch "^3.1.9"
-
-http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.17.0:
+http-proxy@^1.13.0, http-proxy@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
@@ -7514,6 +7361,25 @@ inquirer@6.2.1:
     strip-ansi "^5.0.0"
     through "^2.3.6"
 
+inquirer@6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.11"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
 inquirer@^6.2.0:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
@@ -7538,14 +7404,6 @@ inside@^1.0.0:
   resolved "https://registry.yarnpkg.com/inside/-/inside-1.0.0.tgz#db45e993573cdb3db70b9832e8285bad46424770"
   integrity sha1-20Xpk1c82z23C5gy6ChbrUZCR3A=
 
-internal-ip@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
-  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
-  dependencies:
-    default-gateway "^2.6.0"
-    ipaddr.js "^1.5.2"
-
 internal-ip@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -7606,7 +7464,7 @@ ipaddr.js@1.8.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
   integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
-ipaddr.js@^1.5.2, ipaddr.js@^1.9.0:
+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==
@@ -7855,7 +7713,7 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.1.0:
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
@@ -8351,10 +8209,10 @@ karma-jasmine@^2.0.1:
   dependencies:
     jasmine-core "^3.3"
 
-karma-source-map-support@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
-  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
   dependencies:
     source-map-support "^0.5.5"
 
@@ -8396,7 +8254,7 @@ keycode@^2.2.0:
   resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
   integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
 
-killable@^1.0.0, killable@^1.0.1:
+killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -8505,10 +8363,10 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-license-webpack-plugin@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
-  integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==
+license-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz#f0ab760f7f301c76f5af52e480f320656b5721bb"
+  integrity sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
@@ -8559,16 +8417,6 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -8673,6 +8521,11 @@ lodash.isplainobject@^4.0.6:
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
   integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+
 lodash.mergewith@^4.6.0, lodash.mergewith@^4.6.1:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -8718,6 +8571,11 @@ lodash.throttle@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
 lodash@>4.17.4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
@@ -8741,7 +8599,7 @@ log4js@^4.0.0:
     rfdc "^1.1.2"
     streamroller "^1.0.4"
 
-loglevel@^1.4.1, loglevel@^1.6.1:
+loglevel@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
   integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
@@ -8779,7 +8637,7 @@ lowlight@~1.9.1:
     fault "^1.0.2"
     highlight.js "~9.12.0"
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3, lru-cache@^4.1.5:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -8804,6 +8662,13 @@ macos-release@^2.2.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
   integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
+magic-string@0.25.2, magic-string@^0.25.0:
+  version "0.25.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
+  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
@@ -8811,14 +8676,7 @@ magic-string@^0.22.4:
   dependencies:
     vlq "^0.2.2"
 
-magic-string@^0.25.0:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-make-dir@^1.0.0, make-dir@^1.3.0:
+make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
   integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
@@ -8958,13 +8816,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 mem@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
@@ -9067,7 +8918,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -9151,12 +9002,13 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
-mini-css-extract-plugin@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
-  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+mini-css-extract-plugin@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "^2.0.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -9220,22 +9072,6 @@ minizlib@^1.1.1:
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -9369,6 +9205,11 @@ nan@^2.10.0, nan@^2.9.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
   integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
+nan@^2.12.1:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -9588,6 +9429,22 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
+node-pre-gyp@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
+  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
 node-releases@^1.1.13, node-releases@^1.1.3:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
@@ -9595,7 +9452,14 @@ node-releases@^1.1.13, node-releases@^1.1.3:
   dependencies:
     semver "^5.3.0"
 
-node-sass@4.11.0, node-sass@^4.11.0:
+node-releases@^1.1.14, node-releases@^1.1.21:
+  version "1.1.22"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.22.tgz#d90cd5adc59ab9b0f377d4f532b09656399c88bf"
+  integrity sha512-O6XpteBuntW1j86mw6LlovBIwTe+sO2+7vi9avQffNeIW4upgnaCVm6xrBWH+KATz7mNNRNNeEpuWB7dT6Cr3w==
+  dependencies:
+    semver "^5.3.0"
+
+node-sass@^4.11.0:
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
   integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
@@ -9647,7 +9511,7 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -9679,6 +9543,15 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
+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.css@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
@@ -9906,10 +9779,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
-  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+open@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
+  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -9940,7 +9813,7 @@ opn@5.4.0:
   dependencies:
     is-wsl "^1.1.0"
 
-opn@^5.1.0, opn@^5.4.0, opn@^5.5.0:
+opn@^5.4.0, opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
   integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
@@ -10005,15 +9878,6 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
 os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -10059,14 +9923,14 @@ p-is-promise@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.0.0, p-limit@^1.1.0:
+p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
+p-limit@^2.0.0, p-limit@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
   integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
@@ -10087,11 +9951,6 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
-
 p-map@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
@@ -10112,10 +9971,10 @@ pace-js@1.0.2:
   resolved "https://registry.yarnpkg.com/pace-js/-/pace-js-1.0.2.tgz#673a717f833ccb4f4315531b75ee4788376600f7"
   integrity sha1-Zzpxf4M8y09DFVMbde5HiDdmAPc=
 
-pacote@9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
-  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
+pacote@9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
+  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"
@@ -10317,13 +10176,6 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -10411,13 +10263,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -10468,7 +10313,7 @@ popper.js@^1.14.4, popper.js@^1.15.0:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
   integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
 
-portfinder@^1.0.20, portfinder@^1.0.9:
+portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
   integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
@@ -10648,7 +10493,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -10662,6 +10507,11 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
+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=
+
 pretty-error@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
@@ -10825,7 +10675,7 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -10901,6 +10751,15 @@ qs@^6.5.2, qs@^6.6.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
+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"
@@ -11232,6 +11091,29 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+read-package-json@^2.0.0:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
+  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -11240,14 +11122,6 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -11265,15 +11139,6 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.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=
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -11315,6 +11180,16 @@ read-pkg@^5.1.1:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
 readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -11783,7 +11658,7 @@ rxjs@6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.1.0, rxjs@^6.4.0:
+rxjs@6.4.0, rxjs@^6.1.0, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
@@ -11851,6 +11726,13 @@ sass-loader@7.1.0, sass-loader@^7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
+sass@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.19.0.tgz#5de82c713d4299fac57384ef5219534a37fe3e6c"
+  integrity sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==
+  dependencies:
+    chokidar "^2.0.0"
+
 saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
@@ -11883,7 +11765,7 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.4, schema-utils@^0.4.5:
+schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
   integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
@@ -11928,7 +11810,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.10.4, selfsigned@^1.9.1:
+selfsigned@^1.10.4:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
@@ -11959,12 +11841,7 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-semver@5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
-semver@^6.0.0:
+semver@6.0.0, semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
   integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
@@ -12009,7 +11886,7 @@ serve-favicon@^2.5.0:
     parseurl "~1.3.2"
     safe-buffer "5.1.1"
 
-serve-index@^1.7.2, serve-index@^1.9.1:
+serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -12315,6 +12192,13 @@ socks@~2.3.2:
     ip "^1.1.5"
     smart-buffer "4.0.2"
 
+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"
@@ -12344,15 +12228,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+source-map-support@0.5.12, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
   version "0.5.12"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
   integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
@@ -12539,13 +12415,6 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -12672,6 +12541,11 @@ streamroller@^1.0.4:
     fs-extra "^7.0.0"
     lodash "^4.17.10"
 
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -12952,7 +12826,7 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^5.1.0, supports-color@^5.3.0:
+supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -13057,21 +12931,7 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
-  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
-  dependencies:
-    cacache "^11.0.2"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    terser "^3.16.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.1:
+terser-webpack-plugin@1.2.3, terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.1:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
   integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
@@ -13497,10 +13357,15 @@ typescript@2.9.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
   integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
-typescript@3.2.4, typescript@~3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
-  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+typescript@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.4.tgz#aac4a08abecab8091a75f10842ffa0631818f785"
+  integrity sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==
+
+typescript@3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
 
 typescript@^2.4.2:
   version "2.9.2"
@@ -13614,7 +13479,7 @@ uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
   integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
-unique-filename@^1.1.0, unique-filename@^1.1.1:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -13666,6 +13531,15 @@ unist-util-visit@^1.1.0:
   dependencies:
     unist-util-visit-parents "^2.0.0"
 
+universal-analytics@^0.4.20:
+  version "0.4.20"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
+  integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
+  dependencies:
+    debug "^3.0.0"
+    request "^2.88.0"
+    uuid "^3.0.0"
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -13983,27 +13857,7 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-middleware@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
-  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-middleware@^3.5.1, webpack-dev-middleware@^3.6.2:
+webpack-dev-middleware@3.6.2, webpack-dev-middleware@^3.5.1, webpack-dev-middleware@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
   integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
@@ -14013,43 +13867,7 @@ webpack-dev-middleware@^3.5.1, webpack-dev-middleware@^3.6.2:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.14:
-  version "3.1.14"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
-  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
-  dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "~0.18.0"
-    import-local "^2.0.0"
-    internal-ip "^3.0.1"
-    ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
-    schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
-    sockjs "0.3.19"
-    sockjs-client "1.3.0"
-    spdy "^4.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "3.4.0"
-    webpack-log "^2.0.0"
-    yargs "12.0.2"
-
-webpack-dev-server@^3.3.1:
+webpack-dev-server@3.3.1, webpack-dev-server@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
   integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
@@ -14125,15 +13943,15 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.29.0:
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
-  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
+webpack@4.30.0:
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
+  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
@@ -14149,7 +13967,7 @@ webpack@4.29.0:
     mkdirp "~0.5.0"
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
+    schema-utils "^1.0.0"
     tapable "^1.1.0"
     terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
@@ -14268,6 +14086,13 @@ worker-farm@^1.5.2:
   dependencies:
     errno "~0.1.7"
 
+worker-plugin@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.1.0.tgz#6311778f3514a87c273510ee3f809cc3fe161e6f"
+  integrity sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==
+  dependencies:
+    loader-utils "^1.1.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -14348,11 +14173,6 @@ xmlhttprequest@1:
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
   integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
 
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
 xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -14378,7 +14198,7 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@^10.0.0, yargs-parser@^10.1.0:
+yargs-parser@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
   integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
@@ -14393,7 +14213,7 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.0:
+yargs-parser@^13.0.0, yargs-parser@^13.1.0:
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
   integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
@@ -14408,31 +14228,6 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
-  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^2.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
 yargs@12.0.5, yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -14451,24 +14246,22 @@ yargs@12.0.5, yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
   dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
 
 yargs@^13.2.4:
   version "13.2.4"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index bccd2533b..0defe3e62 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -52,16 +52,16 @@
 		"cordova:run:prod:device": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ionic cordova run android --prod --release --device"
 	},
 	"dependencies": {
-		"@angular/animations": "^7.2.11",
-		"@angular/common": "^7.2.11",
-		"@angular/core": "^7.2.11",
-		"@angular/forms": "^7.2.11",
-		"@angular/http": "^7.2.11",
-		"@angular/platform-browser": "^7.2.11",
-		"@angular/platform-browser-dynamic": "^7.2.11",
-		"@angular/pwa": "^0.13.7",
-		"@angular/router": "^7.2.11",
-		"@angular/service-worker": "^7.2.11",
+		"@angular/animations": "^8.0.0",
+		"@angular/common": "^8.0.0",
+		"@angular/core": "^8.0.0",
+		"@angular/forms": "^8.0.0",
+		"@angular/http": "^7.2.15",
+		"@angular/platform-browser": "^8.0.0",
+		"@angular/platform-browser-dynamic": "^8.0.0",
+		"@angular/pwa": "^0.800.1",
+		"@angular/router": "^8.0.0",
+		"@angular/service-worker": "^8.0.0",
 		"@ionic-native/barcode-scanner": "^5.5.1",
 		"@ionic-native/call-number": "^5.5.1",
 		"@ionic-native/camera": "^5.5.1",
@@ -156,17 +156,17 @@
 		"zone.js": "^0.9.0"
 	},
 	"devDependencies": {
-		"@angular-builders/custom-webpack": "^7.4.3",
+		"@angular-builders/custom-webpack": "~7.4.3",
 		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "^0.13.8",
-		"@angular-devkit/build-angular": "^0.13.8",
-		"@angular-devkit/build-webpack": "^0.13.8",
-		"@angular-devkit/core": "^7.3.8",
-		"@angular-devkit/schematics": "^7.3.8",
-		"@angular/cli": "^7.3.8",
-		"@angular/compiler": "^7.2.12",
-		"@angular/compiler-cli": "^7.2.12",
-		"@angular/language-service": "^7.2.12",
+		"@angular-devkit/architect": "~0.13.8",
+		"@angular-devkit/build-angular": "~0.13.8",
+		"@angular-devkit/build-webpack": "~0.13.8",
+		"@angular-devkit/core": "~7.3.8",
+		"@angular-devkit/schematics": "~7.3.8",
+		"@angular/cli": "~7.3.8",
+		"@angular/compiler": "^8.0.0",
+		"@angular/compiler-cli": "~7.2.12",
+		"@angular/language-service": "~7.2.12",
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.1",
 		"@ionic/app-scripts": "^3.2.3",
diff --git a/carrier/mobile-ionic/src/pages/main/common/map/map.component.ts b/carrier/mobile-ionic/src/pages/main/common/map/map.component.ts
index 725a5e515..fbe81e574 100644
--- a/carrier/mobile-ionic/src/pages/main/common/map/map.component.ts
+++ b/carrier/mobile-ionic/src/pages/main/common/map/map.component.ts
@@ -8,7 +8,7 @@ const directionsService = new google.maps.DirectionsService();
 	templateUrl: 'map.component.html'
 })
 export class MapComponent implements OnInit {
-	@ViewChild('map')
+	@ViewChild('map', { static: false })
 	mapElement: ElementRef;
 
 	map: google.maps.Map;
diff --git a/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts b/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts
index b867e3ace..8e4bd6444 100644
--- a/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts
+++ b/carrier/mobile-ionic/src/pages/main/delivery/delivery.ts
@@ -20,7 +20,7 @@ declare var google: any;
 	templateUrl: 'delivery.html'
 })
 export class DeliveryPage implements AfterViewInit {
-	@ViewChild('map')
+	@ViewChild('map', { static: false })
 	carrierMap: MapComponent;
 
 	selectedOrder: IOrder;
diff --git a/carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.ts b/carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.ts
index 72169ec07..dfa7d8b66 100644
--- a/carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.ts
+++ b/carrier/mobile-ionic/src/pages/main/drive-to-warehouse/drive-to-warehouse.ts
@@ -22,7 +22,7 @@ declare var google: any;
 	templateUrl: 'drive-to-warehouse.html'
 })
 export class DriveToWarehousePage {
-	@ViewChild('map')
+	@ViewChild('map', { static: false })
 	carrierMap: MapComponent;
 
 	selectedOrder: IOrder;
diff --git a/carrier/mobile-ionic/src/pages/main/home/home.ts b/carrier/mobile-ionic/src/pages/main/home/home.ts
index b6edf6fa9..7fa7cdc41 100644
--- a/carrier/mobile-ionic/src/pages/main/home/home.ts
+++ b/carrier/mobile-ionic/src/pages/main/home/home.ts
@@ -22,7 +22,7 @@ declare var google: any;
 	templateUrl: 'home.html'
 })
 export class HomePage {
-	@ViewChild('map')
+	@ViewChild('map', { static: false })
 	carrierMap: MapComponent;
 
 	carrier: ICarrier;
diff --git a/carrier/mobile-ionic/src/pages/main/starting-delivery/starting-delivery.ts b/carrier/mobile-ionic/src/pages/main/starting-delivery/starting-delivery.ts
index 2dad3cd65..0b7dbe319 100644
--- a/carrier/mobile-ionic/src/pages/main/starting-delivery/starting-delivery.ts
+++ b/carrier/mobile-ionic/src/pages/main/starting-delivery/starting-delivery.ts
@@ -18,7 +18,7 @@ import OrderCarrierStatus from '@modules/server.common/enums/OrderCarrierStatus'
 	templateUrl: 'starting-delivery.html'
 })
 export class StartingDeliveryPage implements AfterViewInit {
-	@ViewChild('map')
+	@ViewChild('map', { static: false })
 	carrierMap: MapComponent;
 
 	selectedOrder: IOrder;
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 6f9f78198..08fc246e8 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@angular-builders/custom-webpack@^7.4.3":
+"@angular-builders/custom-webpack@~7.4.3":
   version "7.4.3"
   resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-7.4.3.tgz#c95e32f007ca956cbeac703206f7c3b573029aee"
   integrity sha512-dizPcKBSdgM8ztVbhOdVxHnfV/FBkTi1ZirsxWaw1B0S0KuPTESnsJaZA15i8Y2l202hCPs5fJfqy5aCoRrs1Q==
@@ -14,24 +14,24 @@
   resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
   integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
 
-"@angular-devkit/architect@0.13.8", "@angular-devkit/architect@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
-  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
+"@angular-devkit/architect@0.13.9", "@angular-devkit/architect@~0.13.8":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.9.tgz#8bbca4b968fccbf88fc2f86542cbee09e1256e1f"
+  integrity sha512-EAFtCs9dsGhpMRC45PoYsrkiExpWz9Ax15qXfzwdDRacz5DmdOVt+QpkLW1beUOwiyj/bhFyj23eaONK2RTn/w==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/core" "7.3.9"
     rxjs "6.3.3"
 
-"@angular-devkit/build-angular@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
-  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
+"@angular-devkit/build-angular@~0.13.8":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.9.tgz#92ef7b55a1aa055b2f5c8ffed4bdb04df86db678"
+  integrity sha512-onh07LhdxotDFjja0KKsDWNCwgpM/ymuRr5h0e+vT4AgklP2Uioz1CpzVOgxPIKkdVdGR9QgDinVsWAmY90J8g==
   dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/build-optimizer" "0.13.8"
-    "@angular-devkit/build-webpack" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@ngtools/webpack" "7.3.8"
+    "@angular-devkit/architect" "0.13.9"
+    "@angular-devkit/build-optimizer" "0.13.9"
+    "@angular-devkit/build-webpack" "0.13.9"
+    "@angular-devkit/core" "7.3.9"
+    "@ngtools/webpack" "7.3.9"
     ajv "6.9.1"
     autoprefixer "9.4.6"
     circular-dependency-plugin "5.0.2"
@@ -72,7 +72,7 @@
     webpack-sources "1.3.0"
     webpack-subresource-integrity "1.1.0-rc.6"
   optionalDependencies:
-    node-sass "4.11.0"
+    node-sass "4.12.0"
 
 "@angular-devkit/build-optimizer@0.0.35":
   version "0.0.35"
@@ -84,26 +84,26 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
-  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
+"@angular-devkit/build-optimizer@0.13.9":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.9.tgz#05a25ca7743876987158881585c55dfc478b95bd"
+  integrity sha512-GQtCntthQHSBv5l1ZY5p00JOECb/WcE1qUBo5kFjp84z0fszDkhOy52M1kcWCX4PFzJaY4DKk58hbUE/2UN0jw==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.2.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.8", "@angular-devkit/build-webpack@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
-  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
+"@angular-devkit/build-webpack@0.13.9", "@angular-devkit/build-webpack@~0.13.8":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.9.tgz#9fa091d778db752c539e1c585e21ba47d7054672"
+  integrity sha512-6ypu6pzNmQxzATF4rTWEhGSl5hyGQ8a/3aCZF/ux+XGc3d4hi2HW+NWlDm1UEna6ZjNtgEPlgfP4q8BKrjRmfA==
   dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/architect" "0.13.9"
+    "@angular-devkit/core" "7.3.9"
     rxjs "6.3.3"
 
-"@angular-devkit/core@7.3.8", "@angular-devkit/core@^7.3.8":
+"@angular-devkit/core@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
   integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
@@ -114,7 +114,29 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
+"@angular-devkit/core@7.3.9", "@angular-devkit/core@~7.3.8":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.9.tgz#bef2aaa0be7219c546fb99ea0ba9dd3a6dcd288a"
+  integrity sha512-SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
+"@angular-devkit/core@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.1.tgz#4a38141006deefa2f60f105b458d32885ffc1bec"
+  integrity sha512-GQtspR2umZeuTUDTLy2dpUstvQfK7oAwE0o+rWSa8mx0DyhYssrfBbvfE4GzUzKp6OSz1sbZAatSO+iimZjbQw==
+  dependencies:
+    ajv "6.10.0"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
   integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
@@ -122,23 +144,39 @@
     "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular/animations@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
-  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
+"@angular-devkit/schematics@7.3.9", "@angular-devkit/schematics@~7.3.8":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.9.tgz#4fe7bc878b116b157a3adf00583c28c951215877"
+  integrity sha512-xzROGCYp7aQbeJ3V6YC0MND7wKEAdWqmm/GaCufEk0dDS8ZGe0sQhcM2oBRa2nQqGQNeThFIH51kx+FayrJP0w==
+  dependencies:
+    "@angular-devkit/core" "7.3.9"
+    rxjs "6.3.3"
+
+"@angular-devkit/schematics@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.1.tgz#1f0f616681eb451de31fa5f2d848f5ecbc6226d4"
+  integrity sha512-AbE/Gt0h/6pGu/sQ2oMXZo5ZMDeUhkdU32Nq5styh+B5nVXzGuZK4CGqyDNttdnzebhHt4Bi5ZtF2Avlwt+KEA==
+  dependencies:
+    "@angular-devkit/core" "8.0.1"
+    rxjs "6.4.0"
+
+"@angular/animations@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
+  integrity sha512-hggSRi83rmocLwzrKZtmFcqPdivKSJqp2yiYaiNmJ2yQWJ1JW/Lurypv9H347RWxmwCCwC2kV8embTGbOXIFDQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
-  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
+"@angular/cli@~7.3.8":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.9.tgz#0366b5a66654c1f02ab2f3a9f15ebde446d506a4"
+  integrity sha512-7oJj7CKDlFUbQav1x1CV4xKKcbt0pnxY4unKcm7Q1tVXhu8bU2bc3cDA0aJnbofcYb6TJcd/C2qHgCt78q7edA==
   dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    "@schematics/angular" "7.3.8"
-    "@schematics/update" "0.13.8"
+    "@angular-devkit/architect" "0.13.9"
+    "@angular-devkit/core" "7.3.9"
+    "@angular-devkit/schematics" "7.3.9"
+    "@schematics/angular" "7.3.9"
+    "@schematics/update" "0.13.9"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     inquirer "6.2.1"
@@ -148,17 +186,17 @@
     semver "5.6.0"
     symbol-observable "1.2.0"
 
-"@angular/common@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
-  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
+"@angular/common@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0.tgz#700aeda9be8af96692fce0ea6bf6157f7c874c0e"
+  integrity sha512-iOAJZ0+1zTRHnHE/5G30+4Q66W1pfZkSkxZIXvgijZ+wtuNloYdWNy/IdZ/m7ayBI7A6FsYEhyMUoWz2HVEJNw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
-  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
+"@angular/compiler-cli@~7.2.12":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.15.tgz#25cc3a6556ba726d00c4992ad894f8db203f4fbc"
+  integrity sha512-+AsfyKawmj/sa+m4Pz8VSRFbCfx/3IOjAuuEjhopbyr154YpPDSu8NTbcwzq3yfbVcPwK4/4exmbQzpsndaCTg==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -172,75 +210,75 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
-  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
+"@angular/compiler@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0.tgz#302c987737e1473db3a113ff70fbbb315aa41b58"
+  integrity sha512-4rKsVFMNykF83tPL1VE1+j9kZ3cWHUsLOAB/VqmF64EcR/GsbjKog2v23rSso5kqUtPiVq/FWGYllW6qMdxtJA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
-  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
+"@angular/core@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0.tgz#bf7a582b818e9181d830219907470e2b865ba32f"
+  integrity sha512-mrkP1PTzqCmZGLYll+TDyawLXHzi+FcRPqSuRxCmDMthUUE93SLXT2yISDkx9aMPtFKgFr6KfrIkKuCz16BP/g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
-  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
+"@angular/forms@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0.tgz#6d636c4f83004290e1a5732a05e87148aaf6ed64"
+  integrity sha512-T6XdG3mALWzvnrN3fA1hAmfwvraiF1SPMWNXgPk2riuMf8CFdoro+tQZ4eo1islHrTTw5QzmqN8JJALfhAG6bg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.12.tgz#0ec28f6dc7814c85761833b1fd4b53b397b5e882"
-  integrity sha512-cceU+SWIQFOL3gRKqm5SYHQM3VoKbXne2XQRSY2Fdoc3XsipOzTEvJQPLm5ZcTEXdmRFlfianDoDaWEIvGbXkw==
+"@angular/http@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.15.tgz#a32bea9e67e99eef88150085aeebbe7aeecd39eb"
+  integrity sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
-  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
+"@angular/language-service@~7.2.12":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.15.tgz#b2ba33e472dc5e530047c408ff7a35deba4427b8"
+  integrity sha512-Ig5Jr7mnDelaZvSbUd9YhI5am3q1ku9xelAuwvtyDKvQJeKQj3BtTagcOgWrnQBfrJ/FsA/M5Zo48ncSsV0tqQ==
 
-"@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
-  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
+"@angular/platform-browser-dynamic@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0.tgz#c15f394579ff44f3752033de58edc1afa5065d59"
+  integrity sha512-dx7W7JoSFbsveexjZ/BPlsXbMDLWVLmRCo7IqLvibMrTbdpaaOCNJIXJk1X+f7JJrQ7SwlZaVkoLCMoDWw6fmA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
-  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
+"@angular/platform-browser@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0.tgz#fc7c55a0483e67e5606e499c129fda60ae8d4363"
+  integrity sha512-fTD+pTMbq+On9Uv3VXiei2lfuX7GX31dngm/Y4yWTFeW6eXy0+7kkfflzpLOb0hykCZvcXzarqCuEBBYNLrrOg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.7":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.8.tgz#20799d6c5a00c8b15d56874bc5c2344e13683a1a"
-  integrity sha512-Yu9bFh/9Vq2Wi3X4foki2qM3kLRs/GTROaI2Na+OfCpACMn6vNTHgJdqyjzSW9DpFTbW/4Fsb2NMmPf8CgAScw==
+"@angular/pwa@^0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.800.1.tgz#4d6b48cd5f7d81cd297441ba4843f6327d475459"
+  integrity sha512-pWcxdbksfdC2tTrlEn7bMH9wShyjLtIk97gXhNZ99vtlnIjUfA+DHO2b4AvKy4QG92Hw94QDAGtqAZ/oVT+VGQ==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    "@schematics/angular" "7.3.8"
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
+    "@schematics/angular" "8.0.1"
     parse5-html-rewriting-stream "5.1.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
 
-"@angular/router@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
-  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
+"@angular/router@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0.tgz#26094fd473e17441b0ae8af4883ec1b4ea3ad569"
+  integrity sha512-DGUTb8qpndE5m716xh00GxuC8o7qamlqbUruGB+SQD6ynU7s5yLGxtKffxqb1BT63+YewpsVxc2Koruvb1qjDw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.12.tgz#9d3ca7399a105900a4d706cf5da5954cbe5b66dc"
-  integrity sha512-0hvKy+EXPoGrLujqzXK02gfVUZ187o/aDvmBuH2Io9us93RgGew/Se1iFl2YaawhPYSsuwwbrcjoSVMznoI1GQ==
+"@angular/service-worker@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0.tgz#5cb55bc39b29e318f5d72c1223a966c088f18568"
+  integrity sha512-MrR6Xb0X0+qO+bbdGasg7+xEvH7rPhgLpDn9FF/RwMMzj4qQmeJw9uRSJe9xMR6n0gNS7+cH8RptivOanY1QjQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -831,12 +869,12 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
-  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
+"@ngtools/webpack@7.3.9":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.9.tgz#db115dba8cc0886d8d822723be4119d3849fb4e3"
+  integrity sha512-+ROpqfCXLdQwfP+UNDLk4p959ZrocpStkdd2Iy9CeOJ8yDkityqpstTwQC3oHzzu/95BiyZ0hrHbM6AsPPIvJg==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/core" "7.3.9"
     enhanced-resolve "4.1.0"
     rxjs "6.3.3"
     tree-kill "1.2.1"
@@ -868,7 +906,24 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@schematics/angular@7.3.8", "@schematics/angular@^7.0.3", "@schematics/angular@^7.3.8":
+"@schematics/angular@7.3.9":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.9.tgz#f57baf1cd9588d4f1035974d06fd8f3d54df021a"
+  integrity sha512-B3lytFtFeYNLfWdlrIzvy3ulFRccD2/zkoL0734J+DAGfUz7vbysJ50RwYL46sQUcKdZdvb48ktfu1S8yooP6Q==
+  dependencies:
+    "@angular-devkit/core" "7.3.9"
+    "@angular-devkit/schematics" "7.3.9"
+    typescript "3.2.4"
+
+"@schematics/angular@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
+  integrity sha512-/FyFJbHuxWfvVgTBSnEa0fiDgeLhAmfK7NeT8Owj2xDAqvVMxfSxupfdr7a9cDr82WImW09SX7PUlv2EomcGLA==
+  dependencies:
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
+
+"@schematics/angular@^7.0.3", "@schematics/angular@^7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
   integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
@@ -877,13 +932,13 @@
     "@angular-devkit/schematics" "7.3.8"
     typescript "3.2.4"
 
-"@schematics/update@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
-  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
+"@schematics/update@0.13.9":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.9.tgz#60d338676d10d24d1b12812a0624f6e7c3dbcd06"
+  integrity sha512-4MQcaKFxhMzZyE//+DknDh3h3duy3avg2oxSHxdwXlCZ8Q92+4lpegjJcSRiqlEwO4qeJ5XnrjrvzfIiaIZOmA==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
+    "@angular-devkit/core" "7.3.9"
+    "@angular-devkit/schematics" "7.3.9"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.4.0"
@@ -1295,6 +1350,16 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
+ajv@6.10.0, ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
@@ -1315,16 +1380,6 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.5.5:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -2240,13 +2295,13 @@ browserslist@^2.11.3:
     electron-to-chromium "^1.3.30"
 
 browserslist@^4.4.1:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
-  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
+  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
   dependencies:
-    caniuse-lite "^1.0.30000955"
-    electron-to-chromium "^1.3.122"
-    node-releases "^1.1.13"
+    caniuse-lite "^1.0.30000971"
+    electron-to-chromium "^1.3.137"
+    node-releases "^1.1.21"
 
 browserstack@^1.5.1:
   version "1.5.2"
@@ -2460,11 +2515,16 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
-caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955:
+caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
   version "1.0.30000957"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
   integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
+caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000971:
+  version "1.0.30000971"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
+  integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -3831,7 +3891,12 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.122, electron-to-chromium@^1.3.30:
+electron-to-chromium@^1.3.137:
+  version "1.3.141"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.141.tgz#5858d3a74ceafe71e7824e7c809ea2cc59c8e104"
+  integrity sha512-DdQaeP8yQNYFdivOrp37UNAZMvyZP//+SWYMVJD31A/3gbI1J6olQs8tuRaHL2ij7dubhCDXhlE4F97mrT8KGQ==
+
+electron-to-chromium@^1.3.30:
   version "1.3.124"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
@@ -6736,9 +6801,9 @@ log4js@^4.0.0:
     streamroller "^1.0.4"
 
 loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.2.tgz#668c77948a03dbd22502a3513ace1f62a80cc372"
+  integrity sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==
 
 longest@^1.0.1:
   version "1.0.1"
@@ -6795,6 +6860,13 @@ macos-release@^2.2.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
   integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
+magic-string@0.25.2, magic-string@^0.25.0:
+  version "0.25.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
+  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
@@ -6802,13 +6874,6 @@ magic-string@^0.22.4:
   dependencies:
     vlq "^0.2.2"
 
-magic-string@^0.25.0:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -7291,6 +7356,11 @@ nan@^2.10.0, nan@^2.9.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
   integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
+nan@^2.13.2:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -7427,14 +7497,37 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.13:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
-  integrity sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==
+node-releases@^1.1.21:
+  version "1.1.22"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.22.tgz#d90cd5adc59ab9b0f377d4f532b09656399c88bf"
+  integrity sha512-O6XpteBuntW1j86mw6LlovBIwTe+sO2+7vi9avQffNeIW4upgnaCVm6xrBWH+KATz7mNNRNNeEpuWB7dT6Cr3w==
   dependencies:
     semver "^5.3.0"
 
-node-sass@4.11.0, node-sass@^4.10.0, node-sass@^4.11.0:
+node-sass@4.12.0:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
+  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash "^4.17.11"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.13.2"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+    sass-graph "^2.2.4"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
+node-sass@^4.10.0, node-sass@^4.11.0:
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
   integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
@@ -8314,7 +8407,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^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@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13:
+postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -8332,6 +8425,15 @@ postcss@^6.0.17, postcss@^6.0.21:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
+postcss@^7.0.13:
+  version "7.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
+  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -9060,13 +9162,20 @@ rxjs@6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.1.0, rxjs@^6.4.0:
+rxjs@6.4.0, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.1.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index c05002fe0..bbcfaf237 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -55,16 +55,16 @@
 		"cordova:run:prod:device": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ionic cordova run android --prod --release --device"
 	},
 	"dependencies": {
-		"@angular/animations": "^7.2.11",
-		"@angular/common": "^7.2.11",
-		"@angular/core": "^7.2.11",
-		"@angular/forms": "^7.2.11",
-		"@angular/http": "^7.2.11",
-		"@angular/platform-browser": "^7.2.11",
-		"@angular/platform-browser-dynamic": "^7.2.11",
-		"@angular/pwa": "^0.13.8",
-		"@angular/router": "^7.2.11",
-		"@angular/service-worker": "^7.2.11",
+		"@angular/animations": "^8.0.0",
+		"@angular/common": "^8.0.0",
+		"@angular/core": "^8.0.0",
+		"@angular/forms": "^8.0.0",
+		"@angular/http": "^7.2.15",
+		"@angular/platform-browser": "^8.0.0",
+		"@angular/platform-browser-dynamic": "^8.0.0",
+		"@angular/pwa": "^0.800.1",
+		"@angular/router": "^8.0.0",
+		"@angular/service-worker": "^8.0.0",
 		"@ionic-native/barcode-scanner": "^5.5.1",
 		"@ionic-native/call-number": "^5.5.1",
 		"@ionic-native/camera": "^5.5.1",
@@ -177,7 +177,7 @@
 		"@angular-devkit/core": "^7.3.8",
 		"@angular-devkit/schematics": "^7.3.8",
 		"@angular/cli": "^7.3.8",
-		"@angular/compiler": "^7.2.12",
+		"@angular/compiler": "^8.0.0",
 		"@angular/compiler-cli": "^7.2.12",
 		"@angular/language-service": "^7.2.12",
 		"@compodoc/compodoc": "^1.1.9",
diff --git a/merchant/tablet-ionic/src/@shared/google-map/google-map.component.ts b/merchant/tablet-ionic/src/@shared/google-map/google-map.component.ts
index cfccbf3ad..0fd806fa0 100644
--- a/merchant/tablet-ionic/src/@shared/google-map/google-map.component.ts
+++ b/merchant/tablet-ionic/src/@shared/google-map/google-map.component.ts
@@ -17,7 +17,7 @@ import { takeUntil } from 'rxjs/operators';
 	`
 })
 export class GoogleMapComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	mapElement: any;
 
 	@Input()
diff --git a/merchant/tablet-ionic/src/@shared/user/forms/location/location-form.component.ts b/merchant/tablet-ionic/src/@shared/user/forms/location/location-form.component.ts
index f7efe5c47..891af29a5 100644
--- a/merchant/tablet-ionic/src/@shared/user/forms/location/location-form.component.ts
+++ b/merchant/tablet-ionic/src/@shared/user/forms/location/location-form.component.ts
@@ -63,7 +63,7 @@ export class LocationFormComponent implements OnInit, AfterViewInit {
 		google.maps.places.PlaceGeometry | google.maps.GeocoderGeometry
 	>();
 
-	@ViewChild('autocomplete')
+	@ViewChild('autocomplete', { static: false })
 	searchElement: ElementRef;
 
 	showCoordinates: boolean = false;
diff --git a/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts b/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
index b79ce3226..f77fedd59 100644
--- a/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
+++ b/merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
@@ -31,10 +31,10 @@ export class UserMutationComponent {
 	readonly apartment = this.form.get('apartment') as FormGroup;
 	readonly location = this.form.get('location') as FormGroup;
 
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	@Input()
diff --git a/merchant/tablet-ionic/src/components/order-map-popup/order-map-popup.ts b/merchant/tablet-ionic/src/components/order-map-popup/order-map-popup.ts
index 1e099557f..73ee13e57 100644
--- a/merchant/tablet-ionic/src/components/order-map-popup/order-map-popup.ts
+++ b/merchant/tablet-ionic/src/components/order-map-popup/order-map-popup.ts
@@ -19,7 +19,7 @@ declare var google: any;
 	styleUrls: ['./order-map-popup.scss']
 })
 export class OrderMapPopupPage implements OnInit {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 
 	@Input()
diff --git a/merchant/tablet-ionic/src/components/settings-page-components/location/location.ts b/merchant/tablet-ionic/src/components/settings-page-components/location/location.ts
index 17676aba4..8e9060025 100644
--- a/merchant/tablet-ionic/src/components/settings-page-components/location/location.ts
+++ b/merchant/tablet-ionic/src/components/settings-page-components/location/location.ts
@@ -47,7 +47,7 @@ export class LocationComponent implements OnInit, OnChanges, OnDestroy {
 
 	map: google.maps.Map;
 
-	@ViewChild('autocomplete')
+	@ViewChild('autocomplete', { static: false })
 	searchElement: ElementRef;
 
 	mapCoordEmitter = new EventEmitter<google.maps.LatLng>();
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
index 44dbe45ea..de21572ad 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
@@ -18,22 +18,22 @@ import { ModalController } from '@ionic/angular';
 	styleUrls: ['./add-carriers-popup.scss']
 })
 export class AddCarriersPopupPage implements OnInit, OnDestroy {
-	@ViewChild('addNewCarrier')
+	@ViewChild('addNewCarrier', { static: false })
 	addNewCarrierComponent: AddNewCarrierComponent;
 
-	@ViewChild('carriersCatalog')
+	@ViewChild('carriersCatalog', { static: false })
 	carriersCatalog: CarriersCatalogComponent;
 
-	@ViewChild('addChoice')
+	@ViewChild('addChoice', { static: false })
 	addChoiceComponent: AddChoiceComponent;
 
-	@ViewChild('wizzardFrom')
+	@ViewChild('wizzardFrom', { static: false })
 	wizzardFrom: any;
 
-	@ViewChild('wizzardFromStep1')
+	@ViewChild('wizzardFromStep1', { static: false })
 	wizzardFromStep1: any;
 
-	@ViewChild('wizardFormStep2')
+	@ViewChild('wizardFormStep2', { static: false })
 	wizardFormStep2: any;
 
 	choiced: string;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
index 33cb723b0..0f0353e69 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
@@ -36,13 +36,13 @@ export class AddNewCarrierComponent implements OnInit, OnDestroy, OnChanges {
 	@Input()
 	isDone: boolean;
 
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('accountForm')
+	@ViewChild('accountForm', { static: false })
 	accountForm: AccountFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	isNextStepOneAvailable: boolean = true;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
index 20fbeb9a9..3f22f55df 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
@@ -36,7 +36,7 @@ import { first } from 'rxjs/operators';
 	templateUrl: 'location-form.component.html'
 })
 export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
-	@ViewChild('autocomplete')
+	@ViewChild('autocomplete', { static: false })
 	searchElement: ElementRef;
 
 	@Output()
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
index 8f5264a5c..2675929bc 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
@@ -8,7 +8,7 @@ import { ModalController } from '@ionic/angular';
 	styleUrls: ['./carrier-addr-popup.scss']
 })
 export class CarrierAddrPopupPage implements OnInit {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 
 	map: google.maps.Map;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
index 0d60efefb..73d2a82b7 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
@@ -42,13 +42,13 @@ export class CarrierEditPopupPage implements OnInit, OnDestroy, OnChanges {
 	@Input()
 	carrier: Carrier;
 
-	@ViewChild('basicInfoForm')
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('accountForm')
+	@ViewChild('accountForm', { static: false })
 	accountForm: AccountFormComponent;
 
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	isNextStepOneAvailable: boolean = true;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts
index 8b71d7e48..1919efa98 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts
@@ -32,7 +32,7 @@ import Carrier from '@modules/server.common/entities/Carrier';
 	templateUrl: 'location-form.component.html'
 })
 export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
-	@ViewChild('autocomplete')
+	@ViewChild('autocomplete', { static: false })
 	searchElement: ElementRef;
 
 	@Input()
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.ts
index 87f7f8011..255588816 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.ts
@@ -18,7 +18,7 @@ const directionsService = new google.maps.DirectionsService();
 	styleUrls: ['./carrier-track-popup.scss']
 })
 export class CarrierTrackPopup implements OnInit {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 
 	@Input()
diff --git a/merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts b/merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts
index ae7bf502b..dae67c834 100644
--- a/merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts
@@ -8,7 +8,7 @@ import User from '@modules/server.common/entities/User';
 	styleUrls: ['./customer-addr-popup.scss']
 })
 export class CustomerAddrPopupPage implements OnInit {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 	map: google.maps.Map;
 	myLatLng = { lat: 0, lng: 0 };
diff --git a/merchant/tablet-ionic/src/pages/+track/track.ts b/merchant/tablet-ionic/src/pages/+track/track.ts
index b74fe4f43..72596c2b1 100644
--- a/merchant/tablet-ionic/src/pages/+track/track.ts
+++ b/merchant/tablet-ionic/src/pages/+track/track.ts
@@ -21,18 +21,18 @@ declare var google: any;
 	templateUrl: 'track.html',
 	styleUrls: ['./track.scss']
 })
-export class TrackPage implements OnInit, OnDestroy {	    
-	private carriersOnDisplay: Carrier[];	
+export class TrackPage implements OnInit, OnDestroy {
+	private carriersOnDisplay: Carrier[];
 	private carriers$: Subscription;
 	private warehouse$: Subscription;
 	private params$: Subscription;
 	private warehouseCoordinates: any;
 	private orders$: Subscription;
 	private _ngDestroy$ = new Subject<void>();
-	
+
 	map: google.maps.Map;
 	selectedCarrier: Carrier;
-	carriers: Carrier[];    
+	carriers: Carrier[];
 	markers: google.maps.Marker[] = [];
 	totalDeliveries = 0;
 	totalCarriers = 0;
@@ -48,12 +48,12 @@ export class TrackPage implements OnInit, OnDestroy {
 	carrierIcon = 'http://maps.google.com/mapfiles/kml/pal4/icon54.png';
 	carrierListDropdown: Carrier[];
 	sharedCarrierListId: string[];
-  
-  @ViewChild('gmap')
+
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
-  
-	@ViewChild('filterComponent')
-  filterComponent: IonicSelectableComponent;
+
+	@ViewChild('filterComponent', { static: false })
+	filterComponent: IonicSelectableComponent;
 
 	constructor(
 		private carrierService: CarrierService,
diff --git a/merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts b/merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts
index 6392513df..01060dda6 100644
--- a/merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts
@@ -58,7 +58,7 @@ export class CreateProductTypePopupPage implements OnInit {
 
 	hasImage: boolean;
 
-	@ViewChild('fileInput')
+	@ViewChild('fileInput', { static: false })
 	fileInput: ElementRef;
 
 	private imagesData: IProductImage[];
@@ -133,7 +133,7 @@ export class CreateProductTypePopupPage implements OnInit {
 
 	ionViewDidLoad() {}
 
-	@ViewChild('imageHolder')
+	@ViewChild('imageHolder', { static: false })
 	private _imageHolder: ElementRef;
 
 	imageUrlChanged(ev) {
diff --git a/merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts b/merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts
index 39f3f1513..04701e56c 100644
--- a/merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts
@@ -59,7 +59,7 @@ export class EditProductTypePopupPage implements OnInit, AfterViewInit {
 	private lastProductCount: number;
 	private imagesData: IProductImage[];
 
-	@ViewChild('fileInput')
+	@ViewChild('fileInput', { static: false })
 	private fileInput: ElementRef;
 
 	constructor(
@@ -119,7 +119,7 @@ export class EditProductTypePopupPage implements OnInit, AfterViewInit {
 		};
 	}
 
-	@ViewChild('imageHolder')
+	@ViewChild('imageHolder', { static: false })
 	private _imageHolder: ElementRef;
 
 	imageUrlChanged(ev) {
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 13fbb1363..8801ee10b 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -114,6 +114,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.1.tgz#4a38141006deefa2f60f105b458d32885ffc1bec"
+  integrity sha512-GQtspR2umZeuTUDTLy2dpUstvQfK7oAwE0o+rWSa8mx0DyhYssrfBbvfE4GzUzKp6OSz1sbZAatSO+iimZjbQw==
+  dependencies:
+    ajv "6.10.0"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
@@ -122,10 +133,18 @@
     "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular/animations@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
-  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
+"@angular-devkit/schematics@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.1.tgz#1f0f616681eb451de31fa5f2d848f5ecbc6226d4"
+  integrity sha512-AbE/Gt0h/6pGu/sQ2oMXZo5ZMDeUhkdU32Nq5styh+B5nVXzGuZK4CGqyDNttdnzebhHt4Bi5ZtF2Avlwt+KEA==
+  dependencies:
+    "@angular-devkit/core" "8.0.1"
+    rxjs "6.4.0"
+
+"@angular/animations@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
+  integrity sha512-hggSRi83rmocLwzrKZtmFcqPdivKSJqp2yiYaiNmJ2yQWJ1JW/Lurypv9H347RWxmwCCwC2kV8embTGbOXIFDQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -148,10 +167,10 @@
     semver "5.6.0"
     symbol-observable "1.2.0"
 
-"@angular/common@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
-  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
+"@angular/common@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0.tgz#700aeda9be8af96692fce0ea6bf6157f7c874c0e"
+  integrity sha512-iOAJZ0+1zTRHnHE/5G30+4Q66W1pfZkSkxZIXvgijZ+wtuNloYdWNy/IdZ/m7ayBI7A6FsYEhyMUoWz2HVEJNw==
   dependencies:
     tslib "^1.9.0"
 
@@ -172,31 +191,31 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
-  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
+"@angular/compiler@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0.tgz#302c987737e1473db3a113ff70fbbb315aa41b58"
+  integrity sha512-4rKsVFMNykF83tPL1VE1+j9kZ3cWHUsLOAB/VqmF64EcR/GsbjKog2v23rSso5kqUtPiVq/FWGYllW6qMdxtJA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
-  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
+"@angular/core@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0.tgz#bf7a582b818e9181d830219907470e2b865ba32f"
+  integrity sha512-mrkP1PTzqCmZGLYll+TDyawLXHzi+FcRPqSuRxCmDMthUUE93SLXT2yISDkx9aMPtFKgFr6KfrIkKuCz16BP/g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
-  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
+"@angular/forms@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0.tgz#6d636c4f83004290e1a5732a05e87148aaf6ed64"
+  integrity sha512-T6XdG3mALWzvnrN3fA1hAmfwvraiF1SPMWNXgPk2riuMf8CFdoro+tQZ4eo1islHrTTw5QzmqN8JJALfhAG6bg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.12.tgz#0ec28f6dc7814c85761833b1fd4b53b397b5e882"
-  integrity sha512-cceU+SWIQFOL3gRKqm5SYHQM3VoKbXne2XQRSY2Fdoc3XsipOzTEvJQPLm5ZcTEXdmRFlfianDoDaWEIvGbXkw==
+"@angular/http@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.15.tgz#a32bea9e67e99eef88150085aeebbe7aeecd39eb"
+  integrity sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==
   dependencies:
     tslib "^1.9.0"
 
@@ -205,42 +224,42 @@
   resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
   integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
 
-"@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
-  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
+"@angular/platform-browser-dynamic@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0.tgz#c15f394579ff44f3752033de58edc1afa5065d59"
+  integrity sha512-dx7W7JoSFbsveexjZ/BPlsXbMDLWVLmRCo7IqLvibMrTbdpaaOCNJIXJk1X+f7JJrQ7SwlZaVkoLCMoDWw6fmA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
-  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
+"@angular/platform-browser@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0.tgz#fc7c55a0483e67e5606e499c129fda60ae8d4363"
+  integrity sha512-fTD+pTMbq+On9Uv3VXiei2lfuX7GX31dngm/Y4yWTFeW6eXy0+7kkfflzpLOb0hykCZvcXzarqCuEBBYNLrrOg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.8.tgz#20799d6c5a00c8b15d56874bc5c2344e13683a1a"
-  integrity sha512-Yu9bFh/9Vq2Wi3X4foki2qM3kLRs/GTROaI2Na+OfCpACMn6vNTHgJdqyjzSW9DpFTbW/4Fsb2NMmPf8CgAScw==
+"@angular/pwa@^0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.800.1.tgz#4d6b48cd5f7d81cd297441ba4843f6327d475459"
+  integrity sha512-pWcxdbksfdC2tTrlEn7bMH9wShyjLtIk97gXhNZ99vtlnIjUfA+DHO2b4AvKy4QG92Hw94QDAGtqAZ/oVT+VGQ==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    "@schematics/angular" "7.3.8"
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
+    "@schematics/angular" "8.0.1"
     parse5-html-rewriting-stream "5.1.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
 
-"@angular/router@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
-  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
+"@angular/router@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0.tgz#26094fd473e17441b0ae8af4883ec1b4ea3ad569"
+  integrity sha512-DGUTb8qpndE5m716xh00GxuC8o7qamlqbUruGB+SQD6ynU7s5yLGxtKffxqb1BT63+YewpsVxc2Koruvb1qjDw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.12.tgz#9d3ca7399a105900a4d706cf5da5954cbe5b66dc"
-  integrity sha512-0hvKy+EXPoGrLujqzXK02gfVUZ187o/aDvmBuH2Io9us93RgGew/Se1iFl2YaawhPYSsuwwbrcjoSVMznoI1GQ==
+"@angular/service-worker@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0.tgz#5cb55bc39b29e318f5d72c1223a966c088f18568"
+  integrity sha512-MrR6Xb0X0+qO+bbdGasg7+xEvH7rPhgLpDn9FF/RwMMzj4qQmeJw9uRSJe9xMR6n0gNS7+cH8RptivOanY1QjQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -895,6 +914,14 @@
     "@angular-devkit/schematics" "7.3.8"
     typescript "3.2.4"
 
+"@schematics/angular@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
+  integrity sha512-/FyFJbHuxWfvVgTBSnEa0fiDgeLhAmfK7NeT8Owj2xDAqvVMxfSxupfdr7a9cDr82WImW09SX7PUlv2EomcGLA==
+  dependencies:
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
+
 "@schematics/update@0.13.8":
   version "0.13.8"
   resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
@@ -1293,6 +1320,16 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
+ajv@6.10.0, ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
@@ -1313,16 +1350,6 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.5.5:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -6622,6 +6649,13 @@ macos-release@^2.2.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
   integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
+magic-string@0.25.2, magic-string@^0.25.0:
+  version "0.25.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
+  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
@@ -6629,13 +6663,6 @@ magic-string@^0.22.4:
   dependencies:
     vlq "^0.2.2"
 
-magic-string@^0.25.0:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -9020,7 +9047,7 @@ rxjs@6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.1.0, rxjs@^6.4.0:
+rxjs@6.4.0, rxjs@^6.1.0, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
diff --git a/shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts b/shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts
index 643ba620e..607cb324e 100644
--- a/shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts
+++ b/shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts
@@ -99,7 +99,7 @@ export class NgxBarcodeComponent implements OnChanges {
 	@Input('bc-value')
 	value = '';
 
-	@ViewChild('bcElement')
+	@ViewChild('bcElement', { static: false })
 	bcElement: ElementRef;
 
 	@Input('bc-valid')
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3d70da98e..ef1662153 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -52,16 +52,16 @@
 		"cordova:run:prod:device": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn ionic cordova run android --prod --release --device"
 	},
 	"dependencies": {
-		"@angular/animations": "^7.2.11",
-		"@angular/common": "^7.2.11",
-		"@angular/core": "^7.2.11",
-		"@angular/forms": "^7.2.11",
-		"@angular/http": "^7.2.11",
-		"@angular/platform-browser": "^7.2.11",
-		"@angular/platform-browser-dynamic": "^7.2.11",
-		"@angular/pwa": "^0.13.8",
-		"@angular/router": "^7.2.11",
-		"@angular/service-worker": "^7.2.11",
+		"@angular/animations": "^8.0.0",
+		"@angular/common": "^8.0.0",
+		"@angular/core": "^8.0.0",
+		"@angular/forms": "^8.0.0",
+		"@angular/http": "^7.2.15",
+		"@angular/platform-browser": "^8.0.0",
+		"@angular/platform-browser-dynamic": "^8.0.0",
+		"@angular/pwa": "^0.800.1",
+		"@angular/router": "^8.0.0",
+		"@angular/service-worker": "^8.0.0",
 		"@ionic-native/barcode-scanner": "^5.5.1",
 		"@ionic-native/call-number": "^5.5.1",
 		"@ionic-native/camera": "^5.5.1",
@@ -152,7 +152,7 @@
 		"@angular-devkit/core": "^7.3.8",
 		"@angular-devkit/schematics": "^7.3.8",
 		"@angular/cli": "^7.3.8",
-		"@angular/compiler": "^7.2.12",
+		"@angular/compiler": "^8.0.0",
 		"@angular/compiler-cli": "^7.2.12",
 		"@angular/language-service": "^7.2.12",
 		"@compodoc/compodoc": "^1.1.9",
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/order-info.page.ts b/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/order-info.page.ts
index 5af7dbbbb..65a9e793d 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/order-info.page.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/order-info.page.ts
@@ -36,7 +36,7 @@ export class OrderInfoPage implements OnInit, OnDestroy {
 
 	public delivered: boolean;
 
-	@ViewChild('elapsedTime')
+	@ViewChild('elapsedTime', { static: false })
 	elapsedTime: ElapsedTimeComponent;
 
 	public modalOpen: boolean;
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/user-warehouse-map/user-warehouse-map.ts b/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/user-warehouse-map/user-warehouse-map.ts
index 8d0cb747c..a15366f42 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/user-warehouse-map/user-warehouse-map.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/user-warehouse-map/user-warehouse-map.ts
@@ -22,7 +22,7 @@ const userIcon = environment.MAP_USER_ICON_LINK;
 })
 export class UserWarehouseLocationComponent
 	implements AfterViewInit, OnDestroy, OnChanges {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 
 	public map: google.maps.Map;
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/common/carreir-location/carreir-location.ts b/shop/mobile-ionic/src/app/pages/+products/+order/common/carreir-location/carreir-location.ts
index 2d12914d9..d755a2d72 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/common/carreir-location/carreir-location.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/common/carreir-location/carreir-location.ts
@@ -16,7 +16,7 @@ import GeoLocation from '@modules/server.common/entities/GeoLocation';
 	`
 })
 export class DirectionsLocationComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 	public map: google.maps.Map;
 	private directionsDisplay = new google.maps.DirectionsRenderer();
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/order.page.ts b/shop/mobile-ionic/src/app/pages/+products/+order/order.page.ts
index c6159d006..ada080b16 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/order.page.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/order.page.ts
@@ -41,7 +41,7 @@ export class OrderPage implements OnInit, OnDestroy {
 
 	public modalChange: EventEmitter<boolean>;
 
-	@ViewChild('elapsedTime')
+	@ViewChild('elapsedTime', { static: false })
 	elapsedTime: ElapsedTimeComponent;
 
 	private _pageSubscriptions: Subscription[] = [];
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/+page/store-info/store-info.component.ts b/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/+page/store-info/store-info.component.ts
index 7d3fb9098..560b2e2f2 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/+page/store-info/store-info.component.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/+page/store-info/store-info.component.ts
@@ -22,7 +22,7 @@ import Warehouse from '@modules/server.common/entities/Warehouse';
 	styleUrls: ['./store-info.component.scss']
 })
 export class OrderStoreInfo implements OnInit, OnDestroy {
-	@ViewChild('elapsedTime')
+	@ViewChild('elapsedTime', { static: false })
 	elapsedTime: ElapsedTimeComponent;
 
 	@Input()
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/+page/takeaway-page.page.ts b/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/+page/takeaway-page.page.ts
index 0973c6ea3..b3047c7e4 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/+page/takeaway-page.page.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/+page/takeaway-page.page.ts
@@ -24,7 +24,7 @@ import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehou
 	styleUrls: ['./takeaway-page.page.scss']
 })
 export class OrderTakeawayInfoPage implements OnInit, OnDestroy {
-	@ViewChild('storeInfo')
+	@ViewChild('storeInfo', { static: false })
 	storeInfo: OrderStoreInfo;
 
 	modalOpen: boolean;
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/popup/popup.component.ts b/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/popup/popup.component.ts
index d2cf33dea..8726366f9 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/popup/popup.component.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/takeaway/popup/popup.component.ts
@@ -25,7 +25,7 @@ import { ProductLocalesService } from '@modules/client.common.angular2/locale/pr
 	styleUrls: ['./popup.component.scss']
 })
 export class OrderTakeawayInfoPopup implements OnInit, OnDestroy {
-	@ViewChild('elapsedTime')
+	@ViewChild('elapsedTime', { static: false })
 	elapsedTime: ElapsedTimeComponent;
 
 	modalChange: EventEmitter<boolean>;
diff --git a/shop/mobile-ionic/src/app/pages/+products/products-view/slides-view/slides-view.component.ts b/shop/mobile-ionic/src/app/pages/+products/products-view/slides-view/slides-view.component.ts
index 93c2f635a..b97f844fb 100644
--- a/shop/mobile-ionic/src/app/pages/+products/products-view/slides-view/slides-view.component.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/products-view/slides-view/slides-view.component.ts
@@ -59,7 +59,7 @@ export class ProductsSlidesViewComponent
 	@Output()
 	goToDetailsPage = new EventEmitter<ProductInfo>();
 
-	@ViewChild(IonSlides)
+	@ViewChild(IonSlides, { static: false })
 	slides: IonSlides;
 
 	imageOrientation: number = 1;
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 7361b3b93..bf8ffce27 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -114,6 +114,17 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
+"@angular-devkit/core@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.1.tgz#4a38141006deefa2f60f105b458d32885ffc1bec"
+  integrity sha512-GQtspR2umZeuTUDTLy2dpUstvQfK7oAwE0o+rWSa8mx0DyhYssrfBbvfE4GzUzKp6OSz1sbZAatSO+iimZjbQw==
+  dependencies:
+    ajv "6.10.0"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
@@ -122,10 +133,18 @@
     "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular/animations@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
-  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
+"@angular-devkit/schematics@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.1.tgz#1f0f616681eb451de31fa5f2d848f5ecbc6226d4"
+  integrity sha512-AbE/Gt0h/6pGu/sQ2oMXZo5ZMDeUhkdU32Nq5styh+B5nVXzGuZK4CGqyDNttdnzebhHt4Bi5ZtF2Avlwt+KEA==
+  dependencies:
+    "@angular-devkit/core" "8.0.1"
+    rxjs "6.4.0"
+
+"@angular/animations@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
+  integrity sha512-hggSRi83rmocLwzrKZtmFcqPdivKSJqp2yiYaiNmJ2yQWJ1JW/Lurypv9H347RWxmwCCwC2kV8embTGbOXIFDQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -148,10 +167,10 @@
     semver "5.6.0"
     symbol-observable "1.2.0"
 
-"@angular/common@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
-  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
+"@angular/common@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0.tgz#700aeda9be8af96692fce0ea6bf6157f7c874c0e"
+  integrity sha512-iOAJZ0+1zTRHnHE/5G30+4Q66W1pfZkSkxZIXvgijZ+wtuNloYdWNy/IdZ/m7ayBI7A6FsYEhyMUoWz2HVEJNw==
   dependencies:
     tslib "^1.9.0"
 
@@ -172,31 +191,31 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
-  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
+"@angular/compiler@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0.tgz#302c987737e1473db3a113ff70fbbb315aa41b58"
+  integrity sha512-4rKsVFMNykF83tPL1VE1+j9kZ3cWHUsLOAB/VqmF64EcR/GsbjKog2v23rSso5kqUtPiVq/FWGYllW6qMdxtJA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
-  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
+"@angular/core@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0.tgz#bf7a582b818e9181d830219907470e2b865ba32f"
+  integrity sha512-mrkP1PTzqCmZGLYll+TDyawLXHzi+FcRPqSuRxCmDMthUUE93SLXT2yISDkx9aMPtFKgFr6KfrIkKuCz16BP/g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
-  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
+"@angular/forms@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0.tgz#6d636c4f83004290e1a5732a05e87148aaf6ed64"
+  integrity sha512-T6XdG3mALWzvnrN3fA1hAmfwvraiF1SPMWNXgPk2riuMf8CFdoro+tQZ4eo1islHrTTw5QzmqN8JJALfhAG6bg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.12.tgz#0ec28f6dc7814c85761833b1fd4b53b397b5e882"
-  integrity sha512-cceU+SWIQFOL3gRKqm5SYHQM3VoKbXne2XQRSY2Fdoc3XsipOzTEvJQPLm5ZcTEXdmRFlfianDoDaWEIvGbXkw==
+"@angular/http@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.15.tgz#a32bea9e67e99eef88150085aeebbe7aeecd39eb"
+  integrity sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==
   dependencies:
     tslib "^1.9.0"
 
@@ -205,42 +224,42 @@
   resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
   integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
 
-"@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
-  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
+"@angular/platform-browser-dynamic@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0.tgz#c15f394579ff44f3752033de58edc1afa5065d59"
+  integrity sha512-dx7W7JoSFbsveexjZ/BPlsXbMDLWVLmRCo7IqLvibMrTbdpaaOCNJIXJk1X+f7JJrQ7SwlZaVkoLCMoDWw6fmA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
-  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
+"@angular/platform-browser@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0.tgz#fc7c55a0483e67e5606e499c129fda60ae8d4363"
+  integrity sha512-fTD+pTMbq+On9Uv3VXiei2lfuX7GX31dngm/Y4yWTFeW6eXy0+7kkfflzpLOb0hykCZvcXzarqCuEBBYNLrrOg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/pwa@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.13.8.tgz#20799d6c5a00c8b15d56874bc5c2344e13683a1a"
-  integrity sha512-Yu9bFh/9Vq2Wi3X4foki2qM3kLRs/GTROaI2Na+OfCpACMn6vNTHgJdqyjzSW9DpFTbW/4Fsb2NMmPf8CgAScw==
+"@angular/pwa@^0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.800.1.tgz#4d6b48cd5f7d81cd297441ba4843f6327d475459"
+  integrity sha512-pWcxdbksfdC2tTrlEn7bMH9wShyjLtIk97gXhNZ99vtlnIjUfA+DHO2b4AvKy4QG92Hw94QDAGtqAZ/oVT+VGQ==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    "@schematics/angular" "7.3.8"
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
+    "@schematics/angular" "8.0.1"
     parse5-html-rewriting-stream "5.1.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
 
-"@angular/router@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
-  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
+"@angular/router@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0.tgz#26094fd473e17441b0ae8af4883ec1b4ea3ad569"
+  integrity sha512-DGUTb8qpndE5m716xh00GxuC8o7qamlqbUruGB+SQD6ynU7s5yLGxtKffxqb1BT63+YewpsVxc2Koruvb1qjDw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.12.tgz#9d3ca7399a105900a4d706cf5da5954cbe5b66dc"
-  integrity sha512-0hvKy+EXPoGrLujqzXK02gfVUZ187o/aDvmBuH2Io9us93RgGew/Se1iFl2YaawhPYSsuwwbrcjoSVMznoI1GQ==
+"@angular/service-worker@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0.tgz#5cb55bc39b29e318f5d72c1223a966c088f18568"
+  integrity sha512-MrR6Xb0X0+qO+bbdGasg7+xEvH7rPhgLpDn9FF/RwMMzj4qQmeJw9uRSJe9xMR6n0gNS7+cH8RptivOanY1QjQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -877,6 +896,14 @@
     "@angular-devkit/schematics" "7.3.8"
     typescript "3.2.4"
 
+"@schematics/angular@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
+  integrity sha512-/FyFJbHuxWfvVgTBSnEa0fiDgeLhAmfK7NeT8Owj2xDAqvVMxfSxupfdr7a9cDr82WImW09SX7PUlv2EomcGLA==
+  dependencies:
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
+
 "@schematics/update@0.13.8":
   version "0.13.8"
   resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
@@ -1295,6 +1322,16 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
+ajv@6.10.0, ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
@@ -1315,16 +1352,6 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.5.5:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -6746,6 +6773,13 @@ macos-release@^2.2.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
   integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
+magic-string@0.25.2, magic-string@^0.25.0:
+  version "0.25.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
+  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
@@ -6753,13 +6787,6 @@ magic-string@^0.22.4:
   dependencies:
     vlq "^0.2.2"
 
-magic-string@^0.25.0:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -8917,7 +8944,7 @@ rxjs@6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.1.0, rxjs@^6.4.0:
+rxjs@6.4.0, rxjs@^6.1.0, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index b93938ba3..85596553d 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -103,19 +103,19 @@
 	},
 	"dependencies": {
 		"@agm/core": "^1.0.0-beta.5",
-		"@angular/animations": "^7.2.11",
-		"@angular/cdk": "^7.3.6",
-		"@angular/common": "^7.2.11",
-		"@angular/compiler": "^7.2.11",
-		"@angular/core": "^7.2.11",
-		"@angular/forms": "^7.2.11",
-		"@angular/material": "^7.3.3",
-		"@angular/platform-browser": "^7.2.11",
-		"@angular/platform-browser-dynamic": "^7.2.11",
-		"@angular/platform-server": "^7.2.11",
-		"@angular/router": "^7.2.11",
-		"@angular/service-worker": "^7.2.11",
-		"@fortawesome/angular-fontawesome": "~0.3.0",
+		"@angular/animations": "^8.0.0",
+		"@angular/cdk": "^8.0.0",
+		"@angular/common": "^8.0.0",
+		"@angular/compiler": "^8.0.0",
+		"@angular/core": "^8.0.0",
+		"@angular/forms": "^8.0.0",
+		"@angular/material": "^8.0.0",
+		"@angular/platform-browser": "^8.0.0",
+		"@angular/platform-browser-dynamic": "^8.0.0",
+		"@angular/platform-server": "^8.0.0",
+		"@angular/router": "^8.0.0",
+		"@angular/service-worker": "^8.0.0",
+		"@fortawesome/angular-fontawesome": "^0.4.0",
 		"@fortawesome/fontawesome-free": "^5.8.2",
 		"@fortawesome/fontawesome-svg-core": "^1.2.18",
 		"@fortawesome/free-brands-svg-icons": "^5.8.2",
@@ -162,15 +162,14 @@
 		"zone.js": "^0.8.29"
 	},
 	"devDependencies": {
-		"@angular-devkit/build-angular": "^0.13.7",
-		"@angular-devkit/build-optimizer": "^0.13.7",
-		"@angular-extensions/testing-library": "^4.0.3",
-		"@angular/cli": "^7.3.7",
-		"@angular/compiler": "^7.2.11",
-		"@angular/compiler-cli": "^7.2.11",
-		"@angular/language-service": "^7.2.9",
+		"@angular-devkit/build-angular": "^0.800.1",
+		"@angular-devkit/build-optimizer": "^0.800.1",
+		"@angular-extensions/testing-library": "^5.0.0",
+		"@angular/cli": "^8.0.1",
+		"@angular/compiler-cli": "^8.0.0",
+		"@angular/language-service": "^8.0.0",
 		"@compodoc/compodoc": "^1.1.9",
-		"@ngtools/webpack": "~7.3.4",
+		"@ngtools/webpack": "^8.0.1",
 		"@types/googlemaps": "^3.30.16",
 		"@types/hammerjs": "^2.0.36",
 		"@types/jasmine": "^3.3.9",
@@ -240,7 +239,7 @@
 		"tslint": "^5.13.1",
 		"tslint-loader": "^3.6.0",
 		"typedoc": "^0.14.2",
-		"typescript": "~3.1.6",
+		"typescript": "3.4.5",
 		"uglifyjs-webpack-plugin": "^2.1.2",
 		"url-loader": "^1.1.2",
 		"webpack": "^4.29.6",
diff --git a/shop/website-angular/src/app/+login/byLocation/byLocation.component.ts b/shop/website-angular/src/app/+login/byLocation/byLocation.component.ts
index 4aa09f5bd..77efd86db 100644
--- a/shop/website-angular/src/app/+login/byLocation/byLocation.component.ts
+++ b/shop/website-angular/src/app/+login/byLocation/byLocation.component.ts
@@ -23,7 +23,7 @@ import { TranslateService } from '@ngx-translate/core';
 	templateUrl: '/byLocation.component.html'
 })
 export class LoginByLocationComponent implements OnInit {
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	public locationForm: LocationFormComponent;
 
 	public InitUser: User;
diff --git a/shop/website-angular/src/app/+login/byLocation/google-map/google-map.component.ts b/shop/website-angular/src/app/+login/byLocation/google-map/google-map.component.ts
index 527e97896..167f997c0 100644
--- a/shop/website-angular/src/app/+login/byLocation/google-map/google-map.component.ts
+++ b/shop/website-angular/src/app/+login/byLocation/google-map/google-map.component.ts
@@ -19,7 +19,7 @@ import { takeUntil } from 'rxjs/operators';
 	`
 })
 export class GoogleMapComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: false })
 	public mapElement: any;
 
 	@Input()
diff --git a/shop/website-angular/src/app/+login/byLocation/location/location.component.ts b/shop/website-angular/src/app/+login/byLocation/location/location.component.ts
index 527fcc573..2b5f4509b 100644
--- a/shop/website-angular/src/app/+login/byLocation/location/location.component.ts
+++ b/shop/website-angular/src/app/+login/byLocation/location/location.component.ts
@@ -53,7 +53,7 @@ export class LocationFormComponent
 	@Input()
 	place: google.maps.places.PlaceResult;
 
-	@ViewChild('autocomplete')
+	@ViewChild('autocomplete', { static: false })
 	public searchElement: ElementRef;
 
 	@Output()
diff --git a/shop/website-angular/src/app/+login/login.component.ts b/shop/website-angular/src/app/+login/login.component.ts
index 36b1a7b20..c1cd06365 100644
--- a/shop/website-angular/src/app/+login/login.component.ts
+++ b/shop/website-angular/src/app/+login/login.component.ts
@@ -75,7 +75,7 @@ export class LoginComponent implements ToolbarController, OnInit, OnDestroy {
 	private code = this.formControl.get('code');
 	private _ngDestroy$ = new Subject<void>();
 
-	@ViewChild('codeRef', { read: ElementRef })
+	@ViewChild('codeRef', { static: false, read: ElementRef })
 	private codeRef: ElementRef;
 
 	constructor(
diff --git a/shop/website-angular/src/app/+products/products.component.ts b/shop/website-angular/src/app/+products/products.component.ts
index 3b8c74521..c9aaa27b0 100644
--- a/shop/website-angular/src/app/+products/products.component.ts
+++ b/shop/website-angular/src/app/+products/products.component.ts
@@ -34,7 +34,7 @@ const initializeProductsNumber: number = 10;
 	templateUrl: './products.component.html'
 })
 export class ProductsComponent implements OnInit, OnDestroy {
-	@ViewChild('carouselView')
+	@ViewChild('carouselView', { static: false })
 	carouselView: CarouselViewComponent;
 
 	products: ProductInfo[] = [];
diff --git a/shop/website-angular/src/app/+products/views/list/list-view.component.ts b/shop/website-angular/src/app/+products/views/list/list-view.component.ts
index a4dfe1f60..df152b6ae 100644
--- a/shop/website-angular/src/app/+products/views/list/list-view.component.ts
+++ b/shop/website-angular/src/app/+products/views/list/list-view.component.ts
@@ -27,7 +27,7 @@ export class ListViewComponent implements OnDestroy {
 	@Input()
 	isWideView: boolean;
 
-	@ViewChild(MasonryComponent)
+	@ViewChild(MasonryComponent, { static: false })
 	masonry: MasonryComponent;
 
 	containerWidth: string = '100px';
diff --git a/shop/website-angular/src/app/app.component.ts b/shop/website-angular/src/app/app.component.ts
index 1485d8810..055193600 100644
--- a/shop/website-angular/src/app/app.component.ts
+++ b/shop/website-angular/src/app/app.component.ts
@@ -58,7 +58,7 @@ export const ROOT_SELECTOR = 'app';
 	`
 })
 export class AppComponent implements OnInit {
-	@ViewChild(RouterOutlet)
+	@ViewChild(RouterOutlet, { static: false })
 	public routerOutlet: RouterOutlet;
 
 	constructor(
diff --git a/shop/website-angular/src/app/shared/location-popup/location-popup.component.ts b/shop/website-angular/src/app/shared/location-popup/location-popup.component.ts
index 527bad6bf..b7e227132 100644
--- a/shop/website-angular/src/app/shared/location-popup/location-popup.component.ts
+++ b/shop/website-angular/src/app/shared/location-popup/location-popup.component.ts
@@ -22,7 +22,7 @@ import { UserRouter } from '@modules/client.common.angular2/routers/user-router.
 	templateUrl: './location-popup.component.html'
 })
 export class LocationPopupComponent implements OnInit, AfterViewInit {
-	@ViewChild('locationForm')
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	place: google.maps.places.PlaceResult;
diff --git a/shop/website-angular/src/app/toolbar/toolbar.component.ts b/shop/website-angular/src/app/toolbar/toolbar.component.ts
index 018975a01..7df6d600e 100644
--- a/shop/website-angular/src/app/toolbar/toolbar.component.ts
+++ b/shop/website-angular/src/app/toolbar/toolbar.component.ts
@@ -24,7 +24,7 @@ export class ToolbarComponent implements AfterViewInit {
 	styleVariables: typeof styleVariables = styleVariables;
 	isDeliveryRequired: boolean;
 
-	@ViewChild('matSearch')
+	@ViewChild('matSearch', { static: false })
 	matSearch: MatSearchComponent;
 
 	private initializedAddress: string;
diff --git a/shop/website-angular/src/modules/material-extensions/bold-input/mat-bold-input.component.ts b/shop/website-angular/src/modules/material-extensions/bold-input/mat-bold-input.component.ts
index 4db9e4605..9d88eb40d 100644
--- a/shop/website-angular/src/modules/material-extensions/bold-input/mat-bold-input.component.ts
+++ b/shop/website-angular/src/modules/material-extensions/bold-input/mat-bold-input.component.ts
@@ -40,10 +40,10 @@ export class MatBoldInputComponent extends InputComponent
 	@Input()
 	public rippleSpeedFactor: number = 2;
 
-	@ViewChild(MatRipple)
+	@ViewChild(MatRipple, { static: false })
 	public ripple: MatRipple;
 
-	@ViewChild('input')
+	@ViewChild('input', { static: false })
 	public input: ElementRef;
 
 	@HostBinding('class.mat-focused')
diff --git a/shop/website-angular/src/modules/material-extensions/search/mat-search.component.ts b/shop/website-angular/src/modules/material-extensions/search/mat-search.component.ts
index 93df1f352..cd2638eb7 100644
--- a/shop/website-angular/src/modules/material-extensions/search/mat-search.component.ts
+++ b/shop/website-angular/src/modules/material-extensions/search/mat-search.component.ts
@@ -35,13 +35,13 @@ export class MatSearchComponent {
 	@Output()
 	detectLocation: EventEmitter<boolean> = new EventEmitter();
 
-	@ViewChild(MatRipple)
+	@ViewChild(MatRipple, { static: false })
 	public ripple: MatRipple;
 
-	@ViewChild('searchButton')
+	@ViewChild('searchButton', { static: false })
 	public searchButton: MatButton;
 
-	@ViewChild('input')
+	@ViewChild('input', { static: false })
 	public input: ElementRef;
 
 	@HostBinding('class.mat-focused')
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index a179f614f..3c38bff2a 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -7,171 +7,168 @@
   resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.5.tgz#6dbceb666b2dbc4a868b97e1340a3faceb5f2113"
   integrity sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ==
 
-"@angular-devkit/architect@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
-  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
-  dependencies:
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
-
-"@angular-devkit/build-angular@^0.13.7":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
-  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
-  dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/build-optimizer" "0.13.8"
-    "@angular-devkit/build-webpack" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@ngtools/webpack" "7.3.8"
-    ajv "6.9.1"
-    autoprefixer "9.4.6"
+"@angular-devkit/architect@0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.1.tgz#decff7e973b9459834ec256f4329a49420757c1f"
+  integrity sha512-zDueOtGo8q9zAUWL2baLIwc5hlLkNtSr5ud1yTuhS4EmYbXJOvV2BPyXx4d77iL+SK4AMG/FyDsi1ZUxXubHIA==
+  dependencies:
+    "@angular-devkit/core" "8.0.1"
+    rxjs "6.4.0"
+
+"@angular-devkit/build-angular@^0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.1.tgz#1c203c37a7cdf0f47215ad9b74aa4d4c6ec27d69"
+  integrity sha512-woZH0gJb9aGZjJx5Z7ai8FtT2HAcsMNZ+u5pfKn8qmSspbc0DobTeHQ/giTTHY+kfphXuxNeCEWC/lJIEcbBDA==
+  dependencies:
+    "@angular-devkit/architect" "0.800.1"
+    "@angular-devkit/build-optimizer" "0.800.1"
+    "@angular-devkit/build-webpack" "0.800.1"
+    "@angular-devkit/core" "8.0.1"
+    "@ngtools/webpack" "8.0.1"
+    ajv "6.10.0"
+    autoprefixer "9.5.1"
+    browserslist "4.5.5"
+    caniuse-api "3.0.0"
     circular-dependency-plugin "5.0.2"
     clean-css "4.2.1"
-    copy-webpack-plugin "4.6.0"
+    copy-webpack-plugin "5.0.2"
+    core-js "3.0.1"
     file-loader "3.0.1"
     glob "7.1.3"
     istanbul-instrumenter-loader "3.0.1"
-    karma-source-map-support "1.3.0"
+    karma-source-map-support "1.4.0"
     less "3.9.0"
     less-loader "4.1.0"
-    license-webpack-plugin "2.1.0"
+    license-webpack-plugin "2.1.1"
     loader-utils "1.2.3"
-    mini-css-extract-plugin "0.5.0"
+    mini-css-extract-plugin "0.6.0"
     minimatch "3.0.4"
-    open "6.0.0"
+    open "6.2.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
     postcss-loader "3.0.0"
     raw-loader "1.0.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
+    sass "1.19.0"
     sass-loader "7.1.0"
-    semver "5.6.0"
+    semver "6.0.0"
     source-map-loader "0.2.4"
-    source-map-support "0.5.10"
+    source-map-support "0.5.12"
     speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
     stylus-loader "3.0.2"
-    terser-webpack-plugin "1.2.2"
+    terser-webpack-plugin "1.2.3"
     tree-kill "1.2.1"
-    webpack "4.29.0"
-    webpack-dev-middleware "3.5.1"
-    webpack-dev-server "3.1.14"
+    webpack "4.30.0"
+    webpack-dev-middleware "3.6.2"
+    webpack-dev-server "3.3.1"
     webpack-merge "4.2.1"
     webpack-sources "1.3.0"
     webpack-subresource-integrity "1.1.0-rc.6"
-  optionalDependencies:
-    node-sass "4.11.0"
+    worker-plugin "3.1.0"
 
-"@angular-devkit/build-optimizer@0.13.8", "@angular-devkit/build-optimizer@^0.13.7":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
-  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
+"@angular-devkit/build-optimizer@0.800.1", "@angular-devkit/build-optimizer@^0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.1.tgz#9300232f3aa2bd3e39b624ba0dad1873353f2a55"
+  integrity sha512-JES4aXyLDtuI2mXZOkrVD3WRLgicC+/ub13j0sIW3ceBJ4VCuPOJnCVb5To8hEy6E4uKJGFe9dXDQjOis7rmeg==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
-    typescript "3.2.4"
+    typescript "3.4.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
-  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
-  dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
-
-"@angular-devkit/core@7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
-  integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
+"@angular-devkit/build-webpack@0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.1.tgz#e9924b98da51ee5271d4b04a83c394deef96be90"
+  integrity sha512-tJda9/vnYsg2CY2i9RiP/W63m5VIAbIRznD7Jn+cCiPrIyCDnpgqbccHMeo8LGv3jIVwdlNKidG1AtzTx3jczg==
   dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
+    "@angular-devkit/architect" "0.800.1"
+    "@angular-devkit/core" "8.0.1"
+    rxjs "6.4.0"
+    webpack-merge "4.2.1"
 
-"@angular-devkit/core@7.3.9":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.9.tgz#bef2aaa0be7219c546fb99ea0ba9dd3a6dcd288a"
-  integrity sha512-SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw==
+"@angular-devkit/core@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.1.tgz#4a38141006deefa2f60f105b458d32885ffc1bec"
+  integrity sha512-GQtspR2umZeuTUDTLy2dpUstvQfK7oAwE0o+rWSa8mx0DyhYssrfBbvfE4GzUzKp6OSz1sbZAatSO+iimZjbQw==
   dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
+    ajv "6.10.0"
     fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
-  integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
+"@angular-devkit/schematics@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.1.tgz#1f0f616681eb451de31fa5f2d848f5ecbc6226d4"
+  integrity sha512-AbE/Gt0h/6pGu/sQ2oMXZo5ZMDeUhkdU32Nq5styh+B5nVXzGuZK4CGqyDNttdnzebhHt4Bi5ZtF2Avlwt+KEA==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
+    "@angular-devkit/core" "8.0.1"
+    rxjs "6.4.0"
 
-"@angular-extensions/testing-library@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@angular-extensions/testing-library/-/testing-library-4.0.3.tgz#79ca0a9e8f8d03399315fbe8650864443696841c"
-  integrity sha512-RTVcFvi+JkZrzrLXjjaIGNbW1qd8z/BPQMrLGsUPLIPJUsX5jq9U52qa90Xqx7N8/8ZTClfijRMSnlX1J1ZLpA==
+"@angular-extensions/testing-library@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@angular-extensions/testing-library/-/testing-library-5.0.0.tgz#43121b984827fea550a8ed45695716d6427b4353"
+  integrity sha512-C17SEegDFQfYKi/uLdMINcHy1Jdmy+kfgdQlazevWFFgHYSCUa62ltCI8vPfh9OuIs4XwTluso/EAKZR8HtiDA==
   dependencies:
     "@phenomnomnominal/tsquery" "^3.0.0"
-    dom-testing-library "^4.0.1"
+    dom-testing-library "^4.1.0"
     tslib "^1.9.0"
     tslint "^5.16.0"
 
-"@angular/animations@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.12.tgz#822593a53392462b9415ad5960cf0ad5e84e88df"
-  integrity sha512-J7d9hYXNqNz2kVxKEZlAAn4iojjF63WfGenEnMCtFgXU26ok03EAiR+VaiIqIvcevxvvR+iDrCHb+Hub0C212w==
+"@angular/animations@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
+  integrity sha512-hggSRi83rmocLwzrKZtmFcqPdivKSJqp2yiYaiNmJ2yQWJ1JW/Lurypv9H347RWxmwCCwC2kV8embTGbOXIFDQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.3.6":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.7.tgz#ce1ad53ba04beb9c8e950acc5691ea0143753764"
-  integrity sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==
+"@angular/cdk@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.0.0.tgz#34ca95e71d71780b29b5ba07318c88c4577bdc25"
+  integrity sha512-2vsRWEHNARe0iRmqgzvM67gwfRy+aKvdef4Qu9L+ndSsTrrZT3tSgG8SMn1v9SfBHnx5G8mo4d1AMquXG69AuQ==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@^7.3.7":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
-  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
+"@angular/cli@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.1.tgz#7982f3297ba324d8865ac72b581f2cd4d7953089"
+  integrity sha512-V8U4jNE9khQd7ykzewTpGcB7AjRhWIGb3opPfYux5umQsVhlhQqj/jVgGMu+kN9Jl7KkjFzQTjsJws7wODP6MA==
   dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    "@schematics/angular" "7.3.8"
-    "@schematics/update" "0.13.8"
+    "@angular-devkit/architect" "0.800.1"
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
+    "@schematics/angular" "8.0.1"
+    "@schematics/update" "0.800.1"
     "@yarnpkg/lockfile" "1.1.0"
+    debug "^4.1.1"
     ini "1.3.5"
-    inquirer "6.2.1"
+    inquirer "6.3.1"
     npm-package-arg "6.1.0"
-    open "6.0.0"
-    pacote "9.4.0"
-    semver "5.6.0"
+    open "6.2.0"
+    pacote "9.5.0"
+    read-package-tree "5.2.2"
+    semver "6.0.0"
     symbol-observable "1.2.0"
+    universal-analytics "^0.4.20"
+    uuid "^3.3.2"
 
-"@angular/common@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.12.tgz#e36d4f96737783226aeaf81a70f13fe5e902c70a"
-  integrity sha512-JzcysRDfx2dvvcZ4uwgn+6gFDYlbH9j2Uyz6fWOSinAA0kcleOu/Gb77XbCI5M3Xvh1hxHVyz0Zxv/Pi0Y1O1g==
+"@angular/common@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0.tgz#700aeda9be8af96692fce0ea6bf6157f7c874c0e"
+  integrity sha512-iOAJZ0+1zTRHnHE/5G30+4Q66W1pfZkSkxZIXvgijZ+wtuNloYdWNy/IdZ/m7ayBI7A6FsYEhyMUoWz2HVEJNw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
-  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
+"@angular/compiler-cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0.tgz#b53ebb5accc34a68bf7a63d16130ca7c568f8a51"
+  integrity sha512-Z0U0Ih8A7V3J1gq7AXnXbrGAD2ERmz7JbREJJRHDWiUNxIqGQiV3Odo1V8FL5n/cKvLwSYM2Ubvk10gb0+3njA==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -183,75 +180,75 @@
     shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
-    yargs "9.0.1"
+    yargs "13.1.0"
 
-"@angular/compiler@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.12.tgz#0cbaa60f7276d4ad0685adb235101c75e37630b1"
-  integrity sha512-B1N+/ECqIQz7PD2Zjb/21OOCmrXkl8DSXCBGNMXOSng+uYJM4dFPWkYkaAeHj8gcLDHvIPWlsapJ6JqyB3RPxA==
+"@angular/compiler@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0.tgz#302c987737e1473db3a113ff70fbbb315aa41b58"
+  integrity sha512-4rKsVFMNykF83tPL1VE1+j9kZ3cWHUsLOAB/VqmF64EcR/GsbjKog2v23rSso5kqUtPiVq/FWGYllW6qMdxtJA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.12.tgz#506b4e9280cdf03a0028d1fc143c4109fc8d4ef0"
-  integrity sha512-E5BtJPL4Fz1xyGTsoE4LELoZ33x0S0lJ0iUKqLRFeKKYM/fJ8l8mVNSZ7LnURTwpcjCiHcCRMcaCfuXWj7Kqhw==
+"@angular/core@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0.tgz#bf7a582b818e9181d830219907470e2b865ba32f"
+  integrity sha512-mrkP1PTzqCmZGLYll+TDyawLXHzi+FcRPqSuRxCmDMthUUE93SLXT2yISDkx9aMPtFKgFr6KfrIkKuCz16BP/g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.12.tgz#0ffbbdb2b6fd19bf61cf09e1911d2cbc82b88399"
-  integrity sha512-gQU8663C9LOyuza87XDkEQ2HXbaLt3LY8X45swUNfe+BvpKNhF5ZwwY22d93wuzvm/vFrCTPK7949ImfUW0XnA==
+"@angular/forms@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0.tgz#6d636c4f83004290e1a5732a05e87148aaf6ed64"
+  integrity sha512-T6XdG3mALWzvnrN3fA1hAmfwvraiF1SPMWNXgPk2riuMf8CFdoro+tQZ4eo1islHrTTw5QzmqN8JJALfhAG6bg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^7.2.9":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
-  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
+"@angular/language-service@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0.tgz#1ee4ce5003897cad53597da28f4c94fe30519bfb"
+  integrity sha512-vGk14oWroEo6ycO4cooznx57nn2sASmCQ/sdE8UVwySUKl940TsVzijgaGqapTepFof9sMqN77y2G15eRKQeAQ==
 
-"@angular/material@^7.3.3":
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.3.7.tgz#dcd95e6618ba6254c5880efee1aad349cf5b9140"
-  integrity sha512-Eq+7frkeNGkLOfEtmkmJgR+AgoWajOipXZWWfCSamNfpCcPof82DwvGOpAmgGni9FuN2XFQdqP5MoaffQzIvUA==
+"@angular/material@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.0.0.tgz#21dd15c318d1e29eb4d1a2dd888ddb027897eb49"
+  integrity sha512-c7O7GhZd46xF2WB6T/YPam5lJkTgQLdIS53IqwZIFhL427+SEfPvejVzRnVfZCI3NdrKiWt/5VsvtQZwWzlGvw==
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.12.tgz#be125de4c305d9fbbb4c65764879f7cc27177193"
-  integrity sha512-maKmjCTaS+jrXnor9qVJZfkWAKrt6neIlYrjvcr9v2YUqv9vdMcd5WRaODvIXBqwh65gpMxk3hbZ48Yjh8EbBQ==
+"@angular/platform-browser-dynamic@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0.tgz#c15f394579ff44f3752033de58edc1afa5065d59"
+  integrity sha512-dx7W7JoSFbsveexjZ/BPlsXbMDLWVLmRCo7IqLvibMrTbdpaaOCNJIXJk1X+f7JJrQ7SwlZaVkoLCMoDWw6fmA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.12.tgz#35f48efc5439e932cbbde24765c68acb7ea43afd"
-  integrity sha512-rhKxUtWM6LfM0cK0kVzQpdnzfGeL3KImk6kNn+RrZiXLk2N/pnwbrzfd6VUtm+zdg54S4BO8ui1NahwIC/PSKw==
+"@angular/platform-browser@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0.tgz#fc7c55a0483e67e5606e499c129fda60ae8d4363"
+  integrity sha512-fTD+pTMbq+On9Uv3VXiei2lfuX7GX31dngm/Y4yWTFeW6eXy0+7kkfflzpLOb0hykCZvcXzarqCuEBBYNLrrOg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.12.tgz#8c5bf58476958629ff14dce7d25ae60389ba1dc3"
-  integrity sha512-e3kBeiq9CHqTrxjO65XZm0kIG7HUq8zI0vrsSxgznCmH+vJCL+qQOblHrlkdDESU76FbZgYzDIsYBoz31/OpaA==
+"@angular/platform-server@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0.tgz#87e80acba6b09955046dc0a9da7cd6b2e005061a"
+  integrity sha512-pA6m1okOfyy2qH5A6jUxrhx6z7eAG+ne7IM+j/6JUBDjp4KO9BC84aa/xfpZq5dsskl8E8II9c4hUKocMyeRjA==
   dependencies:
-    domino "^2.1.0"
+    domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.12.tgz#73d168534db8a749efcda1507bbf75721d018a3e"
-  integrity sha512-n7EFKuOa6YDDvGZT/t7mXfQMuomkTVPJcWkpfPrViAKi4mcUnaU5IqYiBnv/WJfDDqocVD/Yf9YQD9zAajthEw==
+"@angular/router@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0.tgz#26094fd473e17441b0ae8af4883ec1b4ea3ad569"
+  integrity sha512-DGUTb8qpndE5m716xh00GxuC8o7qamlqbUruGB+SQD6ynU7s5yLGxtKffxqb1BT63+YewpsVxc2Koruvb1qjDw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.2.11":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.12.tgz#9d3ca7399a105900a4d706cf5da5954cbe5b66dc"
-  integrity sha512-0hvKy+EXPoGrLujqzXK02gfVUZ187o/aDvmBuH2Io9us93RgGew/Se1iFl2YaawhPYSsuwwbrcjoSVMznoI1GQ==
+"@angular/service-worker@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0.tgz#5cb55bc39b29e318f5d72c1223a966c088f18568"
+  integrity sha512-MrR6Xb0X0+qO+bbdGasg7+xEvH7rPhgLpDn9FF/RwMMzj4qQmeJw9uRSJe9xMR6n0gNS7+cH8RptivOanY1QjQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -346,10 +343,10 @@
     is-absolute "^1.0.0"
     is-negated-glob "^1.0.0"
 
-"@fortawesome/angular-fontawesome@~0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.3.0.tgz#380492f186469ce03d6fdbb3ec719810f771bf62"
-  integrity sha512-wXvyPI7GidoNiqeMz2re9iemUMFH4zBmuv94CfXlaanQ8+kMP/fYs/k69PLVN1KsebQY4kRA9GHmc1U1ndBkJg==
+"@fortawesome/angular-fontawesome@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.4.0.tgz#ab794362a5e37124b834564dcb55ed1c0ce0413a"
+  integrity sha512-DYVXdCzwQo6d0CxVMRK+10LpBAvYN9xigWeQW4wKYq/Czd5es46nPMKixB5rHfNViECwwlM2gTM61K4DpxlJxg==
   dependencies:
     tslib "^1.9.0"
 
@@ -408,25 +405,14 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
-  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
+"@ngtools/webpack@8.0.1", "@ngtools/webpack@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.1.tgz#892ca23277e2602447fc093380dae585782d1557"
+  integrity sha512-ly+KyzD5S8dVbwDv4pWt8+NNevPskmdXYJVxa068nE1dQV+CCK4mi6aR0GqrRR9zPvhgRoQKK8tMbN6WDCJS7g==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/core" "8.0.1"
     enhanced-resolve "4.1.0"
-    rxjs "6.3.3"
-    tree-kill "1.2.1"
-    webpack-sources "1.3.0"
-
-"@ngtools/webpack@~7.3.4":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.9.tgz#db115dba8cc0886d8d822723be4119d3849fb4e3"
-  integrity sha512-+ROpqfCXLdQwfP+UNDLk4p959ZrocpStkdd2Iy9CeOJ8yDkityqpstTwQC3oHzzu/95BiyZ0hrHbM6AsPPIvJg==
-  dependencies:
-    "@angular-devkit/core" "7.3.9"
-    enhanced-resolve "4.1.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
     tree-kill "1.2.1"
     webpack-sources "1.3.0"
 
@@ -456,27 +442,26 @@
   dependencies:
     esquery "^1.0.1"
 
-"@schematics/angular@7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
-  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
+"@schematics/angular@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
+  integrity sha512-/FyFJbHuxWfvVgTBSnEa0fiDgeLhAmfK7NeT8Owj2xDAqvVMxfSxupfdr7a9cDr82WImW09SX7PUlv2EomcGLA==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    typescript "3.2.4"
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
 
-"@schematics/update@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
-  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
+"@schematics/update@0.800.1":
+  version "0.800.1"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.1.tgz#73497d3a0a763119ec30e50823c8e87866d6e540"
+  integrity sha512-1Bnn6RJ7tzlaZRpvE6oQl7oem0zMMtNn2ygiMb2FxW97FHvW4hLIDrP31V3s5n8Ku+RBFMgr1z1P+GBZnbaubg==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
+    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/schematics" "8.0.1"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
-    pacote "9.4.0"
-    rxjs "6.3.3"
-    semver "5.6.0"
+    pacote "9.5.0"
+    rxjs "6.4.0"
+    semver "6.0.0"
     semver-intersect "1.4.0"
 
 "@sheerun/mutationobserver-shim@^0.3.2":
@@ -730,15 +715,6 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
-"@webassemblyjs/ast@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
-  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
@@ -748,43 +724,21 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
     "@webassemblyjs/wast-parser" "1.8.5"
 
-"@webassemblyjs/floating-point-hex-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
-  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
-
 "@webassemblyjs/floating-point-hex-parser@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
   integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
 
-"@webassemblyjs/helper-api-error@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
-  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
-
 "@webassemblyjs/helper-api-error@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
   integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
 
-"@webassemblyjs/helper-buffer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
-  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
-
 "@webassemblyjs/helper-buffer@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
   integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
 
-"@webassemblyjs/helper-code-frame@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
-  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.11"
-
 "@webassemblyjs/helper-code-frame@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
@@ -792,21 +746,11 @@
   dependencies:
     "@webassemblyjs/wast-printer" "1.8.5"
 
-"@webassemblyjs/helper-fsm@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
-  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
-
 "@webassemblyjs/helper-fsm@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
   integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
 
-"@webassemblyjs/helper-module-context@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
-  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
-
 "@webassemblyjs/helper-module-context@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
@@ -815,26 +759,11 @@
     "@webassemblyjs/ast" "1.8.5"
     mamacro "^0.0.3"
 
-"@webassemblyjs/helper-wasm-bytecode@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
-  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
-
 "@webassemblyjs/helper-wasm-bytecode@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
   integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
 
-"@webassemblyjs/helper-wasm-section@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
-  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-
 "@webassemblyjs/helper-wasm-section@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
@@ -845,13 +774,6 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
     "@webassemblyjs/wasm-gen" "1.8.5"
 
-"@webassemblyjs/ieee754@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
-  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
 "@webassemblyjs/ieee754@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
@@ -859,13 +781,6 @@
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
-  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
 "@webassemblyjs/leb128@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
@@ -873,30 +788,11 @@
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
-  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
-
 "@webassemblyjs/utf8@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
   integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
 
-"@webassemblyjs/wasm-edit@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
-  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/helper-wasm-section" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-opt" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    "@webassemblyjs/wast-printer" "1.7.11"
-
 "@webassemblyjs/wasm-edit@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
@@ -911,17 +807,6 @@
     "@webassemblyjs/wasm-parser" "1.8.5"
     "@webassemblyjs/wast-printer" "1.8.5"
 
-"@webassemblyjs/wasm-gen@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
-  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
 "@webassemblyjs/wasm-gen@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
@@ -933,16 +818,6 @@
     "@webassemblyjs/leb128" "1.8.5"
     "@webassemblyjs/utf8" "1.8.5"
 
-"@webassemblyjs/wasm-opt@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
-  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-
 "@webassemblyjs/wasm-opt@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
@@ -953,18 +828,6 @@
     "@webassemblyjs/wasm-gen" "1.8.5"
     "@webassemblyjs/wasm-parser" "1.8.5"
 
-"@webassemblyjs/wasm-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
-  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
 "@webassemblyjs/wasm-parser@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
@@ -977,18 +840,6 @@
     "@webassemblyjs/leb128" "1.8.5"
     "@webassemblyjs/utf8" "1.8.5"
 
-"@webassemblyjs/wast-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
-  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-code-frame" "1.7.11"
-    "@webassemblyjs/helper-fsm" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
 "@webassemblyjs/wast-parser@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
@@ -1001,15 +852,6 @@
     "@webassemblyjs/helper-fsm" "1.8.5"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
-  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
 "@webassemblyjs/wast-printer@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
@@ -1024,11 +866,6 @@
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
-
 "@xtuc/long@4.2.2":
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
@@ -1133,10 +970,10 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
   integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
 
-ajv@6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
-  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
+ajv@6.10.0, ajv@^6.1.0, ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1153,16 +990,6 @@ ajv@^5.0.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.5.5:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 amdefine@>=0.0.4, amdefine@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -1204,7 +1031,7 @@ ansi-escapes@^1.1.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
   integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
 
-ansi-escapes@^3.0.0:
+ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -1511,7 +1338,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-asap@~2.0.3:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -1583,7 +1410,7 @@ ast-types@^0.7.0:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz#902d2e0d60d071bdcd46dc115e1809ed11c138a9"
   integrity sha1-kC0uDWDQcb3NRtwRXhgJ7RHBOKk=
 
-async-each@^1.0.0, async-each@^1.0.1:
+async-each@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
   integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
@@ -1620,16 +1447,16 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.6:
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
-  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
+autoprefixer@9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
   dependencies:
-    browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000929"
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.13"
+    postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
 awesome-typescript-loader@^5.2.1:
@@ -1932,7 +1759,7 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
+braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
@@ -2052,14 +1879,23 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.4.1:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
-  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
+browserslist@4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
+  integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
   dependencies:
-    caniuse-lite "^1.0.30000955"
-    electron-to-chromium "^1.3.122"
-    node-releases "^1.1.13"
+    caniuse-lite "^1.0.30000960"
+    electron-to-chromium "^1.3.124"
+    node-releases "^1.1.14"
+
+browserslist@^4.0.0, browserslist@^4.5.4:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
+  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
+  dependencies:
+    caniuse-lite "^1.0.30000971"
+    electron-to-chromium "^1.3.137"
+    node-releases "^1.1.21"
 
 browserstack@^1.5.1:
   version "1.5.2"
@@ -2140,25 +1976,6 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
-
 cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0, cacache@^11.3.1, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
@@ -2268,10 +2085,20 @@ camelcase@^5.0.0, camelcase@^5.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955:
-  version "1.0.30000957"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
-  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
+caniuse-api@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000960, caniuse-lite@^1.0.30000971:
+  version "1.0.30000971"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
+  integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -2330,26 +2157,6 @@ cheerio@^1.0.0-rc.2:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
-    glob-parent "^3.1.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    lodash.debounce "^4.0.8"
-    normalize-path "^2.1.1"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.5"
-  optionalDependencies:
-    fsevents "^1.2.2"
-
 chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2, chokidar@^2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
@@ -2369,7 +2176,7 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1, chownr@^1.1.1:
+chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -2607,7 +2414,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.38.0 < 2"
 
-compression@^1.5.2, compression@^1.7.4:
+compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -2645,7 +2452,7 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
-connect-history-api-fallback@^1.3.0, connect-history-api-fallback@^1.6.0:
+connect-history-api-fallback@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
@@ -2884,21 +2691,7 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
-  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
-  dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    globby "^7.1.1"
-    is-glob "^4.0.0"
-    loader-utils "^1.1.0"
-    minimatch "^3.0.4"
-    p-limit "^1.0.0"
-    serialize-javascript "^1.4.0"
-
-copy-webpack-plugin@^5.0.0:
+copy-webpack-plugin@5.0.2, copy-webpack-plugin@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
   integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
@@ -2915,6 +2708,11 @@ copy-webpack-plugin@^5.0.0:
     serialize-javascript "^1.4.0"
     webpack-log "^2.0.0"
 
+core-js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+
 core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
@@ -3010,15 +2808,6 @@ cross-spawn@^3.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -3214,13 +3003,18 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -3234,13 +3028,6 @@ decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -3261,14 +3048,6 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-default-gateway@^2.6.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
-  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
-  dependencies:
-    execa "^0.10.0"
-    ip-regex "^2.1.0"
-
 default-gateway@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
@@ -3319,18 +3098,6 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
-  dependencies:
-    globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
-
 del@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/del/-/del-4.1.0.tgz#049543b8290e1a9293e2bd150ab3a06f637322b8"
@@ -3413,6 +3180,14 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 dfa@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.1.0.tgz#d30218bd10d030fa421df3ebbc82285463a31781"
@@ -3499,10 +3274,10 @@ dom-serializer@0, dom-serializer@~0.1.1:
     domelementtype "^1.3.0"
     entities "^1.1.1"
 
-dom-testing-library@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-4.1.0.tgz#273264e62e9e63f4e404f7349ddd7b9356aacd23"
-  integrity sha512-654GHd0oPC31S+ll1bJH9NUOBRzcHcrf23/XzJh41o6g67uGUpF9tn23qmbcwjNauoRqKQfAdHCDwr/Ez/Ot7A==
+dom-testing-library@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-4.1.1.tgz#615af61bee06db51bd8ecea60c113eba7cb49dda"
+  integrity sha512-PUsG7aY5BJxzulDrOtkksqudRRypcVQF6d4RGAyj9xNwallOFqrNLOyg2QW2mCpFaNVPELX8hBX/wbHQtOto/A==
   dependencies:
     "@babel/runtime" "^7.4.3"
     "@sheerun/mutationobserver-shim" "^0.3.2"
@@ -3526,7 +3301,7 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domino@^2.1.0:
+domino@^2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.3.tgz#0ca1ad02cbd316ebe2e99e0ac9fb0010407d4601"
   integrity sha512-EwjTbUv1Q/RLQOdn9k7ClHutrQcWGsfXaRQNOnM/KgK4xDBoLFEcIRFuBSxAx13Vfa63X029gXYrNFrSy+DOSg==
@@ -3627,10 +3402,10 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.122:
-  version "1.3.124"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
-  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
+electron-to-chromium@^1.3.124, electron-to-chromium@^1.3.137:
+  version "1.3.141"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.141.tgz#5858d3a74ceafe71e7824e7c809ea2cc59c8e104"
+  integrity sha512-DdQaeP8yQNYFdivOrp37UNAZMvyZP//+SWYMVJD31A/3gbI1J6olQs8tuRaHL2ij7dubhCDXhlE4F97mrT8KGQ==
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -4020,32 +3795,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -4097,7 +3846,7 @@ expose-loader@^0.7.5:
   resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.5.tgz#e29ea2d9aeeed3254a3faa1b35f502db9f9c3f6f"
   integrity sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw==
 
-express@^4.16.2, express@^4.16.3, express@^4.16.4:
+express@^4.16.3, express@^4.16.4:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -4169,7 +3918,7 @@ external-editor@^2.0.1:
     iconv-lite "^0.4.17"
     tmp "^0.0.33"
 
-external-editor@^3.0.0:
+external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
@@ -4378,15 +4127,6 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
 find-cache-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -4416,7 +4156,7 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -4604,7 +4344,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.2, fsevents@^1.2.7:
+fsevents@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
   integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
@@ -4699,11 +4439,6 @@ get-stdin@^7.0.0:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
   integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
 
-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@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -5125,7 +4860,7 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^1.2.0, html-entities@^1.2.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=
@@ -5221,17 +4956,7 @@ http-proxy-middleware@^0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy-middleware@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
-  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
-  dependencies:
-    http-proxy "^1.16.2"
-    is-glob "^4.0.0"
-    lodash "^4.17.5"
-    micromatch "^3.1.9"
-
-http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.17.0, http-proxy@^1.8.1:
+http-proxy@^1.13.0, http-proxy@^1.17.0, http-proxy@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
@@ -5499,23 +5224,23 @@ inquirer@3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
-  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
+inquirer@6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^3.0.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
 inside@^1.0.0:
@@ -5523,14 +5248,6 @@ inside@^1.0.0:
   resolved "https://registry.yarnpkg.com/inside/-/inside-1.0.0.tgz#db45e993573cdb3db70b9832e8285bad46424770"
   integrity sha1-20Xpk1c82z23C5gy6ChbrUZCR3A=
 
-internal-ip@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
-  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
-  dependencies:
-    default-gateway "^2.6.0"
-    ipaddr.js "^1.5.2"
-
 internal-ip@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -5583,7 +5300,7 @@ ipaddr.js@1.8.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
   integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
-ipaddr.js@^1.5.2, ipaddr.js@^1.9.0:
+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==
@@ -6148,10 +5865,10 @@ karma-remap-coverage@^0.1.5:
   dependencies:
     remap-istanbul "^0.10"
 
-karma-source-map-support@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
-  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
   dependencies:
     source-map-support "^0.5.5"
 
@@ -6207,7 +5924,7 @@ karma@^4.0.1:
     tmp "0.0.33"
     useragent "2.3.0"
 
-killable@^1.0.0, killable@^1.0.1:
+killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -6288,10 +6005,10 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-license-webpack-plugin@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
-  integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==
+license-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz#f0ab760f7f301c76f5af52e480f320656b5721bb"
+  integrity sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
@@ -6342,16 +6059,6 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -6417,11 +6124,6 @@ lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
-
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
@@ -6432,6 +6134,11 @@ lodash.isplainobject@^4.0.6:
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
   integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -6457,6 +6164,11 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
 lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
@@ -6480,7 +6192,7 @@ log4js@^4.0.0:
     rfdc "^1.1.2"
     streamroller "^1.0.4"
 
-loglevel@^1.4.1, loglevel@^1.6.1:
+loglevel@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
   integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
@@ -6513,7 +6225,7 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -6538,6 +6250,13 @@ macos-release@^2.2.0:
   resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
   integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
 
+magic-string@0.25.2, magic-string@^0.25.0:
+  version "0.25.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
+  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 magic-string@^0.16.0:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.16.0.tgz#970ebb0da7193301285fb1aa650f39bdd81eb45a"
@@ -6552,20 +6271,6 @@ magic-string@^0.22.3, magic-string@^0.22.4:
   dependencies:
     vlq "^0.2.2"
 
-magic-string@^0.25.0:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-make-dir@^1.0.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:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -6677,13 +6382,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 mem@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
@@ -6828,12 +6526,13 @@ mimic-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mini-css-extract-plugin@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
-  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+mini-css-extract-plugin@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "^2.0.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -6907,22 +6606,6 @@ minizlib@^1.1.1:
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -7229,14 +6912,14 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.13:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
-  integrity sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==
+node-releases@^1.1.14, node-releases@^1.1.21:
+  version "1.1.22"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.22.tgz#d90cd5adc59ab9b0f377d4f532b09656399c88bf"
+  integrity sha512-O6XpteBuntW1j86mw6LlovBIwTe+sO2+7vi9avQffNeIW4upgnaCVm6xrBWH+KATz7mNNRNNeEpuWB7dT6Cr3w==
   dependencies:
     semver "^5.3.0"
 
-node-sass@4.11.0, node-sass@^4.11.0:
+node-sass@^4.11.0:
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
   integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
@@ -7276,7 +6959,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7313,6 +6996,15 @@ normalize-url@1.9.1, normalize-url@^1.0.0:
     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"
+
 npm-bundled@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
@@ -7518,10 +7210,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
-  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+open@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
+  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7560,7 +7252,7 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@^5.1.0, opn@^5.5.0:
+opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
   integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
@@ -7644,15 +7336,6 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
 os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -7714,7 +7397,7 @@ p-is-promise@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.0.0, p-limit@^1.1.0:
+p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
@@ -7742,11 +7425,6 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
-
 p-map@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
@@ -7767,10 +7445,10 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
-  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
+pacote@9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
+  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"
@@ -7972,13 +7650,6 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -8061,13 +7732,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -8105,7 +7769,7 @@ png-js@>=0.1.0:
   resolved "https://registry.yarnpkg.com/png-js/-/png-js-0.1.1.tgz#1cc7c212303acabe74263ec3ac78009580242d93"
   integrity sha1-HMfCEjA6yr50Jj7DrHgAlYAkLZM=
 
-portfinder@^1.0.13, portfinder@^1.0.20, portfinder@^1.0.9:
+portfinder@^1.0.13, portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
   integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
@@ -8193,7 +7857,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.5, postcss@^7.0.6:
+postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -8220,6 +7884,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@^1.16.4:
   version "1.16.4"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
@@ -8356,7 +8025,7 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -8442,6 +8111,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"
@@ -8531,6 +8209,29 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+read-package-json@^2.0.0:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
+  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -8539,14 +8240,6 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -8564,15 +8257,6 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.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=
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -8626,7 +8310,17 @@ readable-stream@~2.0.0:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readdirp@^2.0.0, readdirp@^2.2.1:
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
+readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
   integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
@@ -8949,21 +8643,7 @@ rxjs-tslint@0.1.5:
     tslint "^5.9.1"
     tsutils "^2.25.0"
 
-rxjs@6.3.3:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.1.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
-  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.4.0:
+rxjs@6.4.0, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
@@ -9031,6 +8711,13 @@ sass-loader@7.1.0, sass-loader@^7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
+sass@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.19.0.tgz#5de82c713d4299fac57384ef5219534a37fe3e6c"
+  integrity sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==
+  dependencies:
+    chokidar "^2.0.0"
+
 sass@^1.17.2:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.18.0.tgz#f34371c31e268e555c2ac8e43d2b64d194e7d090"
@@ -9062,7 +8749,7 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.4, schema-utils@^0.4.5:
+schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
   integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
@@ -9109,7 +8796,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.10.4, selfsigned@^1.9.1:
+selfsigned@^1.10.4:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
@@ -9140,11 +8827,6 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-semver@5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
 semver@6.0.0, semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
@@ -9179,7 +8861,7 @@ serialize-javascript@^1.4.0:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
   integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
 
-serve-index@^1.7.2, serve-index@^1.9.1:
+serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -9468,6 +9150,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"
@@ -9497,10 +9186,10 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
+source-map-support@0.5.12, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -9512,14 +9201,6 @@ source-map-support@^0.4.0, source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
-  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@0.4.0, source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -9685,13 +9366,6 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -10023,7 +9697,7 @@ supports-color@^3.1.0:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.5.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -10069,21 +9743,7 @@ tar@^4, tar@^4.4.8:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-terser-webpack-plugin@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
-  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
-  dependencies:
-    cacache "^11.0.2"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    terser "^3.16.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-terser-webpack-plugin@^1.1.0:
+terser-webpack-plugin@1.2.3, terser-webpack-plugin@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
   integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
@@ -10485,21 +10145,26 @@ typescript@2.9.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
   integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
-typescript@3.2.4, typescript@3.2.x:
+typescript@3.2.x:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
   integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
 
+typescript@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.4.tgz#aac4a08abecab8091a75f10842ffa0631818f785"
+  integrity sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==
+
+typescript@3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
+
 typescript@^2.4.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
   integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
-typescript@~3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
-  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
-
 uglify-js@3.4.x:
   version "3.4.10"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
@@ -10578,7 +10243,7 @@ uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
   integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
-unique-filename@^1.1.0, unique-filename@^1.1.1:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -10592,6 +10257,15 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
+universal-analytics@^0.4.20:
+  version "0.4.20"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
+  integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
+  dependencies:
+    debug "^3.0.0"
+    request "^2.88.0"
+    uuid "^3.0.0"
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -10615,7 +10289,7 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.0.5, upath@^1.1.1:
+upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
@@ -10885,22 +10559,12 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-middleware@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
-  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
+webpack-dev-middleware@3.6.2, webpack-dev-middleware@^3.6.0, webpack-dev-middleware@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
+  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
   dependencies:
-    memory-fs "~0.4.1"
+    memory-fs "^0.4.1"
     mime "^2.3.1"
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
@@ -10918,53 +10582,7 @@ webpack-dev-middleware@^2.0.6:
     url-join "^2.0.2"
     webpack-log "^1.0.1"
 
-webpack-dev-middleware@^3.6.0, webpack-dev-middleware@^3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
-  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@3.1.14:
-  version "3.1.14"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
-  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
-  dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "~0.18.0"
-    import-local "^2.0.0"
-    internal-ip "^3.0.1"
-    ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
-    schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
-    sockjs "0.3.19"
-    sockjs-client "1.3.0"
-    spdy "^4.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "3.4.0"
-    webpack-log "^2.0.0"
-    yargs "12.0.2"
-
-webpack-dev-server@^3.2.1:
+webpack-dev-server@3.3.1, webpack-dev-server@^3.2.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
   integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
@@ -11055,15 +10673,15 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.29.0:
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
-  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
+webpack@4.30.0:
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
+  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
@@ -11079,7 +10697,7 @@ webpack@4.29.0:
     mkdirp "~0.5.0"
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
+    schema-utils "^1.0.0"
     tapable "^1.1.0"
     terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
@@ -11186,6 +10804,13 @@ worker-farm@^1.5.2:
   dependencies:
     errno "~0.1.7"
 
+worker-plugin@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.1.0.tgz#6311778f3514a87c273510ee3f809cc3fe161e6f"
+  integrity sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==
+  dependencies:
+    loader-utils "^1.1.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -11254,11 +10879,6 @@ xmlhttprequest-ssl@~1.5.4:
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
   integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
 xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -11284,13 +10904,6 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
-  dependencies:
-    camelcase "^4.1.0"
-
 yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
@@ -11330,31 +10943,6 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
-  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^2.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
 yargs@12.0.5, yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -11373,10 +10961,10 @@ yargs@12.0.5, yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@13.2.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
-  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
   dependencies:
     cliui "^4.0.0"
     find-up "^3.0.0"
@@ -11390,24 +10978,22 @@ yargs@13.2.2:
     y18n "^4.0.0"
     yargs-parser "^13.0.0"
 
-yargs@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
+yargs@13.2.2:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
+  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
   dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
 
 yargs@^13.2.4:
   version "13.2.4"

From c5fe4a2475b3f530b3b757b02e20566266de1042 Mon Sep 17 00:00:00 2001
From: Hodzic Adem <athos.blade@gmail.com>
Date: Fri, 31 May 2019 14:16:56 +0200
Subject: [PATCH 348/382] fix(ever-admin): bug where error shows up in console
 if user cancel ban

feat(ever-admin): added show only banned filter to users dashboard

feat(ever-admin): now fake data has 25% to generate a abnned user

feat(ever-admin): added loading indicator and notification on banning

feat(ever-admin): added banned badge next to banned users name

feat(ever-admin): finishing touches on ban feature
---
 .../app/@core/data/fakeDataServices/users.ts  |  3 +-
 .../name-redirect.component.html              |  7 +++-
 .../pages/+customers/customers.component.html |  9 +++++
 .../pages/+customers/customers.component.ts   | 38 ++++++++++++++++---
 4 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/admin/website-angular/src/app/@core/data/fakeDataServices/users.ts b/admin/website-angular/src/app/@core/data/fakeDataServices/users.ts
index 9f46392ac..9ac956b30 100644
--- a/admin/website-angular/src/app/@core/data/fakeDataServices/users.ts
+++ b/admin/website-angular/src/app/@core/data/fakeDataServices/users.ts
@@ -30,7 +30,8 @@ export default class FakeDataUsers {
 							environment.DEFAULT_LATITUDE
 						]
 					}
-				}
+				},
+				isBanned: Math.random() < 0.25
 			},
 			password: '123456'
 		};
diff --git a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
index f19e23849..03f77bf4a 100644
--- a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
@@ -1,5 +1,10 @@
 <div (click)="redirect()" class="{{ redirectPage ? 'redirectBtn' : '' }}">
 	<h6 class="warehouse-name-smt">
-		<strong>{{ rowData.name }}</strong>
+		<strong
+			>{{ rowData.name
+			}}<span *ngIf="rowData.isBanned" class="badge badge-danger"
+				>Banned</span
+			></strong
+		>
 	</h6>
 </div>
diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.html b/admin/website-angular/src/app/pages/+customers/customers.component.html
index 17273ab6c..aa3fcaba9 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.component.html
+++ b/admin/website-angular/src/app/pages/+customers/customers.component.html
@@ -36,6 +36,7 @@
 		<button
 			class="btn btn-danger mr-2 d-inline-block"
 			[disabled]="!isOnlyOneCustomerSelected"
+			[nbSpinner]="showBanLoading"
 			(click)="banSelectedRows()"
 		>
 			<i class="ion-md-close-circle button-icon"></i>
@@ -48,6 +49,14 @@
 				'CUSTOMERS_VIEW.BAN' | translate
 			}}</small>
 		</button>
+		<input
+			type="checkbox"
+			name="bannedOnly"
+			id="showBannedOnly"
+			[(ngModel)]="showOnlyBanned"
+			[ngModelOptions]="{ standalone: true }"
+		/>
+		<label for="bannedOnly">Show Banned Only</label>
 	</nb-card-header>
 
 	<nb-card-body [nbSpinner]="loading">
diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.ts b/admin/website-angular/src/app/pages/+customers/customers.component.ts
index ea167b8c2..cb9e20fb9 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/customers.component.ts
@@ -48,6 +48,7 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 
 	static noInfoSign = '';
 	public loading: boolean;
+	public showBanLoading = false;
 
 	protected customers: User[] = [];
 	protected orders: Order[] = [];
@@ -59,6 +60,8 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 	private dataCount: number;
 	private $users;
 
+	public _showOnlyBanned: boolean;
+
 	constructor(
 		private readonly _router: Router,
 		private readonly _ordersService: OrdersService,
@@ -140,8 +143,14 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 		});
 		modal.componentInstance.user = this._selectedCustomers[0];
 		modal.result
-			.then((id) => this._usersService.unbanUser(id))
-			.catch(console.error);
+			.then(async (id) => {
+				this.showBanLoading = true;
+				await this._usersService.unbanUser(id);
+				this._loadDataSmartTable();
+				this.showBanLoading = false;
+				this._notifyService.success('User is unbanned.');
+			})
+			.catch((_) => {});
 	}
 
 	private showBanPopup() {
@@ -153,8 +162,14 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 		});
 		modal.componentInstance.user = this._selectedCustomers[0];
 		modal.result
-			.then((id) => this._usersService.banUser(id))
-			.catch(console.error);
+			.then(async (id) => {
+				this.showBanLoading = true;
+				await this._usersService.banUser(id);
+				this._loadDataSmartTable();
+				this.showBanLoading = false;
+				this._notifyService.success('User is banned');
+			})
+			.catch((_) => {});
 	}
 
 	private _loadSettingsSmartTable() {
@@ -252,7 +267,7 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 				users.map((u) => u.id)
 			);
 
-			const usersVM = users.map((user) => {
+			let usersVM = users.map((user) => {
 				const userOrders = usersOrders.find(
 					(res) => res['id'] === user.id
 				);
@@ -285,6 +300,10 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 
 			await this.loadDataCount();
 
+			if (this.showOnlyBanned) {
+				usersVM = usersVM.filter((user) => user.isBanned);
+			}
+
 			const usersData = new Array(this.dataCount);
 
 			usersData.splice(perPage * (page - 1), perPage, ...usersVM);
@@ -346,6 +365,15 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 		);
 	}
 
+	public set showOnlyBanned(v: boolean) {
+		this._showOnlyBanned = v;
+		this._loadDataSmartTable();
+	}
+
+	public get showOnlyBanned(): boolean {
+		return this._showOnlyBanned;
+	}
+
 	ngOnDestroy() {
 		this.ngDestroy$.next();
 		this.ngDestroy$.complete();

From fb91a44d2abc7ca3788acb32f0df9601b1ee7462 Mon Sep 17 00:00:00 2001
From: Hodzic Adem <athos.blade@gmail.com>
Date: Sun, 2 Jun 2019 23:02:49 +0200
Subject: [PATCH 349/382] feat(ever-admin): adjusted percent banned users in
 fake data service

---
 .../src/app/@core/data/fakeDataServices/users.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/src/app/@core/data/fakeDataServices/users.ts b/admin/website-angular/src/app/@core/data/fakeDataServices/users.ts
index 9ac956b30..0c8fb86a5 100644
--- a/admin/website-angular/src/app/@core/data/fakeDataServices/users.ts
+++ b/admin/website-angular/src/app/@core/data/fakeDataServices/users.ts
@@ -31,7 +31,7 @@ export default class FakeDataUsers {
 						]
 					}
 				},
-				isBanned: Math.random() < 0.25
+				isBanned: Math.random() < 0.01
 			},
 			password: '123456'
 		};

From 2670bdbdeea48ab1ab745e8f0dd56d25dd9b402f Mon Sep 17 00:00:00 2001
From: Hodzic Adem <athos.blade@gmail.com>
Date: Tue, 4 Jun 2019 16:37:45 +0200
Subject: [PATCH 350/382] feat(ever-admin): improved ban feature

---
 .../name-redirect/name-redirect.component.html       |  2 +-
 .../user/ban-confirm/ban-confirm.component.html      |  2 +-
 .../app/pages/+customers/customers.component.html    |  2 +-
 .../src/app/pages/+customers/customers.component.ts  | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
index 03f77bf4a..c2a32344a 100644
--- a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
@@ -3,7 +3,7 @@ <h6 class="warehouse-name-smt">
 		<strong
 			>{{ rowData.name
 			}}<span *ngIf="rowData.isBanned" class="badge badge-danger"
-				>Banned</span
+				>ban</span
 			></strong
 		>
 	</h6>
diff --git a/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html
index 2fed58c1c..d01f8f872 100644
--- a/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html
+++ b/admin/website-angular/src/app/@shared/user/ban-confirm/ban-confirm.component.html
@@ -30,7 +30,7 @@ <h4 class="modal-title" id="modal-title">Profile Ban</h4>
 		type="button"
 		ngbAutofocus
 		class="btn btn-danger"
-		(click)="modal.close(user.id)"
+		(click)="modal.close(user)"
 	>
 		Ok
 	</button>
diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.html b/admin/website-angular/src/app/pages/+customers/customers.component.html
index aa3fcaba9..cbb7862d5 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.component.html
+++ b/admin/website-angular/src/app/pages/+customers/customers.component.html
@@ -35,7 +35,7 @@
 
 		<button
 			class="btn btn-danger mr-2 d-inline-block"
-			[disabled]="!isOnlyOneCustomerSelected"
+			[disabled]="!isOnlyOneCustomerSelected || showBanLoading"
 			[nbSpinner]="showBanLoading"
 			(click)="banSelectedRows()"
 		>
diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.ts b/admin/website-angular/src/app/pages/+customers/customers.component.ts
index cb9e20fb9..266640d68 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/customers.component.ts
@@ -143,12 +143,12 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 		});
 		modal.componentInstance.user = this._selectedCustomers[0];
 		modal.result
-			.then(async (id) => {
+			.then(async (user) => {
 				this.showBanLoading = true;
-				await this._usersService.unbanUser(id);
+				await this._usersService.unbanUser(user.id);
 				this._loadDataSmartTable();
 				this.showBanLoading = false;
-				this._notifyService.success('User is unbanned.');
+				this._notifyService.success(`${user.name} is unbanned!`);
 			})
 			.catch((_) => {});
 	}
@@ -162,12 +162,12 @@ export class CustomersComponent implements AfterViewInit, OnDestroy {
 		});
 		modal.componentInstance.user = this._selectedCustomers[0];
 		modal.result
-			.then(async (id) => {
+			.then(async (user) => {
 				this.showBanLoading = true;
-				await this._usersService.banUser(id);
+				await this._usersService.banUser(user.id);
 				this._loadDataSmartTable();
 				this.showBanLoading = false;
-				this._notifyService.success('User is banned');
+				this._notifyService.success(`${user.name} is banned!`);
 			})
 			.catch((_) => {});
 	}

From ed3d2603adfb1ae9fb6f95825e4bf8471bee2eb8 Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Wed, 5 Jun 2019 14:58:41 +0300
Subject: [PATCH 351/382] feat(ever-shop-web): order card style  changes, added
 map component

---
 .../location/carrier-location.component.ts    | 286 ++++++++++++++++++
 .../app/+orders/order/order.component.html    |  42 +--
 .../app/+orders/order/order.component.scss    |  33 +-
 .../src/app/+orders/order/order.component.ts  |   5 +
 4 files changed, 339 insertions(+), 27 deletions(-)
 create mode 100644 shop/website-angular/src/app/+orders/location/carrier-location.component.ts

diff --git a/shop/website-angular/src/app/+orders/location/carrier-location.component.ts b/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
new file mode 100644
index 000000000..4d1518e23
--- /dev/null
+++ b/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
@@ -0,0 +1,286 @@
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Subject } from 'rxjs';
+import 'style-loader!leaflet/dist/leaflet.css';
+import { ActivatedRoute } from '@angular/router';
+import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-router.service';
+import { first } from 'rxjs/operators';
+import { CarrierOrdersRouter } from '@modules/client.common.angular2/routers/carrier-orders-router.service';
+import { ICarrierOrdersRouterGetOptions } from '@modules/server.common/routers/ICarrierOrdersRouter';
+import { environment } from 'environments/environment';
+import { CarriersService } from 'app/@core/data/carriers.service';
+import GeoLocation from '@modules/server.common/entities/GeoLocation';
+
+declare var google: any;
+const directionsDisplay = new google.maps.DirectionsRenderer();
+const directionsService = new google.maps.DirectionsService();
+
+@Component({
+	selector: 'ea-carrier-location',
+	styleUrls: ['./carrier-location.component.scss'],
+	templateUrl: './carrier-location.component.html'
+})
+export class CarrierLocationComponent implements OnDestroy, OnInit {
+	private ngDestroy$ = new Subject();
+
+	@ViewChild('gmap')
+	gmapElement: any;
+	map: google.maps.Map;
+	carrierSub$: any;
+	marker: any;
+	userMarker: any;
+	warehouseMarker: any;
+	interval: NodeJS.Timer;
+	isReverted: boolean = true;
+	params$: any;
+	carrierId: string;
+
+	constructor(
+		private route: ActivatedRoute,
+		private carrierRouter: CarrierRouter,
+		private carriersService: CarriersService
+	) {}
+
+	ngOnInit(): void {
+		this.showMap();
+		this._subscribeCarrier();
+	}
+
+	async _subscribeCarrier() {
+		this.params$ = this.route.params.subscribe((res) => {
+			const carrierId = res.id || this.carrierId;
+
+			this.carrierSub$ = this.carrierRouter
+				.get(carrierId)
+				.subscribe(async (carrier) => {
+					if (this.interval) {
+						clearInterval(this.interval);
+					}
+					const newCoordinates = new google.maps.LatLng(
+						carrier.geoLocation.coordinates.lat,
+						carrier.geoLocation.coordinates.lng
+					);
+					if (this.marker) {
+						this.marker.setMap(null);
+					}
+					let isWorking = false;
+
+					this.interval = setInterval(async () => {
+						const order = await this.carriersService.getCarrierCurrentOrder(
+							carrierId
+						);
+
+						if (order) {
+							if (!isWorking) {
+								const user = order.user;
+								const warehouse = order.warehouse;
+								const warehouseIcon =
+									'http://maps.google.com/mapfiles/kml/pal3/icon21.png';
+								const userIcon =
+									'http://maps.google.com/mapfiles/kml/pal3/icon48.png';
+								user.geoLocation = new GeoLocation(
+									user.geoLocation
+								);
+								this.userMarker = this.addMarker(
+									new google.maps.LatLng(
+										user.geoLocation.coordinates.lat,
+										user.geoLocation.coordinates.lng
+									),
+									this.map,
+									userIcon
+								);
+								warehouse.geoLocation = new GeoLocation(
+									warehouse.geoLocation
+								);
+								this.warehouseMarker = this.addMarker(
+									new google.maps.LatLng(
+										warehouse[
+											'geoLocation'
+										].coordinates.lat,
+										warehouse['geoLocation'].coordinates.lng
+									),
+									this.map,
+									warehouseIcon
+								);
+								const start = new google.maps.LatLng(
+									user.geoLocation.coordinates.lat,
+									user.geoLocation.coordinates.lng
+								);
+								const end = new google.maps.LatLng(
+									warehouse['geoLocation'].coordinates.lat,
+									warehouse['geoLocation'].coordinates.lng
+								);
+								const request = {
+									origin: start,
+									destination: end,
+									travelMode: 'DRIVING'
+								};
+
+								directionsService.route(request, function(
+									res,
+									stat
+								) {
+									if (stat === 'OK') {
+										directionsDisplay.setDirections(res);
+									}
+								});
+								directionsDisplay.setOptions({
+									suppressMarkers: true
+								});
+								directionsDisplay.setMap(this.map);
+
+								const bounds = new google.maps.LatLngBounds();
+								bounds.extend(this.marker.getPosition());
+								bounds.extend(
+									this.warehouseMarker.getPosition()
+								);
+								bounds.extend(this.userMarker.getPosition());
+								this.map.fitBounds(bounds);
+
+								isWorking = true;
+								this.isReverted = false;
+
+								const userInfoContent = `
+									<h3>  ${order.user.firstName + ' ' + order.user.lastName}</h3>
+									<ul>
+										<li><i style='margin-right:5px;' class="ion-md-mail"></i>${
+											order.user.email
+										}</li>
+										<li><i style='margin-right:5px;' class="ion-md-call"></i>${
+											order.user.phone
+										}</li>
+										<li><i style='margin-right:5px;' class="ion-md-locate"></i>${
+											order.user.geoLocation.streetAddress
+										}</li>
+									</ul>
+									`;
+
+								const userInfoWindow = new google.maps.InfoWindow(
+									{
+										content: userInfoContent
+									}
+								);
+
+								this.userMarker.addListener('click', () => {
+									userInfoWindow.open(
+										this.map,
+										this.userMarker
+									);
+								});
+								const warehouseInfoContent = `
+									<h3>  ${order.warehouse.name}</h3>
+									<ul>
+										<li>
+											<i style='margin-right:5px;' class="ion-md-mail"></i>
+											${order.warehouse.contactEmail}
+										</li>
+										<li>
+											<i style='margin-right:5px;' class="ion-md-phone"></i><i class="ion-md-call"></i>
+											${order.warehouse.contactPhone}
+										</li>
+										<li>
+											<i style='margin-right:5px;' class="ion-md-locate"></i>
+											${order.warehouse.geoLocation.streetAddress}
+										</li>
+									</ul>
+									`;
+
+								const warehouseInfoWindow = new google.maps.InfoWindow(
+									{
+										content: warehouseInfoContent
+									}
+								);
+
+								this.warehouseMarker.addListener(
+									'click',
+									() => {
+										warehouseInfoWindow.open(
+											this.map,
+											this.warehouseMarker
+										);
+									}
+								);
+							}
+						} else {
+							if (isWorking) {
+								this.revertMap();
+								isWorking = false;
+							}
+
+							if (!this.isReverted) {
+								this.revertMap();
+							}
+						}
+					}, 1500);
+
+					this.map.setCenter(newCoordinates);
+					const carierIcon =
+						'http://maps.google.com/mapfiles/kml/pal4/icon54.png';
+
+					this.marker = this.addMarker(
+						newCoordinates,
+						this.map,
+						carierIcon
+					);
+					const carrierInfoContent = `
+					<h3>  ${carrier.fullName}</h3>
+					<ul>
+						<li>${carrier.username}</li>
+						<li><i style='margin-right:5px;' class="ion-md-call"></i>${carrier.phone}</li>
+						<li><i style='margin-right:5px;' class="ion-md-locate"></i>${
+							carrier.geoLocation.streetAddress
+						}</li>
+					</ul>
+					`;
+
+					const carrierInfoWindow = new google.maps.InfoWindow({
+						content: carrierInfoContent
+					});
+
+					this.marker.addListener('click', () => {
+						carrierInfoWindow.open(this.map, this.marker);
+					});
+				});
+		});
+	}
+
+	revertMap() {
+		this.map.setZoom(15);
+		this.warehouseMarker.setMap(null);
+		this.userMarker.setMap(null);
+		this.isReverted = true;
+	}
+
+	showMap() {
+		const mapProp = {
+			center: new google.maps.LatLng(42.642941, 23.334149),
+			zoom: 15,
+			mapTypeId: google.maps.MapTypeId.ROADMAP
+		};
+		this.map = new google.maps.Map(this.gmapElement.nativeElement, mapProp);
+	}
+
+	addMarker(position, map, icon) {
+		return new google.maps.Marker({
+			position,
+			map,
+			icon
+		});
+	}
+
+	ngOnDestroy() {
+		this.ngDestroy$.next();
+		this.ngDestroy$.complete();
+
+		if (this.interval) {
+			clearInterval(this.interval);
+		}
+
+		if (this.carrierSub$) {
+			this.carrierSub$.unsubscribe();
+		}
+
+		if (this.params$) {
+			this.params$.unsubscribe();
+		}
+	}
+}
diff --git a/shop/website-angular/src/app/+orders/order/order.component.html b/shop/website-angular/src/app/+orders/order/order.component.html
index affe8b8c8..2754e2878 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.html
+++ b/shop/website-angular/src/app/+orders/order/order.component.html
@@ -28,19 +28,6 @@
 		</div>
 	</div>
 	<div class="order-details">
-		<div class="side-container">
-			<div class="warehouse-info" *ngIf="warehouse">
-				<h3>{{ warehouse.name }}</h3>
-				<span>{{ warehouse.contactPhone }}</span>
-				<span>{{ warehouse.geoLocation.streetAddress }}</span>
-			</div>
-			<div class="warehouse-info" *ngIf="carrier">
-				<h3>{{ carrier.username }}</h3>
-				<span>{{ carrier.phone }}</span>
-				<span>{{ carrier.geoLocation.streetAddress }}</span>
-			</div>
-		</div>
-
 		<div class="order-info">
 			<div class="product-info">
 				<h1 class="product-name">
@@ -62,22 +49,37 @@ <h2 class="product-description">{{ description }}</h2>
 					</svg>
 					{{ 'ORDER_VIEW.CANCEL' | translate }}
 				</button>
-				<button mat-raised-button color="accent">
-					Pay
+				<button mat-raised-button color="accent" class="pay-button">
+					<svg class="payment-button-icon" viewBox="0 0 24 24">
+						<path
+							d="M20,8H4V6H20M20,18H4V12H20M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z"
+						/></svg
+					>Pay
 				</button>
 			</div>
 		</div>
+		<div class="side-container">
+			<div class="warehouse-info" *ngIf="warehouse">
+				<h5>{{ warehouse.name }}</h5>
+				<span>{{ warehouse.contactPhone }}</span>
+				<span>{{ warehouse.geoLocation.streetAddress }}</span>
+			</div>
+			<div class="warehouse-info" *ngIf="carrier">
+				<h5>{{ carrier.username }}</h5>
+				<span>{{ carrier.phone }}</span>
+				<span>{{ carrier.geoLocation.streetAddress }}</span>
+			</div>
+		</div>
 	</div>
-
 	<div class="order-images">
 		<img
-			*ngIf="order.products.length"
-			class="order-picture h-100"
-			src="{{ img }}"
+			*ngFor="let image of imgArray"
+			class="order-picture"
+			[src]="image"
 		/>
 		<span
 			*ngIf="!order.products.length"
-			class="no-product-img order-picture h-100"
+			class="no-product-img order-picture"
 		></span>
 	</div>
 </mat-card>
diff --git a/shop/website-angular/src/app/+orders/order/order.component.scss b/shop/website-angular/src/app/+orders/order/order.component.scss
index 4ebfcd97d..244e634eb 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.scss
+++ b/shop/website-angular/src/app/+orders/order/order.component.scss
@@ -5,7 +5,7 @@
 	display: flex;
 	justify-content: space-between;
 	flex-direction: column;
-	height: 440px;
+	height: fit-content;
 	box-sizing: border-box;
 
 	.no-product-img {
@@ -15,9 +15,9 @@
 
 .order-header {
 	background: #2a2c39;
-	height: 85px;
-	max-height: 85px;
 	width: 100%;
+	padding-right: 20px;
+	height: 60px;
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
@@ -60,8 +60,10 @@
 
 .order-details {
 	display: flex;
+	justify-content: space-between;
+	//border: 1px solid black;
+	height: fit-content;
 	width: 100%;
-	height: 70%;
 
 	.side-container {
 		width: 25%;
@@ -70,9 +72,11 @@
 	}
 
 	.order-info {
-		height: 100%;
+		height: fit-content;
 		display: flex;
 		flex-direction: column;
+		padding-left: 20px;
+		padding-right: 20px;
 	}
 }
 
@@ -80,8 +84,9 @@
 	display: flex;
 
 	button {
-		margin-left: 20px;
+		margin-right: 20px;
 	}
+	margin-bottom: 20px;
 }
 
 .product-name {
@@ -112,6 +117,9 @@
 	display: flex;
 	flex-direction: column;
 	font-size: 0.8em;
+	padding-right: 20px;
+	padding-top: 10px;
+	text-align: right;
 
 	span:first-child {
 		font-size: 1em;
@@ -127,7 +135,18 @@
 	height: 19px;
 }
 
+.pay-button svg {
+	position: relative;
+	top: -2px;
+	fill: #fff;
+	width: 19px;
+	height: 19px;
+}
+
+.order-images {
+	display: flex;
+}
 .order-picture {
-	width: 140px;
+	height: 110px;
 	user-select: none;
 }
diff --git a/shop/website-angular/src/app/+orders/order/order.component.ts b/shop/website-angular/src/app/+orders/order/order.component.ts
index 482101bf5..664b078f7 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.ts
+++ b/shop/website-angular/src/app/+orders/order/order.component.ts
@@ -38,6 +38,7 @@ export class OrderComponent implements OnInit {
 	public price: number;
 	public description: string;
 	public img: string;
+	public imgArray: string[];
 	public orderStatusText: string;
 	public orderNumber: number;
 	public orderType: number;
@@ -111,6 +112,10 @@ export class OrderComponent implements OnInit {
 			this.img = this.localeTranslate(
 				this.order.products[0].product.images
 			);
+			console.log(this.img);
+			this.imgArray = this.order.products[0].product.images.map(
+				(obj) => obj.url
+			);
 		}
 		this.orderStatusText = this.order.warehouseStatusText;
 		this.orderStatusTextTranslates =

From a2d4688b07c8c1a55abbd0f129478fe87434b5ad Mon Sep 17 00:00:00 2001
From: Hodzic Adem <athos.blade@gmail.com>
Date: Wed, 5 Jun 2019 23:05:33 +0200
Subject: [PATCH 352/382] feat(ever-admin): generate all in fake data now
 generates banned users

---
 backend/api/src/services/users/UsersService.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/api/src/services/users/UsersService.ts b/backend/api/src/services/users/UsersService.ts
index cfe80ff42..34a45b50f 100644
--- a/backend/api/src/services/users/UsersService.ts
+++ b/backend/api/src/services/users/UsersService.ts
@@ -454,6 +454,7 @@ export class UsersService extends DBService<User>
 			const firstName = faker.name.firstName();
 			const lastName = faker.name.lastName();
 			const email = faker.internet.email(firstName, lastName);
+			const isBanned = Math.random() < 0.02;
 
 			const geoLocation: IGeoLocationCreateObject = {
 				countryId: faker.random.number(Country.ZW) as Country,
@@ -475,6 +476,7 @@ export class UsersService extends DBService<User>
 					geoLocation,
 					apartment: `${customerCount}`,
 					email,
+					isBanned,
 					image: faker.image.avatar(),
 					phone: faker.phone.phoneNumber(),
 					_createdAt: faker.date.between(

From b50fece6c88d3f81c200946e5d2fc6842e8f6ca6 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 6 Jun 2019 11:33:09 +0300
Subject: [PATCH 353/382] chore(ever-admin): update to nebular 4

---
 admin/website-angular/package.json            |  15 +-
 .../@core/auth/admin-auth-strategy.service.ts |   3 +-
 .../components/header/header.component.scss   |  25 +--
 .../switcher/switcher.component.scss          |   9 +-
 .../warehouse-order-view.component.scss       |   5 +-
 .../+warehouse/warehouse.component.scss       |   5 +-
 admin/website-angular/yarn.lock               | 167 ++++--------------
 7 files changed, 70 insertions(+), 159 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index cd4a88b30..b4c51abbd 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -65,16 +65,15 @@
 		"@angular/compiler": "^8.0.0",
 		"@angular/core": "^8.0.0",
 		"@angular/forms": "^8.0.0",
-		"@angular/http": "^7.2.15",
 		"@angular/platform-browser": "^8.0.0",
 		"@angular/platform-browser-dynamic": "^8.0.0",
 		"@angular/router": "^8.0.0",
 		"@asymmetrik/ngx-leaflet": "^5.0.2",
-		"@fortawesome/fontawesome-free": "^5.8.1",
-		"@nebular/auth": "^3.5.0",
-		"@nebular/bootstrap": "^3.5.0",
-		"@nebular/security": "^3.5.0",
-		"@nebular/theme": "^3.5.0",
+		"@fortawesome/fontawesome-free": "^5.9.0",
+		"@nebular/auth": "^4.0.0",
+		"@nebular/bootstrap": "^4.0.0",
+		"@nebular/security": "^4.0.0",
+		"@nebular/theme": "^4.0.0",
 		"@ng-bootstrap/ng-bootstrap": "^4.1.1",
 		"@ng-select/ng-select": "^2.18.0",
 		"@ngx-translate/core": "^11.0.1",
@@ -128,7 +127,7 @@
 		"ngx-highlightjs": "^2.1.4",
 		"ngx-moment": "^3.4.0",
 		"ngx-translate-multi-http-loader": "^3.0.0",
-		"node-sass": "^4.11.0",
+		"node-sass": "^4.12.0",
 		"normalize.css": "^8.0.1",
 		"pace-js": "1.0.2",
 		"popper.js": "^1.15.0",
@@ -153,7 +152,7 @@
 		"@angular-devkit/architect": "^0.800.1",
 		"@angular-devkit/build-angular": "^0.800.1",
 		"@angular-devkit/build-webpack": "^0.800.1",
-		"@angular-devkit/core": "~7.3.8",
+		"@angular-devkit/core": "^8.0.1",
 		"@angular-devkit/schematics": "^8.0.1",
 		"@angular/cli": "^8.0.1",
 		"@angular/compiler-cli": "^8.0.0",
diff --git a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts
index 8847ebd73..67becbd3d 100644
--- a/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts
+++ b/admin/website-angular/src/app/@core/auth/admin-auth-strategy.service.ts
@@ -1,11 +1,10 @@
 import { Observable, from, of } from 'rxjs';
-import { NbAuthResult } from '@nebular/auth';
+import { NbAuthResult, NbAuthStrategy } from '@nebular/auth';
 import { ActivatedRoute } from '@angular/router';
 import { Apollo } from 'apollo-angular';
 import gql from 'graphql-tag';
 import { catchError, map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { NbAuthStrategy } from '@nebular/auth/strategies/auth-strategy';
 import { Store } from '../data/store.service';
 import Admin from '@modules/server.common/entities/Admin';
 import { NbAuthStrategyClass } from '@nebular/auth/auth.options';
diff --git a/admin/website-angular/src/app/@theme/components/header/header.component.scss b/admin/website-angular/src/app/@theme/components/header/header.component.scss
index e750d2011..42a8d6682 100644
--- a/admin/website-angular/src/app/@theme/components/header/header.component.scss
+++ b/admin/website-angular/src/app/@theme/components/header/header.component.scss
@@ -140,17 +140,18 @@
 		}
 	}
 
-	@include keyframes(pulse) {
-		0% {
-			box-shadow: 0 0 1px 0 rgba(nb-theme(color-fg-highlight), 0);
-		}
-		20% {
-			box-shadow: 0 0 3px 10px rgba(nb-theme(color-fg-highlight), 0.4);
-		}
-		100% {
-			box-shadow: 0 0 5px 20px rgba(nb-theme(color-fg-highlight), 0);
-		}
-	}
+	// TODO style
+	// @include keyframes(pulse) {
+	// 	0% {
+	// 		box-shadow: 0 0 1px 0 rgba(nb-theme(color-fg-highlight), 0);
+	// 	}
+	// 	20% {
+	// 		box-shadow: 0 0 3px 10px rgba(nb-theme(color-fg-highlight), 0.4);
+	// 	}
+	// 	100% {
+	// 		box-shadow: 0 0 5px 20px rgba(nb-theme(color-fg-highlight), 0);
+	// 	}
+	// }
 
 	@include keyframes(pulse-light) {
 		0% {
@@ -218,7 +219,7 @@
 		}
 	}
 
-	.admin-menu{
+	.admin-menu {
 		cursor: pointer;
 	}
 }
diff --git a/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss b/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
index bfefba1af..1adf8ca80 100644
--- a/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
+++ b/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
@@ -94,11 +94,12 @@
 			background-color: nb-theme(color-success);
 			transition: 0.2s;
 
-			box-shadow: 0 0 0.25rem 0 rgba(nb-theme(color-fg), 0.4);
+			// TODO style
+			// box-shadow: 0 0 0.25rem 0 rgba(nb-theme(color-fg), 0.4);
 
-			@include nb-for-theme(cosmic) {
-				@include btn-hero-primary-gradient();
-			}
+			// @include nb-for-theme(cosmic) {
+			// 	@include btn-hero-primary-gradient();
+			// }
 
 			@include nb-for-theme(corporate) {
 				background-color: nb-theme(color-primary);
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
index 821502894..42f0de4ef 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
@@ -44,8 +44,9 @@ $brand-darken: darken($brand, 5%);
 .subheader {
 	margin-bottom: 0.75rem;
 	font-size: 0.875rem;
-	font-weight: nb-theme(font-weight-bolder);
-	color: nb-theme(color-fg-heading);
+	// TODO style
+	// font-weight: nb-theme(font-weight-bolder);
+	// color: nb-theme(color-fg-heading);
 }
 
 .example-container:not(:last-child) {
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
index e375e087b..fe43f77ed 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
@@ -44,8 +44,9 @@ $brand-darken: darken($brand, 5%);
 .subheader {
 	margin-bottom: 0.75rem;
 	font-size: 0.875rem;
-	font-weight: nb-theme(font-weight-bolder);
-	color: nb-theme(color-fg-heading);
+	// TODO style
+	// font-weight: nb-theme(font-weight-bolder);
+	// color: nb-theme(color-fg-heading);
 }
 
 .example-container:not(:last-child) {
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 97333d2d2..1e87ba503 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -90,7 +90,7 @@
     rxjs "6.4.0"
     webpack-merge "4.2.1"
 
-"@angular-devkit/core@8.0.1":
+"@angular-devkit/core@8.0.1", "@angular-devkit/core@^8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.1.tgz#4a38141006deefa2f60f105b458d32885ffc1bec"
   integrity sha512-GQtspR2umZeuTUDTLy2dpUstvQfK7oAwE0o+rWSa8mx0DyhYssrfBbvfE4GzUzKp6OSz1sbZAatSO+iimZjbQw==
@@ -101,17 +101,6 @@
     rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/core@~7.3.8":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.9.tgz#bef2aaa0be7219c546fb99ea0ba9dd3a6dcd288a"
-  integrity sha512-SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw==
-  dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
 "@angular-devkit/schematics@8.0.1", "@angular-devkit/schematics@^8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.1.tgz#1f0f616681eb451de31fa5f2d848f5ecbc6226d4"
@@ -204,13 +193,6 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.15":
-  version "7.2.15"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.15.tgz#a32bea9e67e99eef88150085aeebbe7aeecd39eb"
-  integrity sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==
-  dependencies:
-    tslib "^1.9.0"
-
 "@angular/language-service@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0.tgz#1ee4ce5003897cad53597da28f4c94fe30519bfb"
@@ -1109,10 +1091,10 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e"
   integrity sha512-n/VQ4mbfr81aqkx/XmVicOLjviMuy02eenSdJY33SVA7S2J42EU0P1H0mOogfYedb3wXA0d/LVtBrgTSm04WEA==
 
-"@fortawesome/fontawesome-free@^5.8.1":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz#cbafbfe8894c4e3e3c3a9da6774e249ac1f2da8b"
-  integrity sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA==
+"@fortawesome/fontawesome-free@^5.9.0":
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.9.0.tgz#1aa5c59efb1b8c6eb6277d1e3e8c8f31998b8c8e"
+  integrity sha512-g795BBEzM/Hq2SYNPm/NQTIp3IWd4eXSH0ds87Na2jnrAUFX3wkyZAI4Gwj9DOaWMuz2/01i8oWI7P7T/XLkhg==
 
 "@icons/material@^0.2.4":
   version "0.2.4"
@@ -1127,25 +1109,25 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nebular/auth@^3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@nebular/auth/-/auth-3.5.0.tgz#b6ac219bb46a0ae942ca60b02db06a467c688d75"
-  integrity sha512-dDrQuijLD/HsdYPQocdmNN7XU3Hukj3Diy6HMDS7vH9Twb3TByFkESH+s0Y0IpNugwJraZlYroiwP0/1IXG2SQ==
+"@nebular/auth@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@nebular/auth/-/auth-4.0.0.tgz#e29cd994e3c7a57fccf5eb378b069bd3cf5ab32a"
+  integrity sha512-VShBFTpWDjaM1yWPZLilwaf1+/ZDs+W3bEKtmW8MTs+eG6pJX9ulyicPax/B3l5MT2PQ2AKdvRNEd9LgfBTT5Q==
 
-"@nebular/bootstrap@^3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@nebular/bootstrap/-/bootstrap-3.5.0.tgz#33ba3426c01f5764685c4a5e8ded2db53ffd83db"
-  integrity sha512-GbiqPBpgDIiwxy9tHapf4RTydzY5W6E+PAN+afhNvmSGu2R2iovTzVXhoEmNNzvZsB85jJ9+OBxLhq1PLmkLCA==
+"@nebular/bootstrap@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@nebular/bootstrap/-/bootstrap-4.0.0.tgz#7c26a111f6ea3e1b617672f7175ff48369ec166a"
+  integrity sha512-YiHPeAp2HOXf0yGmA0wfDVTonc1Aiy4I6yn42Xd2PlBKv7a8sXq+W7vBkUNdMiS/+8vQeCCvCxelcdXDsTxjXw==
 
-"@nebular/security@^3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@nebular/security/-/security-3.5.0.tgz#4598956dcfcb696c80038eee88280e8813f4e196"
-  integrity sha512-FySytmzIJXpa8aHLlcq+RM1YPnophKyv46Erm6Wkswfs6rIkunCAz5/nolQGf29nbyyeV4wp+HvDIOLf2o/ApQ==
+"@nebular/security@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@nebular/security/-/security-4.0.0.tgz#5c2c9ffc2491f2083fa1c865a7d261d6e4b1689e"
+  integrity sha512-e5SEZIMGOT1DwNql+TmAv1hC9WcH5DMHyfbJWzfJST1t8I9rkuSFYIYg5Luvf0id5LknjsqrNbjxu3lC01uitQ==
 
-"@nebular/theme@^3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@nebular/theme/-/theme-3.5.0.tgz#7b3d34daed6efde13238cd3efef638f5f3dbd7c6"
-  integrity sha512-FE6cj3uB/0uhwz760o2/pfKHAGj9CMflCC4+lHymq3EVpoJua7//7+0VFMloMckAGqCMWDoZ04TDzAOf5lT44w==
+"@nebular/theme@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@nebular/theme/-/theme-4.0.0.tgz#697b46ab812e24132275bc4d73161de6d2ccadbc"
+  integrity sha512-wFPLMRvHKkcKH/oKuc8TtXFJOaeFWYOvG7AvkgI3IqtkHa+x8fEsz4EMLFPOh4XADOjxXHo8wAHI3vhsgyavcg==
   dependencies:
     intersection-observer "0.5.0"
 
@@ -2058,16 +2040,6 @@ ajv@6.10.0, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
-  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 ajv@^5.0.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -2566,11 +2538,6 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-async-each@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
-  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-
 async-each@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
@@ -3174,7 +3141,7 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
+braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
@@ -3667,26 +3634,6 @@ child-process-promise@^2.2.1:
     node-version "^1.0.0"
     promise-polyfill "^6.0.1"
 
-chokidar@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
-    glob-parent "^3.1.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    lodash.debounce "^4.0.8"
-    normalize-path "^2.1.1"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.5"
-  optionalDependencies:
-    fsevents "^1.2.2"
-
 chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2, chokidar@^2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
@@ -6438,14 +6385,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.2:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
-  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
-  dependencies:
-    nan "^2.12.1"
-    node-pre-gyp "^0.12.0"
-
 fsevents@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
@@ -8486,12 +8425,7 @@ lodash._reinterpolate@~3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-
-lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -8526,7 +8460,7 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.mergewith@^4.6.0, lodash.mergewith@^4.6.1:
+lodash.mergewith@^4.6.1:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
   integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
@@ -9200,16 +9134,16 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-nan@^2.10.0, nan@^2.9.2:
-  version "2.13.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
-  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
-
-nan@^2.12.1:
+nan@^2.13.2:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
 
+nan@^2.9.2:
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -9429,22 +9363,6 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-pre-gyp@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
-  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
 node-releases@^1.1.13, node-releases@^1.1.3:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
@@ -9459,10 +9377,10 @@ node-releases@^1.1.14, node-releases@^1.1.21:
   dependencies:
     semver "^5.3.0"
 
-node-sass@^4.11.0:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
-  integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
+node-sass@^4.12.0:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
+  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -9471,12 +9389,10 @@ node-sass@^4.11.0:
     get-stdin "^4.0.1"
     glob "^7.0.3"
     in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
+    lodash "^4.17.11"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.10.0"
+    nan "^2.13.2"
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
     request "^2.88.0"
@@ -11190,7 +11106,7 @@ readdir-scoped-modules@^1.0.0:
     graceful-fs "^4.1.2"
     once "^1.3.0"
 
-readdirp@^2.0.0, readdirp@^2.2.1:
+readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
   integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
@@ -11651,13 +11567,6 @@ rxjs-tslint@0.1.5:
     tslint "^5.9.1"
     tsutils "^2.25.0"
 
-rxjs@6.3.3:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
-  dependencies:
-    tslib "^1.9.0"
-
 rxjs@6.4.0, rxjs@^6.1.0, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
@@ -13568,7 +13477,7 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.0.5, upath@^1.1.1:
+upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==

From b378136a763d6c90c475d88840b8fb1b4fad5a69 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 6 Jun 2019 12:48:34 +0300
Subject: [PATCH 354/382] fix(ever-admin): fix build error

---
 .../src/app/@core/data/fakeDataServices/warehouses.ts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts b/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts
index 2eecc183b..c85bf7e0a 100644
--- a/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts
+++ b/admin/website-angular/src/app/@core/data/fakeDataServices/warehouses.ts
@@ -7,7 +7,7 @@ import { getFakeImg } from '@modules/server.common/utils';
 import { environment } from 'environments/environment';
 import * as faker from 'faker';
 import _ from 'lodash';
-import { _appIdRandomProviderFactory } from '@angular/core/src/application_tokens';
+// import { _appIdRandomProviderFactory } from '@angular/core/src/application_tokens';
 
 const NEED_DEFAULT_SETTINGS_MESSAGE =
 	"Can't generate fake data without DEFAULT_LONGITUDE and DEFAULT_LATITUDE";

From 602d3293b7f61fe9320aec22dd630935b993a4d8 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 6 Jun 2019 14:32:48 +0300
Subject: [PATCH 355/382] chore: update packages to the latest version
 @types/async, handlebars, neo-async, uglify-js

---
 admin/website-angular/package.json |  2 +-
 admin/website-angular/yarn.lock    |  8 ++++----
 carrier/mobile-ionic/package.json  |  3 +++
 carrier/mobile-ionic/yarn.lock     | 24 ++++++++++++++++++++++++
 merchant/tablet-ionic/package.json |  3 +++
 merchant/tablet-ionic/yarn.lock    | 24 ++++++++++++++++++++++++
 package.json                       |  2 +-
 shop/mobile-ionic/package.json     |  3 +++
 shop/mobile-ionic/yarn.lock        | 24 ++++++++++++++++++++++++
 yarn.lock                          |  8 ++++----
 10 files changed, 91 insertions(+), 10 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index d26c7da53..89a0878d5 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -166,7 +166,7 @@
 		"@storybook/addon-notes": "^5.0.10",
 		"@storybook/addons": "^5.0.10",
 		"@storybook/angular": "^5.0.10",
-		"@types/async": "^2.4.1",
+		"@types/async": "^3.0.0",
 		"@types/d3-color": "^1.2.2",
 		"@types/faker": "^4.1.5",
 		"@types/googlemaps": "^3.30.19",
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 1c9e18977..dba4ce701 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -1567,10 +1567,10 @@
     d3-shape "^1.2.0"
     d3-time-format "^2.1.0"
 
-"@types/async@^2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@types/async/-/async-2.4.1.tgz#43c3b2c60eab41c25ca0009c07ca7d619d943119"
-  integrity sha512-C09BK/wXzbW+/JK9zckhe+FeSbg7NmvVjUWwApnw7ksRpUq3ecGLiq2Aw1LlY4Z/VmtdhSaIs7jO5/MWRYMcOA==
+"@types/async@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/async/-/async-3.0.0.tgz#d403560ee2aabccdb7936cb9a3fee5f147d626bd"
+  integrity sha512-DvEhEeG8ynipwkg7LtNHlO99+vEVbin+E+3YuzeJCM9TREewJ1B5fdZsQzykR7fKuh6rKh8mEir36zKd3uafOA==
 
 "@types/bson@*":
   version "4.0.0"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index bccd2533b..e8201dbfd 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -130,6 +130,7 @@
 		"fstream": "^1.0.12",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
+		"handlebars": "^4.1.2",
 		"hooks-fixed": "^2.0.2",
 		"ionicons": "^4.5.5",
 		"kareem": "^2.3.0",
@@ -138,6 +139,7 @@
 		"mpath": "^0.6.0",
 		"mquery": "^3.2.0",
 		"mx.ferreyra.callnumber": "0.0.2",
+		"neo-async": "^2.6.1",
 		"node-sass": "^4.11.0",
 		"phonegap-plugin-barcodescanner": "^8.0.1",
 		"qrcode": "^1.3.3",
@@ -151,6 +153,7 @@
 		"sw-toolbox": "^3.6.0",
 		"swiper": "^4.5.0",
 		"tslib": "^1.9.3",
+		"uglify-js": "^3.6.0",
 		"uuid": "^3.3.2",
 		"waves": "^0.1.1",
 		"zone.js": "^0.9.0"
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 6f9f78198..d70e45fec 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -5144,6 +5144,17 @@ handlebars@^4.1.0:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+handlebars@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -7327,6 +7338,11 @@ neo-async@^2.5.0, neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
+neo-async@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+
 netmask@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
@@ -10624,6 +10640,14 @@ uglify-js@^3.1.4:
     commander "~2.20.0"
     source-map "~0.6.1"
 
+uglify-js@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
+  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
+  dependencies:
+    commander "~2.20.0"
+    source-map "~0.6.1"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index c05002fe0..6208a9277 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -139,6 +139,7 @@
 		"fstream": "^1.0.12",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
+		"handlebars": "^4.1.2",
 		"imagesloaded": "^4.1.4",
 		"ionic-selectable": "4.4.1",
 		"ionicons": "^4.5.5",
@@ -148,6 +149,7 @@
 		"moment": "^2.24.0",
 		"mongoose": "^5.5.0",
 		"mx.ferreyra.callnumber": "^0.0.2",
+		"neo-async": "^2.6.1",
 		"ng2-completer": "^2.0.8",
 		"ng2-file-upload": "^1.3.0",
 		"ng2-smart-table": "^1.4.0",
@@ -165,6 +167,7 @@
 		"subscriptions-transport-ws": "^0.9.16",
 		"sw-toolbox": "^3.6.0",
 		"symbol-observable": "^1.2.0",
+		"uglify-js": "^3.6.0",
 		"uuid": "^3.3.2",
 		"zone.js": "^0.8.29"
 	},
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 13fbb1363..2972d45db 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -5122,6 +5122,17 @@ handlebars@^4.1.0:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+handlebars@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -7169,6 +7180,11 @@ neo-async@^2.5.0, neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
+neo-async@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+
 netmask@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
@@ -10474,6 +10490,14 @@ uglify-js@^3.1.4:
     commander "~2.20.0"
     source-map "~0.6.1"
 
+uglify-js@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
+  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
+  dependencies:
+    commander "~2.20.0"
+    source-map "~0.6.1"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
diff --git a/package.json b/package.json
index 9df95aa0d..79cfc264c 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
 		"@commitlint/config-conventional": "^8.0.0",
 		"@commitlint/config-lerna-scopes": "^8.0.0",
 		"@commitlint/travis-cli": "^8.0.0",
-		"@types/async": "^2.4.1",
+		"@types/async": "^3.0.0",
 		"@types/d3-color": "^1.2.2",
 		"@types/faker": "^4.1.5",
 		"@types/googlemaps": "^3.30.19",
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 3d70da98e..0bd51eb04 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -122,11 +122,13 @@
 		"fstream": "^1.0.12",
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
+		"handlebars": "^4.1.2",
 		"ionicons": "^4.5.5",
 		"jasmine": "^3.3.1",
 		"jsbarcode": "^3.11.0",
 		"lodash": "^4.17.11",
 		"mx.ferreyra.callnumber": "0.0.2",
+		"neo-async": "^2.6.1",
 		"node-sass": "^4.11.0",
 		"phonegap-plugin-barcodescanner": "^8.0.1",
 		"qrcode": "^1.3.3",
@@ -140,6 +142,7 @@
 		"subscriptions-transport-ws": "^0.9.16",
 		"swiper": "^4.5.0",
 		"tslib": "^1.9.3",
+		"uglify-js": "^3.6.0",
 		"uuid": "^3.3.2",
 		"zone.js": "^0.9.0"
 	},
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 7361b3b93..7ea026348 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -5092,6 +5092,17 @@ handlebars@^4.1.0:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+handlebars@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -7209,6 +7220,11 @@ neo-async@^2.5.0, neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
+neo-async@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+
 netmask@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
@@ -10455,6 +10471,14 @@ uglify-js@^3.1.4:
     commander "~2.20.0"
     source-map "~0.6.1"
 
+uglify-js@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
+  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
+  dependencies:
+    commander "~2.20.0"
+    source-map "~0.6.1"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
diff --git a/yarn.lock b/yarn.lock
index 101119f22..a36185220 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -989,10 +989,10 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@types/async@^2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@types/async/-/async-2.4.1.tgz#43c3b2c60eab41c25ca0009c07ca7d619d943119"
-  integrity sha512-C09BK/wXzbW+/JK9zckhe+FeSbg7NmvVjUWwApnw7ksRpUq3ecGLiq2Aw1LlY4Z/VmtdhSaIs7jO5/MWRYMcOA==
+"@types/async@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/async/-/async-3.0.0.tgz#d403560ee2aabccdb7936cb9a3fee5f147d626bd"
+  integrity sha512-DvEhEeG8ynipwkg7LtNHlO99+vEVbin+E+3YuzeJCM9TREewJ1B5fdZsQzykR7fKuh6rKh8mEir36zKd3uafOA==
 
 "@types/bson@*":
   version "1.0.11"

From 2224b2ad7622f967c055ae923f087686dd1f5a67 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 6 Jun 2019 14:50:17 +0300
Subject: [PATCH 356/382] chore: update packages to the latest version
 mongoose, @ng-bootstrap/ng-bootstrap

---
 admin/website-angular/package.json |  2 +-
 admin/website-angular/yarn.lock    |  8 ++---
 backend/api/package.json           |  2 +-
 backend/api/yarn.lock              | 54 ++++++++++++++--------------
 carrier/mobile-ionic/package.json  |  2 +-
 carrier/mobile-ionic/yarn.lock     | 58 ++++++++++++------------------
 merchant/tablet-ionic/package.json |  2 +-
 merchant/tablet-ionic/yarn.lock    | 54 ++++++++++++++--------------
 8 files changed, 85 insertions(+), 97 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 89a0878d5..f86987c10 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -75,7 +75,7 @@
 		"@nebular/bootstrap": "^3.5.0",
 		"@nebular/security": "^3.5.0",
 		"@nebular/theme": "^3.5.0",
-		"@ng-bootstrap/ng-bootstrap": "^4.1.1",
+		"@ng-bootstrap/ng-bootstrap": "^4.2.1",
 		"@ng-select/ng-select": "^2.18.0",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index dba4ce701..88767f335 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -1130,10 +1130,10 @@
   dependencies:
     intersection-observer "0.5.0"
 
-"@ng-bootstrap/ng-bootstrap@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.1.1.tgz#5e9c477ed9cc19114b56a0abc87e9c8483fb6bbf"
-  integrity sha512-OgbmPVhbDdNpIwogEXsycUJG0caNtb2+wCABfLUClgi9YcfNXhZ9Phu2GQq7Pk/LO66okth6s77RBQnbTJuysg==
+"@ng-bootstrap/ng-bootstrap@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.2.1.tgz#aa87f2ee6c4def0be087d4f456930b1e0761d91a"
+  integrity sha512-7etP9X9jKIkbuDzU3ngI2jQhHQDZxIu0ErvlkHb7u7YH9akIOLVkXvz2mTMvcFABWZhze64UjFuEgR46b6WGSw==
   dependencies:
     tslib "^1.9.0"
 
diff --git a/backend/api/package.json b/backend/api/package.json
index f0724627e..d77292740 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -103,7 +103,7 @@
 		"moment": "^2.24.0",
 		"mongodb": "^3.2.3",
 		"mongodb-memory-server": "^5.1.0",
-		"mongoose": "^5.5.4",
+		"mongoose": "^5.5.13",
 		"morgan": "^1.9.1",
 		"ms": "^2.1.1",
 		"node-sass": "^4.11.0",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index ffac18bbb..d80cf6c63 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -2002,18 +2002,18 @@ async@2.6.1, async@^2.4.1, async@^2.5.0, async@^2.6, async@^2.6.0, async@^2.6.1:
   dependencies:
     lodash "^4.17.10"
 
-async@^1.4.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-
-async@^2.6.2, async@~2.6.1:
+async@2.6.2, async@^2.6.2, async@~2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
   integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
   dependencies:
     lodash "^4.17.11"
 
+async@^1.4.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -7568,10 +7568,10 @@ moment@^2.24.0:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-mongodb-core@3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.2.tgz#d1c084b34c102a98b4734087800115e639d907c5"
-  integrity sha512-YRgC39MuzKL0uoGoRdTmV1e9m47NbMnYmuEx4IOkgWAGXPSEzRY7cwb3N0XMmrDMnD9vp7MysNyAriIIeGgIQg==
+mongodb-core@3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.6.tgz#5522b721a744720a27a07b29177d10fe849ad20e"
+  integrity sha512-i+XRVjur9D0ywGF7cFebOUnALnbvMHajdNhhl3TQuopW6QDE655G8CpPeERbqSqfa3rOKEUo08lENDIiBIuAvQ==
   dependencies:
     bson "^1.1.1"
     require_optional "^1.0.1"
@@ -7619,12 +7619,12 @@ mongodb-memory-server@^5.1.0:
   dependencies:
     mongodb-memory-server-core "5.1.0"
 
-mongodb@3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.2.tgz#49b592be3cd50097f78e0964488d18c2e189de20"
-  integrity sha512-xQ6apOOV+w7VFApdaJpWhYhzartpjIDFQjG0AwgJkLh7dBs7PTsq4A3Bia2QWpDohmAzTBIdQVLMqqLy0mwt3Q==
+mongodb@3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.6.tgz#bfd23bc0ae6cc57443cd256aec24aa4dc2b99f2f"
+  integrity sha512-qnHc4tjEkHKemuzBq9R7ycYnhFE0Dlpt6+n6suoZp2DcDdqviQ+teloJU24fsOw/PLmr75yGk4mRx/YabjDQEQ==
   dependencies:
-    mongodb-core "3.2.2"
+    mongodb-core "3.2.6"
     safe-buffer "^5.1.2"
 
 mongodb@>=3.0.0, mongodb@^3.2.3:
@@ -7639,18 +7639,18 @@ mongoose-legacy-pluralize@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
 
-mongoose@^5.5.4:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.4.tgz#77b0664dd7e49a0a158d1eb83f6e53433b57b48b"
-  integrity sha512-xzS7fJtXGjCOZozCtlyFS8graMub1L9knp37+1dJCDmWzOtXVHeLjV2XIC9tX0sE54cxeG5rHvSmIkLpeHjjmA==
+mongoose@^5.5.13:
+  version "5.5.13"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.13.tgz#3890052be742d069f97c8b03c278f0b44628e93c"
+  integrity sha512-+RueYqq7fb8gu4wXkUsPa2B0R4JWnyYuN0+s3BCPpe3Rn3XndPPKhrx9OId3fMiuGX4jbG/HL2ZDoliiftDY7w==
   dependencies:
-    async "2.6.1"
+    async "2.6.2"
     bson "~1.1.1"
     kareem "2.3.0"
-    mongodb "3.2.2"
-    mongodb-core "3.2.2"
+    mongodb "3.2.6"
+    mongodb-core "3.2.6"
     mongoose-legacy-pluralize "1.0.2"
-    mpath "0.5.2"
+    mpath "0.6.0"
     mquery "3.2.0"
     ms "2.1.1"
     regexp-clone "0.0.1"
@@ -7680,10 +7680,10 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-mpath@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.5.2.tgz#b1eac586dffb5175d2f51ca9aacba35d9940dd41"
-  integrity sha512-NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw==
+mpath@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.6.0.tgz#aa922029fca4f0f641f360e74c5c1b6a4c47078e"
+  integrity sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw==
 
 mquery@3.2.0:
   version "3.2.0"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index e8201dbfd..192b9c91b 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -135,7 +135,7 @@
 		"ionicons": "^4.5.5",
 		"kareem": "^2.3.0",
 		"lodash": "^4.17.11",
-		"mongoose": "^5.5.0",
+		"mongoose": "^5.5.13",
 		"mpath": "^0.6.0",
 		"mquery": "^3.2.0",
 		"mx.ferreyra.callnumber": "0.0.2",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index d70e45fec..a298e63c5 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -1739,25 +1739,18 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
+async@2.6.2, async@^2.1.2, async@^2.4.1, async@^2.5.0, async@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
+  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
 async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.1.2, async@^2.4.1, async@^2.5.0, async@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
-  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
-  dependencies:
-    lodash "^4.17.11"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -7167,10 +7160,10 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkd
   dependencies:
     minimist "0.0.8"
 
-mongodb-core@3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.2.tgz#d1c084b34c102a98b4734087800115e639d907c5"
-  integrity sha512-YRgC39MuzKL0uoGoRdTmV1e9m47NbMnYmuEx4IOkgWAGXPSEzRY7cwb3N0XMmrDMnD9vp7MysNyAriIIeGgIQg==
+mongodb-core@3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.6.tgz#5522b721a744720a27a07b29177d10fe849ad20e"
+  integrity sha512-i+XRVjur9D0ywGF7cFebOUnALnbvMHajdNhhl3TQuopW6QDE655G8CpPeERbqSqfa3rOKEUo08lENDIiBIuAvQ==
   dependencies:
     bson "^1.1.1"
     require_optional "^1.0.1"
@@ -7178,12 +7171,12 @@ mongodb-core@3.2.2:
   optionalDependencies:
     saslprep "^1.0.0"
 
-mongodb@3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.2.tgz#49b592be3cd50097f78e0964488d18c2e189de20"
-  integrity sha512-xQ6apOOV+w7VFApdaJpWhYhzartpjIDFQjG0AwgJkLh7dBs7PTsq4A3Bia2QWpDohmAzTBIdQVLMqqLy0mwt3Q==
+mongodb@3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.6.tgz#bfd23bc0ae6cc57443cd256aec24aa4dc2b99f2f"
+  integrity sha512-qnHc4tjEkHKemuzBq9R7ycYnhFE0Dlpt6+n6suoZp2DcDdqviQ+teloJU24fsOw/PLmr75yGk4mRx/YabjDQEQ==
   dependencies:
-    mongodb-core "3.2.2"
+    mongodb-core "3.2.6"
     safe-buffer "^5.1.2"
 
 mongoose-legacy-pluralize@1.0.2:
@@ -7191,18 +7184,18 @@ mongoose-legacy-pluralize@1.0.2:
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
   integrity sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==
 
-mongoose@^5.5.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.1.tgz#a256a08241a1412bb307b85e7ece25629d0b4bbe"
-  integrity sha512-sVDyzADl0RbNvoRWLL/zQDqoFGi1IaSo5+DpOwhvGgFs3pSsvmONPNW3JF1KvZerNkkkGFb8ZMuFBeKEiDqZLw==
+mongoose@^5.5.13:
+  version "5.5.13"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.13.tgz#3890052be742d069f97c8b03c278f0b44628e93c"
+  integrity sha512-+RueYqq7fb8gu4wXkUsPa2B0R4JWnyYuN0+s3BCPpe3Rn3XndPPKhrx9OId3fMiuGX4jbG/HL2ZDoliiftDY7w==
   dependencies:
-    async "2.6.1"
+    async "2.6.2"
     bson "~1.1.1"
     kareem "2.3.0"
-    mongodb "3.2.2"
-    mongodb-core "3.2.2"
+    mongodb "3.2.6"
+    mongodb-core "3.2.6"
     mongoose-legacy-pluralize "1.0.2"
-    mpath "0.5.1"
+    mpath "0.6.0"
     mquery "3.2.0"
     ms "2.1.1"
     regexp-clone "0.0.1"
@@ -7233,12 +7226,7 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-mpath@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.5.1.tgz#17131501f1ff9e6e4fbc8ffa875aa7065b5775ab"
-  integrity sha512-H8OVQ+QEz82sch4wbODFOz+3YQ61FYz/z3eJ5pIdbMEaUzDqA268Wd+Vt4Paw9TJfvDgVKaayC0gBzMIw2jhsg==
-
-mpath@^0.6.0:
+mpath@0.6.0, mpath@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.6.0.tgz#aa922029fca4f0f641f360e74c5c1b6a4c47078e"
   integrity sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw==
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 6208a9277..bef59de21 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -147,7 +147,7 @@
 		"lodash": "^4.17.11",
 		"masonry-layout": "^4.2.2",
 		"moment": "^2.24.0",
-		"mongoose": "^5.5.0",
+		"mongoose": "^5.5.13",
 		"mx.ferreyra.callnumber": "^0.0.2",
 		"neo-async": "^2.6.1",
 		"ng2-completer": "^2.0.8",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 2972d45db..bba54eb68 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -1764,18 +1764,18 @@ async@2.6.1:
   dependencies:
     lodash "^4.17.10"
 
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-
-async@^2.1.2, async@^2.4.1, async@^2.5.0, async@^2.6, async@^2.6.0, async@^2.6.1, async@~2.6.1:
+async@2.6.2, async@^2.1.2, async@^2.4.1, async@^2.5.0, async@^2.6, async@^2.6.0, async@^2.6.1, async@~2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
   integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
   dependencies:
     lodash "^4.17.11"
 
+async@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -7009,10 +7009,10 @@ moment-timezone@^0.5.x:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-mongodb-core@3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.2.tgz#d1c084b34c102a98b4734087800115e639d907c5"
-  integrity sha512-YRgC39MuzKL0uoGoRdTmV1e9m47NbMnYmuEx4IOkgWAGXPSEzRY7cwb3N0XMmrDMnD9vp7MysNyAriIIeGgIQg==
+mongodb-core@3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-3.2.6.tgz#5522b721a744720a27a07b29177d10fe849ad20e"
+  integrity sha512-i+XRVjur9D0ywGF7cFebOUnALnbvMHajdNhhl3TQuopW6QDE655G8CpPeERbqSqfa3rOKEUo08lENDIiBIuAvQ==
   dependencies:
     bson "^1.1.1"
     require_optional "^1.0.1"
@@ -7020,12 +7020,12 @@ mongodb-core@3.2.2:
   optionalDependencies:
     saslprep "^1.0.0"
 
-mongodb@3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.2.tgz#49b592be3cd50097f78e0964488d18c2e189de20"
-  integrity sha512-xQ6apOOV+w7VFApdaJpWhYhzartpjIDFQjG0AwgJkLh7dBs7PTsq4A3Bia2QWpDohmAzTBIdQVLMqqLy0mwt3Q==
+mongodb@3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.2.6.tgz#bfd23bc0ae6cc57443cd256aec24aa4dc2b99f2f"
+  integrity sha512-qnHc4tjEkHKemuzBq9R7ycYnhFE0Dlpt6+n6suoZp2DcDdqviQ+teloJU24fsOw/PLmr75yGk4mRx/YabjDQEQ==
   dependencies:
-    mongodb-core "3.2.2"
+    mongodb-core "3.2.6"
     safe-buffer "^5.1.2"
 
 mongoose-legacy-pluralize@1.0.2:
@@ -7033,18 +7033,18 @@ mongoose-legacy-pluralize@1.0.2:
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
   integrity sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==
 
-mongoose@^5.5.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.1.tgz#a256a08241a1412bb307b85e7ece25629d0b4bbe"
-  integrity sha512-sVDyzADl0RbNvoRWLL/zQDqoFGi1IaSo5+DpOwhvGgFs3pSsvmONPNW3JF1KvZerNkkkGFb8ZMuFBeKEiDqZLw==
+mongoose@^5.5.13:
+  version "5.5.13"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.5.13.tgz#3890052be742d069f97c8b03c278f0b44628e93c"
+  integrity sha512-+RueYqq7fb8gu4wXkUsPa2B0R4JWnyYuN0+s3BCPpe3Rn3XndPPKhrx9OId3fMiuGX4jbG/HL2ZDoliiftDY7w==
   dependencies:
-    async "2.6.1"
+    async "2.6.2"
     bson "~1.1.1"
     kareem "2.3.0"
-    mongodb "3.2.2"
-    mongodb-core "3.2.2"
+    mongodb "3.2.6"
+    mongodb-core "3.2.6"
     mongoose-legacy-pluralize "1.0.2"
-    mpath "0.5.1"
+    mpath "0.6.0"
     mquery "3.2.0"
     ms "2.1.1"
     regexp-clone "0.0.1"
@@ -7075,10 +7075,10 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-mpath@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.5.1.tgz#17131501f1ff9e6e4fbc8ffa875aa7065b5775ab"
-  integrity sha512-H8OVQ+QEz82sch4wbODFOz+3YQ61FYz/z3eJ5pIdbMEaUzDqA268Wd+Vt4Paw9TJfvDgVKaayC0gBzMIw2jhsg==
+mpath@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mpath/-/mpath-0.6.0.tgz#aa922029fca4f0f641f360e74c5c1b6a4c47078e"
+  integrity sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw==
 
 mquery@3.2.0:
   version "3.2.0"

From 0310a8ae41284aea2103f5e1396e5cc78d6c2b4a Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 6 Jun 2019 15:21:15 +0300
Subject: [PATCH 357/382] chore: update packages to the latest version
 apollo-server-express, snyk

---
 backend/api/package.json          |   4 +-
 backend/api/yarn.lock             | 297 +++++++++++++++---------------
 shop/website-angular/package.json |  11 +-
 shop/website-angular/yarn.lock    |  38 +++-
 4 files changed, 189 insertions(+), 161 deletions(-)

diff --git a/backend/api/package.json b/backend/api/package.json
index d77292740..eedbd7b49 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -60,7 +60,7 @@
 		"@nestjs/swagger": "^3.0.2",
 		"@nestjs/typeorm": "^6.1.1",
 		"@nestjs/websockets": "^6.1.1",
-		"apollo-server-express": "^2.4.8",
+		"apollo-server-express": "^2.6.1",
 		"axios": "^0.19.0",
 		"bcrypt": "^3.0.4",
 		"bluebird": "^3.5.4",
@@ -199,7 +199,7 @@
 		"pretty-quick": "^1.10.0",
 		"require-directory": "^2.1.1",
 		"rxjs-tslint": "0.1.5",
-		"snyk": "^1.161.1",
+		"snyk": "^1.173.1",
 		"supertest": "^4.0.2",
 		"ts-jest": "^24.0.2",
 		"ts-loader": "^5.4.3",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index d80cf6c63..f42681b5e 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -2,17 +2,17 @@
 # yarn lockfile v1
 
 
-"@apollographql/apollo-tools@^0.3.3":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.3.5.tgz#d4e860ca2300f90d183084390e2f1516cf775bf6"
-  integrity sha512-5ySiiNT2EIwxGKWyoAOnibCPUXvbxKOVxiPMK4uIXmvF+qbGNleQWP+vekciiAmCCESPmGd5szscRwDm4G/NNg==
+"@apollographql/apollo-tools@^0.3.6":
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.3.7.tgz#3bc9c35b9fff65febd4ddc0c1fc04677693a3d40"
+  integrity sha512-+ertvzAwzkYmuUtT8zH3Zi6jPdyxZwOgnYaZHY7iLnMVJDhQKWlkyjLMF8wyzlPiEdDImVUMm5lOIBZo7LkGlg==
   dependencies:
-    apollo-env "0.4.0"
+    apollo-env "0.5.1"
 
-"@apollographql/graphql-playground-html@^1.6.6":
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.6.tgz#022209e28a2b547dcde15b219f0c50f47aa5beb3"
-  integrity sha512-lqK94b+caNtmKFs5oUVXlSpN3sm5IXZ+KfhMxOtr0LR2SqErzkoJilitjDvJ1WbjHlxLI7WtCjRmOLdOGJqtMQ==
+"@apollographql/graphql-playground-html@1.6.20":
+  version "1.6.20"
+  resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.20.tgz#bf9f2acdf319c0959fad8ec1239741dd2ead4e8d"
+  integrity sha512-3LWZa80HcP70Pl+H4KhLDJ7S0px+9/c8GTXdl6SpunRecUaB27g/oOQnAjNHLHdbWuGE0uyqcuGiTfbKB3ilaQ==
 
 "@babel/code-frame@^7.0.0":
   version "7.0.0"
@@ -947,6 +947,11 @@
   dependencies:
     "@types/express" "*"
 
+"@types/debug@^4.1.4":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.4.tgz#56eec47706f0fd0b7c694eae2f3172e6b0b769da"
+  integrity sha512-D9MyoQFI7iP5VdpEyPZyjjqIJ8Y8EDNQFIFVLOmeg1rI1xiHOChyUPMPRUVfqFCerxfE+yS3vMyj37F6IdtOoQ==
+
 "@types/errorhandler@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/errorhandler/-/errorhandler-0.0.32.tgz#387eca73957b481254baddc15d1d40f7fe7153c6"
@@ -1665,13 +1670,13 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-apollo-cache-control@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.5.2.tgz#47931ede0b11c64d45429850c274b30d19322362"
-  integrity sha512-uehXDUrd3Qim+nzxqqN7XT1YTbNSyumW3/FY5BxbKZTI8d4oPG4eyVQKqaggooSjswKQnOoIQVes3+qg9tGAkw==
+apollo-cache-control@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.7.1.tgz#3d4fba232f561f096f61051e103bf58ee4bf8b54"
+  integrity sha512-3h1TEoMnzex6IIiFb5Ja3owTyLwT5YzK69cRgrSpSscdpYc3ID4KVs0Ht9cbOUmb/L/UKtYVkRC8KeVAYmHEjQ==
   dependencies:
-    apollo-server-env "2.2.0"
-    graphql-extensions "0.5.4"
+    apollo-server-env "2.4.0"
+    graphql-extensions "0.7.1"
 
 apollo-codegen@^0.19.1:
   version "0.19.1"
@@ -1691,48 +1696,48 @@ apollo-codegen@^0.19.1:
     source-map-support "^0.5.0"
     yargs "^10.0.3"
 
-apollo-datasource@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.3.1.tgz#4b7ec4c2dd7d08eb7edc865b95fd46b83a4679fd"
-  integrity sha512-qdEUeonc9pPZvYwXK36h2NZoT7Pddmy0HYOzdV0ON5pcG1YtNmUyyYi83Q60V5wTWjuaCjyJ9hOY6wr0BMvQuA==
+apollo-datasource@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.5.0.tgz#7a8c97e23da7b9c15cb65103d63178ab19eca5e9"
+  integrity sha512-SVXxJyKlWguuDjxkY/WGlC/ykdsTmPxSF0z8FenagcQ91aPURXzXP1ZDz5PbamY+0iiCRubazkxtTQw4GWTFPg==
   dependencies:
-    apollo-server-caching "0.3.1"
-    apollo-server-env "2.2.0"
+    apollo-server-caching "0.4.0"
+    apollo-server-env "2.4.0"
 
-apollo-engine-reporting-protobuf@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.2.1.tgz#8547efcb4078a501ddf606cbfe01a2e8c3ba1afd"
-  integrity sha512-5pYR84uWeylRS2OJowtkTczT3bWTwOErWtfnkRKccUi/wZ/AZJBP+D5HKNzM7xoFcz9XvrJyS+wBTz1oBi0Jiw==
+apollo-engine-reporting-protobuf@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.3.0.tgz#2c764c054ff9968387cf16115546e0d5b04ee9f1"
+  integrity sha512-PYowpx/E+TJT/8nKpp3JmJuKh3x1SZcxDF6Cquj0soV205TUpFFCZQMi91i5ACiEp2AkYvM/GDBIrw+rfIwzTg==
   dependencies:
     protobufjs "^6.8.6"
 
-apollo-engine-reporting@1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.0.7.tgz#d326b51b12b1f71a40885b8189dbcd162171c953"
-  integrity sha512-mFsXvd+1/o5jSa9tI2RoXYGcvCLcwwcfLwchjSTxqUd4ViB8RbqYKynzEZ+Omji7PBRM0azioBm43f7PSsQPqA==
+apollo-engine-reporting@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.2.1.tgz#0b77fad2e9221d62f4a29b8b4fab8f7f47dcc1d6"
+  integrity sha512-DVXZhz/nSZR4lphakjb1guAD0qJ7Wm1PVtZEBjN097cnOor4XSOzQlPfTaYtVuhlxUKUuCx1syiBbOuV8sKqXg==
   dependencies:
-    apollo-engine-reporting-protobuf "0.2.1"
-    apollo-graphql "^0.1.0"
-    apollo-server-core "2.4.8"
-    apollo-server-env "2.2.0"
+    apollo-engine-reporting-protobuf "0.3.0"
+    apollo-graphql "^0.3.0"
+    apollo-server-core "2.6.1"
+    apollo-server-env "2.4.0"
     async-retry "^1.2.1"
-    graphql-extensions "0.5.7"
+    graphql-extensions "0.7.1"
 
-apollo-env@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.4.0.tgz#f26c8570cc66edc3606d0cf9b66dbc1770b99353"
-  integrity sha512-TZpk59RTbXd8cEqwmI0KHFoRrgBRplvPAP4bbRrX4uDSxXvoiY0Y6tQYUlJ35zi398Hob45mXfrZxeRDzoFMkQ==
+apollo-env@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.5.1.tgz#b9b0195c16feadf0fe9fd5563edb0b9b7d9e97d3"
+  integrity sha512-fndST2xojgSdH02k5hxk1cbqA9Ti8RX4YzzBoAB4oIe1Puhq7+YlhXGXfXB5Y4XN0al8dLg+5nAkyjNAR2qZTw==
   dependencies:
-    core-js "3.0.0-beta.13"
+    core-js "^3.0.1"
     node-fetch "^2.2.0"
     sha.js "^2.4.11"
 
-apollo-graphql@^0.1.0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.1.3.tgz#98f9e6bb98ec08ae0dea6f125f640acf6de3f31f"
-  integrity sha512-bYgDh71jFfHKO9ioGlxnnoSYgpNp6LRl+/QHTx6tktQEN0Z+AdpkOKFNCHO/pRU/4vSqV5wuIhxhnCecxJQrMA==
+apollo-graphql@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.3.1.tgz#d13b80cc0cae3fe7066b81b80914c6f983fac8d7"
+  integrity sha512-tbhtzNAAhNI34v4XY9OlZGnH7U0sX4BP1cJrUfSiNzQnZRg1UbQYZ06riHSOHpi5RSndFcA9LDM5C1ZKKOUeBg==
   dependencies:
-    apollo-env "0.4.0"
+    apollo-env "0.5.1"
     lodash.sortby "^4.7.0"
 
 apollo-link@^1.2.3:
@@ -1743,31 +1748,31 @@ apollo-link@^1.2.3:
     apollo-utilities "^1.0.0"
     zen-observable-ts "^0.8.13"
 
-apollo-server-caching@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.3.1.tgz#63fcb2aaa176e1e101b36a8450e6b4c593d2767a"
-  integrity sha512-mfxzikYXbB/OoEms77AGYwRh7FF3Oim5v5XWAL+VL49FrkbZt5lopVa4bABi7Mz8Nt3Htl9EBJN8765s/yh8IA==
+apollo-server-caching@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.4.0.tgz#e82917590d723c0adc1fa52900e79e93ad65e4d9"
+  integrity sha512-GTOZdbLhrSOKYNWMYgaqX5cVNSMT0bGUTZKV8/tYlyYmsB6ey7l6iId3Q7UpHS6F6OR2lstz5XaKZ+T3fDfPzQ==
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@2.4.8:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.4.8.tgz#47e503a345e314222725597c889773e018d8c67a"
-  integrity sha512-N+5UOzHhMOnHizEiArJtNvEe/cGhSHQyTn5tlU4RJ36FDBJ/WlYZfPbGDMLISSUCJ6t+aP8GLL4Mnudt9d2PDQ==
+apollo-server-core@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.1.tgz#d0d878b0a4959b6c661fc43300ce45b29996176a"
+  integrity sha512-jO2BtcP7ozSSK5qtw1gGDwO66WSNtzhvpDJD7erkA9byv8Z0jB2QIPNWN6iaj311LaPahM05k+8hMIhFy9oHWg==
   dependencies:
-    "@apollographql/apollo-tools" "^0.3.3"
-    "@apollographql/graphql-playground-html" "^1.6.6"
+    "@apollographql/apollo-tools" "^0.3.6"
+    "@apollographql/graphql-playground-html" "1.6.20"
     "@types/ws" "^6.0.0"
-    apollo-cache-control "0.5.2"
-    apollo-datasource "0.3.1"
-    apollo-engine-reporting "1.0.7"
-    apollo-server-caching "0.3.1"
-    apollo-server-env "2.2.0"
-    apollo-server-errors "2.2.1"
-    apollo-server-plugin-base "0.3.7"
-    apollo-tracing "0.5.2"
+    apollo-cache-control "0.7.1"
+    apollo-datasource "0.5.0"
+    apollo-engine-reporting "1.2.1"
+    apollo-server-caching "0.4.0"
+    apollo-server-env "2.4.0"
+    apollo-server-errors "2.3.0"
+    apollo-server-plugin-base "0.5.1"
+    apollo-tracing "0.7.1"
     fast-json-stable-stringify "^2.0.0"
-    graphql-extensions "0.5.7"
+    graphql-extensions "0.7.1"
     graphql-subscriptions "^1.0.0"
     graphql-tag "^2.9.2"
     graphql-tools "^4.0.0"
@@ -1776,49 +1781,49 @@ apollo-server-core@2.4.8:
     subscriptions-transport-ws "^0.9.11"
     ws "^6.0.0"
 
-apollo-server-env@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.2.0.tgz#5eec5dbf46581f663fd6692b2e05c7e8ae6d6034"
-  integrity sha512-wjJiI5nQWPBpNmpiLP389Ezpstp71szS6DHAeTgYLb/ulCw3CTuuA+0/E1bsThVWiQaDeHZE0sE3yI8q2zrYiA==
+apollo-server-env@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.0.tgz#6611556c6b627a1636eed31317d4f7ea30705872"
+  integrity sha512-7ispR68lv92viFeu5zsRUVGP+oxsVI3WeeBNniM22Cx619maBUwcYTIC3+Y3LpXILhLZCzA1FASZwusgSlyN9w==
   dependencies:
     node-fetch "^2.1.2"
     util.promisify "^1.0.0"
 
-apollo-server-errors@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.2.1.tgz#f68a3f845929768057da7e1c6d30517db5872205"
-  integrity sha512-wY/YE3iJVMYC+WYIf8QODBjIP4jhI+oc7kiYo9mrz7LdYPKAgxr/he+NteGcqn/0Ea9K5/ZFTGJDbEstSMeP8g==
+apollo-server-errors@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz#700622b66a16dffcad3b017e4796749814edc061"
+  integrity sha512-rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw==
 
-apollo-server-express@^2.4.8:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.4.8.tgz#ec9eb61a87324555d49097e9fade3c7d142eb6cb"
-  integrity sha512-i60l32mfVe33jnKDPNYgUKUKu4Al0xEm2HLOSMgtJ9Wbpe/MbOx5X8M5F27fnHYdM+G5XfAErsakAyRGnQJ48Q==
+apollo-server-express@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.6.1.tgz#1e2649d3fd38c0c0a2c830090fd41e086b259c9f"
+  integrity sha512-TVu68LVp+COMGOXuxc0OFeCUQiPApxy7Isv2Vk85nikZV4t4FXlODB6PrRKf5rfvP31dvGsfE6GHPJTLLbKfyg==
   dependencies:
-    "@apollographql/graphql-playground-html" "^1.6.6"
+    "@apollographql/graphql-playground-html" "1.6.20"
     "@types/accepts" "^1.3.5"
     "@types/body-parser" "1.17.0"
     "@types/cors" "^2.8.4"
     "@types/express" "4.16.1"
     accepts "^1.3.5"
-    apollo-server-core "2.4.8"
+    apollo-server-core "2.6.1"
     body-parser "^1.18.3"
     cors "^2.8.4"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
     type-is "^1.6.16"
 
-apollo-server-plugin-base@0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.7.tgz#bfa4932fc9481bb36221545578d311db464af5a6"
-  integrity sha512-hW1jaLKf9qNOxMTwRq2CSqz3eqXsZuEiCc8/mmEtOciiVBq1GMtxFf19oIYM9HQuPvQU2RWpns1VrYN59L3vbg==
+apollo-server-plugin-base@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.1.tgz#b81056666763879bdc98d8d58f3c4c43cbb30da6"
+  integrity sha512-UejnBk6XDqYQ+Ydkbm+gvlOzP+doQA8glVUULs8rCi0/MshsFSsBVl6rtzruELDBVgZhJgGsd4pUexcvNc3aZA==
 
-apollo-tracing@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.5.2.tgz#cc49936fb435fa98d19c841514cfe05237c85b33"
-  integrity sha512-2FdwRvPIq9uuF6OzONroXep6VBGqzHOkP6LlcFQe7SdwxfRP+SD/ycHNSC1acVg2b8d+am9Kzqg2vV54UpOIKA==
+apollo-tracing@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.7.1.tgz#6a7356b619f3aa0ca22c623b5d8bb1af5ca1c74c"
+  integrity sha512-1BYQua+jCWFkZZJP0/rSpzY4XbLLbCrRHCYu8sJn0RCH/hs34BMdFXscS9uSglgIpXwUAIafgsU0hAVCrJjbTw==
   dependencies:
-    apollo-server-env "2.2.0"
-    graphql-extensions "0.5.4"
+    apollo-server-env "2.4.0"
+    graphql-extensions "0.7.1"
 
 apollo-utilities@^1.0.0, apollo-utilities@^1.0.1:
   version "1.0.21"
@@ -3353,11 +3358,6 @@ core-decorators@*, core-decorators@^0.20.0:
   version "0.20.0"
   resolved "https://registry.yarnpkg.com/core-decorators/-/core-decorators-0.20.0.tgz#605896624053af8c28efbe735c25a301a61c65c5"
 
-core-js@3.0.0-beta.13:
-  version "3.0.0-beta.13"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0-beta.13.tgz#7732c69be5e4758887917235fe7c0352c4cb42a1"
-  integrity sha512-16Q43c/3LT9NyePUJKL8nRIQgYWjcBhjJSMWg96PVSxoS0PeE0NHitPI3opBrs9MGGHjte1KoEVr9W63YKlTXQ==
-
 core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.3:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
@@ -3367,7 +3367,7 @@ core-js@^2.5.7:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
-core-js@^3.1.3:
+core-js@^3.0.1, core-js@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
   integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
@@ -3640,18 +3640,18 @@ debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3, debug@^3.1, debug@^3.2.5, debug@^3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  dependencies:
-    ms "^2.1.1"
-
 debug@^3.0, debug@^3.1.0:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
   dependencies:
     ms "^2.1.1"
 
+debug@^3.1, debug@^3.2.5, debug@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  dependencies:
+    ms "^2.1.1"
+
 debug@^4.1.0, debug@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
@@ -3885,10 +3885,10 @@ dir-glob@^2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
-dockerfile-ast@0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz#6f25f6ad55eeecdd297ab68b08be1b32e64b5aeb"
-  integrity sha512-cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==
+dockerfile-ast@0.0.16:
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz#10b329d343329dab1de70375833495f85ad65913"
+  integrity sha512-+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw==
   dependencies:
     vscode-languageserver-types "^3.5.0"
 
@@ -5158,19 +5158,12 @@ graphql-config@^1.1.1:
     lodash "^4.17.4"
     minimatch "^3.0.4"
 
-graphql-extensions@0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.5.4.tgz#18a9674f9adb11aa6c0737485887ea8877914cff"
-  integrity sha512-qLThJGVMqcItE7GDf/xX/E40m/aeqFheEKiR5bfra4q5eHxQKGjnIc20P9CVqjOn9I0FkEiU9ypOobfmIf7t6g==
-  dependencies:
-    "@apollographql/apollo-tools" "^0.3.3"
-
-graphql-extensions@0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.5.7.tgz#2b647e4e36997dc85b7f58ebd64324a5250fb2cf"
-  integrity sha512-HrU6APE1PiehZ46scMB3S5DezSeCATd8v+e4mmg2bqszMyCFkmAnmK6hR1b5VjHxhzt5/FX21x1WsXfqF4FwdQ==
+graphql-extensions@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.7.1.tgz#f55b01ac8ddf09a215e21f34caeee3ae66a88f21"
+  integrity sha512-4NkAz/f0j5a1DSPl3V77OcesBmwhHz56Soj0yTImlcDdRv9knyO2e+ehi1TIeKBOyIKS7d3A7zqOW/4ieGxlVA==
   dependencies:
-    "@apollographql/apollo-tools" "^0.3.3"
+    "@apollographql/apollo-tools" "^0.3.6"
 
 graphql-import@^0.4.0:
   version "0.4.5"
@@ -9855,6 +9848,11 @@ semver@^5.5.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
+semver@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -10109,41 +10107,43 @@ snyk-config@^2.2.1:
     lodash "^4.17.11"
     nconf "^0.10.0"
 
-snyk-docker-plugin@1.24.1:
-  version "1.24.1"
-  resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.24.1.tgz#a27fdabfdc86b00423968217850eff17ccdbd212"
-  integrity sha512-Y130BbrZ5hEPhjR1s57n5m1kNnlh4ydA000nPY4HvXylAX3JWQZR3/HFJ6nCKLes/z1cH19EsSdBNw7+r/N2ag==
+snyk-docker-plugin@1.25.1:
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.25.1.tgz#3f97dda88adfac2e1938151372d07905767bc8a1"
+  integrity sha512-n/LfA7VXjPEcSz2ZfZonT/DPSC89Zs1/HD0inPFN4RLQT3WiQnjqJUXct+D0nWwEVfhLWNc+Y7PLcTjpnZ9R3Q==
   dependencies:
-    debug "^3"
-    dockerfile-ast "0.0.12"
-    semver "^5.6.0"
+    debug "^4.1.1"
+    dockerfile-ast "0.0.16"
+    semver "^6.1.0"
     tslib "^1"
 
-snyk-go-parser@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.0.2.tgz#7f60455b5af9407ad06ddc310d4a139300545646"
-  integrity sha512-vQfrPecK3j5JYwEI5lO0Gsy+QvFN2dHusGecmiXYpQPiyn1QLnYFTBxFIu94buxlxdKtujYkR/lA4dB82LJ8Lw==
+snyk-go-parser@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.3.0.tgz#7539a5d191029c688e1b7effbeb2f17533f40375"
+  integrity sha512-qXzmvPyehnrqXMqROtM2PqkvRG7AEBPDDOAywxHdumgDgMPOwOQOZj9t94halDlqb3qVTYgNTupox9kg0tqovA==
   dependencies:
     toml "^3.0.0"
     tslib "^1.9.3"
 
-snyk-go-plugin@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.7.2.tgz#d93c068e4965a3c5f5edb0f45cfa27a165c310f4"
-  integrity sha512-PDYZplpMVS3G5mQWDJakje4h2QibJSfwuNNaKMjBYFi+i8YoO6SG//G57Pdkz0uJ5iz5sEldfEtQNN2xN/zlIw==
+snyk-go-plugin@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.9.0.tgz#fc6b3ae897949fad60f65bfc3033dd3d50b4661e"
+  integrity sha512-8keL4KKHZUXHK2R9DSaejzs4/UPokT1LsSLBxNsqxC9PJ8JSfXIErNmUCyZbCraVt3TPUbUyAfIYoekhokMgpQ==
   dependencies:
     debug "^4.1.1"
     graphlib "^2.1.1"
-    snyk-go-parser "1.0.2"
+    snyk-go-parser "1.3.0"
     tmp "0.0.33"
 
-snyk-gradle-plugin@2.10.2:
-  version "2.10.2"
-  resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-2.10.2.tgz#1822f618a01698745a1ad32aa5a0b891ccb0151d"
-  integrity sha512-XUn6ShQIY53qti8l3zluGsS2KjPGO0P3hfcXK9T34bWcOyLDLvSQjvM1HK/TpCqGldClbyuu+x6kHs5YRe+jjw==
+snyk-gradle-plugin@2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-2.12.0.tgz#d4dae0b2f9df9a59d5c865c5d841e2e8a2c26ecd"
+  integrity sha512-9J3wiqbd/CR6MbmqRfmXxvlGdQHo9cINwxsAoLKTErexGMXzlrEUVUiQ5F3XzUNajVCn+Kf9ukZdsLJF3JhA8A==
   dependencies:
+    "@types/debug" "^4.1.4"
     chalk "^2.4.2"
     clone-deep "^0.3.0"
+    debug "^4.1.1"
     tmp "0.0.33"
     tslib "^1.9.3"
 
@@ -10216,10 +10216,10 @@ snyk-policy@1.13.5:
     snyk-try-require "^1.3.1"
     then-fs "^2.0.0"
 
-snyk-python-plugin@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.10.0.tgz#16ce09a72b3676bfde2188837ee42e4695860938"
-  integrity sha512-U88Om9HxKxRp6EQ3Mn/iySr60ozjxzVaui+/Vmv6tcXqAEotstW/q24EBC3wmnRyAxzfZ7qTMQ+6XJxnYSKa2w==
+snyk-python-plugin@1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.10.1.tgz#db85448240857ba5f400efe4f856e16a38cad584"
+  integrity sha512-1UAYRBTgnHgzPyX/PUAh9Wb9Udp6Q162IAfftK9uhN1o+KVN3RzsP/jeR0MhOXqECu7f4eABUv4rh+bn25/3hw==
   dependencies:
     tmp "0.0.33"
 
@@ -10274,10 +10274,10 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1:
     lru-cache "^4.0.0"
     then-fs "^2.0.0"
 
-snyk@^1.161.1:
-  version "1.165.0"
-  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.165.0.tgz#8ab56a62fdf8d66f6c2c773082187a1814378a97"
-  integrity sha512-EFB4iZywig+4PMGn8EyLjNcAbESg8kxxPytRxu8gAV7fAd0HNsqAInwmTsd/4F3T3onjI9hAWfXv8UbkITh3FA==
+snyk@^1.173.1:
+  version "1.173.1"
+  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.173.1.tgz#de385211a77721bea626c68b46b90029ff903cff"
+  integrity sha512-ZqA2qMzsxjm6Q+arSuxnqNvCl8EhZpPBaVgRae3lyajaBssuwz4HmGb5fv86DnKJCDq/Ib+GKtzXTlBZT+s+Zw==
   dependencies:
     "@snyk/dep-graph" "1.4.1"
     "@snyk/gemfile" "1.2.0"
@@ -10298,22 +10298,23 @@ snyk@^1.161.1:
     proxy-from-env "^1.0.0"
     semver "^6.0.0"
     snyk-config "^2.2.1"
-    snyk-docker-plugin "1.24.1"
-    snyk-go-plugin "1.7.2"
-    snyk-gradle-plugin "2.10.2"
+    snyk-docker-plugin "1.25.1"
+    snyk-go-plugin "1.9.0"
+    snyk-gradle-plugin "2.12.0"
     snyk-module "1.9.1"
     snyk-mvn-plugin "2.3.0"
     snyk-nodejs-lockfile-parser "1.13.0"
     snyk-nuget-plugin "1.10.0"
     snyk-php-plugin "1.5.3"
     snyk-policy "1.13.5"
-    snyk-python-plugin "1.10.0"
+    snyk-python-plugin "1.10.1"
     snyk-resolve "1.0.1"
     snyk-resolve-deps "4.0.3"
     snyk-sbt-plugin "2.2.0"
     snyk-tree "^1.0.0"
     snyk-try-require "1.3.1"
     source-map-support "^0.5.11"
+    strip-ansi "^5.2.0"
     tempfile "^2.0.0"
     then-fs "^2.0.0"
     update-notifier "^2.5.0"
@@ -10684,7 +10685,7 @@ strip-ansi@^5.0.0:
   dependencies:
     ansi-regex "^4.0.0"
 
-strip-ansi@^5.1.0:
+strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index b93938ba3..2a9f76938 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -102,7 +102,7 @@
 		"webpack": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && node --max_old_space_size=4096 node_modules/webpack/bin/webpack.js"
 	},
 	"dependencies": {
-		"@agm/core": "^1.0.0-beta.5",
+		"@agm/core": "~1.0.0-beta.5",
 		"@angular/animations": "^7.2.11",
 		"@angular/cdk": "^7.3.6",
 		"@angular/common": "^7.2.11",
@@ -140,10 +140,12 @@
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"hammerjs": "^2.0.8",
+		"handlebars": "^4.1.2",
 		"http-server": "^0.11.1",
 		"ie-shim": "^0.1.0",
 		"masonry-layout": "^4.2.2",
 		"mdi-svg": "^2.2.43",
+		"neo-async": "^2.6.1",
 		"ng-lazyload-image": "^5.0.0",
 		"ngx-drag-scroll": "^7.1.3",
 		"ngx-hm-carousel": "^1.6.5-bata.1",
@@ -157,6 +159,7 @@
 		"sass-extract-loader": "^1.1.0",
 		"socket.io-client": "^2.2.0",
 		"stripe": "^7.0.0",
+		"uglify-js": "^3.6.0",
 		"uuid": "^3.3.2",
 		"web-animations-js": "^2.3.1",
 		"zone.js": "^0.8.29"
@@ -198,7 +201,7 @@
 		"exports-loader": "^0.7.0",
 		"expose-loader": "^0.7.5",
 		"extract-text-webpack-plugin": "~3.0.2",
-		"file-loader": "^3.0.1",
+		"file-loader": "~3.0.1",
 		"find-root": "^1.1.0",
 		"gh-pages": "^2.0.1",
 		"html-webpack-plugin": "^3.2.0",
@@ -225,7 +228,7 @@
 		"preload-webpack-plugin": "^2.3.0",
 		"prettier": "^1.16.4",
 		"protractor": "^5.4.2",
-		"raw-loader": "^1.0.0",
+		"raw-loader": "~1.0.0",
 		"rimraf": "^2.6.3",
 		"rxjs-tslint": "0.1.5",
 		"sass-loader": "^7.1.0",
@@ -242,7 +245,7 @@
 		"typedoc": "^0.14.2",
 		"typescript": "~3.1.6",
 		"uglifyjs-webpack-plugin": "^2.1.2",
-		"url-loader": "^1.1.2",
+		"url-loader": "~1.1.2",
 		"webpack": "^4.29.6",
 		"webpack-bundle-analyzer": "^3.1.0",
 		"webpack-cli": "^3.2.3",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index a179f614f..8cbb5475a 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@agm/core@^1.0.0-beta.5":
-  version "1.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.5.tgz#6dbceb666b2dbc4a868b97e1340a3faceb5f2113"
-  integrity sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ==
+"@agm/core@~1.0.0-beta.5":
+  version "1.0.0-beta.6"
+  resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.6.tgz#89a812b4b4ceb4d9cf2195400423c4b833103c5e"
+  integrity sha512-Bf6azUVIZYwgUWUNISaENh38D17XJxgKU7m1TNTrP+sIgYjPrjEON8mxoGnYI8B7PBbdaWl6RPV/FcrEfSG9Ng==
 
 "@angular-devkit/architect@0.13.8":
   version "0.13.8"
@@ -4307,7 +4307,7 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-loader@3.0.1, file-loader@^3.0.1:
+file-loader@3.0.1, file-loader@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
   integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
@@ -4968,6 +4968,17 @@ handlebars@*, handlebars@^4.0.1, handlebars@^4.0.6, handlebars@^4.1.0:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+handlebars@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -7069,6 +7080,11 @@ neo-async@^2.5.0, neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
+neo-async@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+
 next-tick@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
@@ -8501,7 +8517,7 @@ raw-body@2.3.3:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-raw-loader@1.0.0, raw-loader@^1.0.0:
+raw-loader@1.0.0, raw-loader@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405"
   integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==
@@ -10516,6 +10532,14 @@ uglify-js@^3.0.0, uglify-js@^3.1.4:
     commander "~2.20.0"
     source-map "~0.6.1"
 
+uglify-js@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
+  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
+  dependencies:
+    commander "~2.20.0"
+    source-map "~0.6.1"
+
 uglifyjs-webpack-plugin@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.1.2.tgz#70e5c38fb2d35ee887949c2a0adb2656c23296d5"
@@ -10642,7 +10666,7 @@ url-join@^2.0.2, url-join@^2.0.5:
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
   integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=
 
-url-loader@^1.1.2:
+url-loader@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
   integrity sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==

From a1cd392edb488c12677586bddcd1028ac6d8595c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 6 Jun 2019 15:37:14 +0300
Subject: [PATCH 358/382] chore: update packages to the latest version
 @fortawesome/fontawesome-svg-core, @fortawesome/free-brands-svg-icons,
 @fortawesome/free-regular-svg-icons, @fortawesome/free-solid-svg-icons

---
 shop/website-angular/package.json |  8 +++---
 shop/website-angular/yarn.lock    | 48 +++++++++++++++----------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 2a9f76938..48b4f85b0 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -117,10 +117,10 @@
 		"@angular/service-worker": "^7.2.11",
 		"@fortawesome/angular-fontawesome": "~0.3.0",
 		"@fortawesome/fontawesome-free": "^5.8.2",
-		"@fortawesome/fontawesome-svg-core": "^1.2.18",
-		"@fortawesome/free-brands-svg-icons": "^5.8.2",
-		"@fortawesome/free-regular-svg-icons": "^5.8.2",
-		"@fortawesome/free-solid-svg-icons": "^5.8.2",
+		"@fortawesome/fontawesome-svg-core": "^1.2.19",
+		"@fortawesome/free-brands-svg-icons": "^5.9.0",
+		"@fortawesome/free-regular-svg-icons": "^5.9.0",
+		"@fortawesome/free-solid-svg-icons": "^5.9.0",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
 		"@types/googlemaps": "^3.30.16",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 8cbb5475a..42e433fbe 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -353,43 +353,43 @@
   dependencies:
     tslib "^1.9.0"
 
-"@fortawesome/fontawesome-common-types@^0.2.18":
-  version "0.2.18"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.18.tgz#c0d8f073a5116b2de0a2c8a7aba66093a6956ce7"
-  integrity sha512-834DrzO2Ne3upCW+mJJPC/E6BsFcj+2Z1HmPIhbpbj8UaKmXWum4NClqLpUiMetugRlHuG4jbIHNdv2/lc3c1Q==
+"@fortawesome/fontawesome-common-types@^0.2.19":
+  version "0.2.19"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.19.tgz#754a0f85e1290858152e1c05700ab502b11197f1"
+  integrity sha512-nd2Ul/CUs8U9sjofQYAALzOGpgkVJQgEhIJnOHaoyVR/LeC3x2mVg4eB910a4kS6WgLPebAY0M2fApEI497raQ==
 
 "@fortawesome/fontawesome-free@^5.8.2":
   version "5.8.2"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.2.tgz#fae4112c4fb47086f6ae167e32524b280000abd5"
   integrity sha512-E4fDUF4fbu9AxKpaQQqCN3XBnNzb/5e0Gvd9OaQsYkK574LVI57v/EqqPfIm/mC7jYbxaPNrhvT5AF+Yzwyizg==
 
-"@fortawesome/fontawesome-svg-core@^1.2.18":
-  version "1.2.18"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.18.tgz#c26cbded461895ebe260f0dea771ca29d8cb3517"
-  integrity sha512-1vyLWVQqxQ8q8bA2zgZcljk3RkeELlDJ757ymLk+ebK019AFgEFH5kTnR5OMN1SFsTwW1OHlFQO3VufdeCg/Gg==
+"@fortawesome/fontawesome-svg-core@^1.2.19":
+  version "1.2.19"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.19.tgz#0eca1ce9285c3d99e6e340633ee8f615f9d1a2e0"
+  integrity sha512-D4ICXg9oU08eF9o7Or392gPpjmwwgJu8ecCFusthbID95CLVXOgIyd4mOKD9Nud5Ckz+Ty59pqkNtThDKR0erA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.18"
+    "@fortawesome/fontawesome-common-types" "^0.2.19"
 
-"@fortawesome/free-brands-svg-icons@^5.8.2":
-  version "5.8.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.8.2.tgz#e68a509c986d5d197cc5bd9ae8d966eff513468d"
-  integrity sha512-nhEWctDOP6f+Ka10LXAFoF+6mtWidC2iQgTBGRGgydmhBtcIEwyxWVx5wQHa86A1zAMi5TnipDAYQs2qn7DD6A==
+"@fortawesome/free-brands-svg-icons@^5.9.0":
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.9.0.tgz#4ebedba0ea026368f8c21f2c598b4458c32236e5"
+  integrity sha512-sOz1wFyslaHUak8tY6IEhSAV1mAWbCLssBR8yFQV6f065k8nUCkjyrcxW4RVl9+wiLXmeG1CJUABUJV9DiW+7Q==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.18"
+    "@fortawesome/fontawesome-common-types" "^0.2.19"
 
-"@fortawesome/free-regular-svg-icons@^5.8.2":
-  version "5.8.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.8.2.tgz#f61c603c73695a41bcee9d6f9d44e2ca4829f151"
-  integrity sha512-499WODlsDcXA9hM+Y3ZqoWj1kKhVLCHS8PnJs3zEaoPr5W6yrE9Jnp3C9Hb9KpwnRMh3IRXZ3XqxyUaQFMMRFw==
+"@fortawesome/free-regular-svg-icons@^5.9.0":
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.9.0.tgz#b16b325bdcdf51abebc547313cb75c3ef722ca04"
+  integrity sha512-6ZO0jLhk/Yrso0u5pXeYYSfZiHCNoCF7SgtqStdlEX8WtWD4IOfAB1N+MlSnMo12P5KR4cmucX/K0NCOPrhJwg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.18"
+    "@fortawesome/fontawesome-common-types" "^0.2.19"
 
-"@fortawesome/free-solid-svg-icons@^5.8.2":
-  version "5.8.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.8.2.tgz#aa2f042f73aca43eb4a26149907e63bf26d2e31c"
-  integrity sha512-5tF6WOFlqqO95zY5ukSB6jliDa3jnk1p5L4K/a58ccDFsbjSkhfGuvZkRkeWxH8uMms81pZd6yQTwQrkedeJmg==
+"@fortawesome/free-solid-svg-icons@^5.9.0":
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.9.0.tgz#1c73e7bac17417d23f934d83f7fff5b100a7fda9"
+  integrity sha512-U8YXPfWcSozsCW0psCtlRGKjjRs5+Am5JJwLOUmVHFZbIEWzaz4YbP84EoPwUsVmSAKrisu3QeNcVOtmGml0Xw==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.18"
+    "@fortawesome/fontawesome-common-types" "^0.2.19"
 
 "@jest/types@^24.8.0":
   version "24.8.0"

From ff76407b05a993975436434e97f9e7e6ab3adae6 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 6 Jun 2019 15:59:04 +0300
Subject: [PATCH 359/382] chore: update packages to the latest version husky,
 @nestjs/websockets

---
 admin/website-angular/package.json |  2 +-
 admin/website-angular/yarn.lock    |  8 ++++----
 backend/api/package.json           |  4 ++--
 backend/api/yarn.lock              | 16 ++++++++--------
 carrier/mobile-ionic/package.json  |  2 +-
 carrier/mobile-ionic/yarn.lock     |  8 ++++----
 merchant/tablet-ionic/package.json |  2 +-
 merchant/tablet-ionic/yarn.lock    |  8 ++++----
 package.json                       |  2 +-
 shop/mobile-ionic/package.json     |  2 +-
 shop/mobile-ionic/yarn.lock        |  8 ++++----
 shop/website-angular/package.json  |  2 +-
 shop/website-angular/yarn.lock     |  8 ++++----
 yarn.lock                          |  8 ++++----
 14 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index f86987c10..cf2af9106 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -187,7 +187,7 @@
 		"cross-env": "^5.2.0",
 		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
-		"husky": "^2.3.0",
+		"husky": "^2.4.0",
 		"jasmine-core": "^3.4.0",
 		"jasmine-spec-reporter": "^4.2.1",
 		"karma": "^4.1.0",
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 88767f335..b114ba9d7 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -7280,10 +7280,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
-  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
+husky@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.4.0.tgz#1bac7c44588f6e91f808b72efc82d24a57194f36"
+  integrity sha512-3k1wuZU20gFkphNWMjh2ISCFaqfbaLY7R9FST2Mj9HeRhUK9ydj9qQR8qfXlog3EctVGsyeilcZkIT7uBZDDVA==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
diff --git a/backend/api/package.json b/backend/api/package.json
index eedbd7b49..b23d2fddc 100644
--- a/backend/api/package.json
+++ b/backend/api/package.json
@@ -59,7 +59,7 @@
 		"@nestjs/platform-socket.io": "^6.1.1",
 		"@nestjs/swagger": "^3.0.2",
 		"@nestjs/typeorm": "^6.1.1",
-		"@nestjs/websockets": "^6.1.1",
+		"@nestjs/websockets": "^6.3.1",
 		"apollo-server-express": "^2.6.1",
 		"axios": "^0.19.0",
 		"bcrypt": "^3.0.4",
@@ -190,7 +190,7 @@
 		"coveralls": "^3.0.3",
 		"cross-env": "^5.2.0",
 		"cz-conventional-changelog": "^2.1.0",
-		"husky": "^2.3.0",
+		"husky": "^2.4.0",
 		"jest": "^24.7.1",
 		"nodemon": "^1.18.11",
 		"nyc": "^14.1.1",
diff --git a/backend/api/yarn.lock b/backend/api/yarn.lock
index f42681b5e..1f786e451 100644
--- a/backend/api/yarn.lock
+++ b/backend/api/yarn.lock
@@ -666,10 +666,10 @@
   dependencies:
     uuid "3.3.2"
 
-"@nestjs/websockets@^6.1.1":
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/@nestjs/websockets/-/websockets-6.1.1.tgz#99202e4ebe1310337926b5b32b264921ae957247"
-  integrity sha512-iPdp9ipM8cx2Entak4oI6eg1QPhNFH81kx9on44mQ8oAGRdZVcbiS2wQ+ERbwQyNIUsWSR390kObOlXKqelaxw==
+"@nestjs/websockets@^6.3.1":
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/websockets/-/websockets-6.3.1.tgz#f2cae8842a64f06d80cfcfeea196813152ec8db6"
+  integrity sha512-kkzDn2oULL7RpBUZ9Fh755rebXe9pqp67Pn84/1OMErLpk3XMSMXcfABomFNHKY2pbevxOk4ojpnm5WZdw3S9w==
   dependencies:
     iterare "1.1.2"
 
@@ -5511,10 +5511,10 @@ https-proxy-agent@^2.2.1:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
-husky@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
-  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
+husky@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.4.0.tgz#1bac7c44588f6e91f808b72efc82d24a57194f36"
+  integrity sha512-3k1wuZU20gFkphNWMjh2ISCFaqfbaLY7R9FST2Mj9HeRhUK9ydj9qQR8qfXlog3EctVGsyeilcZkIT7uBZDDVA==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 192b9c91b..70dcbd533 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -195,7 +195,7 @@
 		"cross-env": "^5.2.0",
 		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
-		"husky": "^2.3.0",
+		"husky": "^2.4.0",
 		"ionic": "^4.12.0",
 		"jasmine-core": "^3.3.0",
 		"jasmine-spec-reporter": "^4.2.1",
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index a298e63c5..e1d3a9b34 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -5401,10 +5401,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
-  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
+husky@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.4.0.tgz#1bac7c44588f6e91f808b72efc82d24a57194f36"
+  integrity sha512-3k1wuZU20gFkphNWMjh2ISCFaqfbaLY7R9FST2Mj9HeRhUK9ydj9qQR8qfXlog3EctVGsyeilcZkIT7uBZDDVA==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index bef59de21..4c4a656a1 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -206,7 +206,7 @@
 		"cross-env": "^5.2.0",
 		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
-		"husky": "^2.3.0",
+		"husky": "^2.4.0",
 		"ionic": "^4.12.0",
 		"rxjs-tslint": "0.1.5",
 		"terser": "^4.0.0",
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index bba54eb68..acc61ea39 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -5381,10 +5381,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
-  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
+husky@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.4.0.tgz#1bac7c44588f6e91f808b72efc82d24a57194f36"
+  integrity sha512-3k1wuZU20gFkphNWMjh2ISCFaqfbaLY7R9FST2Mj9HeRhUK9ydj9qQR8qfXlog3EctVGsyeilcZkIT7uBZDDVA==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
diff --git a/package.json b/package.json
index 79cfc264c..b434ee422 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
 		"conventional-changelog": "^3.1.4",
 		"cross-env": "^5.2.0",
 		"cz-conventional-changelog": "^2.1.0",
-		"husky": "^2.3.0",
+		"husky": "^2.4.0",
 		"jasmine-core": "^3.4.0",
 		"jasmine-spec-reporter": "^4.2.1",
 		"karma": "^4.1.0",
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 0bd51eb04..e64956e91 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -183,7 +183,7 @@
 		"cross-env": "^5.2.0",
 		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
-		"husky": "^2.3.0",
+		"husky": "^2.4.0",
 		"ionic": "^4.12.0",
 		"jasmine-core": "^3.3.0",
 		"jasmine-spec-reporter": "^4.2.1",
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 7ea026348..695ad4a1c 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -5351,10 +5351,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
-  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
+husky@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.4.0.tgz#1bac7c44588f6e91f808b72efc82d24a57194f36"
+  integrity sha512-3k1wuZU20gFkphNWMjh2ISCFaqfbaLY7R9FST2Mj9HeRhUK9ydj9qQR8qfXlog3EctVGsyeilcZkIT7uBZDDVA==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 48b4f85b0..02afc31e9 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -205,7 +205,7 @@
 		"find-root": "^1.1.0",
 		"gh-pages": "^2.0.1",
 		"html-webpack-plugin": "^3.2.0",
-		"husky": "^2.3.0",
+		"husky": "^2.4.0",
 		"imports-loader": "^0.8.0",
 		"istanbul-instrumenter-loader": "^3.0.1",
 		"jasmine-core": "^3.3.0",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 42e433fbe..cbeb1498c 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -5302,10 +5302,10 @@ humanize-url@^1.0.0:
     normalize-url "^1.0.0"
     strip-url-auth "^1.0.0"
 
-husky@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
-  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
+husky@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.4.0.tgz#1bac7c44588f6e91f808b72efc82d24a57194f36"
+  integrity sha512-3k1wuZU20gFkphNWMjh2ISCFaqfbaLY7R9FST2Mj9HeRhUK9ydj9qQR8qfXlog3EctVGsyeilcZkIT7uBZDDVA==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"
diff --git a/yarn.lock b/yarn.lock
index a36185220..83239a464 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3725,10 +3725,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
-  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
+husky@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.4.0.tgz#1bac7c44588f6e91f808b72efc82d24a57194f36"
+  integrity sha512-3k1wuZU20gFkphNWMjh2ISCFaqfbaLY7R9FST2Mj9HeRhUK9ydj9qQR8qfXlog3EctVGsyeilcZkIT7uBZDDVA==
   dependencies:
     cosmiconfig "^5.2.0"
     execa "^1.0.0"

From b7619d277c77112e8a6c024ee426d3b6a431eb33 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 6 Jun 2019 16:54:43 +0300
Subject: [PATCH 360/382] chore(ever-shop-web): update packages to the latest
 version file-loader, url-loader

---
 shop/website-angular/package.json |  4 ++--
 shop/website-angular/yarn.lock    | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index 02afc31e9..c88e5fe9a 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -201,7 +201,7 @@
 		"exports-loader": "^0.7.0",
 		"expose-loader": "^0.7.5",
 		"extract-text-webpack-plugin": "~3.0.2",
-		"file-loader": "~3.0.1",
+		"file-loader": "^4.0.0",
 		"find-root": "^1.1.0",
 		"gh-pages": "^2.0.1",
 		"html-webpack-plugin": "^3.2.0",
@@ -245,7 +245,7 @@
 		"typedoc": "^0.14.2",
 		"typescript": "~3.1.6",
 		"uglifyjs-webpack-plugin": "^2.1.2",
-		"url-loader": "~1.1.2",
+		"url-loader": "^2.0.0",
 		"webpack": "^4.29.6",
 		"webpack-bundle-analyzer": "^3.1.0",
 		"webpack-cli": "^3.2.3",
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index cbeb1498c..321c3a67d 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -4307,7 +4307,7 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-loader@3.0.1, file-loader@~3.0.1:
+file-loader@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
   integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
@@ -4315,6 +4315,14 @@ file-loader@3.0.1, file-loader@~3.0.1:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
+file-loader@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.0.0.tgz#c3570783fefb6e1bc0978a856f4bf5825b966c2a"
+  integrity sha512-roAbL6IdSGczwfXxhMi6Zq+jD4IfUpL0jWHD7fvmjdOVb7xBfdRUHe4LpBgO23VtVK5AW1OlWZo0p34Jvx3iWg==
+  dependencies:
+    loader-utils "^1.2.2"
+    schema-utils "^1.0.0"
+
 filename-reserved-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
@@ -6378,7 +6386,7 @@ loader-runner@^2.3.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.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@1.2.3, loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.2, 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==
@@ -10666,10 +10674,10 @@ url-join@^2.0.2, url-join@^2.0.5:
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
   integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=
 
-url-loader@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
-  integrity sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==
+url-loader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.0.0.tgz#600ef36f463e21bd673ad70156d850619d9cd092"
+  integrity sha512-RT3cz+Lw+kFMCKLabMyogFrc/aRoAMJHmY5os1VDBlav+4t5vxUxKDn47zCSFAYAl+hM8YLg4TZwG4TkJaafkg==
   dependencies:
     loader-utils "^1.1.0"
     mime "^2.0.3"

From c20c3cb4de0c9ccadedb0fc016399d6c882d376c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 7 Jun 2019 09:44:20 +0300
Subject: [PATCH 361/382] chore(ever-carrier): completed upgrade to angular 8

---
 carrier/mobile-ionic/angular.json             |    2 +-
 carrier/mobile-ionic/package.json             |   49 +-
 .../pages/main/common/map/map.component.ts    |    2 +-
 carrier/mobile-ionic/src/polyfills.ts         |    1 +
 carrier/mobile-ionic/yarn.lock                | 1998 +++++++++--------
 5 files changed, 1113 insertions(+), 939 deletions(-)

diff --git a/carrier/mobile-ionic/angular.json b/carrier/mobile-ionic/angular.json
index 7a5ede5db..50ba1592a 100644
--- a/carrier/mobile-ionic/angular.json
+++ b/carrier/mobile-ionic/angular.json
@@ -68,7 +68,7 @@
 					}
 				},
 				"serve": {
-					"builder": "@angular-builders/dev-server:generic",
+					"builder": "@angular-builders/custom-webpack:dev-server",
 					"options": {
 						"browserTarget": "app:build"
 					},
diff --git a/carrier/mobile-ionic/package.json b/carrier/mobile-ionic/package.json
index 296f2afac..629d00142 100644
--- a/carrier/mobile-ionic/package.json
+++ b/carrier/mobile-ionic/package.json
@@ -56,7 +56,6 @@
 		"@angular/common": "^8.0.0",
 		"@angular/core": "^8.0.0",
 		"@angular/forms": "^8.0.0",
-		"@angular/http": "^7.2.15",
 		"@angular/platform-browser": "^8.0.0",
 		"@angular/platform-browser-dynamic": "^8.0.0",
 		"@angular/pwa": "^0.800.1",
@@ -81,17 +80,17 @@
 		"@ionic-native/status-bar": "^5.3.0",
 		"@ionic-native/unique-device-id": "^5.3.0",
 		"@ionic-native/vibration": "^5.5.1",
-		"@ionic/angular": "^4.1.2",
+		"@ionic/angular": "^4.4.2",
 		"@ionic/pro": "^2.0.4",
 		"@ionic/storage": "^2.2.0",
 		"@ngx-progressbar/core": "^5.3.2",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
 		"angular2-logger": "^0.7.0",
-		"apollo-angular": "^1.5.0",
-		"apollo-angular-link-http": "^1.5.0",
-		"apollo-cache-inmemory": "^1.5.1",
-		"apollo-client": "^2.5.1",
+		"apollo-angular": "^1.6.0",
+		"apollo-angular-link-http": "^1.7.0",
+		"apollo-cache-inmemory": "^1.6.2",
+		"apollo-client": "^2.6.2",
 		"apollo-link": "^1.2.11",
 		"apollo-link-context": "^1.0.17",
 		"apollo-link-ws": "^1.0.17",
@@ -132,7 +131,7 @@
 		"graphql-tag": "^2.10.1",
 		"handlebars": "^4.1.2",
 		"hooks-fixed": "^2.0.2",
-		"ionicons": "^4.5.5",
+		"ionicons": "^4.5.8",
 		"kareem": "^2.3.0",
 		"lodash": "^4.17.11",
 		"mongoose": "^5.5.13",
@@ -144,8 +143,8 @@
 		"phonegap-plugin-barcodescanner": "^8.0.1",
 		"qrcode": "^1.3.3",
 		"reflect-metadata": "^0.1.13",
-		"rxjs": "^6.4.0",
-		"rxjs-compat": "^6.4.0",
+		"rxjs": "^6.5.2",
+		"rxjs-compat": "^6.5.2",
 		"sass-loader": "^7.1.0",
 		"save": "^2.3.3",
 		"socket.io-client": "^2.2.0",
@@ -156,25 +155,24 @@
 		"uglify-js": "^3.6.0",
 		"uuid": "^3.3.2",
 		"waves": "^0.1.1",
-		"zone.js": "^0.9.0"
+		"zone.js": "^0.9.1"
 	},
 	"devDependencies": {
-		"@angular-builders/custom-webpack": "~7.4.3",
-		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "~0.13.8",
-		"@angular-devkit/build-angular": "~0.13.8",
-		"@angular-devkit/build-webpack": "~0.13.8",
-		"@angular-devkit/core": "~7.3.8",
-		"@angular-devkit/schematics": "~7.3.8",
-		"@angular/cli": "~7.3.8",
+		"@angular-builders/custom-webpack": "^8.0.2",
+		"@angular-devkit/architect": "^0.800.2",
+		"@angular-devkit/build-angular": "^0.800.2",
+		"@angular-devkit/build-webpack": "^0.800.2",
+		"@angular-devkit/core": "^8.0.2",
+		"@angular-devkit/schematics": "^8.0.2",
+		"@angular/cli": "^8.0.2",
 		"@angular/compiler": "^8.0.0",
-		"@angular/compiler-cli": "~7.2.12",
-		"@angular/language-service": "~7.2.12",
+		"@angular/compiler-cli": "^8.0.0",
+		"@angular/language-service": "^8.0.0",
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.1",
-		"@ionic/app-scripts": "^3.2.3",
-		"@ionic/lab": "^2.0.0",
-		"@schematics/angular": "^7.3.8",
+		"@ionic/app-scripts": "^3.2.4",
+		"@ionic/lab": "^2.0.1",
+		"@schematics/angular": "^8.0.2",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
 		"@types/graphql": "^14.0.7",
@@ -190,13 +188,14 @@
 		"@types/swiper": "^4.4.2",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
+		"@webcomponents/webcomponentsjs": "^2.2.10",
 		"codelyzer": "^5.0.1",
 		"cpr": "^3.0.1",
 		"cross-env": "^5.2.0",
 		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
 		"husky": "^2.4.0",
-		"ionic": "^4.12.0",
+		"ionic": "^5.0.1",
 		"jasmine-core": "^3.3.0",
 		"jasmine-spec-reporter": "^4.2.1",
 		"karma": "^4.0.1",
@@ -210,7 +209,7 @@
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
-		"typescript": "~3.2.4",
+		"typescript": "3.4.5",
 		"webpack-bundle-analyzer": "^3.1.0",
 		"webpack-merge": "^4.2.1",
 		"yargs": "^13.2.4"
diff --git a/carrier/mobile-ionic/src/pages/main/common/map/map.component.ts b/carrier/mobile-ionic/src/pages/main/common/map/map.component.ts
index fbe81e574..de41f785e 100644
--- a/carrier/mobile-ionic/src/pages/main/common/map/map.component.ts
+++ b/carrier/mobile-ionic/src/pages/main/common/map/map.component.ts
@@ -8,7 +8,7 @@ const directionsService = new google.maps.DirectionsService();
 	templateUrl: 'map.component.html'
 })
 export class MapComponent implements OnInit {
-	@ViewChild('map', { static: false })
+	@ViewChild('map', { static: true })
 	mapElement: ElementRef;
 
 	map: google.maps.Map;
diff --git a/carrier/mobile-ionic/src/polyfills.ts b/carrier/mobile-ionic/src/polyfills.ts
index 9d02706c4..f7d78da60 100644
--- a/carrier/mobile-ionic/src/polyfills.ts
+++ b/carrier/mobile-ionic/src/polyfills.ts
@@ -22,6 +22,7 @@
 };
 
 (window as any).global = window;
+import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js';
 
 /** IE9, IE10 and IE11 requires all of the following polyfills. **/
 // import 'core-js/es6/symbol';
diff --git a/carrier/mobile-ionic/yarn.lock b/carrier/mobile-ionic/yarn.lock
index 44d885932..23a413326 100644
--- a/carrier/mobile-ionic/yarn.lock
+++ b/carrier/mobile-ionic/yarn.lock
@@ -2,77 +2,76 @@
 # yarn lockfile v1
 
 
-"@angular-builders/custom-webpack@~7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-7.4.3.tgz#c95e32f007ca956cbeac703206f7c3b573029aee"
-  integrity sha512-dizPcKBSdgM8ztVbhOdVxHnfV/FBkTi1ZirsxWaw1B0S0KuPTESnsJaZA15i8Y2l202hCPs5fJfqy5aCoRrs1Q==
+"@angular-builders/custom-webpack@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-8.0.2.tgz#0303d87e13f3fe3336098875ed109e093ab0c49b"
+  integrity sha512-ZxR931h0FX/5YZC6RBBczeMkgwOO0eD83EoOtjcshK2mw6jBarONlifhr6Ud0ALyU7fGueOCTgqgGaVwT1QEbw==
   dependencies:
     lodash "^4.17.10"
+    webpack-merge "^4.2.1"
 
-"@angular-builders/dev-server@^7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
-  integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
-
-"@angular-devkit/architect@0.13.9", "@angular-devkit/architect@~0.13.8":
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.9.tgz#8bbca4b968fccbf88fc2f86542cbee09e1256e1f"
-  integrity sha512-EAFtCs9dsGhpMRC45PoYsrkiExpWz9Ax15qXfzwdDRacz5DmdOVt+QpkLW1beUOwiyj/bhFyj23eaONK2RTn/w==
+"@angular-devkit/architect@0.800.2", "@angular-devkit/architect@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.2.tgz#0924864e57d1e56bddeae257c8779a2662c34e69"
+  integrity sha512-251GOQwI3254AtnGWZoHmjOMFcz7h6M3fPmRHpYuuhRPIwZnQCKaszYI7gaP9zR7uArLUwsuPo+YYz8lb6Giwg==
   dependencies:
-    "@angular-devkit/core" "7.3.9"
-    rxjs "6.3.3"
+    "@angular-devkit/core" "8.0.2"
+    rxjs "6.4.0"
 
-"@angular-devkit/build-angular@~0.13.8":
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.9.tgz#92ef7b55a1aa055b2f5c8ffed4bdb04df86db678"
-  integrity sha512-onh07LhdxotDFjja0KKsDWNCwgpM/ymuRr5h0e+vT4AgklP2Uioz1CpzVOgxPIKkdVdGR9QgDinVsWAmY90J8g==
+"@angular-devkit/build-angular@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.2.tgz#712f106f50fb8301816e4417493e98e1e12eb296"
+  integrity sha512-RlYPEp5FVKosgzWhbI7llM3lGIxAYuCwEPloeUL4XaDasNe2zmLNUlYDVTrF7GpZRoAgiIejmT0HvvKfEuZNZQ==
   dependencies:
-    "@angular-devkit/architect" "0.13.9"
-    "@angular-devkit/build-optimizer" "0.13.9"
-    "@angular-devkit/build-webpack" "0.13.9"
-    "@angular-devkit/core" "7.3.9"
-    "@ngtools/webpack" "7.3.9"
-    ajv "6.9.1"
-    autoprefixer "9.4.6"
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/build-optimizer" "0.800.2"
+    "@angular-devkit/build-webpack" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    "@ngtools/webpack" "8.0.2"
+    ajv "6.10.0"
+    autoprefixer "9.5.1"
+    browserslist "4.5.5"
+    caniuse-api "3.0.0"
     circular-dependency-plugin "5.0.2"
     clean-css "4.2.1"
-    copy-webpack-plugin "4.6.0"
+    copy-webpack-plugin "5.0.2"
+    core-js "3.0.1"
     file-loader "3.0.1"
     glob "7.1.3"
     istanbul-instrumenter-loader "3.0.1"
-    karma-source-map-support "1.3.0"
+    karma-source-map-support "1.4.0"
     less "3.9.0"
     less-loader "4.1.0"
-    license-webpack-plugin "2.1.0"
+    license-webpack-plugin "2.1.1"
     loader-utils "1.2.3"
-    mini-css-extract-plugin "0.5.0"
+    mini-css-extract-plugin "0.6.0"
     minimatch "3.0.4"
-    open "6.0.0"
+    open "6.2.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
     postcss-loader "3.0.0"
     raw-loader "1.0.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
+    sass "1.19.0"
     sass-loader "7.1.0"
-    semver "5.6.0"
+    semver "6.0.0"
     source-map-loader "0.2.4"
-    source-map-support "0.5.10"
+    source-map-support "0.5.12"
     speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
     stylus-loader "3.0.2"
-    terser-webpack-plugin "1.2.2"
+    terser-webpack-plugin "1.2.3"
     tree-kill "1.2.1"
-    webpack "4.29.0"
-    webpack-dev-middleware "3.5.1"
-    webpack-dev-server "3.1.14"
+    webpack "4.30.0"
+    webpack-dev-middleware "3.6.2"
+    webpack-dev-server "3.3.1"
     webpack-merge "4.2.1"
     webpack-sources "1.3.0"
     webpack-subresource-integrity "1.1.0-rc.6"
-  optionalDependencies:
-    node-sass "4.12.0"
+    worker-plugin "3.1.0"
 
 "@angular-devkit/build-optimizer@0.0.35":
   version "0.0.35"
@@ -84,24 +83,25 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.9":
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.9.tgz#05a25ca7743876987158881585c55dfc478b95bd"
-  integrity sha512-GQtCntthQHSBv5l1ZY5p00JOECb/WcE1qUBo5kFjp84z0fszDkhOy52M1kcWCX4PFzJaY4DKk58hbUE/2UN0jw==
+"@angular-devkit/build-optimizer@0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.2.tgz#4223b2ac8c2a4c05682d1f3cb0417b4630b4a943"
+  integrity sha512-A/lX7Fjfeh5PspGURV8fJeOsrIYM/7why7mC6v78zdxaErd4S18wUXJDfndjx3qiKyuq76Uu4cQcS7XfClpb8Q==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
-    typescript "3.2.4"
+    typescript "3.4.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.9", "@angular-devkit/build-webpack@~0.13.8":
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.9.tgz#9fa091d778db752c539e1c585e21ba47d7054672"
-  integrity sha512-6ypu6pzNmQxzATF4rTWEhGSl5hyGQ8a/3aCZF/ux+XGc3d4hi2HW+NWlDm1UEna6ZjNtgEPlgfP4q8BKrjRmfA==
+"@angular-devkit/build-webpack@0.800.2", "@angular-devkit/build-webpack@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.2.tgz#af90ea503eece948390bce154a53df9d7c566539"
+  integrity sha512-Bd/sazcriUTFQCGFDyUkjXSmpn8hRLIyLIXBLAn+5coH4Y4xNy8PXt+hnr6ffwu92h/WnyxKIJi44+5aoUBURA==
   dependencies:
-    "@angular-devkit/architect" "0.13.9"
-    "@angular-devkit/core" "7.3.9"
-    rxjs "6.3.3"
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    rxjs "6.4.0"
+    webpack-merge "4.2.1"
 
 "@angular-devkit/core@7.3.8":
   version "7.3.8"
@@ -114,17 +114,6 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/core@7.3.9", "@angular-devkit/core@~7.3.8":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.9.tgz#bef2aaa0be7219c546fb99ea0ba9dd3a6dcd288a"
-  integrity sha512-SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw==
-  dependencies:
-    ajv "6.9.1"
-    chokidar "2.0.4"
-    fast-json-stable-stringify "2.0.0"
-    rxjs "6.3.3"
-    source-map "0.7.3"
-
 "@angular-devkit/core@8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.1.tgz#4a38141006deefa2f60f105b458d32885ffc1bec"
@@ -136,6 +125,17 @@
     rxjs "6.4.0"
     source-map "0.7.3"
 
+"@angular-devkit/core@8.0.2", "@angular-devkit/core@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.2.tgz#22b017b38b4d6127ab2e39a27990fd7962d3844a"
+  integrity sha512-S2OPYe6Qu7qTS8Q2lzf4qNjXdbN/J2YVnd3wGauMI8Tih5tY/NzUW3h5ds09nRcjsdBDuT0qgf3IMlCZWIABvQ==
+  dependencies:
+    ajv "6.10.0"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
@@ -144,14 +144,6 @@
     "@angular-devkit/core" "7.3.8"
     rxjs "6.3.3"
 
-"@angular-devkit/schematics@7.3.9", "@angular-devkit/schematics@~7.3.8":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.9.tgz#4fe7bc878b116b157a3adf00583c28c951215877"
-  integrity sha512-xzROGCYp7aQbeJ3V6YC0MND7wKEAdWqmm/GaCufEk0dDS8ZGe0sQhcM2oBRa2nQqGQNeThFIH51kx+FayrJP0w==
-  dependencies:
-    "@angular-devkit/core" "7.3.9"
-    rxjs "6.3.3"
-
 "@angular-devkit/schematics@8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.1.tgz#1f0f616681eb451de31fa5f2d848f5ecbc6226d4"
@@ -160,6 +152,14 @@
     "@angular-devkit/core" "8.0.1"
     rxjs "6.4.0"
 
+"@angular-devkit/schematics@8.0.2", "@angular-devkit/schematics@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.2.tgz#854a4366c7dc7462bebd10c24e808b5c9f65b6e2"
+  integrity sha512-v+g0MOPADJJ5QNNmojCyh2sw1GOzadlbHPdTFqZOm77b2Bi79dRm+yuYMuY6a2nUt7DIcioLRcOFwV8UctajRg==
+  dependencies:
+    "@angular-devkit/core" "8.0.2"
+    rxjs "6.4.0"
+
 "@angular/animations@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
@@ -167,24 +167,28 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@~7.3.8":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.9.tgz#0366b5a66654c1f02ab2f3a9f15ebde446d506a4"
-  integrity sha512-7oJj7CKDlFUbQav1x1CV4xKKcbt0pnxY4unKcm7Q1tVXhu8bU2bc3cDA0aJnbofcYb6TJcd/C2qHgCt78q7edA==
-  dependencies:
-    "@angular-devkit/architect" "0.13.9"
-    "@angular-devkit/core" "7.3.9"
-    "@angular-devkit/schematics" "7.3.9"
-    "@schematics/angular" "7.3.9"
-    "@schematics/update" "0.13.9"
+"@angular/cli@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.2.tgz#b64c044342f0af2ed7e78e51c54087693407a47b"
+  integrity sha512-xXSCwTKonC6nMqKPDlEFhXjKBu85jVB+KYo2tLU+RKtgFeIF/hTaUWQTvWXRwRsQAfBhB1cwe0oijdljOItTgw==
+  dependencies:
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
+    "@schematics/angular" "8.0.2"
+    "@schematics/update" "0.800.2"
     "@yarnpkg/lockfile" "1.1.0"
+    debug "^4.1.1"
     ini "1.3.5"
-    inquirer "6.2.1"
+    inquirer "6.3.1"
     npm-package-arg "6.1.0"
-    open "6.0.0"
-    pacote "9.4.0"
-    semver "5.6.0"
+    open "6.2.0"
+    pacote "9.5.0"
+    read-package-tree "5.2.2"
+    semver "6.0.0"
     symbol-observable "1.2.0"
+    universal-analytics "^0.4.20"
+    uuid "^3.3.2"
 
 "@angular/common@^8.0.0":
   version "8.0.0"
@@ -193,10 +197,10 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@~7.2.12":
-  version "7.2.15"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.15.tgz#25cc3a6556ba726d00c4992ad894f8db203f4fbc"
-  integrity sha512-+AsfyKawmj/sa+m4Pz8VSRFbCfx/3IOjAuuEjhopbyr154YpPDSu8NTbcwzq3yfbVcPwK4/4exmbQzpsndaCTg==
+"@angular/compiler-cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0.tgz#b53ebb5accc34a68bf7a63d16130ca7c568f8a51"
+  integrity sha512-Z0U0Ih8A7V3J1gq7AXnXbrGAD2ERmz7JbREJJRHDWiUNxIqGQiV3Odo1V8FL5n/cKvLwSYM2Ubvk10gb0+3njA==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -208,7 +212,7 @@
     shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
-    yargs "9.0.1"
+    yargs "13.1.0"
 
 "@angular/compiler@^8.0.0":
   version "8.0.0"
@@ -231,17 +235,10 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.15":
-  version "7.2.15"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.15.tgz#a32bea9e67e99eef88150085aeebbe7aeecd39eb"
-  integrity sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/language-service@~7.2.12":
-  version "7.2.15"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.15.tgz#b2ba33e472dc5e530047c408ff7a35deba4427b8"
-  integrity sha512-Ig5Jr7mnDelaZvSbUd9YhI5am3q1ku9xelAuwvtyDKvQJeKQj3BtTagcOgWrnQBfrJ/FsA/M5Zo48ncSsV0tqQ==
+"@angular/language-service@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0.tgz#1ee4ce5003897cad53597da28f4c94fe30519bfb"
+  integrity sha512-vGk14oWroEo6ycO4cooznx57nn2sASmCQ/sdE8UVwySUKl940TsVzijgaGqapTepFof9sMqN77y2G15eRKQeAQ==
 
 "@angular/platform-browser-dynamic@^8.0.0":
   version "8.0.0"
@@ -579,18 +576,18 @@
     typescript "~3.3.3333"
     ws "^6.1.4"
 
-"@ionic/angular@^4.1.2":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.2.0.tgz#f90ad2b8b5f515a9cfc1025c8b40ec77fddb2c1c"
-  integrity sha512-ALZNxEZjkBJDyLH0mqcZQsgi9yUWB8uW2u6kg6ZjjSGf6atQL1IhOt+tTvdE98GWoNwFghNmdg9IFCFjUhANjw==
+"@ionic/angular@^4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@ionic/angular/-/angular-4.4.2.tgz#9b4e23fb4e76b218332c63e5cb7a9fafcaaec586"
+  integrity sha512-ihjhvPFXqDS3HURvAfSH5vMlCersP08pnxfek36IOKX1sYOYq6VI/2miTv+jr7GuIZlmyZan0PibiRZPg7DIqA==
   dependencies:
-    "@ionic/core" "4.2.0"
+    "@ionic/core" "4.4.2"
     tslib "^1.9.3"
 
-"@ionic/app-scripts@^3.2.3":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@ionic/app-scripts/-/app-scripts-3.2.3.tgz#b1bc492f2ff49777ec0f6594930a0e707a641a4f"
-  integrity sha512-t1kL9NqY/sVLfAIVKfN4VJigPqMWs5euKxig3sjsrakSQ9z4njmbDghzAC4taefIpYxLGMOeWgKwrrxOiLkdWQ==
+"@ionic/app-scripts@^3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@ionic/app-scripts/-/app-scripts-3.2.4.tgz#db3f6a215ba226099db2a9af41f0f6bb5d4cc368"
+  integrity sha512-Wt6bBnLtyknbTn6ikUTst2HLs5ww+BL9FpYv2dQWZwDODYqyWFkQQvdXj0IFibU2umXFOH5nQXJin2vvgtovzA==
   dependencies:
     "@angular-devkit/build-optimizer" "0.0.35"
     autoprefixer "^7.2.6"
@@ -620,45 +617,18 @@
     ws "3.3.2"
     xml2js "^0.4.19"
 
-"@ionic/cli-framework@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-1.7.0.tgz#6cb516ad6a95b10c7e3197e9510eb64c1d580587"
-  integrity sha512-2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg==
-  dependencies:
-    "@ionic/utils-array" "0.0.1"
-    "@ionic/utils-fs" "1.2.0"
-    "@ionic/utils-object" "0.0.1"
-    "@ionic/utils-process" "0.1.0"
-    "@ionic/utils-stream" "0.0.1"
-    "@ionic/utils-subprocess" "0.1.0"
-    "@ionic/utils-terminal" "0.0.1"
-    chalk "^2.3.0"
-    debug "^4.0.0"
-    inquirer "^6.0.0"
-    lodash "^4.17.5"
-    log-update "^2.3.0"
-    minimist "^1.2.0"
-    rimraf "^2.6.2"
-    slice-ansi "^2.0.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-    tslib "^1.9.0"
-    untildify "^3.0.2"
-    wrap-ansi "^4.0.0"
-    write-file-atomic "^2.3.0"
-
-"@ionic/cli-framework@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-2.0.0.tgz#0fa5de4b97d9473b97cca8076b307ac40ca0c8d2"
-  integrity sha512-AovnYq4bH1eFKiAiuaze3YXK9DeOGq1ODn6bUPOquYrQeXpMQmxbYYleLlJ2sKj1UTr7VpfdoO1dJARkyRayOQ==
-  dependencies:
-    "@ionic/utils-array" "1.0.0"
-    "@ionic/utils-fs" "2.0.0"
-    "@ionic/utils-object" "1.0.0"
-    "@ionic/utils-process" "1.0.0"
-    "@ionic/utils-stream" "1.0.0"
-    "@ionic/utils-subprocess" "1.0.0"
-    "@ionic/utils-terminal" "1.0.0"
+"@ionic/cli-framework@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-2.0.1.tgz#f91923b045ca656248798a23f8498b41e63034c8"
+  integrity sha512-4ZIbKJg5LTKE8xNUIZCZnX/VrsuKQbdPdeQ8HTkuxUotqT2ceAExuq2r8LLQ4nquRvUZGwJdGF+1w2UwZlg8yA==
+  dependencies:
+    "@ionic/utils-array" "1.0.1"
+    "@ionic/utils-fs" "2.0.1"
+    "@ionic/utils-object" "1.0.1"
+    "@ionic/utils-process" "1.0.1"
+    "@ionic/utils-stream" "1.0.1"
+    "@ionic/utils-subprocess" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     chalk "^2.3.0"
     debug "^4.0.0"
     inquirer "^6.0.0"
@@ -674,30 +644,30 @@
     wrap-ansi "^5.1.0"
     write-file-atomic "^2.3.0"
 
-"@ionic/core@4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.2.0.tgz#9b71c4b22a6b58cfe1bd3b1e24142b462ed9b480"
-  integrity sha512-JGnx8NV9z3Bgg/Ds/uEe4PPwp/UWnxqU35koByWZcyDpdb1WTwF8b4iJA8QGoj2DWEyFx7qt3c/bw3Zk/F7JPw==
+"@ionic/core@4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@ionic/core/-/core-4.4.2.tgz#7bcadf125b77e08d2166581a00e1bcb35976547f"
+  integrity sha512-B6cA8Nz29hB+FxRHZ78em1Zlo2r1NqTl6HfiIA8lQtfI9tj4VQe7R1mF/Qb9jaati1U2k4eaHbxiwJ50Hez/4w==
   dependencies:
-    ionicons "4.5.5"
+    ionicons "4.5.8"
 
-"@ionic/discover@1.0.13":
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/@ionic/discover/-/discover-1.0.13.tgz#a9cfe9559b37f3665112bb30edb489f9b5470ef4"
-  integrity sha512-9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA==
+"@ionic/discover@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/discover/-/discover-2.0.1.tgz#fd5ec41a6a4c335d88f1febca76baf311d95e4a7"
+  integrity sha512-ADGcv+JY7+cc20l3D0/EOAMnWkALwmlimFrms8DsDwCX4zLOpIB8sHuLfteNEwUFMFDgkHs543WdrkeGbEz/AA==
   dependencies:
     debug "^4.0.0"
     netmask "^1.0.6"
     tslib "^1.9.0"
     ws "^6.0.0"
 
-"@ionic/lab@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-2.0.0.tgz#f879730fcea9b6b974dd19bf90ac2478d18253fc"
-  integrity sha512-XbgkR94fdZ/WhWb39vcY+3+YttPEp4iIKys8TFWX5Dp6eNdKFu9Zg1hXVnn/ZcMYaPn5cSXFraSelKM9/WiwYA==
+"@ionic/lab@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-2.0.1.tgz#a3a38d114c0d8b6f9e84d9b710d53340bb75d844"
+  integrity sha512-CHiUkw98NGX8XoaOFUEGmWYjJ6XgqSI0j8SSepk4CtveTJ8+OraCjOG0k/dOkQbrqWEra+apHH3jqnC4WOdPLQ==
   dependencies:
-    "@ionic/cli-framework" "2.0.0"
-    "@ionic/utils-fs" "2.0.0"
+    "@ionic/cli-framework" "2.0.1"
+    "@ionic/utils-fs" "2.0.1"
     chalk "^2.3.0"
     express "^4.16.2"
     tslib "^1.9.0"
@@ -716,147 +686,79 @@
     localforage-cordovasqlitedriver "1.7.0"
     tslib "^1.7.1"
 
-"@ionic/utils-array@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-0.0.1.tgz#40469892e6a58995687a60c1dcf0f93c7da3b925"
-  integrity sha512-gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-array@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-1.0.0.tgz#f9967f4cf121c3d16d88943116564aac4df1dd47"
-  integrity sha512-W0wTuUCmQ7ZDfnIOJ11gmszXlv9xYNO3z99TqbNKBQHyr4dm3mRhAKrfZslPQ202VTvh9/e0Nwx8znu+zUMaJQ==
+"@ionic/utils-array@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-1.0.1.tgz#7c5b4732218f350e4197804b87af451089761ce1"
+  integrity sha512-XqGhwcGS5XwXpQbGi1K97UY1bBZLYlj/DQ5HVE6551C6QF6PRM8WAlpKs4m4Y1MZ5FRLbZOSykcx6q4mlFF5FA==
   dependencies:
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-fs@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-1.2.0.tgz#bc4492c5d57f910dedac2d3a33026d71ff3a51d5"
-  integrity sha512-31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA==
-  dependencies:
-    debug "^4.0.0"
-    fs-extra "^7.0.1"
-    through2 "^3.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-fs@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-2.0.0.tgz#f5188f17d63c4d70d8b1af095f2f60c70c4bcb16"
-  integrity sha512-WKIwS7WNsxabq2fpbkoDFKvNfPnkoFtdmxFuD5qztBG/tGD8zCE8ON1dui9DjKVDIR4lr6rkovmdVu2SCVM3rA==
+"@ionic/utils-fs@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-2.0.1.tgz#49bc3bab56f911cc73abdef7a8b0c53c0a3a9ba3"
+  integrity sha512-dwsa9puttLOlLoAa6sZQRqQIp/TIqmxECun8Ec/AnL0hfeFvpyq5MOjo/3rkq2Oq5bEiZr5ppe8hGEpl8pVx7Q==
   dependencies:
     debug "^4.0.0"
     fs-extra "^7.0.1"
     through2 "^3.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-network@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-network/-/utils-network-0.0.8.tgz#371b3bbc1d7ee770fbcbc5759fdcdf215d8865c6"
-  integrity sha512-DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-object@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-0.0.1.tgz#07aa9ce3ae6069e6ed589444ca2c80b691b70585"
-  integrity sha512-ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-object@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-1.0.0.tgz#2783cf44d99164087688054bc41f6a453535f2a2"
-  integrity sha512-Bn8X+3LLKLX2HT1jjcZvavKB7W5JAm8gWW+NybClO2D8S6Py0Fr0ckB5XKrYnNmk2C/Dr7n+Ga5dMypei/xAxA==
+"@ionic/utils-network@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-network/-/utils-network-1.0.1.tgz#52063de7f00b2d587b1d32d2ae265619e9984388"
+  integrity sha512-3fqq+2SzlWRpf4029Cry86D/Vb/hTc2zO90GtFlCU+3az2IpGQOzGeVrZ8az9pgzROY/hDfdL6VUsvwF4MF20g==
   dependencies:
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-process@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-0.1.0.tgz#35263b7e2cc5b05b6e21ab7105eb8ccf78befadd"
-  integrity sha512-CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw==
+"@ionic/utils-object@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-1.0.1.tgz#1a9910e21271f268c23d44a163c071feff3959c2"
+  integrity sha512-SIc8bqsCJA8+zsIPS34TmgTJg0WyqkJzcSEZTdfpMPS+qPq/Sm2yaeDGRhlXGRnfDckulRiCK3mhW2dfNPTGhQ==
   dependencies:
-    "@ionic/utils-object" "0.0.1"
-    "@ionic/utils-terminal" "0.0.1"
     debug "^4.0.0"
-    lodash "^4.17.5"
-    tree-kill "1.2.1"
     tslib "^1.9.0"
 
-"@ionic/utils-process@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-1.0.0.tgz#4a5ade9ec59a728c84f913557d2625d6e91ece67"
-  integrity sha512-4YMbpT4CAe+GdgW1GTxbzOze8q/7yCnjtqQJyLMzRIGSEdOeXx6I8GRf5Y6IDJhhdf7QVYUZXoeFpNASQXiSPA==
+"@ionic/utils-process@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-1.0.1.tgz#466a540d45d38f7210a26cdef747b32f6fa99a2a"
+  integrity sha512-kEAte96A5xBA0wJX35ykHERgc4KkYS4Xiq7XsSMo3inBbN2rNUkRIzC+aFM3IFeNKtCqgNgh7t9LczvLDEzdiQ==
   dependencies:
-    "@ionic/utils-object" "1.0.0"
-    "@ionic/utils-terminal" "1.0.0"
+    "@ionic/utils-object" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     debug "^4.0.0"
     lodash "^4.17.5"
     tree-kill "1.2.1"
     tslib "^1.9.0"
 
-"@ionic/utils-stream@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-0.0.1.tgz#f73808262b77be2e6a3c2fbedb69cc185d6f3b69"
-  integrity sha512-IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg==
-  dependencies:
-    debug "^4.0.0"
-    stream-combiner2 "^1.1.1"
-    tslib "^1.9.0"
-
-"@ionic/utils-stream@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-1.0.0.tgz#2cf66bb2c8f49e0ad5ae5151c02d90505d93854e"
-  integrity sha512-kW8MX33YlvP/JXo9qs6fZ3ghbtHX+R0twAZuyuF1WeBWq4eDwJeOaNv80PHr+wm+DBwYPhXmve/d20z/trgm/Q==
+"@ionic/utils-stream@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-1.0.1.tgz#a1d312708f985ff9683154293f8dc3cbde1f4343"
+  integrity sha512-EIprRexxL+s1J8u6cvJrigDXpRTRUwrobBETxJ9DL8KFLhv3HOVcwRFtiP08mm4l3SCfQtrbi4tMCX/KssVLFQ==
   dependencies:
     debug "^4.0.0"
     stream-combiner2 "^1.1.1"
     tslib "^1.9.0"
 
-"@ionic/utils-subprocess@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz#3f2fc1d829e06d8c5ed66faad2ce8d9c7a3a1d9b"
-  integrity sha512-8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg==
-  dependencies:
-    "@ionic/utils-array" "0.0.1"
-    "@ionic/utils-fs" "1.2.0"
-    "@ionic/utils-process" "0.1.0"
-    "@ionic/utils-stream" "0.0.1"
-    cross-spawn "^6.0.5"
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-subprocess@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-1.0.0.tgz#e3714d69f7b7ef3577e8832a67ea8630ef0c3ad7"
-  integrity sha512-iHjs7voSlOauNv3kICfBtlyAHYfh/DsWaxucLaQ2IXcYknqqzr8H1FbW2dH+TxorG1g7YPWEnbjY7UeeiavnqQ==
-  dependencies:
-    "@ionic/utils-array" "1.0.0"
-    "@ionic/utils-fs" "2.0.0"
-    "@ionic/utils-process" "1.0.0"
-    "@ionic/utils-stream" "1.0.0"
-    "@ionic/utils-terminal" "1.0.0"
+"@ionic/utils-subprocess@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-1.0.1.tgz#e615f5f7b4d474b6a8560d19abf699d7e517f34f"
+  integrity sha512-JsNLpxoMWIkUhAiQpff+Fzn6+Fl8SvXFglqqBq4E0sKLVuVRDhzD+5JDUKqDO7q+crQhRZbDTRVM+GFsi7ZGgg==
+  dependencies:
+    "@ionic/utils-array" "1.0.1"
+    "@ionic/utils-fs" "2.0.1"
+    "@ionic/utils-process" "1.0.1"
+    "@ionic/utils-stream" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     cross-spawn "^6.0.5"
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-terminal@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz#3ffd2d18cf5039c5944768cb259d649e962ecba7"
-  integrity sha512-xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-terminal@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-1.0.0.tgz#e7477abf9fc4e0ce27afdf515ac0a331215244d2"
-  integrity sha512-8NVfY+ZyKajfsXj/bzKe5QduDJy0T0I/GPgaPKRZzFHQyUDbcUKZqKfVnAEUCm8l54v13drXovy08jP/6ulKXw==
+"@ionic/utils-terminal@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-1.0.1.tgz#5612e587b5f0064ca31a3823415964e72848d13e"
+  integrity sha512-y/mEpPNPW2oYfFGtFTCRbZAmp0Go17S7uNUFGKThV397lmHm3yiPiu0M5cDV9v/UDuOZ7nmz3LqwhtIaPPeK9g==
   dependencies:
     debug "^4.0.0"
     tslib "^1.9.0"
@@ -869,14 +771,14 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.9":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.9.tgz#db115dba8cc0886d8d822723be4119d3849fb4e3"
-  integrity sha512-+ROpqfCXLdQwfP+UNDLk4p959ZrocpStkdd2Iy9CeOJ8yDkityqpstTwQC3oHzzu/95BiyZ0hrHbM6AsPPIvJg==
+"@ngtools/webpack@8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.2.tgz#d60167b514b531ed6ae308b4911739dd102e41c7"
+  integrity sha512-5P0FHF4p5H/G9xGjOG9meDViXcdW3RPdJa2nX1gGpii3/dhFhmU4pxjKn1Bfs4x+PB9FQQvhSvGIBLNf+B4y5Q==
   dependencies:
-    "@angular-devkit/core" "7.3.9"
+    "@angular-devkit/core" "8.0.2"
     enhanced-resolve "4.1.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
     tree-kill "1.2.1"
     webpack-sources "1.3.0"
 
@@ -906,15 +808,6 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@schematics/angular@7.3.9":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.9.tgz#f57baf1cd9588d4f1035974d06fd8f3d54df021a"
-  integrity sha512-B3lytFtFeYNLfWdlrIzvy3ulFRccD2/zkoL0734J+DAGfUz7vbysJ50RwYL46sQUcKdZdvb48ktfu1S8yooP6Q==
-  dependencies:
-    "@angular-devkit/core" "7.3.9"
-    "@angular-devkit/schematics" "7.3.9"
-    typescript "3.2.4"
-
 "@schematics/angular@8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
@@ -923,7 +816,15 @@
     "@angular-devkit/core" "8.0.1"
     "@angular-devkit/schematics" "8.0.1"
 
-"@schematics/angular@^7.0.3", "@schematics/angular@^7.3.8":
+"@schematics/angular@8.0.2", "@schematics/angular@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.2.tgz#80d2a4d55f89b0f843f64d38f588ccca4fdf4de2"
+  integrity sha512-mN9qsoBVpbY1Q7BP8WaiHsyDv+kl5WrIHw/9OASLrGZcoVY7+oj2CfznVq0XRwvVjDtm6ZFor5ruxLF9dQUOSw==
+  dependencies:
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
+
+"@schematics/angular@^7.0.3":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
   integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
@@ -932,18 +833,18 @@
     "@angular-devkit/schematics" "7.3.8"
     typescript "3.2.4"
 
-"@schematics/update@0.13.9":
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.9.tgz#60d338676d10d24d1b12812a0624f6e7c3dbcd06"
-  integrity sha512-4MQcaKFxhMzZyE//+DknDh3h3duy3avg2oxSHxdwXlCZ8Q92+4lpegjJcSRiqlEwO4qeJ5XnrjrvzfIiaIZOmA==
+"@schematics/update@0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.2.tgz#48d23bf60f2870f0887946165cad42c243c4faac"
+  integrity sha512-HPjbzr/LfFLdMzi6zMQK8mPyLw+nt+m7OQsdoeOkFgHkHVfHrKQWcOGt4A0D6keDJ6K2g7W5CsqFR6/GMac7Mg==
   dependencies:
-    "@angular-devkit/core" "7.3.9"
-    "@angular-devkit/schematics" "7.3.9"
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
-    pacote "9.4.0"
-    rxjs "6.3.3"
-    semver "5.6.0"
+    pacote "9.5.0"
+    rxjs "6.4.0"
+    semver "6.0.0"
     semver-intersect "1.4.0"
 
 "@types/bson@*":
@@ -963,11 +864,25 @@
   resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.2.2.tgz#80cf7cfff7401587b8f89307ba36fe4a576bc7cf"
   integrity sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==
 
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
 "@types/geojson@*":
   version "7946.0.7"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
   integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
+"@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/googlemaps@^3.30.19":
   version "3.30.19"
   resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.19.tgz#359c025e244490b0775826fb216bed093fd66b16"
@@ -997,6 +912,11 @@
   dependencies:
     "@types/geojson" "*"
 
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
 "@types/mongodb@*", "@types/mongodb@^3.1.22":
   version "3.1.23"
   resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.23.tgz#9aaa105f448427036cb6cd3aa042ab77b2ab8a7a"
@@ -1018,6 +938,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@>=6":
+  version "12.0.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
+  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
+
 "@types/node@^12.0.2":
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
@@ -1105,158 +1030,181 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
-"@webassemblyjs/ast@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
-  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
-  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
-
-"@webassemblyjs/helper-api-error@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
-  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
-
-"@webassemblyjs/helper-buffer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
-  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
-
-"@webassemblyjs/helper-code-frame@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
-  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/helper-fsm@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
-  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
-
-"@webassemblyjs/helper-module-context@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
-  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
-  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
-
-"@webassemblyjs/helper-wasm-section@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
-  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-
-"@webassemblyjs/ieee754@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
-  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
-  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/utf8@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
-  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
-
-"@webassemblyjs/wasm-edit@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
-  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/helper-wasm-section" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-opt" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/wasm-gen@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
-  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wasm-opt@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
-  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-
-"@webassemblyjs/wasm-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
-  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wast-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
-  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-code-frame" "1.7.11"
-    "@webassemblyjs/helper-fsm" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/wast-printer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
-  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-    "@xtuc/long" "4.2.1"
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webcomponents/webcomponentsjs@^2.2.10":
+  version "2.2.10"
+  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.10.tgz#6f6bee0277833ae98d7e5b46f1e0fdb48cd5ff44"
+  integrity sha512-5dzhUhP+h0qMiK0IWb7VNb0OGBoXO3AuI6Qi8t9PoKT50s5L1jv0xnwnLq+cFgPuTB8FLTNP8xIDmyoOsKBy9Q==
+
+"@wry/context@^0.4.0":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.4.3.tgz#5e5653ef4d2d2d9cbac7d984528a0d69c78becf9"
+  integrity sha512-CzjOb1sSDPT+uqCItFq7edIoNTBzeg53ye2h81hrfd24lcD2YiSkpJNKJ8jm2Q3UZf6Jth1vDHbS6ub8bGczxw==
+  dependencies:
+    "@types/node" ">=6"
+    tslib "^1.9.3"
+
+"@wry/equality@^0.1.2":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9"
+  integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew==
+  dependencies:
+    tslib "^1.9.3"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
@@ -1284,6 +1232,14 @@ accepts@~1.3.4, accepts@~1.3.5:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
+accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
@@ -1430,7 +1386,7 @@ ansi-escapes@^1.1.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
   integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -1504,61 +1460,60 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
-  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
+apollo-angular-link-http-common@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.7.0.tgz#c4ece9832724437027a591e5840ebedef8e4609b"
+  integrity sha512-syKJD/AgSrfeaZ0XRGfDuRNT2CowTu7VugdlPxf41wJ+v3uPbUnNoha9/simuxOQuUR7ykUWVyKtNPpJO+MagA==
   dependencies:
     tslib "^1.9.0"
 
-apollo-angular-link-http@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
-  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
+apollo-angular-link-http@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.7.0.tgz#1d0b8a5a6cd94b5397c6a959330a0e2fb9f61d6a"
+  integrity sha512-YNZx1sQS8SleEadF4TPswRF/iq2M99/iwnwtxlqmlq7E+4ZSXXyxXjQO6LsXH8iWoG7aitCpzUZR7XAVuXGp+g==
   dependencies:
-    apollo-angular-link-http-common "~1.6.0"
+    apollo-angular-link-http-common "~1.7.0"
     extract-files "5.0.1"
     tslib "^1.9.0"
 
-apollo-angular@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.5.0.tgz#da653b76189fb72ea801c51996ea87fe19aa064f"
-  integrity sha512-zAyMev+bU7cdqRm2AbAH0hJqJOVRN/PpllJ+eqqA0O9dV570RUs2sGehn3dtOcwPHNRof/qrCRoWBEwGrP6hog==
+apollo-angular@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.6.0.tgz#d71cce64d388f4b8e46583f3bf87802eb3458f10"
+  integrity sha512-c8wEskvbGs7n6GNOnVzax6ng4RZtBctzUk9HqqjyLO8TCH4SWGBh1zuShG/9wDqJjTJAb3EcKd5XUJxFybAXeA==
   dependencies:
-    semver "^5.5.1"
+    semver "^6.0.0"
     tslib "^1.9.0"
 
-apollo-cache-inmemory@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz#265d1ee67b0bf0aca9c37629d410bfae44e62953"
-  integrity sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==
+apollo-cache-inmemory@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e"
+  integrity sha512-AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ==
   dependencies:
-    apollo-cache "^1.2.1"
-    apollo-utilities "^1.2.1"
-    optimism "^0.6.9"
-    ts-invariant "^0.2.1"
+    apollo-cache "^1.3.2"
+    apollo-utilities "^1.3.2"
+    optimism "^0.9.0"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
-apollo-cache@1.2.1, apollo-cache@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz#aae71eb4a11f1f7322adc343f84b1a39b0693644"
-  integrity sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==
+apollo-cache@1.3.2, apollo-cache@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a"
+  integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg==
   dependencies:
-    apollo-utilities "^1.2.1"
+    apollo-utilities "^1.3.2"
     tslib "^1.9.3"
 
-apollo-client@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz#36126ed1d32edd79c3713c6684546a3bea80e6d1"
-  integrity sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==
+apollo-client@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.2.tgz#03b6af651e09b6e413e486ddc87464c85bd6e514"
+  integrity sha512-oks1MaT5x7gHcPeC8vPC1UzzsKaEIC0tye+jg72eMDt5OKc7BobStTeS/o2Ib3e0ii40nKxGBnMdl/Xa/p56Yg==
   dependencies:
     "@types/zen-observable" "^0.8.0"
-    apollo-cache "1.2.1"
+    apollo-cache "1.3.2"
     apollo-link "^1.0.0"
-    apollo-link-dedup "^1.0.0"
-    apollo-utilities "1.2.1"
+    apollo-utilities "1.3.2"
     symbol-observable "^1.0.2"
-    ts-invariant "^0.2.1"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
@@ -1570,14 +1525,6 @@ apollo-link-context@^1.0.17:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link-dedup@^1.0.0:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
-  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
-  dependencies:
-    apollo-link "^1.2.11"
-    tslib "^1.9.3"
-
 apollo-link-ws@^1.0.17:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz#a7ec3f90d2651b77d6be9bb6e63deff2efac56d4"
@@ -1596,7 +1543,17 @@ apollo-link@^1.0.0, apollo-link@^1.2.11:
     tslib "^1.9.3"
     zen-observable-ts "^0.8.18"
 
-apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
+apollo-utilities@1.3.2, apollo-utilities@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
+  integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
+  dependencies:
+    "@wry/equality" "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    ts-invariant "^0.4.0"
+    tslib "^1.9.3"
+
+apollo-utilities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
   integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
@@ -1712,7 +1669,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-asap@~2.0.3:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -1816,16 +1773,16 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.6:
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
-  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
+autoprefixer@9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
   dependencies:
-    browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000929"
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.13"
+    postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
 autoprefixer@^7.2.6:
@@ -2104,6 +2061,22 @@ body-parser@1.18.3, body-parser@^1.16.1:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
@@ -2279,6 +2252,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
+browserslist@4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
+  integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
+  dependencies:
+    caniuse-lite "^1.0.30000960"
+    electron-to-chromium "^1.3.124"
+    node-releases "^1.1.14"
+
 browserslist@^2.11.3:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
@@ -2287,7 +2269,7 @@ browserslist@^2.11.3:
     caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
-browserslist@^4.4.1:
+browserslist@^4.0.0, browserslist@^4.5.4:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
   integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
@@ -2380,26 +2362,12 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.2:
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.1, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -2508,12 +2476,27 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
+caniuse-api@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000960:
+  version "1.0.30000974"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
+  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
+
 caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
   version "1.0.30000957"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
   integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
-caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000971:
+caniuse-lite@^1.0.30000971:
   version "1.0.30000971"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
   integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
@@ -2627,7 +2610,26 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1, chownr@^1.1.1:
+chokidar@^2.1.5:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
+  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -2684,7 +2686,7 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
+cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
@@ -2866,7 +2868,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.38.0 < 2"
 
-compression@^1.5.2, compression@^1.6.0:
+compression@^1.6.0, compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -2906,7 +2908,7 @@ configstore@^3.0.0:
     write-file-atomic "^2.0.0"
     xdg-basedir "^3.0.0"
 
-connect-history-api-fallback@^1.3.0:
+connect-history-api-fallback@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
@@ -2943,6 +2945,13 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -2970,6 +2979,11 @@ cookie@0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
 cookiejar@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
@@ -2992,19 +3006,22 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
-  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
+copy-webpack-plugin@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
+  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
   dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
+    cacache "^11.3.1"
+    find-cache-dir "^2.0.0"
+    glob-parent "^3.1.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^1.1.0"
     minimatch "^3.0.4"
-    p-limit "^1.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^2.1.0"
     serialize-javascript "^1.4.0"
+    webpack-log "^2.0.0"
 
 cordova-android-support-gradle-release@^2.0.1:
   version "2.1.0"
@@ -3213,6 +3230,11 @@ cordova-serve@^3.0.0:
     opn "^5.3.0"
     which "^1.3.0"
 
+core-js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+
 core-js@^2.2.0, core-js@^2.4.0:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
@@ -3489,25 +3511,23 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -3533,12 +3553,12 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-default-gateway@^2.6.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
-  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
     ip-regex "^2.1.0"
 
 default-require-extensions@^2.0.0:
@@ -3604,17 +3624,18 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+del@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
   dependencies:
+    "@types/glob" "^7.1.1"
     globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -3666,6 +3687,14 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 dfa@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.1.0.tgz#d30218bd10d030fa421df3ebbc82285463a31781"
@@ -3884,6 +3913,11 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
+electron-to-chromium@^1.3.124:
+  version "1.3.150"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.150.tgz#afb972b53a702b37c76db843c39c967e9f68464b"
+  integrity sha512-5wuYlaXhXbBvavSTij5ZyidICB6sAK/1BwgZZoPCgsniid1oDgzVvDOV/Dw6J25lKV9QZ9ZdQCp8MEfF0/OIKA==
+
 electron-to-chromium@^1.3.137:
   version "1.3.141"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.141.tgz#5858d3a74ceafe71e7824e7c809ea2cc59c8e104"
@@ -4368,19 +4402,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -4461,6 +4482,42 @@ express@^4.13.3, express@^4.16.2, express@^4.16.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.16.4:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -4490,7 +4547,7 @@ external-editor@^2.0.1:
     iconv-lite "^0.4.17"
     tmp "^0.0.33"
 
-external-editor@^3.0.0, external-editor@^3.0.3:
+external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
@@ -4678,14 +4735,18 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
 
 find-cache-dir@^2.0.0:
   version "2.1.0"
@@ -4704,7 +4765,7 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -5358,7 +5419,7 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^1.2.0, html-entities@^1.2.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=
@@ -5405,6 +5466,17 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-errors@1.7.2, http-errors@~1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-parser-js@>=0.4.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
@@ -5418,17 +5490,17 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
-http-proxy-middleware@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
-  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
+http-proxy-middleware@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
   dependencies:
-    http-proxy "^1.16.2"
+    http-proxy "^1.17.0"
     is-glob "^4.0.0"
-    lodash "^4.17.5"
-    micromatch "^3.1.9"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
 
-http-proxy@^1.13.0, http-proxy@^1.16.2:
+http-proxy@^1.13.0, http-proxy@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
@@ -5496,7 +5568,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5535,11 +5607,6 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immutable-tuple@^0.4.9:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.10.tgz#e0b1625384f514084a7a84b749a3bb26e9179929"
-  integrity sha512-45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q==
-
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -5639,23 +5706,23 @@ inquirer@3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
-  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
+inquirer@6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^3.0.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
 inquirer@^6.0.0:
@@ -5682,13 +5749,13 @@ inside@^1.0.0:
   resolved "https://registry.yarnpkg.com/inside/-/inside-1.0.0.tgz#db45e993573cdb3db70b9832e8285bad46424770"
   integrity sha1-20Xpk1c82z23C5gy6ChbrUZCR3A=
 
-internal-ip@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
-  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
+internal-ip@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    default-gateway "^2.6.0"
-    ipaddr.js "^1.5.2"
+    default-gateway "^4.2.0"
+    ipaddr.js "^1.9.0"
 
 interpret@^1.0.0:
   version "1.2.0"
@@ -5712,30 +5779,29 @@ invert-kv@^2.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
-ionic@^4.12.0:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/ionic/-/ionic-4.12.0.tgz#4bd4f0bdeafd9a770d6c7c041672edbcf6e36c6d"
-  integrity sha512-3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg==
-  dependencies:
-    "@ionic/cli-framework" "1.7.0"
-    "@ionic/discover" "1.0.13"
-    "@ionic/utils-array" "0.0.1"
-    "@ionic/utils-fs" "1.2.0"
-    "@ionic/utils-network" "0.0.8"
-    "@ionic/utils-process" "0.1.0"
-    "@ionic/utils-stream" "0.0.1"
-    "@ionic/utils-subprocess" "0.1.0"
-    "@ionic/utils-terminal" "0.0.1"
+ionic@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ionic/-/ionic-5.0.1.tgz#6cb007cdee84665f8ee56ddcdf5fe21ef3accf69"
+  integrity sha512-48v7X8C8OvLN4GdizNJiGpP6/qp9C4V+uP1MXL7zCrcoty4FP4RXbpeBXaZJlrxC9zHxlsPQ/gB/p3e2XINALA==
+  dependencies:
+    "@ionic/cli-framework" "2.0.1"
+    "@ionic/discover" "2.0.1"
+    "@ionic/utils-array" "1.0.1"
+    "@ionic/utils-fs" "2.0.1"
+    "@ionic/utils-network" "1.0.1"
+    "@ionic/utils-process" "1.0.1"
+    "@ionic/utils-stream" "1.0.1"
+    "@ionic/utils-subprocess" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     chalk "^2.3.0"
     debug "^4.0.0"
     diff "^4.0.1"
     elementtree "^0.1.7"
     leek "0.0.24"
     lodash "^4.17.5"
-    log-update "^2.3.0"
-    opn "^5.2.0"
-    os-name "^3.0.0"
-    semver "^5.5.0"
+    open "^6.1.0"
+    os-name "^3.1.0"
+    semver "^6.0.0"
     split2 "^3.0.0"
     ssh-config "^1.1.1"
     superagent "^4.1.0"
@@ -5746,15 +5812,10 @@ ionic@^4.12.0:
     update-notifier "^2.3.0"
     uuid "^3.2.1"
 
-ionicons@4.5.5:
-  version "4.5.5"
-  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.5.tgz#b059958a54dd45cfa127acc0baf11503b8671e51"
-  integrity sha512-dIGI73XG6Fg2Ps77ry5Ywe36Pq7wUGkDkl0pBhC4uhsiyoW+oXe+pplmarXEnKEcB5fmlkRrBOxYYzZaoRiUGw==
-
-ionicons@^4.5.5:
-  version "4.5.6"
-  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.6.tgz#f3b5d2446e7e1b30e67ddcd1fc563271acc60f3c"
-  integrity sha512-/F3U/rxdLPGl8eUW5dMouhBBoJuUPrlFO6rkoz4VNuw1lxP6l+bFtsDA8MaVM1dHABp+gIHxtpt+IhwmB3oIfA==
+ionicons@4.5.8, ionicons@^4.5.8:
+  version "4.5.8"
+  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.8.tgz#a81177325153e7eaecb9546ee0b7955451743f8e"
+  integrity sha512-Zib/fFGHt+r9tWrvZnrxVj22cO4NVj+ZOb76v5yiOyvb0LSTbbReECDg7lEU8e+YR69qCtWHruStJ+b4G/OWxg==
 
 ip-regex@^2.1.0:
   version "2.1.0"
@@ -5771,7 +5832,7 @@ ipaddr.js@1.8.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
   integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
-ipaddr.js@^1.5.2:
+ipaddr.js@1.9.0, 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==
@@ -5971,6 +6032,11 @@ is-path-cwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
   integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
+is-path-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.1.0.tgz#2e0c7e463ff5b7a0eb60852d851a6809347a124c"
+  integrity sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==
+
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
@@ -5978,6 +6044,13 @@ is-path-in-cwd@^1.0.0:
   dependencies:
     is-path-inside "^1.0.0"
 
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
+  dependencies:
+    is-path-inside "^2.1.0"
+
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
@@ -5985,6 +6058,18 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
+is-path-inside@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
+  dependencies:
+    path-is-inside "^1.0.2"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -6406,10 +6491,10 @@ karma-jasmine@^2.0.1:
   dependencies:
     jasmine-core "^3.3"
 
-karma-source-map-support@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
-  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
   dependencies:
     source-map-support "^0.5.5"
 
@@ -6446,7 +6531,7 @@ karma@^4.0.1:
     tmp "0.0.33"
     useragent "2.3.0"
 
-killable@^1.0.0:
+killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -6543,10 +6628,10 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-license-webpack-plugin@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
-  integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==
+license-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz#f0ab760f7f301c76f5af52e480f320656b5721bb"
+  integrity sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
@@ -6755,6 +6840,11 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -6770,20 +6860,16 @@ lodash.tail@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
   integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
 lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
-
 log-update@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-3.2.0.tgz#719f24293250d65d0165f4e2ec2ed805ff062eec"
@@ -6804,7 +6890,7 @@ log4js@^4.0.0:
     rfdc "^1.1.2"
     streamroller "^1.0.4"
 
-loglevel@^1.4.1:
+loglevel@^1.6.1:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.2.tgz#668c77948a03dbd22502a3513ace1f62a80cc372"
   integrity sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==
@@ -6834,7 +6920,7 @@ lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -6915,6 +7001,11 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
 map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -6989,7 +7080,7 @@ mem@^4.0.0:
     mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -7040,7 +7131,7 @@ methods@^1.1.1, methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -7067,6 +7158,11 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
+mime-db@1.40.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+
 "mime-db@>= 1.38.0 < 2":
   version "1.39.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
@@ -7084,12 +7180,19 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.38.0"
 
+mime-types@~2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  dependencies:
+    mime-db "1.40.0"
+
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.4.1:
+mime@1.6.0, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -7099,6 +7202,11 @@ mime@^2.3.1, mime@^2.4.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
   integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
 
+mime@^2.4.2:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe"
+  integrity sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -7114,12 +7222,13 @@ mingo@1:
   resolved "https://registry.yarnpkg.com/mingo/-/mingo-1.3.3.tgz#6922c4d147efc771a01425a2c4c8f7784478c546"
   integrity sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY=
 
-mini-css-extract-plugin@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
-  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+mini-css-extract-plugin@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "^2.0.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -7170,22 +7279,6 @@ minizlib@^1.1.1:
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -7355,11 +7448,6 @@ nan@^2.10.0, nan@^2.9.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
   integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
-nan@^2.13.2:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -7391,6 +7479,11 @@ negotiator@0.6.1:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
 neo-async@^2.5.0, neo-async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
@@ -7501,6 +7594,13 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
+node-releases@^1.1.14:
+  version "1.1.23"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
+  integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
+  dependencies:
+    semver "^5.3.0"
+
 node-releases@^1.1.21:
   version "1.1.22"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.22.tgz#d90cd5adc59ab9b0f377d4f532b09656399c88bf"
@@ -7508,29 +7608,6 @@ node-releases@^1.1.21:
   dependencies:
     semver "^5.3.0"
 
-node-sass@4.12.0:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
-  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash "^4.17.11"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.13.2"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "^2.2.4"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
 node-sass@^4.10.0, node-sass@^4.11.0:
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
@@ -7578,7 +7655,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7605,6 +7682,15 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
+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"
+
 npm-bundled@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
@@ -7779,10 +7865,17 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
-  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+open@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
+  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
+  dependencies:
+    is-wsl "^1.1.0"
+
+open@^6.1.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.3.0.tgz#60d0b845ee38fae0631f5d739a21bd40e3d2a527"
+  integrity sha512-6AHdrJxPvAXIowO/aIaeHZ8CeMdDf7qCyRNq8NwJpinmCdXhz+NZR7ie1Too94lpciCDsG+qHGO9Mt0svA4OqA==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7811,7 +7904,7 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@^5.1.0, opn@^5.2.0, opn@^5.3.0:
+opn@^5.3.0, opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
   integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
@@ -7825,12 +7918,12 @@ opn@latest:
   dependencies:
     is-wsl "^1.1.0"
 
-optimism@^0.6.9:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz#19258ff8b3be0cea29ac35f06bff818e026e30bb"
-  integrity sha512-xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ==
+optimism@^0.9.0:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.5.tgz#b8b5dc9150e97b79ddbf2d2c6c0e44de4d255527"
+  integrity sha512-lNvmuBgONAGrUbj/xpH69FjMOz1d0jvMNoOCKyVynUPzq2jgVlGL4jFYJqrUHzUfBv+jAFSCP61x5UkfbduYJA==
   dependencies:
-    immutable-tuple "^0.4.9"
+    "@wry/context" "^0.4.0"
 
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
@@ -7902,7 +7995,7 @@ os-name@^2.0.1:
     macos-release "^1.0.0"
     win-release "^1.0.0"
 
-os-name@^3.0.0:
+os-name@^3.0.0, os-name@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
   integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
@@ -7938,14 +8031,14 @@ p-is-promise@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.0.0, p-limit@^1.1.0:
+p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
+p-limit@^2.0.0, p-limit@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
   integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
@@ -7966,10 +8059,10 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
 p-try@^1.0.0:
   version "1.0.0"
@@ -8016,10 +8109,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
-  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
+pacote@9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
+  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"
@@ -8151,6 +8244,11 @@ parseurl@~1.3.2:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
   integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -8183,7 +8281,7 @@ path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -8308,13 +8406,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -8364,7 +8455,7 @@ pngjs@^3.3.0:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
-portfinder@^1.0.9:
+portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
   integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
@@ -8429,10 +8520,10 @@ postcss@^6.0.17, postcss@^6.0.21:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.13:
-  version "7.0.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
-  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
+postcss@^7.0.14:
+  version "7.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -8448,6 +8539,11 @@ prepend-http@^1.0.1:
   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=
+
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
@@ -8519,6 +8615,14 @@ proxy-addr@~2.0.4:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
 
+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==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.0"
+
 proxy-agent@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
@@ -8570,7 +8674,7 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -8641,11 +8745,20 @@ qs@6.5.2, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@^6.4.0, qs@^6.6.0:
+qs@6.7.0, qs@^6.4.0, qs@^6.6.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
+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"
@@ -8690,6 +8803,11 @@ range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
+range-parser@^1.2.1, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
 raw-body@2.3.3, raw-body@^2.2.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
@@ -8700,6 +8818,16 @@ raw-body@2.3.3, raw-body@^2.2.0:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
@@ -8733,6 +8861,29 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+read-package-json@^2.0.0:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
+  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -8809,6 +8960,16 @@ readable-stream@1.1.x:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
 readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -9066,7 +9227,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -9144,10 +9305,10 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs-compat@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.4.0.tgz#800923c15697948e1f30f18c531b12b49451c75c"
-  integrity sha512-eo/O8RS83hJdJukCtA+IF6qnqa8FPOuVo+OPCzgVi+dbTle9KCdNv97IcQO0WwNVik7DJLKmf0F8uwzc0q40vw==
+rxjs-compat@^6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.2.tgz#e469070adf6260bdad195e9d4a39f444ae28b458"
+  integrity sha512-TRMkTp4FgSxE2HtGvxmgRukh3JqdFM7ejAj1Ti/VdodbPGfWvZR5+KdLKRV9jVDFyu2SknM8RD+PR54KGnoLjg==
 
 rxjs-tslint@0.1.5:
   version "0.1.5"
@@ -9173,7 +9334,7 @@ rxjs@6.4.0, rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.1.0:
+rxjs@^6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
   integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
@@ -9236,6 +9397,13 @@ sass-loader@7.1.0, sass-loader@^7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
+sass@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.19.0.tgz#5de82c713d4299fac57384ef5219534a37fe3e6c"
+  integrity sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==
+  dependencies:
+    chokidar "^2.0.0"
+
 saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
@@ -9280,14 +9448,6 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.4:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -9320,7 +9480,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.9.1:
+selfsigned@^1.10.4:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
@@ -9353,7 +9513,7 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -9368,10 +9528,15 @@ semver@5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-semver@5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+semver@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
+semver@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
 
 semver@~5.3.0:
   version "5.3.0"
@@ -9397,12 +9562,31 @@ send@0.16.2, send@latest:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
 serialize-javascript@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
   integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
 
-serve-index@^1.7.2, serve-index@^1.9.1:
+serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -9425,6 +9609,16 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
 serviceworker-cache-polyfill@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
@@ -9470,6 +9664,11 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -9698,6 +9897,13 @@ socks@~2.3.2:
     ip "^1.1.5"
     smart-buffer "4.0.2"
 
+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"
@@ -9727,15 +9933,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+source-map-support@0.5.12, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
   version "0.5.12"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
   integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
@@ -9920,13 +10118,6 @@ ssr-window@^1.0.1:
   resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-1.0.1.tgz#30752a6a4666e7767f0b7e6aa6fc2fdbd0d9b369"
   integrity sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -9976,7 +10167,7 @@ stats-webpack-plugin@0.7.0:
   dependencies:
     lodash "^4.17.4"
 
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
@@ -10064,6 +10255,11 @@ streamroller@^1.0.4:
     fs-extra "^7.0.0"
     lodash "^4.17.10"
 
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -10256,7 +10452,7 @@ supports-color@^4.2.1:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -10349,21 +10545,7 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
-  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
-  dependencies:
-    cacache "^11.0.2"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    terser "^3.16.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
+terser-webpack-plugin@1.2.3, terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
   integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
@@ -10518,6 +10700,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -10572,6 +10759,13 @@ ts-invariant@^0.3.2:
   dependencies:
     tslib "^1.9.3"
 
+ts-invariant@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.2.tgz#8685131b8083e67c66d602540e78763408be9113"
+  integrity sha512-PTAAn8lJPEdRBJJEs4ig6MVZWfO12yrFzV7YaPslmyhG7+4MA279y4BXT3f72gXeVl0mC1aAWq2rMX4eKTWU/Q==
+  dependencies:
+    tslib "^1.9.3"
+
 ts-node@^8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.3.tgz#aa60b836a24dafd8bf21b54766841a232fdbc641"
@@ -10681,6 +10875,14 @@ type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -10691,11 +10893,21 @@ typescript@2.9.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
   integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
-typescript@3.2.4, typescript@~3.2.4:
+typescript@3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
   integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
 
+typescript@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.4.tgz#aac4a08abecab8091a75f10842ffa0631818f785"
+  integrity sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==
+
+typescript@3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
+
 typescript@^2.4.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
@@ -10800,7 +11012,7 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-unique-filename@^1.1.0, unique-filename@^1.1.1:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -10821,6 +11033,15 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+universal-analytics@^0.4.20:
+  version "0.4.20"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
+  integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
+  dependencies:
+    debug "^3.0.0"
+    request "^2.88.0"
+    uuid "^3.0.0"
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -10849,11 +11070,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-untildify@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
-  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
-
 untildify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
@@ -11091,61 +11307,61 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
+webpack-dev-middleware@3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
+  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
   dependencies:
-    memory-fs "~0.4.1"
+    memory-fs "^0.4.1"
     mime "^2.3.1"
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
-  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
+webpack-dev-middleware@^3.6.2:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
+  integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
   dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
+    memory-fs "^0.4.1"
+    mime "^2.4.2"
+    range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.14:
-  version "3.1.14"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
-  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
+webpack-dev-server@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
+  integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "~0.18.0"
+    chokidar "^2.1.5"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
+    debug "^4.1.1"
+    del "^4.1.0"
+    express "^4.16.4"
+    html-entities "^1.2.1"
+    http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
-    internal-ip "^3.0.1"
+    internal-ip "^4.2.0"
     ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
+    killable "^1.0.1"
+    loglevel "^1.6.1"
+    opn "^5.5.0"
+    portfinder "^1.0.20"
     schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
+    selfsigned "^1.10.4"
+    semver "^6.0.0"
+    serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
     spdy "^4.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
+    strip-ansi "^3.0.1"
+    supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "3.4.0"
+    webpack-dev-middleware "^3.6.2"
     webpack-log "^2.0.0"
-    yargs "12.0.2"
+    yargs "12.0.5"
 
 webpack-log@^2.0.0:
   version "2.0.0"
@@ -11205,15 +11421,15 @@ webpack@3.12.0:
     webpack-sources "^1.0.1"
     yargs "^8.0.2"
 
-webpack@4.29.0:
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
-  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
+webpack@4.30.0:
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
+  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
@@ -11229,7 +11445,7 @@ webpack@4.29.0:
     mkdirp "~0.5.0"
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
+    schema-utils "^1.0.0"
     tapable "^1.1.0"
     terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
@@ -11330,6 +11546,13 @@ worker-farm@^1.5.2:
   dependencies:
     errno "~0.1.7"
 
+worker-plugin@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.1.0.tgz#6311778f3514a87c273510ee3f809cc3fe161e6f"
+  integrity sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==
+  dependencies:
+    loader-utils "^1.1.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -11338,23 +11561,6 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
-wrap-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-4.0.0.tgz#b3570d7c70156159a2d42be5cc942e957f7b1131"
-  integrity sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrap-ansi@^5.0.0, wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -11448,11 +11654,6 @@ xregexp@2.0.0:
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
   integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
 
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
 xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -11478,13 +11679,6 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
-  dependencies:
-    camelcase "^4.1.0"
-
 yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
@@ -11493,7 +11687,7 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.0:
+yargs-parser@^13.0.0, yargs-parser@^13.1.0:
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
   integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
@@ -11515,13 +11709,13 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+yargs@12.0.5, yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^2.0.0"
+    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^1.0.1"
     os-locale "^3.0.0"
@@ -11531,44 +11725,24 @@ yargs@12.0.2:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
-yargs@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
-  dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    yargs-parser "^11.1.1"
 
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^1.2.0"
     find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
 
 yargs@^13.2.4:
   version "13.2.4"
@@ -11658,7 +11832,7 @@ zen-observable@^0.8.0:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
   integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
-zone.js@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.0.tgz#f42319d657f7616724ed40c5907d4614b4c683fa"
-  integrity sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q==
+zone.js@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

From 71cc862cbc38659badccf2dccfec1dd74ca714ba Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 7 Jun 2019 11:05:06 +0300
Subject: [PATCH 362/382] chore(ever-merchant): completed upgrade to angular 8

---
 merchant/tablet-ionic/angular.json            |    2 +-
 merchant/tablet-ionic/package.json            |   47 +-
 .../google-map/google-map.component.ts        |    2 +-
 .../order-map-popup/order-map-popup.ts        |    2 +-
 .../location/location.ts                      |    2 +-
 .../add-carriers-popup/add-carriers-popup.ts  |    8 +-
 .../add-new-carrier/add-new-carrier.ts        |    6 +-
 .../location/location-form.component.ts       |    2 +-
 .../carrier-addr-popup/carrier-addr-popup.ts  |    2 +-
 .../carrier-edit-popup/carrier-edit-popup.ts  |    6 +-
 .../location/location-form.component.ts       |    2 +-
 .../carrier-track-popup.ts                    |    2 +-
 .../customer-addr-popup.ts                    |    2 +-
 .../tablet-ionic/src/pages/+track/track.ts    |    4 +-
 .../create-product-type-popup.ts              |    4 +-
 .../edit-product-type-popup.ts                |    4 +-
 merchant/tablet-ionic/src/polyfills.ts        |    2 +
 merchant/tablet-ionic/yarn.lock               | 1978 +++++++++--------
 .../ngx-barcode/ngx-barcode.component.ts      |    2 +-
 shop/website-angular/yarn.lock                |    2 +-
 20 files changed, 1157 insertions(+), 924 deletions(-)

diff --git a/merchant/tablet-ionic/angular.json b/merchant/tablet-ionic/angular.json
index 3059336a5..243336f20 100644
--- a/merchant/tablet-ionic/angular.json
+++ b/merchant/tablet-ionic/angular.json
@@ -69,7 +69,7 @@
 					}
 				},
 				"serve": {
-					"builder": "@angular-builders/dev-server:generic",
+					"builder": "@angular-builders/custom-webpack:dev-server",
 					"options": {
 						"browserTarget": "app:build"
 					},
diff --git a/merchant/tablet-ionic/package.json b/merchant/tablet-ionic/package.json
index 76288ecdb..f5b97d416 100644
--- a/merchant/tablet-ionic/package.json
+++ b/merchant/tablet-ionic/package.json
@@ -59,7 +59,6 @@
 		"@angular/common": "^8.0.0",
 		"@angular/core": "^8.0.0",
 		"@angular/forms": "^8.0.0",
-		"@angular/http": "^7.2.15",
 		"@angular/platform-browser": "^8.0.0",
 		"@angular/platform-browser-dynamic": "^8.0.0",
 		"@angular/pwa": "^0.800.1",
@@ -95,10 +94,10 @@
 		"@ngx-translate/http-loader": "^4.0.0",
 		"angular2-logger": "^0.7.0",
 		"angular2-wizard": "^0.4.0",
-		"apollo-angular": "^1.5.0",
-		"apollo-angular-link-http": "^1.5.0",
-		"apollo-cache-inmemory": "^1.5.1",
-		"apollo-client": "^2.5.1",
+		"apollo-angular": "^1.6.0",
+		"apollo-angular-link-http": "^1.7.0",
+		"apollo-cache-inmemory": "^1.6.2",
+		"apollo-client": "^2.6.2",
 		"apollo-link-context": "^1.0.17",
 		"apollo-link-ws": "^1.0.17",
 		"bootstrap": "^4.3.1",
@@ -141,8 +140,8 @@
 		"graphql-tag": "^2.10.1",
 		"handlebars": "^4.1.2",
 		"imagesloaded": "^4.1.4",
-		"ionic-selectable": "4.4.1",
-		"ionicons": "^4.5.5",
+		"ionic-selectable": "^4.4.1",
+		"ionicons": "^4.5.8",
 		"jsbarcode": "^3.11.0",
 		"lodash": "^4.17.11",
 		"masonry-layout": "^4.2.2",
@@ -160,8 +159,8 @@
 		"phonegap-plugin-barcodescanner": "^8.0.1",
 		"pm2": "^3.4.0",
 		"qrcode": "^1.3.3",
-		"rxjs": "^6.4.0",
-		"rxjs-compat": "^6.4.0",
+		"rxjs": "^6.5.2",
+		"rxjs-compat": "^6.5.2",
 		"socket.io-client": "^2.2.0",
 		"stripe": "^7.0.0",
 		"subscriptions-transport-ws": "^0.9.16",
@@ -169,24 +168,23 @@
 		"symbol-observable": "^1.2.0",
 		"uglify-js": "^3.6.0",
 		"uuid": "^3.3.2",
-		"zone.js": "^0.8.29"
+		"zone.js": "^0.9.1"
 	},
 	"devDependencies": {
-		"@angular-builders/custom-webpack": "^7.4.3",
-		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "^0.13.8",
-		"@angular-devkit/build-angular": "^0.13.8",
-		"@angular-devkit/build-optimizer": "^0.13.8",
-		"@angular-devkit/core": "^7.3.8",
-		"@angular-devkit/schematics": "^7.3.8",
-		"@angular/cli": "^7.3.8",
+		"@angular-builders/custom-webpack": "^8.0.2",
+		"@angular-devkit/architect": "^0.800.2",
+		"@angular-devkit/build-angular": "^0.800.2",
+		"@angular-devkit/build-optimizer": "^0.800.2",
+		"@angular-devkit/core": "^8.0.2",
+		"@angular-devkit/schematics": "^8.0.2",
+		"@angular/cli": "^8.0.2",
 		"@angular/compiler": "^8.0.0",
-		"@angular/compiler-cli": "^7.2.12",
-		"@angular/language-service": "^7.2.12",
+		"@angular/compiler-cli": "^8.0.0",
+		"@angular/language-service": "^8.0.0",
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.1",
-		"@ionic/app-scripts": "^3.2.3",
-		"@ionic/lab": "^2.0.0",
+		"@ionic/app-scripts": "^3.2.4",
+		"@ionic/lab": "^2.0.1",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
 		"@types/graphql": "^14.0.7",
@@ -201,19 +199,20 @@
 		"@types/stripe": "^6.25.17",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
+		"@webcomponents/webcomponentsjs": "^2.2.10",
 		"codelyzer": "^5.0.1",
 		"cpr": "^3.0.1",
 		"cross-env": "^5.2.0",
 		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
 		"husky": "^2.4.0",
-		"ionic": "^4.12.0",
+		"ionic": "^5.0.1",
 		"rxjs-tslint": "0.1.5",
 		"terser": "^4.0.0",
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
-		"typescript": "~3.2.4",
+		"typescript": "3.4.5",
 		"webpack-bundle-analyzer": "^3.1.0",
 		"webpack-merge": "^4.2.1",
 		"yargs": "^13.2.4"
diff --git a/merchant/tablet-ionic/src/@shared/google-map/google-map.component.ts b/merchant/tablet-ionic/src/@shared/google-map/google-map.component.ts
index 0fd806fa0..0691279b9 100644
--- a/merchant/tablet-ionic/src/@shared/google-map/google-map.component.ts
+++ b/merchant/tablet-ionic/src/@shared/google-map/google-map.component.ts
@@ -17,7 +17,7 @@ import { takeUntil } from 'rxjs/operators';
 	`
 })
 export class GoogleMapComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	mapElement: any;
 
 	@Input()
diff --git a/merchant/tablet-ionic/src/components/order-map-popup/order-map-popup.ts b/merchant/tablet-ionic/src/components/order-map-popup/order-map-popup.ts
index 73ee13e57..baa27fbd2 100644
--- a/merchant/tablet-ionic/src/components/order-map-popup/order-map-popup.ts
+++ b/merchant/tablet-ionic/src/components/order-map-popup/order-map-popup.ts
@@ -19,7 +19,7 @@ declare var google: any;
 	styleUrls: ['./order-map-popup.scss']
 })
 export class OrderMapPopupPage implements OnInit {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 
 	@Input()
diff --git a/merchant/tablet-ionic/src/components/settings-page-components/location/location.ts b/merchant/tablet-ionic/src/components/settings-page-components/location/location.ts
index 8e9060025..053edab10 100644
--- a/merchant/tablet-ionic/src/components/settings-page-components/location/location.ts
+++ b/merchant/tablet-ionic/src/components/settings-page-components/location/location.ts
@@ -47,7 +47,7 @@ export class LocationComponent implements OnInit, OnChanges, OnDestroy {
 
 	map: google.maps.Map;
 
-	@ViewChild('autocomplete', { static: false })
+	@ViewChild('autocomplete', { static: true })
 	searchElement: ElementRef;
 
 	mapCoordEmitter = new EventEmitter<google.maps.LatLng>();
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
index de21572ad..6ac83cb77 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
@@ -24,16 +24,16 @@ export class AddCarriersPopupPage implements OnInit, OnDestroy {
 	@ViewChild('carriersCatalog', { static: false })
 	carriersCatalog: CarriersCatalogComponent;
 
-	@ViewChild('addChoice', { static: false })
+	@ViewChild('addChoice', { static: true })
 	addChoiceComponent: AddChoiceComponent;
 
-	@ViewChild('wizzardFrom', { static: false })
+	@ViewChild('wizzardFrom', { static: true })
 	wizzardFrom: any;
 
-	@ViewChild('wizzardFromStep1', { static: false })
+	@ViewChild('wizzardFromStep1', { static: true })
 	wizzardFromStep1: any;
 
-	@ViewChild('wizardFormStep2', { static: false })
+	@ViewChild('wizardFormStep2', { static: true })
 	wizardFormStep2: any;
 
 	choiced: string;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
index 0f0353e69..683031ff0 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
@@ -36,13 +36,13 @@ export class AddNewCarrierComponent implements OnInit, OnDestroy, OnChanges {
 	@Input()
 	isDone: boolean;
 
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('accountForm', { static: false })
+	@ViewChild('accountForm', { static: true })
 	accountForm: AccountFormComponent;
 
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	isNextStepOneAvailable: boolean = true;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
index 3f22f55df..6ffc84958 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
@@ -36,7 +36,7 @@ import { first } from 'rxjs/operators';
 	templateUrl: 'location-form.component.html'
 })
 export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
-	@ViewChild('autocomplete', { static: false })
+	@ViewChild('autocomplete', { static: true })
 	searchElement: ElementRef;
 
 	@Output()
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
index 2675929bc..c084efa9f 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
@@ -8,7 +8,7 @@ import { ModalController } from '@ionic/angular';
 	styleUrls: ['./carrier-addr-popup.scss']
 })
 export class CarrierAddrPopupPage implements OnInit {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 
 	map: google.maps.Map;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
index 73d2a82b7..06b8f02d5 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
@@ -42,13 +42,13 @@ export class CarrierEditPopupPage implements OnInit, OnDestroy, OnChanges {
 	@Input()
 	carrier: Carrier;
 
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('accountForm', { static: false })
+	@ViewChild('accountForm', { static: true })
 	accountForm: AccountFormComponent;
 
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	isNextStepOneAvailable: boolean = true;
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts
index 1919efa98..6142d530a 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts
@@ -32,7 +32,7 @@ import Carrier from '@modules/server.common/entities/Carrier';
 	templateUrl: 'location-form.component.html'
 })
 export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
-	@ViewChild('autocomplete', { static: false })
+	@ViewChild('autocomplete', { static: true })
 	searchElement: ElementRef;
 
 	@Input()
diff --git a/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.ts b/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.ts
index 255588816..978e93ab4 100644
--- a/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.ts
@@ -18,7 +18,7 @@ const directionsService = new google.maps.DirectionsService();
 	styleUrls: ['./carrier-track-popup.scss']
 })
 export class CarrierTrackPopup implements OnInit {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 
 	@Input()
diff --git a/merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts b/merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts
index dae67c834..c6668d208 100644
--- a/merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts
@@ -8,7 +8,7 @@ import User from '@modules/server.common/entities/User';
 	styleUrls: ['./customer-addr-popup.scss']
 })
 export class CustomerAddrPopupPage implements OnInit {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 	map: google.maps.Map;
 	myLatLng = { lat: 0, lng: 0 };
diff --git a/merchant/tablet-ionic/src/pages/+track/track.ts b/merchant/tablet-ionic/src/pages/+track/track.ts
index 72596c2b1..88a13cba6 100644
--- a/merchant/tablet-ionic/src/pages/+track/track.ts
+++ b/merchant/tablet-ionic/src/pages/+track/track.ts
@@ -49,10 +49,10 @@ export class TrackPage implements OnInit, OnDestroy {
 	carrierListDropdown: Carrier[];
 	sharedCarrierListId: string[];
 
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 
-	@ViewChild('filterComponent', { static: false })
+	@ViewChild('filterComponent', { static: true })
 	filterComponent: IonicSelectableComponent;
 
 	constructor(
diff --git a/merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts b/merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts
index 01060dda6..b99140ac9 100644
--- a/merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts
@@ -58,7 +58,7 @@ export class CreateProductTypePopupPage implements OnInit {
 
 	hasImage: boolean;
 
-	@ViewChild('fileInput', { static: false })
+	@ViewChild('fileInput', { static: true })
 	fileInput: ElementRef;
 
 	private imagesData: IProductImage[];
@@ -133,7 +133,7 @@ export class CreateProductTypePopupPage implements OnInit {
 
 	ionViewDidLoad() {}
 
-	@ViewChild('imageHolder', { static: false })
+	@ViewChild('imageHolder', { static: true })
 	private _imageHolder: ElementRef;
 
 	imageUrlChanged(ev) {
diff --git a/merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts b/merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts
index 04701e56c..6030bbe13 100644
--- a/merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts
+++ b/merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts
@@ -59,7 +59,7 @@ export class EditProductTypePopupPage implements OnInit, AfterViewInit {
 	private lastProductCount: number;
 	private imagesData: IProductImage[];
 
-	@ViewChild('fileInput', { static: false })
+	@ViewChild('fileInput', { static: true })
 	private fileInput: ElementRef;
 
 	constructor(
@@ -119,7 +119,7 @@ export class EditProductTypePopupPage implements OnInit, AfterViewInit {
 		};
 	}
 
-	@ViewChild('imageHolder', { static: false })
+	@ViewChild('imageHolder', { static: true })
 	private _imageHolder: ElementRef;
 
 	imageUrlChanged(ev) {
diff --git a/merchant/tablet-ionic/src/polyfills.ts b/merchant/tablet-ionic/src/polyfills.ts
index 9d02706c4..e51ca9f69 100644
--- a/merchant/tablet-ionic/src/polyfills.ts
+++ b/merchant/tablet-ionic/src/polyfills.ts
@@ -23,6 +23,8 @@
 
 (window as any).global = window;
 
+import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js';
+
 /** IE9, IE10 and IE11 requires all of the following polyfills. **/
 // import 'core-js/es6/symbol';
 // import 'core-js/es6/object';
diff --git a/merchant/tablet-ionic/yarn.lock b/merchant/tablet-ionic/yarn.lock
index 37906e6e5..bada2e6e7 100644
--- a/merchant/tablet-ionic/yarn.lock
+++ b/merchant/tablet-ionic/yarn.lock
@@ -2,77 +2,76 @@
 # yarn lockfile v1
 
 
-"@angular-builders/custom-webpack@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-7.4.3.tgz#c95e32f007ca956cbeac703206f7c3b573029aee"
-  integrity sha512-dizPcKBSdgM8ztVbhOdVxHnfV/FBkTi1ZirsxWaw1B0S0KuPTESnsJaZA15i8Y2l202hCPs5fJfqy5aCoRrs1Q==
+"@angular-builders/custom-webpack@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-8.0.2.tgz#0303d87e13f3fe3336098875ed109e093ab0c49b"
+  integrity sha512-ZxR931h0FX/5YZC6RBBczeMkgwOO0eD83EoOtjcshK2mw6jBarONlifhr6Ud0ALyU7fGueOCTgqgGaVwT1QEbw==
   dependencies:
     lodash "^4.17.10"
+    webpack-merge "^4.2.1"
 
-"@angular-builders/dev-server@^7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
-  integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
-
-"@angular-devkit/architect@0.13.8", "@angular-devkit/architect@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
-  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
+"@angular-devkit/architect@0.800.2", "@angular-devkit/architect@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.2.tgz#0924864e57d1e56bddeae257c8779a2662c34e69"
+  integrity sha512-251GOQwI3254AtnGWZoHmjOMFcz7h6M3fPmRHpYuuhRPIwZnQCKaszYI7gaP9zR7uArLUwsuPo+YYz8lb6Giwg==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
+    "@angular-devkit/core" "8.0.2"
+    rxjs "6.4.0"
 
-"@angular-devkit/build-angular@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
-  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
+"@angular-devkit/build-angular@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.2.tgz#712f106f50fb8301816e4417493e98e1e12eb296"
+  integrity sha512-RlYPEp5FVKosgzWhbI7llM3lGIxAYuCwEPloeUL4XaDasNe2zmLNUlYDVTrF7GpZRoAgiIejmT0HvvKfEuZNZQ==
   dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/build-optimizer" "0.13.8"
-    "@angular-devkit/build-webpack" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@ngtools/webpack" "7.3.8"
-    ajv "6.9.1"
-    autoprefixer "9.4.6"
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/build-optimizer" "0.800.2"
+    "@angular-devkit/build-webpack" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    "@ngtools/webpack" "8.0.2"
+    ajv "6.10.0"
+    autoprefixer "9.5.1"
+    browserslist "4.5.5"
+    caniuse-api "3.0.0"
     circular-dependency-plugin "5.0.2"
     clean-css "4.2.1"
-    copy-webpack-plugin "4.6.0"
+    copy-webpack-plugin "5.0.2"
+    core-js "3.0.1"
     file-loader "3.0.1"
     glob "7.1.3"
     istanbul-instrumenter-loader "3.0.1"
-    karma-source-map-support "1.3.0"
+    karma-source-map-support "1.4.0"
     less "3.9.0"
     less-loader "4.1.0"
-    license-webpack-plugin "2.1.0"
+    license-webpack-plugin "2.1.1"
     loader-utils "1.2.3"
-    mini-css-extract-plugin "0.5.0"
+    mini-css-extract-plugin "0.6.0"
     minimatch "3.0.4"
-    open "6.0.0"
+    open "6.2.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
     postcss-loader "3.0.0"
     raw-loader "1.0.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
+    sass "1.19.0"
     sass-loader "7.1.0"
-    semver "5.6.0"
+    semver "6.0.0"
     source-map-loader "0.2.4"
-    source-map-support "0.5.10"
+    source-map-support "0.5.12"
     speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
     stylus-loader "3.0.2"
-    terser-webpack-plugin "1.2.2"
+    terser-webpack-plugin "1.2.3"
     tree-kill "1.2.1"
-    webpack "4.29.0"
-    webpack-dev-middleware "3.5.1"
-    webpack-dev-server "3.1.14"
+    webpack "4.30.0"
+    webpack-dev-middleware "3.6.2"
+    webpack-dev-server "3.3.1"
     webpack-merge "4.2.1"
     webpack-sources "1.3.0"
     webpack-subresource-integrity "1.1.0-rc.6"
-  optionalDependencies:
-    node-sass "4.11.0"
+    worker-plugin "3.1.0"
 
 "@angular-devkit/build-optimizer@0.0.35":
   version "0.0.35"
@@ -84,26 +83,27 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.8", "@angular-devkit/build-optimizer@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
-  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
+"@angular-devkit/build-optimizer@0.800.2", "@angular-devkit/build-optimizer@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.2.tgz#4223b2ac8c2a4c05682d1f3cb0417b4630b4a943"
+  integrity sha512-A/lX7Fjfeh5PspGURV8fJeOsrIYM/7why7mC6v78zdxaErd4S18wUXJDfndjx3qiKyuq76Uu4cQcS7XfClpb8Q==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
-    typescript "3.2.4"
+    typescript "3.4.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
-  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
+"@angular-devkit/build-webpack@0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.2.tgz#af90ea503eece948390bce154a53df9d7c566539"
+  integrity sha512-Bd/sazcriUTFQCGFDyUkjXSmpn8hRLIyLIXBLAn+5coH4Y4xNy8PXt+hnr6ffwu92h/WnyxKIJi44+5aoUBURA==
   dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    rxjs "6.4.0"
+    webpack-merge "4.2.1"
 
-"@angular-devkit/core@7.3.8", "@angular-devkit/core@^7.3.8":
+"@angular-devkit/core@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
   integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
@@ -125,7 +125,18 @@
     rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
+"@angular-devkit/core@8.0.2", "@angular-devkit/core@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.2.tgz#22b017b38b4d6127ab2e39a27990fd7962d3844a"
+  integrity sha512-S2OPYe6Qu7qTS8Q2lzf4qNjXdbN/J2YVnd3wGauMI8Tih5tY/NzUW3h5ds09nRcjsdBDuT0qgf3IMlCZWIABvQ==
+  dependencies:
+    ajv "6.10.0"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
   integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
@@ -141,6 +152,14 @@
     "@angular-devkit/core" "8.0.1"
     rxjs "6.4.0"
 
+"@angular-devkit/schematics@8.0.2", "@angular-devkit/schematics@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.2.tgz#854a4366c7dc7462bebd10c24e808b5c9f65b6e2"
+  integrity sha512-v+g0MOPADJJ5QNNmojCyh2sw1GOzadlbHPdTFqZOm77b2Bi79dRm+yuYMuY6a2nUt7DIcioLRcOFwV8UctajRg==
+  dependencies:
+    "@angular-devkit/core" "8.0.2"
+    rxjs "6.4.0"
+
 "@angular/animations@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
@@ -148,24 +167,28 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
-  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
-  dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    "@schematics/angular" "7.3.8"
-    "@schematics/update" "0.13.8"
+"@angular/cli@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.2.tgz#b64c044342f0af2ed7e78e51c54087693407a47b"
+  integrity sha512-xXSCwTKonC6nMqKPDlEFhXjKBu85jVB+KYo2tLU+RKtgFeIF/hTaUWQTvWXRwRsQAfBhB1cwe0oijdljOItTgw==
+  dependencies:
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
+    "@schematics/angular" "8.0.2"
+    "@schematics/update" "0.800.2"
     "@yarnpkg/lockfile" "1.1.0"
+    debug "^4.1.1"
     ini "1.3.5"
-    inquirer "6.2.1"
+    inquirer "6.3.1"
     npm-package-arg "6.1.0"
-    open "6.0.0"
-    pacote "9.4.0"
-    semver "5.6.0"
+    open "6.2.0"
+    pacote "9.5.0"
+    read-package-tree "5.2.2"
+    semver "6.0.0"
     symbol-observable "1.2.0"
+    universal-analytics "^0.4.20"
+    uuid "^3.3.2"
 
 "@angular/common@^8.0.0":
   version "8.0.0"
@@ -174,10 +197,10 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
-  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
+"@angular/compiler-cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0.tgz#b53ebb5accc34a68bf7a63d16130ca7c568f8a51"
+  integrity sha512-Z0U0Ih8A7V3J1gq7AXnXbrGAD2ERmz7JbREJJRHDWiUNxIqGQiV3Odo1V8FL5n/cKvLwSYM2Ubvk10gb0+3njA==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -189,7 +212,7 @@
     shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
-    yargs "9.0.1"
+    yargs "13.1.0"
 
 "@angular/compiler@^8.0.0":
   version "8.0.0"
@@ -212,17 +235,10 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.15":
-  version "7.2.15"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.15.tgz#a32bea9e67e99eef88150085aeebbe7aeecd39eb"
-  integrity sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/language-service@^7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
-  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
+"@angular/language-service@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0.tgz#1ee4ce5003897cad53597da28f4c94fe30519bfb"
+  integrity sha512-vGk14oWroEo6ycO4cooznx57nn2sASmCQ/sdE8UVwySUKl940TsVzijgaGqapTepFof9sMqN77y2G15eRKQeAQ==
 
 "@angular/platform-browser-dynamic@^8.0.0":
   version "8.0.0"
@@ -508,10 +524,10 @@
     "@ionic/core" "4.2.0"
     tslib "^1.9.3"
 
-"@ionic/app-scripts@^3.2.3":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@ionic/app-scripts/-/app-scripts-3.2.3.tgz#b1bc492f2ff49777ec0f6594930a0e707a641a4f"
-  integrity sha512-t1kL9NqY/sVLfAIVKfN4VJigPqMWs5euKxig3sjsrakSQ9z4njmbDghzAC4taefIpYxLGMOeWgKwrrxOiLkdWQ==
+"@ionic/app-scripts@^3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@ionic/app-scripts/-/app-scripts-3.2.4.tgz#db3f6a215ba226099db2a9af41f0f6bb5d4cc368"
+  integrity sha512-Wt6bBnLtyknbTn6ikUTst2HLs5ww+BL9FpYv2dQWZwDODYqyWFkQQvdXj0IFibU2umXFOH5nQXJin2vvgtovzA==
   dependencies:
     "@angular-devkit/build-optimizer" "0.0.35"
     autoprefixer "^7.2.6"
@@ -541,45 +557,18 @@
     ws "3.3.2"
     xml2js "^0.4.19"
 
-"@ionic/cli-framework@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-1.7.0.tgz#6cb516ad6a95b10c7e3197e9510eb64c1d580587"
-  integrity sha512-2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg==
-  dependencies:
-    "@ionic/utils-array" "0.0.1"
-    "@ionic/utils-fs" "1.2.0"
-    "@ionic/utils-object" "0.0.1"
-    "@ionic/utils-process" "0.1.0"
-    "@ionic/utils-stream" "0.0.1"
-    "@ionic/utils-subprocess" "0.1.0"
-    "@ionic/utils-terminal" "0.0.1"
-    chalk "^2.3.0"
-    debug "^4.0.0"
-    inquirer "^6.0.0"
-    lodash "^4.17.5"
-    log-update "^2.3.0"
-    minimist "^1.2.0"
-    rimraf "^2.6.2"
-    slice-ansi "^2.0.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-    tslib "^1.9.0"
-    untildify "^3.0.2"
-    wrap-ansi "^4.0.0"
-    write-file-atomic "^2.3.0"
-
-"@ionic/cli-framework@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-2.0.0.tgz#0fa5de4b97d9473b97cca8076b307ac40ca0c8d2"
-  integrity sha512-AovnYq4bH1eFKiAiuaze3YXK9DeOGq1ODn6bUPOquYrQeXpMQmxbYYleLlJ2sKj1UTr7VpfdoO1dJARkyRayOQ==
-  dependencies:
-    "@ionic/utils-array" "1.0.0"
-    "@ionic/utils-fs" "2.0.0"
-    "@ionic/utils-object" "1.0.0"
-    "@ionic/utils-process" "1.0.0"
-    "@ionic/utils-stream" "1.0.0"
-    "@ionic/utils-subprocess" "1.0.0"
-    "@ionic/utils-terminal" "1.0.0"
+"@ionic/cli-framework@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-2.0.1.tgz#f91923b045ca656248798a23f8498b41e63034c8"
+  integrity sha512-4ZIbKJg5LTKE8xNUIZCZnX/VrsuKQbdPdeQ8HTkuxUotqT2ceAExuq2r8LLQ4nquRvUZGwJdGF+1w2UwZlg8yA==
+  dependencies:
+    "@ionic/utils-array" "1.0.1"
+    "@ionic/utils-fs" "2.0.1"
+    "@ionic/utils-object" "1.0.1"
+    "@ionic/utils-process" "1.0.1"
+    "@ionic/utils-stream" "1.0.1"
+    "@ionic/utils-subprocess" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     chalk "^2.3.0"
     debug "^4.0.0"
     inquirer "^6.0.0"
@@ -602,23 +591,23 @@
   dependencies:
     ionicons "4.5.5"
 
-"@ionic/discover@1.0.13":
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/@ionic/discover/-/discover-1.0.13.tgz#a9cfe9559b37f3665112bb30edb489f9b5470ef4"
-  integrity sha512-9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA==
+"@ionic/discover@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/discover/-/discover-2.0.1.tgz#fd5ec41a6a4c335d88f1febca76baf311d95e4a7"
+  integrity sha512-ADGcv+JY7+cc20l3D0/EOAMnWkALwmlimFrms8DsDwCX4zLOpIB8sHuLfteNEwUFMFDgkHs543WdrkeGbEz/AA==
   dependencies:
     debug "^4.0.0"
     netmask "^1.0.6"
     tslib "^1.9.0"
     ws "^6.0.0"
 
-"@ionic/lab@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-2.0.0.tgz#f879730fcea9b6b974dd19bf90ac2478d18253fc"
-  integrity sha512-XbgkR94fdZ/WhWb39vcY+3+YttPEp4iIKys8TFWX5Dp6eNdKFu9Zg1hXVnn/ZcMYaPn5cSXFraSelKM9/WiwYA==
+"@ionic/lab@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-2.0.1.tgz#a3a38d114c0d8b6f9e84d9b710d53340bb75d844"
+  integrity sha512-CHiUkw98NGX8XoaOFUEGmWYjJ6XgqSI0j8SSepk4CtveTJ8+OraCjOG0k/dOkQbrqWEra+apHH3jqnC4WOdPLQ==
   dependencies:
-    "@ionic/cli-framework" "2.0.0"
-    "@ionic/utils-fs" "2.0.0"
+    "@ionic/cli-framework" "2.0.1"
+    "@ionic/utils-fs" "2.0.1"
     chalk "^2.3.0"
     express "^4.16.2"
     tslib "^1.9.0"
@@ -637,147 +626,79 @@
     localforage-cordovasqlitedriver "1.7.0"
     tslib "^1.7.1"
 
-"@ionic/utils-array@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-0.0.1.tgz#40469892e6a58995687a60c1dcf0f93c7da3b925"
-  integrity sha512-gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-array@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-1.0.0.tgz#f9967f4cf121c3d16d88943116564aac4df1dd47"
-  integrity sha512-W0wTuUCmQ7ZDfnIOJ11gmszXlv9xYNO3z99TqbNKBQHyr4dm3mRhAKrfZslPQ202VTvh9/e0Nwx8znu+zUMaJQ==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-fs@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-1.2.0.tgz#bc4492c5d57f910dedac2d3a33026d71ff3a51d5"
-  integrity sha512-31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA==
+"@ionic/utils-array@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-1.0.1.tgz#7c5b4732218f350e4197804b87af451089761ce1"
+  integrity sha512-XqGhwcGS5XwXpQbGi1K97UY1bBZLYlj/DQ5HVE6551C6QF6PRM8WAlpKs4m4Y1MZ5FRLbZOSykcx6q4mlFF5FA==
   dependencies:
     debug "^4.0.0"
-    fs-extra "^7.0.1"
-    through2 "^3.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-fs@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-2.0.0.tgz#f5188f17d63c4d70d8b1af095f2f60c70c4bcb16"
-  integrity sha512-WKIwS7WNsxabq2fpbkoDFKvNfPnkoFtdmxFuD5qztBG/tGD8zCE8ON1dui9DjKVDIR4lr6rkovmdVu2SCVM3rA==
+"@ionic/utils-fs@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-2.0.1.tgz#49bc3bab56f911cc73abdef7a8b0c53c0a3a9ba3"
+  integrity sha512-dwsa9puttLOlLoAa6sZQRqQIp/TIqmxECun8Ec/AnL0hfeFvpyq5MOjo/3rkq2Oq5bEiZr5ppe8hGEpl8pVx7Q==
   dependencies:
     debug "^4.0.0"
     fs-extra "^7.0.1"
     through2 "^3.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-network@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-network/-/utils-network-0.0.8.tgz#371b3bbc1d7ee770fbcbc5759fdcdf215d8865c6"
-  integrity sha512-DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-object@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-0.0.1.tgz#07aa9ce3ae6069e6ed589444ca2c80b691b70585"
-  integrity sha512-ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-object@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-1.0.0.tgz#2783cf44d99164087688054bc41f6a453535f2a2"
-  integrity sha512-Bn8X+3LLKLX2HT1jjcZvavKB7W5JAm8gWW+NybClO2D8S6Py0Fr0ckB5XKrYnNmk2C/Dr7n+Ga5dMypei/xAxA==
+"@ionic/utils-network@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-network/-/utils-network-1.0.1.tgz#52063de7f00b2d587b1d32d2ae265619e9984388"
+  integrity sha512-3fqq+2SzlWRpf4029Cry86D/Vb/hTc2zO90GtFlCU+3az2IpGQOzGeVrZ8az9pgzROY/hDfdL6VUsvwF4MF20g==
   dependencies:
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-process@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-0.1.0.tgz#35263b7e2cc5b05b6e21ab7105eb8ccf78befadd"
-  integrity sha512-CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw==
+"@ionic/utils-object@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-1.0.1.tgz#1a9910e21271f268c23d44a163c071feff3959c2"
+  integrity sha512-SIc8bqsCJA8+zsIPS34TmgTJg0WyqkJzcSEZTdfpMPS+qPq/Sm2yaeDGRhlXGRnfDckulRiCK3mhW2dfNPTGhQ==
   dependencies:
-    "@ionic/utils-object" "0.0.1"
-    "@ionic/utils-terminal" "0.0.1"
     debug "^4.0.0"
-    lodash "^4.17.5"
-    tree-kill "1.2.1"
     tslib "^1.9.0"
 
-"@ionic/utils-process@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-1.0.0.tgz#4a5ade9ec59a728c84f913557d2625d6e91ece67"
-  integrity sha512-4YMbpT4CAe+GdgW1GTxbzOze8q/7yCnjtqQJyLMzRIGSEdOeXx6I8GRf5Y6IDJhhdf7QVYUZXoeFpNASQXiSPA==
+"@ionic/utils-process@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-1.0.1.tgz#466a540d45d38f7210a26cdef747b32f6fa99a2a"
+  integrity sha512-kEAte96A5xBA0wJX35ykHERgc4KkYS4Xiq7XsSMo3inBbN2rNUkRIzC+aFM3IFeNKtCqgNgh7t9LczvLDEzdiQ==
   dependencies:
-    "@ionic/utils-object" "1.0.0"
-    "@ionic/utils-terminal" "1.0.0"
+    "@ionic/utils-object" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     debug "^4.0.0"
     lodash "^4.17.5"
     tree-kill "1.2.1"
     tslib "^1.9.0"
 
-"@ionic/utils-stream@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-0.0.1.tgz#f73808262b77be2e6a3c2fbedb69cc185d6f3b69"
-  integrity sha512-IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg==
-  dependencies:
-    debug "^4.0.0"
-    stream-combiner2 "^1.1.1"
-    tslib "^1.9.0"
-
-"@ionic/utils-stream@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-1.0.0.tgz#2cf66bb2c8f49e0ad5ae5151c02d90505d93854e"
-  integrity sha512-kW8MX33YlvP/JXo9qs6fZ3ghbtHX+R0twAZuyuF1WeBWq4eDwJeOaNv80PHr+wm+DBwYPhXmve/d20z/trgm/Q==
+"@ionic/utils-stream@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-1.0.1.tgz#a1d312708f985ff9683154293f8dc3cbde1f4343"
+  integrity sha512-EIprRexxL+s1J8u6cvJrigDXpRTRUwrobBETxJ9DL8KFLhv3HOVcwRFtiP08mm4l3SCfQtrbi4tMCX/KssVLFQ==
   dependencies:
     debug "^4.0.0"
     stream-combiner2 "^1.1.1"
     tslib "^1.9.0"
 
-"@ionic/utils-subprocess@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz#3f2fc1d829e06d8c5ed66faad2ce8d9c7a3a1d9b"
-  integrity sha512-8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg==
-  dependencies:
-    "@ionic/utils-array" "0.0.1"
-    "@ionic/utils-fs" "1.2.0"
-    "@ionic/utils-process" "0.1.0"
-    "@ionic/utils-stream" "0.0.1"
-    cross-spawn "^6.0.5"
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-subprocess@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-1.0.0.tgz#e3714d69f7b7ef3577e8832a67ea8630ef0c3ad7"
-  integrity sha512-iHjs7voSlOauNv3kICfBtlyAHYfh/DsWaxucLaQ2IXcYknqqzr8H1FbW2dH+TxorG1g7YPWEnbjY7UeeiavnqQ==
-  dependencies:
-    "@ionic/utils-array" "1.0.0"
-    "@ionic/utils-fs" "2.0.0"
-    "@ionic/utils-process" "1.0.0"
-    "@ionic/utils-stream" "1.0.0"
-    "@ionic/utils-terminal" "1.0.0"
+"@ionic/utils-subprocess@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-1.0.1.tgz#e615f5f7b4d474b6a8560d19abf699d7e517f34f"
+  integrity sha512-JsNLpxoMWIkUhAiQpff+Fzn6+Fl8SvXFglqqBq4E0sKLVuVRDhzD+5JDUKqDO7q+crQhRZbDTRVM+GFsi7ZGgg==
+  dependencies:
+    "@ionic/utils-array" "1.0.1"
+    "@ionic/utils-fs" "2.0.1"
+    "@ionic/utils-process" "1.0.1"
+    "@ionic/utils-stream" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     cross-spawn "^6.0.5"
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-terminal@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz#3ffd2d18cf5039c5944768cb259d649e962ecba7"
-  integrity sha512-xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-terminal@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-1.0.0.tgz#e7477abf9fc4e0ce27afdf515ac0a331215244d2"
-  integrity sha512-8NVfY+ZyKajfsXj/bzKe5QduDJy0T0I/GPgaPKRZzFHQyUDbcUKZqKfVnAEUCm8l54v13drXovy08jP/6ulKXw==
+"@ionic/utils-terminal@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-1.0.1.tgz#5612e587b5f0064ca31a3823415964e72848d13e"
+  integrity sha512-y/mEpPNPW2oYfFGtFTCRbZAmp0Go17S7uNUFGKThV397lmHm3yiPiu0M5cDV9v/UDuOZ7nmz3LqwhtIaPPeK9g==
   dependencies:
     debug "^4.0.0"
     tslib "^1.9.0"
@@ -790,14 +711,14 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
-  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
+"@ngtools/webpack@8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.2.tgz#d60167b514b531ed6ae308b4911739dd102e41c7"
+  integrity sha512-5P0FHF4p5H/G9xGjOG9meDViXcdW3RPdJa2nX1gGpii3/dhFhmU4pxjKn1Bfs4x+PB9FQQvhSvGIBLNf+B4y5Q==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/core" "8.0.2"
     enhanced-resolve "4.1.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
     tree-kill "1.2.1"
     webpack-sources "1.3.0"
 
@@ -905,15 +826,6 @@
     eventemitter2 "^4.1.0"
     ws "^3.0.0"
 
-"@schematics/angular@7.3.8", "@schematics/angular@^7.0.3":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
-  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
-  dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    typescript "3.2.4"
-
 "@schematics/angular@8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
@@ -922,18 +834,35 @@
     "@angular-devkit/core" "8.0.1"
     "@angular-devkit/schematics" "8.0.1"
 
-"@schematics/update@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
-  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
+"@schematics/angular@8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.2.tgz#80d2a4d55f89b0f843f64d38f588ccca4fdf4de2"
+  integrity sha512-mN9qsoBVpbY1Q7BP8WaiHsyDv+kl5WrIHw/9OASLrGZcoVY7+oj2CfznVq0XRwvVjDtm6ZFor5ruxLF9dQUOSw==
+  dependencies:
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
+
+"@schematics/angular@^7.0.3":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
+  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
   dependencies:
     "@angular-devkit/core" "7.3.8"
     "@angular-devkit/schematics" "7.3.8"
+    typescript "3.2.4"
+
+"@schematics/update@0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.2.tgz#48d23bf60f2870f0887946165cad42c243c4faac"
+  integrity sha512-HPjbzr/LfFLdMzi6zMQK8mPyLw+nt+m7OQsdoeOkFgHkHVfHrKQWcOGt4A0D6keDJ6K2g7W5CsqFR6/GMac7Mg==
+  dependencies:
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
-    pacote "9.4.0"
-    rxjs "6.3.3"
-    semver "5.6.0"
+    pacote "9.5.0"
+    rxjs "6.4.0"
+    semver "6.0.0"
     semver-intersect "1.4.0"
 
 "@types/bson@*":
@@ -953,11 +882,25 @@
   resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.2.2.tgz#80cf7cfff7401587b8f89307ba36fe4a576bc7cf"
   integrity sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==
 
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
 "@types/geojson@*":
   version "7946.0.7"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
   integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
+"@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/googlemaps@^3.30.19":
   version "3.30.19"
   resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.19.tgz#359c025e244490b0775826fb216bed093fd66b16"
@@ -987,6 +930,11 @@
   dependencies:
     "@types/geojson" "*"
 
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
 "@types/mongodb@*", "@types/mongodb@^3.1.22":
   version "3.1.23"
   resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.23.tgz#9aaa105f448427036cb6cd3aa042ab77b2ab8a7a"
@@ -1008,6 +956,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@>=6":
+  version "12.0.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
+  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
+
 "@types/node@^12.0.2":
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
@@ -1080,158 +1033,181 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
-"@webassemblyjs/ast@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
-  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
-  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
-
-"@webassemblyjs/helper-api-error@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
-  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
-
-"@webassemblyjs/helper-buffer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
-  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
-
-"@webassemblyjs/helper-code-frame@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
-  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/helper-fsm@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
-  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
-
-"@webassemblyjs/helper-module-context@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
-  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
-  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
-
-"@webassemblyjs/helper-wasm-section@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
-  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-
-"@webassemblyjs/ieee754@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
-  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
-  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/utf8@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
-  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
-
-"@webassemblyjs/wasm-edit@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
-  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/helper-wasm-section" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-opt" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/wasm-gen@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
-  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wasm-opt@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
-  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-
-"@webassemblyjs/wasm-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
-  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wast-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
-  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-code-frame" "1.7.11"
-    "@webassemblyjs/helper-fsm" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/wast-printer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
-  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-    "@xtuc/long" "4.2.1"
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webcomponents/webcomponentsjs@^2.2.10":
+  version "2.2.10"
+  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.10.tgz#6f6bee0277833ae98d7e5b46f1e0fdb48cd5ff44"
+  integrity sha512-5dzhUhP+h0qMiK0IWb7VNb0OGBoXO3AuI6Qi8t9PoKT50s5L1jv0xnwnLq+cFgPuTB8FLTNP8xIDmyoOsKBy9Q==
+
+"@wry/context@^0.4.0":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.4.3.tgz#5e5653ef4d2d2d9cbac7d984528a0d69c78becf9"
+  integrity sha512-CzjOb1sSDPT+uqCItFq7edIoNTBzeg53ye2h81hrfd24lcD2YiSkpJNKJ8jm2Q3UZf6Jth1vDHbS6ub8bGczxw==
+  dependencies:
+    "@types/node" ">=6"
+    tslib "^1.9.3"
+
+"@wry/equality@^0.1.2":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9"
+  integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew==
+  dependencies:
+    tslib "^1.9.3"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
@@ -1259,6 +1235,14 @@ accepts@~1.3.4, accepts@~1.3.5:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
+accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
@@ -1419,7 +1403,7 @@ ansi-escapes@^1.1.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
   integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -1493,61 +1477,60 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
-  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
+apollo-angular-link-http-common@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.7.0.tgz#c4ece9832724437027a591e5840ebedef8e4609b"
+  integrity sha512-syKJD/AgSrfeaZ0XRGfDuRNT2CowTu7VugdlPxf41wJ+v3uPbUnNoha9/simuxOQuUR7ykUWVyKtNPpJO+MagA==
   dependencies:
     tslib "^1.9.0"
 
-apollo-angular-link-http@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
-  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
+apollo-angular-link-http@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.7.0.tgz#1d0b8a5a6cd94b5397c6a959330a0e2fb9f61d6a"
+  integrity sha512-YNZx1sQS8SleEadF4TPswRF/iq2M99/iwnwtxlqmlq7E+4ZSXXyxXjQO6LsXH8iWoG7aitCpzUZR7XAVuXGp+g==
   dependencies:
-    apollo-angular-link-http-common "~1.6.0"
+    apollo-angular-link-http-common "~1.7.0"
     extract-files "5.0.1"
     tslib "^1.9.0"
 
-apollo-angular@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.5.0.tgz#da653b76189fb72ea801c51996ea87fe19aa064f"
-  integrity sha512-zAyMev+bU7cdqRm2AbAH0hJqJOVRN/PpllJ+eqqA0O9dV570RUs2sGehn3dtOcwPHNRof/qrCRoWBEwGrP6hog==
+apollo-angular@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.6.0.tgz#d71cce64d388f4b8e46583f3bf87802eb3458f10"
+  integrity sha512-c8wEskvbGs7n6GNOnVzax6ng4RZtBctzUk9HqqjyLO8TCH4SWGBh1zuShG/9wDqJjTJAb3EcKd5XUJxFybAXeA==
   dependencies:
-    semver "^5.5.1"
+    semver "^6.0.0"
     tslib "^1.9.0"
 
-apollo-cache-inmemory@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz#265d1ee67b0bf0aca9c37629d410bfae44e62953"
-  integrity sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==
+apollo-cache-inmemory@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e"
+  integrity sha512-AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ==
   dependencies:
-    apollo-cache "^1.2.1"
-    apollo-utilities "^1.2.1"
-    optimism "^0.6.9"
-    ts-invariant "^0.2.1"
+    apollo-cache "^1.3.2"
+    apollo-utilities "^1.3.2"
+    optimism "^0.9.0"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
-apollo-cache@1.2.1, apollo-cache@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz#aae71eb4a11f1f7322adc343f84b1a39b0693644"
-  integrity sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==
+apollo-cache@1.3.2, apollo-cache@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a"
+  integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg==
   dependencies:
-    apollo-utilities "^1.2.1"
+    apollo-utilities "^1.3.2"
     tslib "^1.9.3"
 
-apollo-client@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz#36126ed1d32edd79c3713c6684546a3bea80e6d1"
-  integrity sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==
+apollo-client@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.2.tgz#03b6af651e09b6e413e486ddc87464c85bd6e514"
+  integrity sha512-oks1MaT5x7gHcPeC8vPC1UzzsKaEIC0tye+jg72eMDt5OKc7BobStTeS/o2Ib3e0ii40nKxGBnMdl/Xa/p56Yg==
   dependencies:
     "@types/zen-observable" "^0.8.0"
-    apollo-cache "1.2.1"
+    apollo-cache "1.3.2"
     apollo-link "^1.0.0"
-    apollo-link-dedup "^1.0.0"
-    apollo-utilities "1.2.1"
+    apollo-utilities "1.3.2"
     symbol-observable "^1.0.2"
-    ts-invariant "^0.2.1"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
@@ -1559,14 +1542,6 @@ apollo-link-context@^1.0.17:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link-dedup@^1.0.0:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
-  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
-  dependencies:
-    apollo-link "^1.2.11"
-    tslib "^1.9.3"
-
 apollo-link-ws@^1.0.17:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz#a7ec3f90d2651b77d6be9bb6e63deff2efac56d4"
@@ -1585,7 +1560,17 @@ apollo-link@^1.0.0, apollo-link@^1.2.11:
     tslib "^1.9.3"
     zen-observable-ts "^0.8.18"
 
-apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
+apollo-utilities@1.3.2, apollo-utilities@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
+  integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
+  dependencies:
+    "@wry/equality" "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    ts-invariant "^0.4.0"
+    tslib "^1.9.3"
+
+apollo-utilities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
   integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
@@ -1694,7 +1679,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-asap@~2.0.3:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -1813,16 +1798,16 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.6:
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
-  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
+autoprefixer@9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
   dependencies:
-    browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000929"
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.13"
+    postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
 autoprefixer@^7.2.6:
@@ -2107,6 +2092,22 @@ body-parser@1.18.3:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
@@ -2287,6 +2288,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
+browserslist@4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
+  integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
+  dependencies:
+    caniuse-lite "^1.0.30000960"
+    electron-to-chromium "^1.3.124"
+    node-releases "^1.1.14"
+
 browserslist@^2.11.3:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
@@ -2295,14 +2305,14 @@ browserslist@^2.11.3:
     caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
-browserslist@^4.4.1:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
-  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
+browserslist@^4.0.0, browserslist@^4.5.4:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
+  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
   dependencies:
-    caniuse-lite "^1.0.30000955"
-    electron-to-chromium "^1.3.122"
-    node-releases "^1.1.13"
+    caniuse-lite "^1.0.30000971"
+    electron-to-chromium "^1.3.137"
+    node-releases "^1.1.21"
 
 bson@^1.1.1, bson@~1.1.1:
   version "1.1.1"
@@ -2363,26 +2373,12 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.2:
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.1, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -2491,7 +2487,22 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
-caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955:
+caniuse-api@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000960, caniuse-lite@^1.0.30000971:
+  version "1.0.30000974"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
+  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
+
+caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
   version "1.0.30000957"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
   integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
@@ -2530,7 +2541,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.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"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2610,7 +2621,26 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1, chownr@^1.1.1:
+chokidar@^2.1.5:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
+  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -2667,7 +2697,7 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
+cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
@@ -2851,7 +2881,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.38.0 < 2"
 
-compression@^1.5.2, compression@^1.6.0:
+compression@^1.6.0, compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -2891,7 +2921,7 @@ configstore@^3.0.0:
     write-file-atomic "^2.0.0"
     xdg-basedir "^3.0.0"
 
-connect-history-api-fallback@^1.3.0:
+connect-history-api-fallback@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
@@ -2928,6 +2958,13 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -2963,6 +3000,11 @@ cookie@0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
 cookiejar@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
@@ -2985,19 +3027,22 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
-  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
+copy-webpack-plugin@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
+  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
   dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
+    cacache "^11.3.1"
+    find-cache-dir "^2.0.0"
+    glob-parent "^3.1.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^1.1.0"
     minimatch "^3.0.4"
-    p-limit "^1.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^2.1.0"
     serialize-javascript "^1.4.0"
+    webpack-log "^2.0.0"
 
 cordova-android-support-gradle-release@^2.0.1:
   version "2.1.0"
@@ -3216,6 +3261,11 @@ cordova-serve@^3.0.0:
     opn "^5.3.0"
     which "^1.3.0"
 
+core-js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+
 core-js@^2.4.0:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
@@ -3478,7 +3528,7 @@ date-now@^0.1.4:
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
   integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
-debug@*, debug@4, debug@^4.0.0, debug@^4.1.0:
+debug@*, debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -3499,25 +3549,23 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0, debug@^3.1, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
+debug@^3.0, debug@^3.0.0, debug@^3.1, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -3543,12 +3591,12 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-default-gateway@^2.6.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
-  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
     ip-regex "^2.1.0"
 
 define-properties@^1.1.2:
@@ -3594,17 +3642,18 @@ degenerator@^1.0.4:
     escodegen "1.x.x"
     esprima "3.x.x"
 
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+del@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
   dependencies:
+    "@types/glob" "^7.1.1"
     globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -3661,6 +3710,14 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 dfa@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.1.0.tgz#d30218bd10d030fa421df3ebbc82285463a31781"
@@ -3857,7 +3914,12 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.122, electron-to-chromium@^1.3.30:
+electron-to-chromium@^1.3.124, electron-to-chromium@^1.3.137:
+  version "1.3.150"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.150.tgz#afb972b53a702b37c76db843c39c967e9f68464b"
+  integrity sha512-5wuYlaXhXbBvavSTij5ZyidICB6sAK/1BwgZZoPCgsniid1oDgzVvDOV/Dw6J25lKV9QZ9ZdQCp8MEfF0/OIKA==
+
+electron-to-chromium@^1.3.30:
   version "1.3.124"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
@@ -4326,19 +4388,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -4414,6 +4463,42 @@ express@^4.13.3, express@^4.16.2, express@^4.16.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.16.4:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -4443,7 +4528,7 @@ external-editor@^2.0.1:
     iconv-lite "^0.4.17"
     tmp "^0.0.33"
 
-external-editor@^3.0.0, external-editor@^3.0.3:
+external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
@@ -4628,14 +4713,18 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
 
 find-cache-dir@^2.0.0:
   version "2.1.0"
@@ -4654,7 +4743,7 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -5300,7 +5389,7 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^1.2.0, html-entities@^1.2.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=
@@ -5347,6 +5436,17 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-errors@1.7.2, http-errors@~1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-parser-js@>=0.4.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
@@ -5360,17 +5460,17 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
-http-proxy-middleware@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
-  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
+http-proxy-middleware@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
   dependencies:
-    http-proxy "^1.16.2"
+    http-proxy "^1.17.0"
     is-glob "^4.0.0"
-    lodash "^4.17.5"
-    micromatch "^3.1.9"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
 
-http-proxy@^1.16.2:
+http-proxy@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
@@ -5438,7 +5538,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5484,11 +5584,6 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immutable-tuple@^0.4.9:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.10.tgz#e0b1625384f514084a7a84b749a3bb26e9179929"
-  integrity sha512-45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q==
-
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -5588,23 +5683,23 @@ inquirer@3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
-  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
+inquirer@6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^3.0.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
 inquirer@^6.0.0:
@@ -5631,13 +5726,13 @@ inside@^1.0.0:
   resolved "https://registry.yarnpkg.com/inside/-/inside-1.0.0.tgz#db45e993573cdb3db70b9832e8285bad46424770"
   integrity sha1-20Xpk1c82z23C5gy6ChbrUZCR3A=
 
-internal-ip@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
-  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
+internal-ip@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    default-gateway "^2.6.0"
-    ipaddr.js "^1.5.2"
+    default-gateway "^4.2.0"
+    ipaddr.js "^1.9.0"
 
 interpret@^1.0.0:
   version "1.2.0"
@@ -5661,35 +5756,34 @@ invert-kv@^2.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
-ionic-selectable@4.4.1:
+ionic-selectable@^4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/ionic-selectable/-/ionic-selectable-4.4.1.tgz#991393a652cf6e616081304b4c00cb683529485e"
   integrity sha512-6Pai6Pqw4ofCNFSpbcN7SiOeH419wjczehrxWbMVNy3KOmSw1mfY0/wazEKlqk+iwgsOuYrhkAaEC8srtHdsBQ==
 
-ionic@^4.12.0:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/ionic/-/ionic-4.12.0.tgz#4bd4f0bdeafd9a770d6c7c041672edbcf6e36c6d"
-  integrity sha512-3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg==
-  dependencies:
-    "@ionic/cli-framework" "1.7.0"
-    "@ionic/discover" "1.0.13"
-    "@ionic/utils-array" "0.0.1"
-    "@ionic/utils-fs" "1.2.0"
-    "@ionic/utils-network" "0.0.8"
-    "@ionic/utils-process" "0.1.0"
-    "@ionic/utils-stream" "0.0.1"
-    "@ionic/utils-subprocess" "0.1.0"
-    "@ionic/utils-terminal" "0.0.1"
+ionic@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ionic/-/ionic-5.0.1.tgz#6cb007cdee84665f8ee56ddcdf5fe21ef3accf69"
+  integrity sha512-48v7X8C8OvLN4GdizNJiGpP6/qp9C4V+uP1MXL7zCrcoty4FP4RXbpeBXaZJlrxC9zHxlsPQ/gB/p3e2XINALA==
+  dependencies:
+    "@ionic/cli-framework" "2.0.1"
+    "@ionic/discover" "2.0.1"
+    "@ionic/utils-array" "1.0.1"
+    "@ionic/utils-fs" "2.0.1"
+    "@ionic/utils-network" "1.0.1"
+    "@ionic/utils-process" "1.0.1"
+    "@ionic/utils-stream" "1.0.1"
+    "@ionic/utils-subprocess" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     chalk "^2.3.0"
     debug "^4.0.0"
     diff "^4.0.1"
     elementtree "^0.1.7"
     leek "0.0.24"
     lodash "^4.17.5"
-    log-update "^2.3.0"
-    opn "^5.2.0"
-    os-name "^3.0.0"
-    semver "^5.5.0"
+    open "^6.1.0"
+    os-name "^3.1.0"
+    semver "^6.0.0"
     split2 "^3.0.0"
     ssh-config "^1.1.1"
     superagent "^4.1.0"
@@ -5705,10 +5799,10 @@ ionicons@4.5.5:
   resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.5.tgz#b059958a54dd45cfa127acc0baf11503b8671e51"
   integrity sha512-dIGI73XG6Fg2Ps77ry5Ywe36Pq7wUGkDkl0pBhC4uhsiyoW+oXe+pplmarXEnKEcB5fmlkRrBOxYYzZaoRiUGw==
 
-ionicons@^4.5.5:
-  version "4.5.6"
-  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.6.tgz#f3b5d2446e7e1b30e67ddcd1fc563271acc60f3c"
-  integrity sha512-/F3U/rxdLPGl8eUW5dMouhBBoJuUPrlFO6rkoz4VNuw1lxP6l+bFtsDA8MaVM1dHABp+gIHxtpt+IhwmB3oIfA==
+ionicons@^4.5.8:
+  version "4.5.8"
+  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.8.tgz#a81177325153e7eaecb9546ee0b7955451743f8e"
+  integrity sha512-Zib/fFGHt+r9tWrvZnrxVj22cO4NVj+ZOb76v5yiOyvb0LSTbbReECDg7lEU8e+YR69qCtWHruStJ+b4G/OWxg==
 
 ip-regex@^2.1.0:
   version "2.1.0"
@@ -5725,7 +5819,7 @@ ipaddr.js@1.8.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
   integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
-ipaddr.js@^1.5.2:
+ipaddr.js@1.9.0, 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==
@@ -5920,17 +6014,17 @@ is-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+is-path-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.1.0.tgz#2e0c7e463ff5b7a0eb60852d851a6809347a124c"
+  integrity sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==
 
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
   dependencies:
-    is-path-inside "^1.0.0"
+    is-path-inside "^2.1.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
@@ -5939,6 +6033,18 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
+is-path-inside@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
+  dependencies:
+    path-is-inside "^1.0.2"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -6223,14 +6329,14 @@ kareem@2.3.0:
   resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.0.tgz#ef33c42e9024dce511eeaf440cd684f3af1fc769"
   integrity sha512-6hHxsp9e6zQU8nXsP+02HGWXwTkOEw6IROhF2ZA28cYbUk4eJ6QbtZvdqZOdD9YPKghG3apk5eOCvs+tLl3lRg==
 
-karma-source-map-support@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
-  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
   dependencies:
     source-map-support "^0.5.5"
 
-killable@^1.0.0:
+killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -6332,10 +6438,10 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-license-webpack-plugin@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
-  integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==
+license-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz#f0ab760f7f301c76f5af52e480f320656b5721bb"
+  integrity sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
@@ -6557,6 +6663,11 @@ lodash.last@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash.last/-/lodash.last-3.0.0.tgz#242f663112dd4c6e63728c60a3c909d1bdadbd4c"
   integrity sha1-JC9mMRLdTG5jcoxgo8kJ0b2tvUw=
 
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -6572,6 +6683,11 @@ lodash.tail@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
   integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
 lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
@@ -6582,15 +6698,6 @@ log-driver@^1.2.7:
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
   integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
 
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
-
 log-update@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-3.2.0.tgz#719f24293250d65d0165f4e2ec2ed805ff062eec"
@@ -6600,10 +6707,10 @@ log-update@^3.2.0:
     cli-cursor "^2.1.0"
     wrap-ansi "^5.0.0"
 
-loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
+loglevel@^1.6.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.2.tgz#668c77948a03dbd22502a3513ace1f62a80cc372"
+  integrity sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==
 
 longest@^1.0.1:
   version "1.0.1"
@@ -6630,7 +6737,7 @@ lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -6711,6 +6818,11 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
 map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -6788,7 +6900,7 @@ mem@^4.0.0:
     mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -6839,7 +6951,7 @@ methods@^1.1.1, methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -6866,6 +6978,11 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
+mime-db@1.40.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+
 "mime-db@>= 1.38.0 < 2":
   version "1.39.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
@@ -6883,12 +7000,19 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.38.0"
 
+mime-types@~2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  dependencies:
+    mime-db "1.40.0"
+
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.4.1:
+mime@1.6.0, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -6898,6 +7022,11 @@ mime@^2.3.1, mime@^2.4.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
   integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
 
+mime@^2.4.2:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe"
+  integrity sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -6908,12 +7037,13 @@ mimic-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mini-css-extract-plugin@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
-  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+mini-css-extract-plugin@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "^2.0.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -6964,22 +7094,6 @@ minizlib@^1.1.1:
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -7202,6 +7316,11 @@ negotiator@0.6.1:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
 neo-async@^2.5.0, neo-async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
@@ -7350,14 +7469,14 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.13:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
-  integrity sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==
+node-releases@^1.1.14, node-releases@^1.1.21:
+  version "1.1.23"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
+  integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
   dependencies:
     semver "^5.3.0"
 
-node-sass@4.11.0, node-sass@^4.10.0, node-sass@^4.11.0:
+node-sass@^4.10.0, node-sass@^4.11.0:
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
   integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
@@ -7404,7 +7523,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7431,6 +7550,15 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
+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"
+
 npm-bundled@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
@@ -7608,10 +7736,17 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
-  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+open@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
+  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
+  dependencies:
+    is-wsl "^1.1.0"
+
+open@^6.1.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.3.0.tgz#60d0b845ee38fae0631f5d739a21bd40e3d2a527"
+  integrity sha512-6AHdrJxPvAXIowO/aIaeHZ8CeMdDf7qCyRNq8NwJpinmCdXhz+NZR7ie1Too94lpciCDsG+qHGO9Mt0svA4OqA==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7640,7 +7775,7 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@^5.1.0, opn@^5.2.0, opn@^5.3.0:
+opn@^5.3.0, opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
   integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
@@ -7654,12 +7789,12 @@ opn@latest:
   dependencies:
     is-wsl "^1.1.0"
 
-optimism@^0.6.9:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz#19258ff8b3be0cea29ac35f06bff818e026e30bb"
-  integrity sha512-xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ==
+optimism@^0.9.0:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.5.tgz#b8b5dc9150e97b79ddbf2d2c6c0e44de4d255527"
+  integrity sha512-lNvmuBgONAGrUbj/xpH69FjMOz1d0jvMNoOCKyVynUPzq2jgVlGL4jFYJqrUHzUfBv+jAFSCP61x5UkfbduYJA==
   dependencies:
-    immutable-tuple "^0.4.9"
+    "@wry/context" "^0.4.0"
 
 optimist@^0.6.1:
   version "0.6.1"
@@ -7731,7 +7866,7 @@ os-name@^2.0.1:
     macos-release "^1.0.0"
     win-release "^1.0.0"
 
-os-name@^3.0.0:
+os-name@^3.0.0, os-name@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
   integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
@@ -7776,14 +7911,14 @@ p-is-promise@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.0.0, p-limit@^1.1.0:
+p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
+p-limit@^2.0.0, p-limit@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
   integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
@@ -7804,10 +7939,10 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
 p-try@^1.0.0:
   version "1.0.0"
@@ -7854,10 +7989,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
-  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
+pacote@9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
+  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"
@@ -7989,6 +8124,11 @@ parseurl@~1.3.2:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
   integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -8021,7 +8161,7 @@ path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -8153,13 +8293,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -8279,7 +8412,7 @@ pngjs@^3.3.0:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
-portfinder@^1.0.9:
+portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
   integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
@@ -8326,7 +8459,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^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@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13:
+postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -8344,6 +8477,15 @@ postcss@^6.0.17, postcss@^6.0.21:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
+postcss@^7.0.14:
+  version "7.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -8354,6 +8496,11 @@ prepend-http@^1.0.1:
   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=
+
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
@@ -8411,6 +8558,14 @@ proxy-addr@~2.0.4:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
 
+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==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.0"
+
 proxy-agent@3, proxy-agent@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
@@ -8462,7 +8617,7 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -8528,11 +8683,20 @@ qs@6.5.2, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@^6.4.0, qs@^6.6.0:
+qs@6.7.0, qs@^6.4.0, qs@^6.6.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
+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"
@@ -8577,6 +8741,11 @@ range-parser@^1.0.3, range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
+range-parser@^1.2.1, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
 raw-body@2.3.3, raw-body@^2.2.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
@@ -8587,6 +8756,16 @@ raw-body@2.3.3, raw-body@^2.2.0:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
@@ -8620,6 +8799,29 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+read-package-json@^2.0.0:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
+  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -8703,6 +8905,16 @@ readable-stream@1.1.x:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
 readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -8963,7 +9175,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -9041,10 +9253,10 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs-compat@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.4.0.tgz#800923c15697948e1f30f18c531b12b49451c75c"
-  integrity sha512-eo/O8RS83hJdJukCtA+IF6qnqa8FPOuVo+OPCzgVi+dbTle9KCdNv97IcQO0WwNVik7DJLKmf0F8uwzc0q40vw==
+rxjs-compat@^6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.2.tgz#e469070adf6260bdad195e9d4a39f444ae28b458"
+  integrity sha512-TRMkTp4FgSxE2HtGvxmgRukh3JqdFM7ejAj1Ti/VdodbPGfWvZR5+KdLKRV9jVDFyu2SknM8RD+PR54KGnoLjg==
 
 rxjs-tslint@0.1.5:
   version "0.1.5"
@@ -9063,13 +9275,20 @@ rxjs@6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@6.4.0, rxjs@^6.1.0, rxjs@^6.4.0:
+rxjs@6.4.0, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9126,6 +9345,13 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
+sass@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.19.0.tgz#5de82c713d4299fac57384ef5219534a37fe3e6c"
+  integrity sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==
+  dependencies:
+    chokidar "^2.0.0"
+
 sax@0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.3.5.tgz#88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"
@@ -9153,14 +9379,6 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.4:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -9183,7 +9401,7 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^1.9.1:
+selfsigned@^1.10.4:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
@@ -9216,7 +9434,7 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.6.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -9231,10 +9449,15 @@ semver@5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-semver@5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+semver@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
+semver@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
 
 semver@~5.3.0:
   version "5.3.0"
@@ -9260,12 +9483,31 @@ send@0.16.2, send@latest:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
 serialize-javascript@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
   integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
 
-serve-index@^1.7.2, serve-index@^1.9.1:
+serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -9288,6 +9530,16 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
 serviceworker-cache-polyfill@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
@@ -9328,6 +9580,11 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -9515,6 +9772,13 @@ socks@~2.3.2:
     ip "^1.1.5"
     smart-buffer "4.0.2"
 
+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"
@@ -9544,15 +9808,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+source-map-support@0.5.12, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
   version "0.5.12"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
   integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
@@ -9723,13 +9979,6 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -9779,7 +10028,7 @@ stats-webpack-plugin@0.7.0:
   dependencies:
     lodash "^4.17.4"
 
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
@@ -9848,6 +10097,11 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
   integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -10051,7 +10305,7 @@ supports-color@^4.2.1:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -10136,21 +10390,7 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
-  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
-  dependencies:
-    cacache "^11.0.2"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    terser "^3.16.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
+terser-webpack-plugin@1.2.3, terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
   integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
@@ -10293,6 +10533,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -10347,6 +10592,13 @@ ts-invariant@^0.3.2:
   dependencies:
     tslib "^1.9.3"
 
+ts-invariant@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.2.tgz#8685131b8083e67c66d602540e78763408be9113"
+  integrity sha512-PTAAn8lJPEdRBJJEs4ig6MVZWfO12yrFzV7YaPslmyhG7+4MA279y4BXT3f72gXeVl0mC1aAWq2rMX4eKTWU/Q==
+  dependencies:
+    tslib "^1.9.3"
+
 ts-node@^8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.3.tgz#aa60b836a24dafd8bf21b54766841a232fdbc641"
@@ -10461,6 +10713,14 @@ type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -10471,11 +10731,21 @@ typescript@2.9.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
   integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
-typescript@3.2.4, typescript@~3.2.4:
+typescript@3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
   integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
 
+typescript@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.4.tgz#aac4a08abecab8091a75f10842ffa0631818f785"
+  integrity sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==
+
+typescript@3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
+
 typescript@^2.4.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
@@ -10580,7 +10850,7 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-unique-filename@^1.1.0, unique-filename@^1.1.1:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -10601,6 +10871,15 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+universal-analytics@^0.4.20:
+  version "0.4.20"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
+  integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
+  dependencies:
+    debug "^3.0.0"
+    request "^2.88.0"
+    uuid "^3.0.0"
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -10629,11 +10908,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-untildify@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
-  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
-
 untildify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
@@ -10847,61 +11121,61 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
+webpack-dev-middleware@3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
+  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
   dependencies:
-    memory-fs "~0.4.1"
+    memory-fs "^0.4.1"
     mime "^2.3.1"
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
-  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
+webpack-dev-middleware@^3.6.2:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
+  integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
   dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
+    memory-fs "^0.4.1"
+    mime "^2.4.2"
+    range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.14:
-  version "3.1.14"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
-  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
+webpack-dev-server@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
+  integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "~0.18.0"
+    chokidar "^2.1.5"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
+    debug "^4.1.1"
+    del "^4.1.0"
+    express "^4.16.4"
+    html-entities "^1.2.1"
+    http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
-    internal-ip "^3.0.1"
+    internal-ip "^4.2.0"
     ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
+    killable "^1.0.1"
+    loglevel "^1.6.1"
+    opn "^5.5.0"
+    portfinder "^1.0.20"
     schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
+    selfsigned "^1.10.4"
+    semver "^6.0.0"
+    serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
     spdy "^4.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
+    strip-ansi "^3.0.1"
+    supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "3.4.0"
+    webpack-dev-middleware "^3.6.2"
     webpack-log "^2.0.0"
-    yargs "12.0.2"
+    yargs "12.0.5"
 
 webpack-log@^2.0.0:
   version "2.0.0"
@@ -10961,15 +11235,15 @@ webpack@3.12.0:
     webpack-sources "^1.0.1"
     yargs "^8.0.2"
 
-webpack@4.29.0:
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
-  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
+webpack@4.30.0:
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
+  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
@@ -10985,7 +11259,7 @@ webpack@4.29.0:
     mkdirp "~0.5.0"
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
+    schema-utils "^1.0.0"
     tapable "^1.1.0"
     terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
@@ -11086,6 +11360,13 @@ worker-farm@^1.5.2:
   dependencies:
     errno "~0.1.7"
 
+worker-plugin@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.1.0.tgz#6311778f3514a87c273510ee3f809cc3fe161e6f"
+  integrity sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==
+  dependencies:
+    loader-utils "^1.1.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -11094,23 +11375,6 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
-wrap-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-4.0.0.tgz#b3570d7c70156159a2d42be5cc942e957f7b1131"
-  integrity sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrap-ansi@^5.0.0, wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -11211,11 +11475,6 @@ xregexp@2.0.0:
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
   integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
 
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
 xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -11249,13 +11508,6 @@ yamljs@^0.3.0:
     argparse "^1.0.7"
     glob "^7.0.5"
 
-yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
-  dependencies:
-    camelcase "^4.1.0"
-
 yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
@@ -11264,7 +11516,7 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.0:
+yargs-parser@^13.0.0, yargs-parser@^13.1.0:
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
   integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
@@ -11286,13 +11538,13 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+yargs@12.0.5, yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^2.0.0"
+    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^1.0.1"
     os-locale "^3.0.0"
@@ -11302,44 +11554,24 @@ yargs@12.0.2:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
-yargs@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
-  dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    yargs-parser "^11.1.1"
 
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^1.2.0"
     find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
 
 yargs@^13.2.4:
   version "13.2.4"
@@ -11429,7 +11661,7 @@ zen-observable@^0.8.0:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
   integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
-zone.js@^0.8.29:
-  version "0.8.29"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.29.tgz#8dce92aa0dd553b50bc5bfbb90af9986ad845a12"
-  integrity sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==
+zone.js@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==
diff --git a/shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts b/shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts
index 607cb324e..79bb5b13e 100644
--- a/shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts
+++ b/shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts
@@ -99,7 +99,7 @@ export class NgxBarcodeComponent implements OnChanges {
 	@Input('bc-value')
 	value = '';
 
-	@ViewChild('bcElement', { static: false })
+	@ViewChild('bcElement', { static: true })
 	bcElement: ElementRef;
 
 	@Input('bc-valid')
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 18a868e90..b72880270 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@agm/core@~1.0.0-beta.5":
+"@agm/core@^1.0.0-beta.5":
   version "1.0.0-beta.6"
   resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.6.tgz#89a812b4b4ceb4d9cf2195400423c4b833103c5e"
   integrity sha512-Bf6azUVIZYwgUWUNISaENh38D17XJxgKU7m1TNTrP+sIgYjPrjEON8mxoGnYI8B7PBbdaWl6RPV/FcrEfSG9Ng==

From b23bb8ca35e08bc7b7679ed7380511fa0d5e878d Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 7 Jun 2019 11:56:32 +0300
Subject: [PATCH 363/382] chore(ever-shop-mobile): completed upgrade to angular
 8

---
 shop/mobile-ionic/angular.json                |    2 +-
 shop/mobile-ionic/package.json                |   47 +-
 .../user-warehouse-map/user-warehouse-map.ts  |    2 +-
 .../carreir-location/carreir-location.ts      |    2 +-
 shop/mobile-ionic/src/polyfills.ts            |   12 +-
 shop/mobile-ionic/yarn.lock                   | 1970 +++++++++--------
 6 files changed, 1137 insertions(+), 898 deletions(-)

diff --git a/shop/mobile-ionic/angular.json b/shop/mobile-ionic/angular.json
index 1aea39fed..dca90f393 100644
--- a/shop/mobile-ionic/angular.json
+++ b/shop/mobile-ionic/angular.json
@@ -69,7 +69,7 @@
 					}
 				},
 				"serve": {
-					"builder": "@angular-builders/dev-server:generic",
+					"builder": "@angular-builders/custom-webpack:dev-server",
 					"options": {
 						"browserTarget": "app:build"
 					},
diff --git a/shop/mobile-ionic/package.json b/shop/mobile-ionic/package.json
index 8258c20e6..78bb47fb0 100644
--- a/shop/mobile-ionic/package.json
+++ b/shop/mobile-ionic/package.json
@@ -56,7 +56,6 @@
 		"@angular/common": "^8.0.0",
 		"@angular/core": "^8.0.0",
 		"@angular/forms": "^8.0.0",
-		"@angular/http": "^7.2.15",
 		"@angular/platform-browser": "^8.0.0",
 		"@angular/platform-browser-dynamic": "^8.0.0",
 		"@angular/pwa": "^0.800.1",
@@ -88,10 +87,10 @@
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
 		"angular2-logger": "^0.7.0",
-		"apollo-angular": "^1.5.0",
-		"apollo-angular-link-http": "^1.5.0",
-		"apollo-cache-inmemory": "^1.5.1",
-		"apollo-client": "^2.5.1",
+		"apollo-angular": "^1.6.0",
+		"apollo-angular-link-http": "^1.7.0",
+		"apollo-cache-inmemory": "^1.6.2",
+		"apollo-client": "^2.6.2",
 		"apollo-link": "^1.2.11",
 		"apollo-link-context": "^1.0.17",
 		"apollo-link-ws": "^1.0.17",
@@ -123,7 +122,7 @@
 		"graphql": "^14.1.1",
 		"graphql-tag": "^2.10.1",
 		"handlebars": "^4.1.2",
-		"ionicons": "^4.5.5",
+		"ionicons": "^4.5.8",
 		"jasmine": "^3.3.1",
 		"jsbarcode": "^3.11.0",
 		"lodash": "^4.17.11",
@@ -133,8 +132,8 @@
 		"phonegap-plugin-barcodescanner": "^8.0.1",
 		"qrcode": "^1.3.3",
 		"reflect-metadata": "^0.1.13",
-		"rxjs": "^6.4.0",
-		"rxjs-compat": "^6.4.0",
+		"rxjs": "^6.5.2",
+		"rxjs-compat": "^6.5.2",
 		"sass-loader": "^7.1.0",
 		"save": "^2.3.3",
 		"socket.io-client": "^2.2.0",
@@ -144,25 +143,24 @@
 		"tslib": "^1.9.3",
 		"uglify-js": "^3.6.0",
 		"uuid": "^3.3.2",
-		"zone.js": "^0.9.0"
+		"zone.js": "^0.9.1"
 	},
 	"devDependencies": {
-		"@angular-builders/custom-webpack": "^7.4.3",
-		"@angular-builders/dev-server": "^7.3.1",
-		"@angular-devkit/architect": "^0.13.8",
-		"@angular-devkit/build-angular": "^0.13.8",
-		"@angular-devkit/build-webpack": "^0.13.8",
-		"@angular-devkit/core": "^7.3.8",
-		"@angular-devkit/schematics": "^7.3.8",
-		"@angular/cli": "^7.3.8",
+		"@angular-builders/custom-webpack": "^8.0.2",
+		"@angular-devkit/architect": "^0.800.2",
+		"@angular-devkit/build-angular": "^0.800.2",
+		"@angular-devkit/build-webpack": "^0.800.2",
+		"@angular-devkit/core": "^8.0.2",
+		"@angular-devkit/schematics": "^8.0.2",
+		"@angular/cli": "^8.0.2",
 		"@angular/compiler": "^8.0.0",
-		"@angular/compiler-cli": "^7.2.12",
-		"@angular/language-service": "^7.2.12",
+		"@angular/compiler-cli": "^8.0.0",
+		"@angular/language-service": "^8.0.0",
 		"@compodoc/compodoc": "^1.1.9",
 		"@ionic/angular-toolkit": "^1.5.1",
-		"@ionic/app-scripts": "^3.2.3",
-		"@ionic/lab": "^2.0.0",
-		"@schematics/angular": "^7.3.8",
+		"@ionic/app-scripts": "^3.2.4",
+		"@ionic/lab": "^2.0.1",
+		"@schematics/angular": "^8.0.2",
 		"@types/d3-color": "^1.2.2",
 		"@types/googlemaps": "^3.30.19",
 		"@types/graphql": "^14.0.7",
@@ -178,13 +176,14 @@
 		"@types/swiper": "^4.4.2",
 		"@types/uuid": "^3.4.4",
 		"@types/yargs": "^13.0.0",
+		"@webcomponents/webcomponentsjs": "^2.2.10",
 		"codelyzer": "^5.0.1",
 		"cpr": "^3.0.1",
 		"cross-env": "^5.2.0",
 		"dotenv": "^8.0.0",
 		"envalid": "^5.0.0",
 		"husky": "^2.4.0",
-		"ionic": "^4.12.0",
+		"ionic": "^5.0.1",
 		"jasmine-core": "^3.3.0",
 		"jasmine-spec-reporter": "^4.2.1",
 		"karma": "^4.0.1",
@@ -198,7 +197,7 @@
 		"terser-webpack-plugin": "^1.2.3",
 		"ts-node": "^8.0.3",
 		"tslint": "^5.14.0",
-		"typescript": "~3.2.4",
+		"typescript": "3.4.5",
 		"webpack-bundle-analyzer": "^3.1.0",
 		"webpack-merge": "^4.2.1",
 		"yargs": "^13.2.4"
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/user-warehouse-map/user-warehouse-map.ts b/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/user-warehouse-map/user-warehouse-map.ts
index a15366f42..9bcc0f031 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/user-warehouse-map/user-warehouse-map.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/+order-info/user-warehouse-map/user-warehouse-map.ts
@@ -22,7 +22,7 @@ const userIcon = environment.MAP_USER_ICON_LINK;
 })
 export class UserWarehouseLocationComponent
 	implements AfterViewInit, OnDestroy, OnChanges {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 
 	public map: google.maps.Map;
diff --git a/shop/mobile-ionic/src/app/pages/+products/+order/common/carreir-location/carreir-location.ts b/shop/mobile-ionic/src/app/pages/+products/+order/common/carreir-location/carreir-location.ts
index d755a2d72..a0e6b67cb 100644
--- a/shop/mobile-ionic/src/app/pages/+products/+order/common/carreir-location/carreir-location.ts
+++ b/shop/mobile-ionic/src/app/pages/+products/+order/common/carreir-location/carreir-location.ts
@@ -16,7 +16,7 @@ import GeoLocation from '@modules/server.common/entities/GeoLocation';
 	`
 })
 export class DirectionsLocationComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 	public map: google.maps.Map;
 	private directionsDisplay = new google.maps.DirectionsRenderer();
diff --git a/shop/mobile-ionic/src/polyfills.ts b/shop/mobile-ionic/src/polyfills.ts
index 449819c27..e51ca9f69 100644
--- a/shop/mobile-ionic/src/polyfills.ts
+++ b/shop/mobile-ionic/src/polyfills.ts
@@ -18,11 +18,13 @@
  * BROWSER POLYFILLS
  */
 (window as any).process = {
-	env: { DEBUG: undefined },
+	env: { DEBUG: undefined }
 };
 
 (window as any).global = window;
 
+import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js';
+
 /** IE9, IE10 and IE11 requires all of the following polyfills. **/
 // import 'core-js/es6/symbol';
 // import 'core-js/es6/object';
@@ -45,26 +47,20 @@
 /** IE10 and IE11 requires the following for the Reflect API. */
 // import 'core-js/es6/reflect';
 
-
 /** Evergreen browsers require these. **/
 // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
 import 'core-js/es7/reflect';
 
-
 /**
  * Required to support Web Animations `@angular/platform-browser/animations`.
  * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
  **/
 // import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
-
-
 /***************************************************************************************************
  * Zone JS is required by Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
-
+import 'zone.js/dist/zone'; // Included with Angular CLI.
 
 /***************************************************************************************************
  * APPLICATION IMPORTS
diff --git a/shop/mobile-ionic/yarn.lock b/shop/mobile-ionic/yarn.lock
index 8f1f94bb3..1a17ffc77 100644
--- a/shop/mobile-ionic/yarn.lock
+++ b/shop/mobile-ionic/yarn.lock
@@ -2,77 +2,76 @@
 # yarn lockfile v1
 
 
-"@angular-builders/custom-webpack@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-7.4.3.tgz#c95e32f007ca956cbeac703206f7c3b573029aee"
-  integrity sha512-dizPcKBSdgM8ztVbhOdVxHnfV/FBkTi1ZirsxWaw1B0S0KuPTESnsJaZA15i8Y2l202hCPs5fJfqy5aCoRrs1Q==
+"@angular-builders/custom-webpack@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-8.0.2.tgz#0303d87e13f3fe3336098875ed109e093ab0c49b"
+  integrity sha512-ZxR931h0FX/5YZC6RBBczeMkgwOO0eD83EoOtjcshK2mw6jBarONlifhr6Ud0ALyU7fGueOCTgqgGaVwT1QEbw==
   dependencies:
     lodash "^4.17.10"
+    webpack-merge "^4.2.1"
 
-"@angular-builders/dev-server@^7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-builders/dev-server/-/dev-server-7.3.1.tgz#a687dda691f921a236e6c9fc12985c2eaf4e8923"
-  integrity sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA==
-
-"@angular-devkit/architect@0.13.8", "@angular-devkit/architect@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.8.tgz#c3b7469e15e2710d48b6fe4e54efea26b557bf14"
-  integrity sha512-gxUs5rhnP576T8ZclKqxlspiChrqRtqaJo54wqNVFvYKEjRZKyMa+1AK6p0oD9zcIToEkcjknj3BbtQa27lLHg==
+"@angular-devkit/architect@0.800.2", "@angular-devkit/architect@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.2.tgz#0924864e57d1e56bddeae257c8779a2662c34e69"
+  integrity sha512-251GOQwI3254AtnGWZoHmjOMFcz7h6M3fPmRHpYuuhRPIwZnQCKaszYI7gaP9zR7uArLUwsuPo+YYz8lb6Giwg==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
+    "@angular-devkit/core" "8.0.2"
+    rxjs "6.4.0"
 
-"@angular-devkit/build-angular@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.8.tgz#7ff949db46c78115e0bc45b3a2f9cad64459c016"
-  integrity sha512-uRb8CKC0hUdcE+Fv2Ov9LJNelyjsiMuddBpo8pdTKCIHVVC6hvip9S/Z18Tvb207kKI3k7Dn+Ji1J63mCqmQzA==
+"@angular-devkit/build-angular@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.2.tgz#712f106f50fb8301816e4417493e98e1e12eb296"
+  integrity sha512-RlYPEp5FVKosgzWhbI7llM3lGIxAYuCwEPloeUL4XaDasNe2zmLNUlYDVTrF7GpZRoAgiIejmT0HvvKfEuZNZQ==
   dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/build-optimizer" "0.13.8"
-    "@angular-devkit/build-webpack" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@ngtools/webpack" "7.3.8"
-    ajv "6.9.1"
-    autoprefixer "9.4.6"
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/build-optimizer" "0.800.2"
+    "@angular-devkit/build-webpack" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    "@ngtools/webpack" "8.0.2"
+    ajv "6.10.0"
+    autoprefixer "9.5.1"
+    browserslist "4.5.5"
+    caniuse-api "3.0.0"
     circular-dependency-plugin "5.0.2"
     clean-css "4.2.1"
-    copy-webpack-plugin "4.6.0"
+    copy-webpack-plugin "5.0.2"
+    core-js "3.0.1"
     file-loader "3.0.1"
     glob "7.1.3"
     istanbul-instrumenter-loader "3.0.1"
-    karma-source-map-support "1.3.0"
+    karma-source-map-support "1.4.0"
     less "3.9.0"
     less-loader "4.1.0"
-    license-webpack-plugin "2.1.0"
+    license-webpack-plugin "2.1.1"
     loader-utils "1.2.3"
-    mini-css-extract-plugin "0.5.0"
+    mini-css-extract-plugin "0.6.0"
     minimatch "3.0.4"
-    open "6.0.0"
+    open "6.2.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
     postcss-loader "3.0.0"
     raw-loader "1.0.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
+    sass "1.19.0"
     sass-loader "7.1.0"
-    semver "5.6.0"
+    semver "6.0.0"
     source-map-loader "0.2.4"
-    source-map-support "0.5.10"
+    source-map-support "0.5.12"
     speed-measure-webpack-plugin "1.3.1"
     stats-webpack-plugin "0.7.0"
     style-loader "0.23.1"
     stylus "0.54.5"
     stylus-loader "3.0.2"
-    terser-webpack-plugin "1.2.2"
+    terser-webpack-plugin "1.2.3"
     tree-kill "1.2.1"
-    webpack "4.29.0"
-    webpack-dev-middleware "3.5.1"
-    webpack-dev-server "3.1.14"
+    webpack "4.30.0"
+    webpack-dev-middleware "3.6.2"
+    webpack-dev-server "3.3.1"
     webpack-merge "4.2.1"
     webpack-sources "1.3.0"
     webpack-subresource-integrity "1.1.0-rc.6"
-  optionalDependencies:
-    node-sass "4.11.0"
+    worker-plugin "3.1.0"
 
 "@angular-devkit/build-optimizer@0.0.35":
   version "0.0.35"
@@ -84,26 +83,27 @@
     typescript "~2.6.1"
     webpack-sources "^1.0.1"
 
-"@angular-devkit/build-optimizer@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.8.tgz#0bcba1a4ef598c1a01caa60dd3603bac52a57b16"
-  integrity sha512-RvYxtsdYuvpFb1iivVixylSVN/Q8LsQ449uYuqEe3OsDjQBvUVG2fMLPOQjmKWhi0NC9WSsNiUluxLDNdvd0Vw==
+"@angular-devkit/build-optimizer@0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.2.tgz#4223b2ac8c2a4c05682d1f3cb0417b4630b4a943"
+  integrity sha512-A/lX7Fjfeh5PspGURV8fJeOsrIYM/7why7mC6v78zdxaErd4S18wUXJDfndjx3qiKyuq76Uu4cQcS7XfClpb8Q==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
-    typescript "3.2.4"
+    typescript "3.4.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.13.8", "@angular-devkit/build-webpack@^0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.8.tgz#81e754442285dd4ece7d16a4d14ed80d7eaa9e27"
-  integrity sha512-WMyn1vUHyx+VfJKgYuEHrICwQzPMDTaUNB1zlvzZt9gX/9H+XnetrebeWBZCITPXHBw/377oA6wmiHWJ0yaZRw==
+"@angular-devkit/build-webpack@0.800.2", "@angular-devkit/build-webpack@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.2.tgz#af90ea503eece948390bce154a53df9d7c566539"
+  integrity sha512-Bd/sazcriUTFQCGFDyUkjXSmpn8hRLIyLIXBLAn+5coH4Y4xNy8PXt+hnr6ffwu92h/WnyxKIJi44+5aoUBURA==
   dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    rxjs "6.3.3"
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    rxjs "6.4.0"
+    webpack-merge "4.2.1"
 
-"@angular-devkit/core@7.3.8", "@angular-devkit/core@^7.3.8":
+"@angular-devkit/core@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.8.tgz#702b0944a69c71cce3a1492e0d62de18df22a993"
   integrity sha512-3X9uzaZXFpm5o2TSzhD6wEOtVU32CgeytKjD1Scxj+uMMVo48SWLlKiFh312T+smI9ko7tOT8VqxglwYkWosgg==
@@ -125,7 +125,18 @@
     rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.3.8", "@angular-devkit/schematics@^7.3.8":
+"@angular-devkit/core@8.0.2", "@angular-devkit/core@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.2.tgz#22b017b38b4d6127ab2e39a27990fd7962d3844a"
+  integrity sha512-S2OPYe6Qu7qTS8Q2lzf4qNjXdbN/J2YVnd3wGauMI8Tih5tY/NzUW3h5ds09nRcjsdBDuT0qgf3IMlCZWIABvQ==
+  dependencies:
+    ajv "6.10.0"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.2"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics@7.3.8":
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.8.tgz#70bfc7876f7924ff53ab9310a00b62f20acf2f5c"
   integrity sha512-mvaKoORZIaW/h0VNZ3IQWP0qThRCZRX6869FNlzV0jlW0mhn07XbiIGHCGGSCDRxS7qJ0VbuIVnKXntF+iDeWw==
@@ -141,6 +152,14 @@
     "@angular-devkit/core" "8.0.1"
     rxjs "6.4.0"
 
+"@angular-devkit/schematics@8.0.2", "@angular-devkit/schematics@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.2.tgz#854a4366c7dc7462bebd10c24e808b5c9f65b6e2"
+  integrity sha512-v+g0MOPADJJ5QNNmojCyh2sw1GOzadlbHPdTFqZOm77b2Bi79dRm+yuYMuY6a2nUt7DIcioLRcOFwV8UctajRg==
+  dependencies:
+    "@angular-devkit/core" "8.0.2"
+    rxjs "6.4.0"
+
 "@angular/animations@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
@@ -148,24 +167,28 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.8.tgz#a0891e08bee7d68b9ef2c00a9a7e93c6c5ac75d7"
-  integrity sha512-5ldU1idvWstmRaavGZen9WRjfjIViERGt8NYuLLI7dgVLYOPF5TyFoTnpT5nxkiCopp4tPIcpbzPV394Bxmdtg==
-  dependencies:
-    "@angular-devkit/architect" "0.13.8"
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    "@schematics/angular" "7.3.8"
-    "@schematics/update" "0.13.8"
+"@angular/cli@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.2.tgz#b64c044342f0af2ed7e78e51c54087693407a47b"
+  integrity sha512-xXSCwTKonC6nMqKPDlEFhXjKBu85jVB+KYo2tLU+RKtgFeIF/hTaUWQTvWXRwRsQAfBhB1cwe0oijdljOItTgw==
+  dependencies:
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
+    "@schematics/angular" "8.0.2"
+    "@schematics/update" "0.800.2"
     "@yarnpkg/lockfile" "1.1.0"
+    debug "^4.1.1"
     ini "1.3.5"
-    inquirer "6.2.1"
+    inquirer "6.3.1"
     npm-package-arg "6.1.0"
-    open "6.0.0"
-    pacote "9.4.0"
-    semver "5.6.0"
+    open "6.2.0"
+    pacote "9.5.0"
+    read-package-tree "5.2.2"
+    semver "6.0.0"
     symbol-observable "1.2.0"
+    universal-analytics "^0.4.20"
+    uuid "^3.3.2"
 
 "@angular/common@^8.0.0":
   version "8.0.0"
@@ -174,10 +197,10 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.12.tgz#bb25fecf6b48ac1f013cf442a62edcbf06a7a000"
-  integrity sha512-EXJuN9XuYjO9gwe5JWfatb64ljPjItZh5bd1MQtntMJONS4ntOtwiCd9RuNVK2ZXM7Co9PcvzE1qynB6tMseCw==
+"@angular/compiler-cli@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0.tgz#b53ebb5accc34a68bf7a63d16130ca7c568f8a51"
+  integrity sha512-Z0U0Ih8A7V3J1gq7AXnXbrGAD2ERmz7JbREJJRHDWiUNxIqGQiV3Odo1V8FL5n/cKvLwSYM2Ubvk10gb0+3njA==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -189,7 +212,7 @@
     shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
-    yargs "9.0.1"
+    yargs "13.1.0"
 
 "@angular/compiler@^8.0.0":
   version "8.0.0"
@@ -212,17 +235,10 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.15":
-  version "7.2.15"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.15.tgz#a32bea9e67e99eef88150085aeebbe7aeecd39eb"
-  integrity sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/language-service@^7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-7.2.12.tgz#ed4d98086b97e4b52acac988dc0cf9b66ffb86bc"
-  integrity sha512-dHHcAtCQ+ECoZa/bkm1diMZuxy/e+x2/qzClfKquO47EPqOIXYKCKZRqgGNHxdbUSRpmIEanfj/li4S7doCHZw==
+"@angular/language-service@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0.tgz#1ee4ce5003897cad53597da28f4c94fe30519bfb"
+  integrity sha512-vGk14oWroEo6ycO4cooznx57nn2sASmCQ/sdE8UVwySUKl940TsVzijgaGqapTepFof9sMqN77y2G15eRKQeAQ==
 
 "@angular/platform-browser-dynamic@^8.0.0":
   version "8.0.0"
@@ -568,10 +584,10 @@
     "@ionic/core" "4.2.0"
     tslib "^1.9.3"
 
-"@ionic/app-scripts@^3.2.3":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@ionic/app-scripts/-/app-scripts-3.2.3.tgz#b1bc492f2ff49777ec0f6594930a0e707a641a4f"
-  integrity sha512-t1kL9NqY/sVLfAIVKfN4VJigPqMWs5euKxig3sjsrakSQ9z4njmbDghzAC4taefIpYxLGMOeWgKwrrxOiLkdWQ==
+"@ionic/app-scripts@^3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@ionic/app-scripts/-/app-scripts-3.2.4.tgz#db3f6a215ba226099db2a9af41f0f6bb5d4cc368"
+  integrity sha512-Wt6bBnLtyknbTn6ikUTst2HLs5ww+BL9FpYv2dQWZwDODYqyWFkQQvdXj0IFibU2umXFOH5nQXJin2vvgtovzA==
   dependencies:
     "@angular-devkit/build-optimizer" "0.0.35"
     autoprefixer "^7.2.6"
@@ -601,45 +617,18 @@
     ws "3.3.2"
     xml2js "^0.4.19"
 
-"@ionic/cli-framework@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-1.7.0.tgz#6cb516ad6a95b10c7e3197e9510eb64c1d580587"
-  integrity sha512-2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg==
-  dependencies:
-    "@ionic/utils-array" "0.0.1"
-    "@ionic/utils-fs" "1.2.0"
-    "@ionic/utils-object" "0.0.1"
-    "@ionic/utils-process" "0.1.0"
-    "@ionic/utils-stream" "0.0.1"
-    "@ionic/utils-subprocess" "0.1.0"
-    "@ionic/utils-terminal" "0.0.1"
-    chalk "^2.3.0"
-    debug "^4.0.0"
-    inquirer "^6.0.0"
-    lodash "^4.17.5"
-    log-update "^2.3.0"
-    minimist "^1.2.0"
-    rimraf "^2.6.2"
-    slice-ansi "^2.0.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-    tslib "^1.9.0"
-    untildify "^3.0.2"
-    wrap-ansi "^4.0.0"
-    write-file-atomic "^2.3.0"
-
-"@ionic/cli-framework@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-2.0.0.tgz#0fa5de4b97d9473b97cca8076b307ac40ca0c8d2"
-  integrity sha512-AovnYq4bH1eFKiAiuaze3YXK9DeOGq1ODn6bUPOquYrQeXpMQmxbYYleLlJ2sKj1UTr7VpfdoO1dJARkyRayOQ==
-  dependencies:
-    "@ionic/utils-array" "1.0.0"
-    "@ionic/utils-fs" "2.0.0"
-    "@ionic/utils-object" "1.0.0"
-    "@ionic/utils-process" "1.0.0"
-    "@ionic/utils-stream" "1.0.0"
-    "@ionic/utils-subprocess" "1.0.0"
-    "@ionic/utils-terminal" "1.0.0"
+"@ionic/cli-framework@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/cli-framework/-/cli-framework-2.0.1.tgz#f91923b045ca656248798a23f8498b41e63034c8"
+  integrity sha512-4ZIbKJg5LTKE8xNUIZCZnX/VrsuKQbdPdeQ8HTkuxUotqT2ceAExuq2r8LLQ4nquRvUZGwJdGF+1w2UwZlg8yA==
+  dependencies:
+    "@ionic/utils-array" "1.0.1"
+    "@ionic/utils-fs" "2.0.1"
+    "@ionic/utils-object" "1.0.1"
+    "@ionic/utils-process" "1.0.1"
+    "@ionic/utils-stream" "1.0.1"
+    "@ionic/utils-subprocess" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     chalk "^2.3.0"
     debug "^4.0.0"
     inquirer "^6.0.0"
@@ -662,23 +651,23 @@
   dependencies:
     ionicons "4.5.5"
 
-"@ionic/discover@1.0.13":
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/@ionic/discover/-/discover-1.0.13.tgz#a9cfe9559b37f3665112bb30edb489f9b5470ef4"
-  integrity sha512-9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA==
+"@ionic/discover@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/discover/-/discover-2.0.1.tgz#fd5ec41a6a4c335d88f1febca76baf311d95e4a7"
+  integrity sha512-ADGcv+JY7+cc20l3D0/EOAMnWkALwmlimFrms8DsDwCX4zLOpIB8sHuLfteNEwUFMFDgkHs543WdrkeGbEz/AA==
   dependencies:
     debug "^4.0.0"
     netmask "^1.0.6"
     tslib "^1.9.0"
     ws "^6.0.0"
 
-"@ionic/lab@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-2.0.0.tgz#f879730fcea9b6b974dd19bf90ac2478d18253fc"
-  integrity sha512-XbgkR94fdZ/WhWb39vcY+3+YttPEp4iIKys8TFWX5Dp6eNdKFu9Zg1hXVnn/ZcMYaPn5cSXFraSelKM9/WiwYA==
+"@ionic/lab@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/lab/-/lab-2.0.1.tgz#a3a38d114c0d8b6f9e84d9b710d53340bb75d844"
+  integrity sha512-CHiUkw98NGX8XoaOFUEGmWYjJ6XgqSI0j8SSepk4CtveTJ8+OraCjOG0k/dOkQbrqWEra+apHH3jqnC4WOdPLQ==
   dependencies:
-    "@ionic/cli-framework" "2.0.0"
-    "@ionic/utils-fs" "2.0.0"
+    "@ionic/cli-framework" "2.0.1"
+    "@ionic/utils-fs" "2.0.1"
     chalk "^2.3.0"
     express "^4.16.2"
     tslib "^1.9.0"
@@ -697,147 +686,79 @@
     localforage-cordovasqlitedriver "1.7.0"
     tslib "^1.7.1"
 
-"@ionic/utils-array@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-0.0.1.tgz#40469892e6a58995687a60c1dcf0f93c7da3b925"
-  integrity sha512-gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-array@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-1.0.0.tgz#f9967f4cf121c3d16d88943116564aac4df1dd47"
-  integrity sha512-W0wTuUCmQ7ZDfnIOJ11gmszXlv9xYNO3z99TqbNKBQHyr4dm3mRhAKrfZslPQ202VTvh9/e0Nwx8znu+zUMaJQ==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-fs@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-1.2.0.tgz#bc4492c5d57f910dedac2d3a33026d71ff3a51d5"
-  integrity sha512-31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA==
+"@ionic/utils-array@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-array/-/utils-array-1.0.1.tgz#7c5b4732218f350e4197804b87af451089761ce1"
+  integrity sha512-XqGhwcGS5XwXpQbGi1K97UY1bBZLYlj/DQ5HVE6551C6QF6PRM8WAlpKs4m4Y1MZ5FRLbZOSykcx6q4mlFF5FA==
   dependencies:
     debug "^4.0.0"
-    fs-extra "^7.0.1"
-    through2 "^3.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-fs@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-2.0.0.tgz#f5188f17d63c4d70d8b1af095f2f60c70c4bcb16"
-  integrity sha512-WKIwS7WNsxabq2fpbkoDFKvNfPnkoFtdmxFuD5qztBG/tGD8zCE8ON1dui9DjKVDIR4lr6rkovmdVu2SCVM3rA==
+"@ionic/utils-fs@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-fs/-/utils-fs-2.0.1.tgz#49bc3bab56f911cc73abdef7a8b0c53c0a3a9ba3"
+  integrity sha512-dwsa9puttLOlLoAa6sZQRqQIp/TIqmxECun8Ec/AnL0hfeFvpyq5MOjo/3rkq2Oq5bEiZr5ppe8hGEpl8pVx7Q==
   dependencies:
     debug "^4.0.0"
     fs-extra "^7.0.1"
     through2 "^3.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-network@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-network/-/utils-network-0.0.8.tgz#371b3bbc1d7ee770fbcbc5759fdcdf215d8865c6"
-  integrity sha512-DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-object@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-0.0.1.tgz#07aa9ce3ae6069e6ed589444ca2c80b691b70585"
-  integrity sha512-ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-object@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-1.0.0.tgz#2783cf44d99164087688054bc41f6a453535f2a2"
-  integrity sha512-Bn8X+3LLKLX2HT1jjcZvavKB7W5JAm8gWW+NybClO2D8S6Py0Fr0ckB5XKrYnNmk2C/Dr7n+Ga5dMypei/xAxA==
+"@ionic/utils-network@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-network/-/utils-network-1.0.1.tgz#52063de7f00b2d587b1d32d2ae265619e9984388"
+  integrity sha512-3fqq+2SzlWRpf4029Cry86D/Vb/hTc2zO90GtFlCU+3az2IpGQOzGeVrZ8az9pgzROY/hDfdL6VUsvwF4MF20g==
   dependencies:
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-process@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-0.1.0.tgz#35263b7e2cc5b05b6e21ab7105eb8ccf78befadd"
-  integrity sha512-CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw==
+"@ionic/utils-object@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-object/-/utils-object-1.0.1.tgz#1a9910e21271f268c23d44a163c071feff3959c2"
+  integrity sha512-SIc8bqsCJA8+zsIPS34TmgTJg0WyqkJzcSEZTdfpMPS+qPq/Sm2yaeDGRhlXGRnfDckulRiCK3mhW2dfNPTGhQ==
   dependencies:
-    "@ionic/utils-object" "0.0.1"
-    "@ionic/utils-terminal" "0.0.1"
     debug "^4.0.0"
-    lodash "^4.17.5"
-    tree-kill "1.2.1"
     tslib "^1.9.0"
 
-"@ionic/utils-process@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-1.0.0.tgz#4a5ade9ec59a728c84f913557d2625d6e91ece67"
-  integrity sha512-4YMbpT4CAe+GdgW1GTxbzOze8q/7yCnjtqQJyLMzRIGSEdOeXx6I8GRf5Y6IDJhhdf7QVYUZXoeFpNASQXiSPA==
+"@ionic/utils-process@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-process/-/utils-process-1.0.1.tgz#466a540d45d38f7210a26cdef747b32f6fa99a2a"
+  integrity sha512-kEAte96A5xBA0wJX35ykHERgc4KkYS4Xiq7XsSMo3inBbN2rNUkRIzC+aFM3IFeNKtCqgNgh7t9LczvLDEzdiQ==
   dependencies:
-    "@ionic/utils-object" "1.0.0"
-    "@ionic/utils-terminal" "1.0.0"
+    "@ionic/utils-object" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     debug "^4.0.0"
     lodash "^4.17.5"
     tree-kill "1.2.1"
     tslib "^1.9.0"
 
-"@ionic/utils-stream@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-0.0.1.tgz#f73808262b77be2e6a3c2fbedb69cc185d6f3b69"
-  integrity sha512-IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg==
-  dependencies:
-    debug "^4.0.0"
-    stream-combiner2 "^1.1.1"
-    tslib "^1.9.0"
-
-"@ionic/utils-stream@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-1.0.0.tgz#2cf66bb2c8f49e0ad5ae5151c02d90505d93854e"
-  integrity sha512-kW8MX33YlvP/JXo9qs6fZ3ghbtHX+R0twAZuyuF1WeBWq4eDwJeOaNv80PHr+wm+DBwYPhXmve/d20z/trgm/Q==
+"@ionic/utils-stream@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-stream/-/utils-stream-1.0.1.tgz#a1d312708f985ff9683154293f8dc3cbde1f4343"
+  integrity sha512-EIprRexxL+s1J8u6cvJrigDXpRTRUwrobBETxJ9DL8KFLhv3HOVcwRFtiP08mm4l3SCfQtrbi4tMCX/KssVLFQ==
   dependencies:
     debug "^4.0.0"
     stream-combiner2 "^1.1.1"
     tslib "^1.9.0"
 
-"@ionic/utils-subprocess@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz#3f2fc1d829e06d8c5ed66faad2ce8d9c7a3a1d9b"
-  integrity sha512-8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg==
-  dependencies:
-    "@ionic/utils-array" "0.0.1"
-    "@ionic/utils-fs" "1.2.0"
-    "@ionic/utils-process" "0.1.0"
-    "@ionic/utils-stream" "0.0.1"
-    cross-spawn "^6.0.5"
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-subprocess@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-1.0.0.tgz#e3714d69f7b7ef3577e8832a67ea8630ef0c3ad7"
-  integrity sha512-iHjs7voSlOauNv3kICfBtlyAHYfh/DsWaxucLaQ2IXcYknqqzr8H1FbW2dH+TxorG1g7YPWEnbjY7UeeiavnqQ==
-  dependencies:
-    "@ionic/utils-array" "1.0.0"
-    "@ionic/utils-fs" "2.0.0"
-    "@ionic/utils-process" "1.0.0"
-    "@ionic/utils-stream" "1.0.0"
-    "@ionic/utils-terminal" "1.0.0"
+"@ionic/utils-subprocess@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-subprocess/-/utils-subprocess-1.0.1.tgz#e615f5f7b4d474b6a8560d19abf699d7e517f34f"
+  integrity sha512-JsNLpxoMWIkUhAiQpff+Fzn6+Fl8SvXFglqqBq4E0sKLVuVRDhzD+5JDUKqDO7q+crQhRZbDTRVM+GFsi7ZGgg==
+  dependencies:
+    "@ionic/utils-array" "1.0.1"
+    "@ionic/utils-fs" "2.0.1"
+    "@ionic/utils-process" "1.0.1"
+    "@ionic/utils-stream" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     cross-spawn "^6.0.5"
     debug "^4.0.0"
     tslib "^1.9.0"
 
-"@ionic/utils-terminal@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz#3ffd2d18cf5039c5944768cb259d649e962ecba7"
-  integrity sha512-xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg==
-  dependencies:
-    debug "^4.0.0"
-    tslib "^1.9.0"
-
-"@ionic/utils-terminal@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-1.0.0.tgz#e7477abf9fc4e0ce27afdf515ac0a331215244d2"
-  integrity sha512-8NVfY+ZyKajfsXj/bzKe5QduDJy0T0I/GPgaPKRZzFHQyUDbcUKZqKfVnAEUCm8l54v13drXovy08jP/6ulKXw==
+"@ionic/utils-terminal@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ionic/utils-terminal/-/utils-terminal-1.0.1.tgz#5612e587b5f0064ca31a3823415964e72848d13e"
+  integrity sha512-y/mEpPNPW2oYfFGtFTCRbZAmp0Go17S7uNUFGKThV397lmHm3yiPiu0M5cDV9v/UDuOZ7nmz3LqwhtIaPPeK9g==
   dependencies:
     debug "^4.0.0"
     tslib "^1.9.0"
@@ -850,14 +771,14 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ngtools/webpack@7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.8.tgz#c8761d0f6959682e03032f8d3de718d1f811410e"
-  integrity sha512-gfjSKz+F/2T4tZHpnQ1XqelKP/CIfI87XdoHsOI53ceTUrAkVKsOb3ULmEfkcdsdQZ/HhmCiLivcutHcW8xkhQ==
+"@ngtools/webpack@8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.2.tgz#d60167b514b531ed6ae308b4911739dd102e41c7"
+  integrity sha512-5P0FHF4p5H/G9xGjOG9meDViXcdW3RPdJa2nX1gGpii3/dhFhmU4pxjKn1Bfs4x+PB9FQQvhSvGIBLNf+B4y5Q==
   dependencies:
-    "@angular-devkit/core" "7.3.8"
+    "@angular-devkit/core" "8.0.2"
     enhanced-resolve "4.1.0"
-    rxjs "6.3.3"
+    rxjs "6.4.0"
     tree-kill "1.2.1"
     webpack-sources "1.3.0"
 
@@ -887,15 +808,6 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@schematics/angular@7.3.8", "@schematics/angular@^7.0.3", "@schematics/angular@^7.3.8":
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
-  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
-  dependencies:
-    "@angular-devkit/core" "7.3.8"
-    "@angular-devkit/schematics" "7.3.8"
-    typescript "3.2.4"
-
 "@schematics/angular@8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
@@ -904,18 +816,35 @@
     "@angular-devkit/core" "8.0.1"
     "@angular-devkit/schematics" "8.0.1"
 
-"@schematics/update@0.13.8":
-  version "0.13.8"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.8.tgz#149c3335f385e94e0593bce4dfac8e91cb4a56c1"
-  integrity sha512-2jP9w7Nnn24jOdrJtWjoS9LsNPmO9/Eu/+gDxBAVERCqR71mtNW+DopgWDtxleE9jri/pZWrHwShGFCSS7w23g==
+"@schematics/angular@8.0.2", "@schematics/angular@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.2.tgz#80d2a4d55f89b0f843f64d38f588ccca4fdf4de2"
+  integrity sha512-mN9qsoBVpbY1Q7BP8WaiHsyDv+kl5WrIHw/9OASLrGZcoVY7+oj2CfznVq0XRwvVjDtm6ZFor5ruxLF9dQUOSw==
+  dependencies:
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
+
+"@schematics/angular@^7.0.3":
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.8.tgz#9cded496b79830164acbc2fc382b66e5b5f7cf02"
+  integrity sha512-7o90bnIxXNpJhWPDY/zCedcG6KMIihz7a4UQe6UdlhEX21MNZLYFiDiR5Vmsx39wjm2EfPh3JTuBIHGmMCXkQQ==
   dependencies:
     "@angular-devkit/core" "7.3.8"
     "@angular-devkit/schematics" "7.3.8"
+    typescript "3.2.4"
+
+"@schematics/update@0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.2.tgz#48d23bf60f2870f0887946165cad42c243c4faac"
+  integrity sha512-HPjbzr/LfFLdMzi6zMQK8mPyLw+nt+m7OQsdoeOkFgHkHVfHrKQWcOGt4A0D6keDJ6K2g7W5CsqFR6/GMac7Mg==
+  dependencies:
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
-    pacote "9.4.0"
-    rxjs "6.3.3"
-    semver "5.6.0"
+    pacote "9.5.0"
+    rxjs "6.4.0"
+    semver "6.0.0"
     semver-intersect "1.4.0"
 
 "@types/bson@*":
@@ -935,11 +864,25 @@
   resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.2.2.tgz#80cf7cfff7401587b8f89307ba36fe4a576bc7cf"
   integrity sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==
 
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
 "@types/geojson@*":
   version "7946.0.7"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
   integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
+"@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/googlemaps@^3.30.19":
   version "3.30.19"
   resolved "https://registry.yarnpkg.com/@types/googlemaps/-/googlemaps-3.30.19.tgz#359c025e244490b0775826fb216bed093fd66b16"
@@ -969,6 +912,11 @@
   dependencies:
     "@types/geojson" "*"
 
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
 "@types/mongodb@*", "@types/mongodb@^3.1.22":
   version "3.1.23"
   resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-3.1.23.tgz#9aaa105f448427036cb6cd3aa042ab77b2ab8a7a"
@@ -990,6 +938,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@>=6":
+  version "12.0.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
+  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
+
 "@types/node@^12.0.2":
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
@@ -1077,158 +1030,181 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
-"@webassemblyjs/ast@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
-  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
-  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
-
-"@webassemblyjs/helper-api-error@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
-  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
-
-"@webassemblyjs/helper-buffer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
-  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
-
-"@webassemblyjs/helper-code-frame@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
-  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/helper-fsm@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
-  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
-
-"@webassemblyjs/helper-module-context@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
-  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
-  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
-
-"@webassemblyjs/helper-wasm-section@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
-  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-
-"@webassemblyjs/ieee754@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
-  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
-  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/utf8@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
-  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
-
-"@webassemblyjs/wasm-edit@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
-  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/helper-wasm-section" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-opt" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/wasm-gen@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
-  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wasm-opt@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
-  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-
-"@webassemblyjs/wasm-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
-  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wast-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
-  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-code-frame" "1.7.11"
-    "@webassemblyjs/helper-fsm" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/wast-printer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
-  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-    "@xtuc/long" "4.2.1"
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webcomponents/webcomponentsjs@^2.2.10":
+  version "2.2.10"
+  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.10.tgz#6f6bee0277833ae98d7e5b46f1e0fdb48cd5ff44"
+  integrity sha512-5dzhUhP+h0qMiK0IWb7VNb0OGBoXO3AuI6Qi8t9PoKT50s5L1jv0xnwnLq+cFgPuTB8FLTNP8xIDmyoOsKBy9Q==
+
+"@wry/context@^0.4.0":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.4.3.tgz#5e5653ef4d2d2d9cbac7d984528a0d69c78becf9"
+  integrity sha512-CzjOb1sSDPT+uqCItFq7edIoNTBzeg53ye2h81hrfd24lcD2YiSkpJNKJ8jm2Q3UZf6Jth1vDHbS6ub8bGczxw==
+  dependencies:
+    "@types/node" ">=6"
+    tslib "^1.9.3"
+
+"@wry/equality@^0.1.2":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9"
+  integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew==
+  dependencies:
+    tslib "^1.9.3"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
@@ -1256,6 +1232,14 @@ accepts@~1.3.4, accepts@~1.3.5:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
+accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
@@ -1402,7 +1386,7 @@ ansi-escapes@^1.1.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
   integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -1476,61 +1460,60 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
-  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
+apollo-angular-link-http-common@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.7.0.tgz#c4ece9832724437027a591e5840ebedef8e4609b"
+  integrity sha512-syKJD/AgSrfeaZ0XRGfDuRNT2CowTu7VugdlPxf41wJ+v3uPbUnNoha9/simuxOQuUR7ykUWVyKtNPpJO+MagA==
   dependencies:
     tslib "^1.9.0"
 
-apollo-angular-link-http@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
-  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
+apollo-angular-link-http@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.7.0.tgz#1d0b8a5a6cd94b5397c6a959330a0e2fb9f61d6a"
+  integrity sha512-YNZx1sQS8SleEadF4TPswRF/iq2M99/iwnwtxlqmlq7E+4ZSXXyxXjQO6LsXH8iWoG7aitCpzUZR7XAVuXGp+g==
   dependencies:
-    apollo-angular-link-http-common "~1.6.0"
+    apollo-angular-link-http-common "~1.7.0"
     extract-files "5.0.1"
     tslib "^1.9.0"
 
-apollo-angular@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.5.0.tgz#da653b76189fb72ea801c51996ea87fe19aa064f"
-  integrity sha512-zAyMev+bU7cdqRm2AbAH0hJqJOVRN/PpllJ+eqqA0O9dV570RUs2sGehn3dtOcwPHNRof/qrCRoWBEwGrP6hog==
+apollo-angular@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.6.0.tgz#d71cce64d388f4b8e46583f3bf87802eb3458f10"
+  integrity sha512-c8wEskvbGs7n6GNOnVzax6ng4RZtBctzUk9HqqjyLO8TCH4SWGBh1zuShG/9wDqJjTJAb3EcKd5XUJxFybAXeA==
   dependencies:
-    semver "^5.5.1"
+    semver "^6.0.0"
     tslib "^1.9.0"
 
-apollo-cache-inmemory@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz#265d1ee67b0bf0aca9c37629d410bfae44e62953"
-  integrity sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==
+apollo-cache-inmemory@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e"
+  integrity sha512-AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ==
   dependencies:
-    apollo-cache "^1.2.1"
-    apollo-utilities "^1.2.1"
-    optimism "^0.6.9"
-    ts-invariant "^0.2.1"
+    apollo-cache "^1.3.2"
+    apollo-utilities "^1.3.2"
+    optimism "^0.9.0"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
-apollo-cache@1.2.1, apollo-cache@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz#aae71eb4a11f1f7322adc343f84b1a39b0693644"
-  integrity sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==
+apollo-cache@1.3.2, apollo-cache@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a"
+  integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg==
   dependencies:
-    apollo-utilities "^1.2.1"
+    apollo-utilities "^1.3.2"
     tslib "^1.9.3"
 
-apollo-client@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz#36126ed1d32edd79c3713c6684546a3bea80e6d1"
-  integrity sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==
+apollo-client@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.2.tgz#03b6af651e09b6e413e486ddc87464c85bd6e514"
+  integrity sha512-oks1MaT5x7gHcPeC8vPC1UzzsKaEIC0tye+jg72eMDt5OKc7BobStTeS/o2Ib3e0ii40nKxGBnMdl/Xa/p56Yg==
   dependencies:
     "@types/zen-observable" "^0.8.0"
-    apollo-cache "1.2.1"
+    apollo-cache "1.3.2"
     apollo-link "^1.0.0"
-    apollo-link-dedup "^1.0.0"
-    apollo-utilities "1.2.1"
+    apollo-utilities "1.3.2"
     symbol-observable "^1.0.2"
-    ts-invariant "^0.2.1"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
@@ -1542,14 +1525,6 @@ apollo-link-context@^1.0.17:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link-dedup@^1.0.0:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
-  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
-  dependencies:
-    apollo-link "^1.2.11"
-    tslib "^1.9.3"
-
 apollo-link-ws@^1.0.17:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz#a7ec3f90d2651b77d6be9bb6e63deff2efac56d4"
@@ -1568,7 +1543,17 @@ apollo-link@^1.0.0, apollo-link@^1.2.11:
     tslib "^1.9.3"
     zen-observable-ts "^0.8.18"
 
-apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
+apollo-utilities@1.3.2, apollo-utilities@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
+  integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
+  dependencies:
+    "@wry/equality" "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    ts-invariant "^0.4.0"
+    tslib "^1.9.3"
+
+apollo-utilities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
   integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
@@ -1684,7 +1669,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-asap@~2.0.3:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -1788,16 +1773,16 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.6:
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
-  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
+autoprefixer@9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
   dependencies:
-    browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000929"
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.13"
+    postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
 autoprefixer@^7.2.6:
@@ -2071,6 +2056,22 @@ body-parser@1.18.3, body-parser@^1.16.1:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
@@ -2251,6 +2252,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
+browserslist@4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
+  integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
+  dependencies:
+    caniuse-lite "^1.0.30000960"
+    electron-to-chromium "^1.3.124"
+    node-releases "^1.1.14"
+
 browserslist@^2.11.3:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
@@ -2259,14 +2269,14 @@ browserslist@^2.11.3:
     caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
-browserslist@^4.4.1:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
-  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
+browserslist@^4.0.0, browserslist@^4.5.4:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
+  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
   dependencies:
-    caniuse-lite "^1.0.30000955"
-    electron-to-chromium "^1.3.122"
-    node-releases "^1.1.13"
+    caniuse-lite "^1.0.30000971"
+    electron-to-chromium "^1.3.137"
+    node-releases "^1.1.21"
 
 browserstack@^1.5.1:
   version "1.5.2"
@@ -2347,26 +2357,12 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.2:
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.3.1, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -2475,7 +2471,22 @@ can-promise@0.0.1:
   dependencies:
     window-or-global "^1.0.1"
 
-caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000955:
+caniuse-api@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000960, caniuse-lite@^1.0.30000971:
+  version "1.0.30000974"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
+  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
+
+caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
   version "1.0.30000957"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
   integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
@@ -2589,7 +2600,26 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1, chownr@^1.1.1:
+chokidar@^2.1.5:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
+  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -2646,7 +2676,7 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
+cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
@@ -2828,7 +2858,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.38.0 < 2"
 
-compression@^1.5.2, compression@^1.6.0:
+compression@^1.6.0, compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -2868,7 +2898,7 @@ configstore@^3.0.0:
     write-file-atomic "^2.0.0"
     xdg-basedir "^3.0.0"
 
-connect-history-api-fallback@^1.3.0:
+connect-history-api-fallback@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
@@ -2905,6 +2935,13 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -2932,6 +2969,11 @@ cookie@0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
 cookiejar@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
@@ -2954,19 +2996,22 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
-  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
+copy-webpack-plugin@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
+  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
   dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
+    cacache "^11.3.1"
+    find-cache-dir "^2.0.0"
+    glob-parent "^3.1.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^1.1.0"
     minimatch "^3.0.4"
-    p-limit "^1.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^2.1.0"
     serialize-javascript "^1.4.0"
+    webpack-log "^2.0.0"
 
 cordova-android-support-gradle-release@^2.0.1:
   version "2.1.0"
@@ -3140,6 +3185,11 @@ cordova-serve@^3.0.0:
     opn "^5.3.0"
     which "^1.3.0"
 
+core-js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+
 core-js@^2.2.0, core-js@^2.4.0:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
@@ -3416,25 +3466,23 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -3460,12 +3508,12 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-default-gateway@^2.6.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
-  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
   dependencies:
-    execa "^0.10.0"
+    execa "^1.0.0"
     ip-regex "^2.1.0"
 
 default-require-extensions@^2.0.0:
@@ -3531,17 +3579,18 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+del@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
   dependencies:
+    "@types/glob" "^7.1.1"
     globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -3593,6 +3642,14 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 dfa@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.1.0.tgz#d30218bd10d030fa421df3ebbc82285463a31781"
@@ -3811,7 +3868,12 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.3.122, electron-to-chromium@^1.3.30:
+electron-to-chromium@^1.3.124, electron-to-chromium@^1.3.137:
+  version "1.3.150"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.150.tgz#afb972b53a702b37c76db843c39c967e9f68464b"
+  integrity sha512-5wuYlaXhXbBvavSTij5ZyidICB6sAK/1BwgZZoPCgsniid1oDgzVvDOV/Dw6J25lKV9QZ9ZdQCp8MEfF0/OIKA==
+
+electron-to-chromium@^1.3.30:
   version "1.3.124"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
@@ -4285,19 +4347,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -4378,6 +4427,42 @@ express@^4.13.3, express@^4.16.2, express@^4.16.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.16.4:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -4407,7 +4492,7 @@ external-editor@^2.0.1:
     iconv-lite "^0.4.17"
     tmp "^0.0.33"
 
-external-editor@^3.0.0, external-editor@^3.0.3:
+external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
@@ -4595,14 +4680,18 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
 
 find-cache-dir@^2.0.0:
   version "2.1.0"
@@ -4621,7 +4710,7 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -5270,7 +5359,7 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^1.2.0, html-entities@^1.2.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=
@@ -5317,6 +5406,17 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-errors@1.7.2, http-errors@~1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-parser-js@>=0.4.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
@@ -5330,17 +5430,17 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
-http-proxy-middleware@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
-  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
+http-proxy-middleware@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
   dependencies:
-    http-proxy "^1.16.2"
+    http-proxy "^1.17.0"
     is-glob "^4.0.0"
-    lodash "^4.17.5"
-    micromatch "^3.1.9"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
 
-http-proxy@^1.13.0, http-proxy@^1.16.2:
+http-proxy@^1.13.0, http-proxy@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
@@ -5408,7 +5508,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5447,11 +5547,6 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immutable-tuple@^0.4.9:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.10.tgz#e0b1625384f514084a7a84b749a3bb26e9179929"
-  integrity sha512-45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q==
-
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -5551,23 +5646,23 @@ inquirer@3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
-  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
+inquirer@6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^3.0.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
 inquirer@^6.0.0:
@@ -5594,13 +5689,13 @@ inside@^1.0.0:
   resolved "https://registry.yarnpkg.com/inside/-/inside-1.0.0.tgz#db45e993573cdb3db70b9832e8285bad46424770"
   integrity sha1-20Xpk1c82z23C5gy6ChbrUZCR3A=
 
-internal-ip@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
-  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
+internal-ip@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    default-gateway "^2.6.0"
-    ipaddr.js "^1.5.2"
+    default-gateway "^4.2.0"
+    ipaddr.js "^1.9.0"
 
 interpret@^1.0.0:
   version "1.2.0"
@@ -5624,30 +5719,29 @@ invert-kv@^2.0.0:
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
-ionic@^4.12.0:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/ionic/-/ionic-4.12.0.tgz#4bd4f0bdeafd9a770d6c7c041672edbcf6e36c6d"
-  integrity sha512-3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg==
-  dependencies:
-    "@ionic/cli-framework" "1.7.0"
-    "@ionic/discover" "1.0.13"
-    "@ionic/utils-array" "0.0.1"
-    "@ionic/utils-fs" "1.2.0"
-    "@ionic/utils-network" "0.0.8"
-    "@ionic/utils-process" "0.1.0"
-    "@ionic/utils-stream" "0.0.1"
-    "@ionic/utils-subprocess" "0.1.0"
-    "@ionic/utils-terminal" "0.0.1"
+ionic@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ionic/-/ionic-5.0.1.tgz#6cb007cdee84665f8ee56ddcdf5fe21ef3accf69"
+  integrity sha512-48v7X8C8OvLN4GdizNJiGpP6/qp9C4V+uP1MXL7zCrcoty4FP4RXbpeBXaZJlrxC9zHxlsPQ/gB/p3e2XINALA==
+  dependencies:
+    "@ionic/cli-framework" "2.0.1"
+    "@ionic/discover" "2.0.1"
+    "@ionic/utils-array" "1.0.1"
+    "@ionic/utils-fs" "2.0.1"
+    "@ionic/utils-network" "1.0.1"
+    "@ionic/utils-process" "1.0.1"
+    "@ionic/utils-stream" "1.0.1"
+    "@ionic/utils-subprocess" "1.0.1"
+    "@ionic/utils-terminal" "1.0.1"
     chalk "^2.3.0"
     debug "^4.0.0"
     diff "^4.0.1"
     elementtree "^0.1.7"
     leek "0.0.24"
-    lodash "^4.17.5"
-    log-update "^2.3.0"
-    opn "^5.2.0"
-    os-name "^3.0.0"
-    semver "^5.5.0"
+    lodash "^4.17.5"
+    open "^6.1.0"
+    os-name "^3.1.0"
+    semver "^6.0.0"
     split2 "^3.0.0"
     ssh-config "^1.1.1"
     superagent "^4.1.0"
@@ -5663,10 +5757,10 @@ ionicons@4.5.5:
   resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.5.tgz#b059958a54dd45cfa127acc0baf11503b8671e51"
   integrity sha512-dIGI73XG6Fg2Ps77ry5Ywe36Pq7wUGkDkl0pBhC4uhsiyoW+oXe+pplmarXEnKEcB5fmlkRrBOxYYzZaoRiUGw==
 
-ionicons@^4.5.5:
-  version "4.5.6"
-  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.6.tgz#f3b5d2446e7e1b30e67ddcd1fc563271acc60f3c"
-  integrity sha512-/F3U/rxdLPGl8eUW5dMouhBBoJuUPrlFO6rkoz4VNuw1lxP6l+bFtsDA8MaVM1dHABp+gIHxtpt+IhwmB3oIfA==
+ionicons@^4.5.8:
+  version "4.5.8"
+  resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.5.8.tgz#a81177325153e7eaecb9546ee0b7955451743f8e"
+  integrity sha512-Zib/fFGHt+r9tWrvZnrxVj22cO4NVj+ZOb76v5yiOyvb0LSTbbReECDg7lEU8e+YR69qCtWHruStJ+b4G/OWxg==
 
 ip-regex@^2.1.0:
   version "2.1.0"
@@ -5683,7 +5777,7 @@ ipaddr.js@1.8.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
   integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
-ipaddr.js@^1.5.2:
+ipaddr.js@1.9.0, 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==
@@ -5883,6 +5977,11 @@ is-path-cwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
   integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
+is-path-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.1.0.tgz#2e0c7e463ff5b7a0eb60852d851a6809347a124c"
+  integrity sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==
+
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
@@ -5890,6 +5989,13 @@ is-path-in-cwd@^1.0.0:
   dependencies:
     is-path-inside "^1.0.0"
 
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
+  dependencies:
+    is-path-inside "^2.1.0"
+
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
@@ -5897,6 +6003,18 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
+is-path-inside@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
+  dependencies:
+    path-is-inside "^1.0.2"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -6326,10 +6444,10 @@ karma-jasmine@^2.0.1:
   dependencies:
     jasmine-core "^3.3"
 
-karma-source-map-support@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
-  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
   dependencies:
     source-map-support "^0.5.5"
 
@@ -6366,7 +6484,7 @@ karma@^4.0.1:
     tmp "0.0.33"
     useragent "2.3.0"
 
-killable@^1.0.0:
+killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -6463,10 +6581,10 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-license-webpack-plugin@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
-  integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==
+license-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz#f0ab760f7f301c76f5af52e480f320656b5721bb"
+  integrity sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
@@ -6675,6 +6793,11 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -6690,20 +6813,16 @@ lodash.tail@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
   integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
 lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
-
 log-update@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-3.2.0.tgz#719f24293250d65d0165f4e2ec2ed805ff062eec"
@@ -6724,10 +6843,10 @@ log4js@^4.0.0:
     rfdc "^1.1.2"
     streamroller "^1.0.4"
 
-loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
+loglevel@^1.6.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.2.tgz#668c77948a03dbd22502a3513ace1f62a80cc372"
+  integrity sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==
 
 longest@^1.0.1:
   version "1.0.1"
@@ -6754,7 +6873,7 @@ lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -6835,6 +6954,11 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
 map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -6909,7 +7033,7 @@ mem@^4.0.0:
     mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -6955,7 +7079,7 @@ methods@^1.1.1, methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -6982,6 +7106,11 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
+mime-db@1.40.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+
 "mime-db@>= 1.38.0 < 2":
   version "1.39.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
@@ -6999,12 +7128,19 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.38.0"
 
+mime-types@~2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  dependencies:
+    mime-db "1.40.0"
+
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.4.1:
+mime@1.6.0, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -7014,6 +7150,11 @@ mime@^2.3.1, mime@^2.4.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
   integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
 
+mime@^2.4.2:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe"
+  integrity sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -7029,12 +7170,13 @@ mingo@1:
   resolved "https://registry.yarnpkg.com/mingo/-/mingo-1.3.3.tgz#6922c4d147efc771a01425a2c4c8f7784478c546"
   integrity sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY=
 
-mini-css-extract-plugin@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
-  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+mini-css-extract-plugin@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "^2.0.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -7085,22 +7227,6 @@ minizlib@^1.1.1:
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -7168,7 +7294,7 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.0.0, ms@^2.1.1:
+ms@2.1.1, ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
@@ -7242,6 +7368,11 @@ negotiator@0.6.1:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
 neo-async@^2.5.0, neo-async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
@@ -7352,14 +7483,14 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.13:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.14.tgz#f1f41c83cac82caebd6739e6313d56b3b09c9189"
-  integrity sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==
+node-releases@^1.1.14, node-releases@^1.1.21:
+  version "1.1.23"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
+  integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
   dependencies:
     semver "^5.3.0"
 
-node-sass@4.11.0, node-sass@^4.10.0, node-sass@^4.11.0:
+node-sass@^4.10.0, node-sass@^4.11.0:
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
   integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
@@ -7406,7 +7537,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7433,6 +7564,15 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
+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"
+
 npm-bundled@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
@@ -7607,10 +7747,17 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
-  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+open@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
+  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
+  dependencies:
+    is-wsl "^1.1.0"
+
+open@^6.1.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.3.0.tgz#60d0b845ee38fae0631f5d739a21bd40e3d2a527"
+  integrity sha512-6AHdrJxPvAXIowO/aIaeHZ8CeMdDf7qCyRNq8NwJpinmCdXhz+NZR7ie1Too94lpciCDsG+qHGO9Mt0svA4OqA==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7639,7 +7786,7 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@^5.1.0, opn@^5.2.0, opn@^5.3.0:
+opn@^5.3.0, opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
   integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
@@ -7653,12 +7800,12 @@ opn@latest:
   dependencies:
     is-wsl "^1.1.0"
 
-optimism@^0.6.9:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz#19258ff8b3be0cea29ac35f06bff818e026e30bb"
-  integrity sha512-xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ==
+optimism@^0.9.0:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.5.tgz#b8b5dc9150e97b79ddbf2d2c6c0e44de4d255527"
+  integrity sha512-lNvmuBgONAGrUbj/xpH69FjMOz1d0jvMNoOCKyVynUPzq2jgVlGL4jFYJqrUHzUfBv+jAFSCP61x5UkfbduYJA==
   dependencies:
-    immutable-tuple "^0.4.9"
+    "@wry/context" "^0.4.0"
 
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
@@ -7730,7 +7877,7 @@ os-name@^2.0.1:
     macos-release "^1.0.0"
     win-release "^1.0.0"
 
-os-name@^3.0.0:
+os-name@^3.0.0, os-name@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
   integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
@@ -7766,14 +7913,14 @@ p-is-promise@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.0.0, p-limit@^1.1.0:
+p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
+p-limit@^2.0.0, p-limit@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
   integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
@@ -7794,10 +7941,10 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
 p-try@^1.0.0:
   version "1.0.0"
@@ -7844,10 +7991,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
-  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
+pacote@9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
+  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"
@@ -7979,6 +8126,11 @@ parseurl@~1.3.2:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
   integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -8011,7 +8163,7 @@ path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -8129,13 +8281,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -8185,7 +8330,7 @@ pngjs@^3.3.0:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
-portfinder@^1.0.9:
+portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
   integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
@@ -8232,7 +8377,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^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@7.0.14, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13:
+postcss@7.0.14, postcss@^7.0.0, postcss@^7.0.1:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -8250,6 +8395,15 @@ postcss@^6.0.17, postcss@^6.0.21:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
+postcss@^7.0.14:
+  version "7.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -8260,6 +8414,11 @@ prepend-http@^1.0.1:
   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=
+
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
@@ -8331,6 +8490,14 @@ proxy-addr@~2.0.4:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
 
+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==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.0"
+
 proxy-agent@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
@@ -8382,7 +8549,7 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -8453,11 +8620,20 @@ qs@6.5.2, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@^6.4.0, qs@^6.6.0:
+qs@6.7.0, qs@^6.4.0, qs@^6.6.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
+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"
@@ -8502,6 +8678,11 @@ range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
+range-parser@^1.2.1, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
 raw-body@2.3.3, raw-body@^2.2.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
@@ -8512,6 +8693,16 @@ raw-body@2.3.3, raw-body@^2.2.0:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
@@ -8545,6 +8736,29 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+read-package-json@^2.0.0:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
+  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -8621,6 +8835,16 @@ readable-stream@1.1.x:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
 readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -8860,7 +9084,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -8938,10 +9162,10 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs-compat@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.4.0.tgz#800923c15697948e1f30f18c531b12b49451c75c"
-  integrity sha512-eo/O8RS83hJdJukCtA+IF6qnqa8FPOuVo+OPCzgVi+dbTle9KCdNv97IcQO0WwNVik7DJLKmf0F8uwzc0q40vw==
+rxjs-compat@^6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.2.tgz#e469070adf6260bdad195e9d4a39f444ae28b458"
+  integrity sha512-TRMkTp4FgSxE2HtGvxmgRukh3JqdFM7ejAj1Ti/VdodbPGfWvZR5+KdLKRV9jVDFyu2SknM8RD+PR54KGnoLjg==
 
 rxjs-tslint@0.1.5:
   version "0.1.5"
@@ -8960,13 +9184,20 @@ rxjs@6.3.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@6.4.0, rxjs@^6.1.0, rxjs@^6.4.0:
+rxjs@6.4.0, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9016,6 +9247,13 @@ sass-loader@7.1.0, sass-loader@^7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
+sass@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.19.0.tgz#5de82c713d4299fac57384ef5219534a37fe3e6c"
+  integrity sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==
+  dependencies:
+    chokidar "^2.0.0"
+
 saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
@@ -9060,14 +9298,6 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.4:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -9100,7 +9330,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.9.1:
+selfsigned@^1.10.4:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
@@ -9133,7 +9363,7 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -9148,10 +9378,15 @@ semver@5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-semver@5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+semver@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
+semver@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
 
 semver@~5.3.0:
   version "5.3.0"
@@ -9177,12 +9412,31 @@ send@0.16.2, send@latest:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
 serialize-javascript@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
   integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
 
-serve-index@^1.7.2, serve-index@^1.9.1:
+serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -9205,6 +9459,16 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -9245,6 +9509,11 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -9463,6 +9732,13 @@ socks@~2.3.2:
     ip "^1.1.5"
     smart-buffer "4.0.2"
 
+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"
@@ -9492,15 +9768,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
+source-map-support@0.5.12, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.10:
   version "0.5.12"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
   integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
@@ -9678,13 +9946,6 @@ ssr-window@^1.0.1:
   resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-1.0.1.tgz#30752a6a4666e7767f0b7e6aa6fc2fdbd0d9b369"
   integrity sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -9734,7 +9995,7 @@ stats-webpack-plugin@0.7.0:
   dependencies:
     lodash "^4.17.4"
 
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
@@ -9822,6 +10083,11 @@ streamroller@^1.0.4:
     fs-extra "^7.0.0"
     lodash "^4.17.10"
 
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -10025,7 +10291,7 @@ supports-color@^4.2.1:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -10110,21 +10376,7 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
-  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
-  dependencies:
-    cacache "^11.0.2"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    terser "^3.16.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
+terser-webpack-plugin@1.2.3, terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
   integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
@@ -10279,6 +10531,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -10333,6 +10590,13 @@ ts-invariant@^0.3.2:
   dependencies:
     tslib "^1.9.3"
 
+ts-invariant@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.2.tgz#8685131b8083e67c66d602540e78763408be9113"
+  integrity sha512-PTAAn8lJPEdRBJJEs4ig6MVZWfO12yrFzV7YaPslmyhG7+4MA279y4BXT3f72gXeVl0mC1aAWq2rMX4eKTWU/Q==
+  dependencies:
+    tslib "^1.9.3"
+
 ts-node@^8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.3.tgz#aa60b836a24dafd8bf21b54766841a232fdbc641"
@@ -10442,6 +10706,14 @@ type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -10452,11 +10724,21 @@ typescript@2.9.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
   integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
-typescript@3.2.4, typescript@~3.2.4:
+typescript@3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
   integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
 
+typescript@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.4.tgz#aac4a08abecab8091a75f10842ffa0631818f785"
+  integrity sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==
+
+typescript@3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
+
 typescript@^2.4.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
@@ -10561,7 +10843,7 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-unique-filename@^1.1.0, unique-filename@^1.1.1:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -10582,6 +10864,15 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+universal-analytics@^0.4.20:
+  version "0.4.20"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
+  integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
+  dependencies:
+    debug "^3.0.0"
+    request "^2.88.0"
+    uuid "^3.0.0"
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -10610,11 +10901,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-untildify@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
-  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
-
 untildify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
@@ -10847,61 +11133,61 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
+webpack-dev-middleware@3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
+  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
   dependencies:
-    memory-fs "~0.4.1"
+    memory-fs "^0.4.1"
     mime "^2.3.1"
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
-  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
+webpack-dev-middleware@^3.6.2:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
+  integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
   dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
+    memory-fs "^0.4.1"
+    mime "^2.4.2"
+    range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.14:
-  version "3.1.14"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
-  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
+webpack-dev-server@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
+  integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "~0.18.0"
+    chokidar "^2.1.5"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
+    debug "^4.1.1"
+    del "^4.1.0"
+    express "^4.16.4"
+    html-entities "^1.2.1"
+    http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
-    internal-ip "^3.0.1"
+    internal-ip "^4.2.0"
     ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
+    killable "^1.0.1"
+    loglevel "^1.6.1"
+    opn "^5.5.0"
+    portfinder "^1.0.20"
     schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
+    selfsigned "^1.10.4"
+    semver "^6.0.0"
+    serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
     spdy "^4.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
+    strip-ansi "^3.0.1"
+    supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "3.4.0"
+    webpack-dev-middleware "^3.6.2"
     webpack-log "^2.0.0"
-    yargs "12.0.2"
+    yargs "12.0.5"
 
 webpack-log@^2.0.0:
   version "2.0.0"
@@ -10961,15 +11247,15 @@ webpack@3.12.0:
     webpack-sources "^1.0.1"
     yargs "^8.0.2"
 
-webpack@4.29.0:
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
-  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
+webpack@4.30.0:
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
+  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
@@ -10985,7 +11271,7 @@ webpack@4.29.0:
     mkdirp "~0.5.0"
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
+    schema-utils "^1.0.0"
     tapable "^1.1.0"
     terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
@@ -11086,6 +11372,13 @@ worker-farm@^1.5.2:
   dependencies:
     errno "~0.1.7"
 
+worker-plugin@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.1.0.tgz#6311778f3514a87c273510ee3f809cc3fe161e6f"
+  integrity sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==
+  dependencies:
+    loader-utils "^1.1.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -11094,23 +11387,6 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
-wrap-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-4.0.0.tgz#b3570d7c70156159a2d42be5cc942e957f7b1131"
-  integrity sha512-uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrap-ansi@^5.0.0, wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -11211,11 +11487,6 @@ xregexp@2.0.0:
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
   integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
 
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
 xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -11241,13 +11512,6 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
-  dependencies:
-    camelcase "^4.1.0"
-
 yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
@@ -11256,7 +11520,7 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.0:
+yargs-parser@^13.0.0, yargs-parser@^13.1.0:
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
   integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
@@ -11278,13 +11542,13 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+yargs@12.0.5, yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^2.0.0"
+    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^1.0.1"
     os-locale "^3.0.0"
@@ -11294,44 +11558,24 @@ yargs@12.0.2:
     string-width "^2.0.0"
     which-module "^2.0.0"
     y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
-yargs@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
-  dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    yargs-parser "^11.1.1"
 
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
   dependencies:
     cliui "^4.0.0"
-    decamelize "^1.2.0"
     find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
 
 yargs@^13.2.4:
   version "13.2.4"
@@ -11421,7 +11665,7 @@ zen-observable@^0.8.0:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
   integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
-zone.js@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.0.tgz#f42319d657f7616724ed40c5907d4614b4c683fa"
-  integrity sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q==
+zone.js@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

From 05af957c7cf6f61108a081eb39b579799e9a0538 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 7 Jun 2019 12:32:42 +0300
Subject: [PATCH 364/382] chore(ever-shop-web): completed upgrade to angular 8

---
 shop/website-angular/package.json             |  15 +-
 .../google-map/google-map.component.ts        |   2 +-
 shop/website-angular/yarn.lock                | 302 ++++++------------
 3 files changed, 104 insertions(+), 215 deletions(-)

diff --git a/shop/website-angular/package.json b/shop/website-angular/package.json
index ba438b672..47bc664eb 100644
--- a/shop/website-angular/package.json
+++ b/shop/website-angular/package.json
@@ -125,10 +125,10 @@
 		"@ngx-translate/http-loader": "^4.0.0",
 		"@types/googlemaps": "^3.30.16",
 		"angular2-logger": "^0.7.0",
-		"apollo-angular": "^1.5.0",
-		"apollo-angular-link-http": "^1.5.0",
-		"apollo-cache-inmemory": "^1.5.1",
-		"apollo-client": "^2.5.1",
+		"apollo-angular": "^1.6.0",
+		"apollo-angular-link-http": "^1.7.0",
+		"apollo-cache-inmemory": "^1.6.2",
+		"apollo-client": "^2.6.2",
 		"apollo-link-context": "^1.0.14",
 		"bootstrap": "^4.3.1",
 		"browser-detect": "^0.2.28",
@@ -152,8 +152,8 @@
 		"ngx-infinite-scroll": "^7.0.1",
 		"ngx-toastr": "^10.0.4",
 		"reflect-metadata": "^0.1.13",
-		"rxjs": "^6.4.0",
-		"rxjs-compat": "^6.4.0",
+		"rxjs": "^6.5.2",
+		"rxjs-compat": "^6.5.2",
 		"sass": "^1.17.2",
 		"sass-extract": "^2.1.0",
 		"sass-extract-loader": "^1.1.0",
@@ -162,12 +162,11 @@
 		"uglify-js": "^3.6.0",
 		"uuid": "^3.3.2",
 		"web-animations-js": "^2.3.1",
-		"zone.js": "^0.8.29"
+		"zone.js": "^0.9.1"
 	},
 	"devDependencies": {
 		"@angular-devkit/build-angular": "^0.800.1",
 		"@angular-devkit/build-optimizer": "^0.800.1",
-		"@angular-extensions/testing-library": "^5.0.0",
 		"@angular/cli": "^8.0.1",
 		"@angular/compiler-cli": "^8.0.0",
 		"@angular/language-service": "^8.0.0",
diff --git a/shop/website-angular/src/app/+login/byLocation/google-map/google-map.component.ts b/shop/website-angular/src/app/+login/byLocation/google-map/google-map.component.ts
index 167f997c0..7b3aaa7e3 100644
--- a/shop/website-angular/src/app/+login/byLocation/google-map/google-map.component.ts
+++ b/shop/website-angular/src/app/+login/byLocation/google-map/google-map.component.ts
@@ -19,7 +19,7 @@ import { takeUntil } from 'rxjs/operators';
 	`
 })
 export class GoogleMapComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	public mapElement: any;
 
 	@Input()
diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index b72880270..93355fefd 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -109,16 +109,6 @@
     "@angular-devkit/core" "8.0.1"
     rxjs "6.4.0"
 
-"@angular-extensions/testing-library@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@angular-extensions/testing-library/-/testing-library-5.0.0.tgz#43121b984827fea550a8ed45695716d6427b4353"
-  integrity sha512-C17SEegDFQfYKi/uLdMINcHy1Jdmy+kfgdQlazevWFFgHYSCUa62ltCI8vPfh9OuIs4XwTluso/EAKZR8HtiDA==
-  dependencies:
-    "@phenomnomnominal/tsquery" "^3.0.0"
-    dom-testing-library "^4.1.0"
-    tslib "^1.9.0"
-    tslint "^5.16.0"
-
 "@angular/animations@^8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0.tgz#6286094babdb3879f7aefcd73aa31772469e50b4"
@@ -252,22 +242,6 @@
   dependencies:
     tslib "^1.9.0"
 
-"@babel/code-frame@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
-  dependencies:
-    "@babel/highlight" "^7.0.0"
-
-"@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
-  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^4.0.0"
-
 "@babel/runtime@^7.3.1":
   version "7.4.3"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
@@ -275,13 +249,6 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.4.3":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.4.tgz#dc2e34982eb236803aa27a07fea6857af1b9171d"
-  integrity sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
 "@compodoc/compodoc@^1.1.9":
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/@compodoc/compodoc/-/compodoc-1.1.9.tgz#b45593897fd54ca8a0996fb41e41e26f99da6c4f"
@@ -388,15 +355,6 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.19"
 
-"@jest/types@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
-  integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^12.0.9"
-
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -435,13 +393,6 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@phenomnomnominal/tsquery@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-3.0.0.tgz#6f2f4dbf6304ff52b12cc7a5b979f20c3794a22a"
-  integrity sha512-SW8lKitBHWJ9fAYkJ9kJivuctwNYCh3BUxLdH0+XiR1GPBiu+7qiZzh8p8jqlj1LgVC1TbvfNFroaEsmYlL8Iw==
-  dependencies:
-    esquery "^1.0.1"
-
 "@schematics/angular@8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
@@ -464,11 +415,6 @@
     semver "6.0.0"
     semver-intersect "1.4.0"
 
-"@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==
-
 "@types/anymatch@*":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
@@ -524,31 +470,6 @@
   resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.3.tgz#b672cfaac25cbbc634a0fd92c515f66faa18dbca"
   integrity sha512-pGF/zvYOACZ/gLGWdQH8zSwteQS1epp68yRcVLJMgUck/MjEn/FBYmPub9pXT8C1e4a8YZfHo1CKyV8q1vKUnQ==
 
-"@types/istanbul-lib-coverage@*":
-  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==
-
-"@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz#1eb8c033e98cf4e1a4cedcaf8bcafe8cb7591e85"
-  integrity sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg==
-
-"@types/istanbul-lib-report@*":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
-  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^1.1.1":
-  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==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-    "@types/istanbul-lib-report" "*"
-
 "@types/jasmine@^3.3.9":
   version "3.3.12"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.12.tgz#bf282cb540e9ad7a0a04b742082c073b655eab39"
@@ -595,6 +516,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@>=6":
+  version "12.0.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
+  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
+
 "@types/node@^12.0.2":
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
@@ -698,11 +624,6 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz#453743c5bbf9f1bed61d959baab5b06be029b2d0"
   integrity sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw==
 
-"@types/yargs@^12.0.9":
-  version "12.0.12"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
-  integrity sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==
-
 "@types/yargs@^13.0.0":
   version "13.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.0.tgz#d2acb3bec0047d8f648ebacdab6b928a900c42c4"
@@ -861,6 +782,21 @@
     "@webassemblyjs/wast-parser" "1.8.5"
     "@xtuc/long" "4.2.2"
 
+"@wry/context@^0.4.0":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.4.3.tgz#5e5653ef4d2d2d9cbac7d984528a0d69c78becf9"
+  integrity sha512-CzjOb1sSDPT+uqCItFq7edIoNTBzeg53ye2h81hrfd24lcD2YiSkpJNKJ8jm2Q3UZf6Jth1vDHbS6ub8bGczxw==
+  dependencies:
+    "@types/node" ">=6"
+    tslib "^1.9.3"
+
+"@wry/equality@^0.1.2":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9"
+  integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew==
+  dependencies:
+    tslib "^1.9.3"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -1065,7 +1001,7 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0, ansi-regex@^4.1.0:
+ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
@@ -1107,61 +1043,60 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
-  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
+apollo-angular-link-http-common@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.7.0.tgz#c4ece9832724437027a591e5840ebedef8e4609b"
+  integrity sha512-syKJD/AgSrfeaZ0XRGfDuRNT2CowTu7VugdlPxf41wJ+v3uPbUnNoha9/simuxOQuUR7ykUWVyKtNPpJO+MagA==
   dependencies:
     tslib "^1.9.0"
 
-apollo-angular-link-http@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
-  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
+apollo-angular-link-http@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.7.0.tgz#1d0b8a5a6cd94b5397c6a959330a0e2fb9f61d6a"
+  integrity sha512-YNZx1sQS8SleEadF4TPswRF/iq2M99/iwnwtxlqmlq7E+4ZSXXyxXjQO6LsXH8iWoG7aitCpzUZR7XAVuXGp+g==
   dependencies:
-    apollo-angular-link-http-common "~1.6.0"
+    apollo-angular-link-http-common "~1.7.0"
     extract-files "5.0.1"
     tslib "^1.9.0"
 
-apollo-angular@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.5.0.tgz#da653b76189fb72ea801c51996ea87fe19aa064f"
-  integrity sha512-zAyMev+bU7cdqRm2AbAH0hJqJOVRN/PpllJ+eqqA0O9dV570RUs2sGehn3dtOcwPHNRof/qrCRoWBEwGrP6hog==
+apollo-angular@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.6.0.tgz#d71cce64d388f4b8e46583f3bf87802eb3458f10"
+  integrity sha512-c8wEskvbGs7n6GNOnVzax6ng4RZtBctzUk9HqqjyLO8TCH4SWGBh1zuShG/9wDqJjTJAb3EcKd5XUJxFybAXeA==
   dependencies:
-    semver "^5.5.1"
+    semver "^6.0.0"
     tslib "^1.9.0"
 
-apollo-cache-inmemory@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz#265d1ee67b0bf0aca9c37629d410bfae44e62953"
-  integrity sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==
+apollo-cache-inmemory@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e"
+  integrity sha512-AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ==
   dependencies:
-    apollo-cache "^1.2.1"
-    apollo-utilities "^1.2.1"
-    optimism "^0.6.9"
-    ts-invariant "^0.2.1"
+    apollo-cache "^1.3.2"
+    apollo-utilities "^1.3.2"
+    optimism "^0.9.0"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
-apollo-cache@1.2.1, apollo-cache@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz#aae71eb4a11f1f7322adc343f84b1a39b0693644"
-  integrity sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==
+apollo-cache@1.3.2, apollo-cache@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a"
+  integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg==
   dependencies:
-    apollo-utilities "^1.2.1"
+    apollo-utilities "^1.3.2"
     tslib "^1.9.3"
 
-apollo-client@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz#36126ed1d32edd79c3713c6684546a3bea80e6d1"
-  integrity sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==
+apollo-client@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.2.tgz#03b6af651e09b6e413e486ddc87464c85bd6e514"
+  integrity sha512-oks1MaT5x7gHcPeC8vPC1UzzsKaEIC0tye+jg72eMDt5OKc7BobStTeS/o2Ib3e0ii40nKxGBnMdl/Xa/p56Yg==
   dependencies:
     "@types/zen-observable" "^0.8.0"
-    apollo-cache "1.2.1"
+    apollo-cache "1.3.2"
     apollo-link "^1.0.0"
-    apollo-link-dedup "^1.0.0"
-    apollo-utilities "1.2.1"
+    apollo-utilities "1.3.2"
     symbol-observable "^1.0.2"
-    ts-invariant "^0.2.1"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
@@ -1173,14 +1108,6 @@ apollo-link-context@^1.0.14:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link-dedup@^1.0.0:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
-  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
-  dependencies:
-    apollo-link "^1.2.11"
-    tslib "^1.9.3"
-
 apollo-link@^1.0.0, apollo-link@^1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
@@ -1191,7 +1118,17 @@ apollo-link@^1.0.0, apollo-link@^1.2.11:
     tslib "^1.9.3"
     zen-observable-ts "^0.8.18"
 
-apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
+apollo-utilities@1.3.2, apollo-utilities@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
+  integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
+  dependencies:
+    "@wry/equality" "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    ts-invariant "^0.4.0"
+    tslib "^1.9.3"
+
+apollo-utilities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
   integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
@@ -3274,16 +3211,6 @@ dom-serializer@0, dom-serializer@~0.1.1:
     domelementtype "^1.3.0"
     entities "^1.1.1"
 
-dom-testing-library@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-4.1.1.tgz#615af61bee06db51bd8ecea60c113eba7cb49dda"
-  integrity sha512-PUsG7aY5BJxzulDrOtkksqudRRypcVQF6d4RGAyj9xNwallOFqrNLOyg2QW2mCpFaNVPELX8hBX/wbHQtOto/A==
-  dependencies:
-    "@babel/runtime" "^7.4.3"
-    "@sheerun/mutationobserver-shim" "^0.3.2"
-    pretty-format "^24.7.0"
-    wait-for-expect "^1.1.1"
-
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -3703,13 +3630,6 @@ esprima@~1.0.4:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
   integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
 
-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==
-  dependencies:
-    estraverse "^4.0.0"
-
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -3722,7 +3642,7 @@ estraverse@^1.9.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
   integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
-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.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
@@ -5126,11 +5046,6 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immutable-tuple@^0.4.9:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.10.tgz#e0b1625384f514084a7a84b749a3bb26e9179929"
-  integrity sha512-45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q==
-
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -5718,7 +5633,7 @@ js-base64@^2.1.8:
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
   integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
 
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+"js-tokens@^3.0.0 || ^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
@@ -7290,12 +7205,12 @@ opn@latest:
   dependencies:
     is-wsl "^1.1.0"
 
-optimism@^0.6.9:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz#19258ff8b3be0cea29ac35f06bff818e026e30bb"
-  integrity sha512-xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ==
+optimism@^0.9.0:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.5.tgz#b8b5dc9150e97b79ddbf2d2c6c0e44de4d255527"
+  integrity sha512-lNvmuBgONAGrUbj/xpH69FjMOz1d0jvMNoOCKyVynUPzq2jgVlGL4jFYJqrUHzUfBv+jAFSCP61x5UkfbduYJA==
   dependencies:
-    immutable-tuple "^0.4.9"
+    "@wry/context" "^0.4.0"
 
 optimist@0.6.x, optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
@@ -7926,16 +7841,6 @@ pretty-error@^2.0.2:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-format@^24.7.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2"
-  integrity sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==
-  dependencies:
-    "@jest/types" "^24.8.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
-
 private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -8221,11 +8126,6 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-is@^16.8.4:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
-  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
-
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -8652,10 +8552,10 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs-compat@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.4.0.tgz#800923c15697948e1f30f18c531b12b49451c75c"
-  integrity sha512-eo/O8RS83hJdJukCtA+IF6qnqa8FPOuVo+OPCzgVi+dbTle9KCdNv97IcQO0WwNVik7DJLKmf0F8uwzc0q40vw==
+rxjs-compat@^6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.2.tgz#e469070adf6260bdad195e9d4a39f444ae28b458"
+  integrity sha512-TRMkTp4FgSxE2HtGvxmgRukh3JqdFM7ejAj1Ti/VdodbPGfWvZR5+KdLKRV9jVDFyu2SknM8RD+PR54KGnoLjg==
 
 rxjs-tslint@0.1.5:
   version "0.1.5"
@@ -8674,6 +8574,13 @@ rxjs@6.4.0, rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -8846,7 +8753,7 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -9982,6 +9889,13 @@ ts-invariant@^0.3.2:
   dependencies:
     tslib "^1.9.3"
 
+ts-invariant@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.2.tgz#8685131b8083e67c66d602540e78763408be9113"
+  integrity sha512-PTAAn8lJPEdRBJJEs4ig6MVZWfO12yrFzV7YaPslmyhG7+4MA279y4BXT3f72gXeVl0mC1aAWq2rMX4eKTWU/Q==
+  dependencies:
+    tslib "^1.9.3"
+
 ts-node@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.3.0.tgz#c13c6a3024e30be1180dd53038fc209289d4bf69"
@@ -10068,25 +9982,6 @@ tslint@^5.13.1, tslint@^5.9.1:
     tslib "^1.8.0"
     tsutils "^2.29.0"
 
-tslint@^5.16.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.16.0.tgz#ae61f9c5a98d295b9a4f4553b1b1e831c1984d67"
-  integrity sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.13.0"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.29.0"
-
 tsutils@^2.25.0, tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
@@ -10496,11 +10391,6 @@ void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
-wait-for-expect@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-1.2.0.tgz#fdab6a26e87d2039101db88bff3d8158e5c3e13f"
-  integrity sha512-EJhKpA+5UHixduMBEGhTFuLuVgQBKWxkFbefOdj2bbk2/OpA5Opsc4aUTGmF+qJ+v3kTGxDRNYwKaT4j6g5n8Q==
-
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -11111,7 +11001,7 @@ zen-observable@^0.8.0:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
   integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
-zone.js@^0.8.29:
-  version "0.8.29"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.29.tgz#8dce92aa0dd553b50bc5bfbb90af9986ad845a12"
-  integrity sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==
+zone.js@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

From 015bedb442fbccd12cdc66c2072f586b04ad9a2c Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 7 Jun 2019 16:41:37 +0300
Subject: [PATCH 365/382] chore(ever-admin): not completed upgrade to angular 8

---
 admin/website-angular/.angular-cli.json       |   1 -
 admin/website-angular/angular.json            |   2 -
 admin/website-angular/package.json            |  22 +-
 .../carrier-mutation.component.scss           |   4 +-
 .../carrier-mutation.component.ts             |   4 +-
 .../file-uploader/file-uploader.component.ts  |   2 +-
 .../forms/google-map/google-map.component.ts  |   2 +-
 .../invite-request-modal.component.ts         |   2 +-
 .../carreir-location/carreir-location.ts      |   2 +-
 .../user-warehouse-map/user-warehouse-map.ts  |   2 +-
 .../categories-table.component.scss           |   2 +-
 .../category-image.component.ts               |   2 +-
 .../basic-info/basic-info-form.component.ts   |   2 +-
 .../basic-info/basic-info-form.component.scss |   2 +-
 .../basic-info/basic-info-form.component.ts   |   4 +-
 .../product-create.component.scss             |   6 +-
 .../product-create.component.ts               |   2 +-
 .../render-component/created.component.ts     |   2 +-
 .../created/created.component.ts              |   2 +-
 .../warehouse-table/elapsed.component.ts      |   2 +-
 .../elapsed/elapsed.component.ts              |   2 +-
 .../@shared/styles/control-icon.shared.scss   |  12 +-
 .../user-mutation.component.scss              |   4 +-
 .../user-mutation/user-mutation.component.ts  |   4 +-
 .../warehouse-product-create.component.scss   |   4 +-
 .../warehouse-product-create.component.ts     |   4 +-
 .../customer-warehouses-table.component.scss  |   2 +-
 .../basic-info/basic-info-form.component.scss |   2 +-
 .../basic-info/basic-info-form.component.ts   |   2 +-
 ...se-manage-tabs-delivery-areas.component.ts |   2 +-
 ...rehouse-manage-tabs-details.component.scss |   2 +-
 ...warehouse-manage-tabs-details.component.ts |   2 +-
 .../warehouse-manage-tabs.component.ts        |  10 +-
 .../warehouse-mutation.component.scss         |   2 +-
 .../warehouse-mutation.component.ts           |   2 +-
 .../components/footer/footer.component.scss   |   4 +-
 .../components/header/header.component.html   |  38 +-
 .../components/header/header.component.scss   |  53 +--
 .../search-input/search-input.component.scss  |  52 +--
 .../search-input/search-input.component.ts    |   2 +-
 .../switcher/switcher.component.scss          |  20 +-
 .../theme-settings.component.scss             | 119 +++---
 .../theme-switcher.component.scss             |  86 ++--
 .../theme-switcher.component.ts               |   2 +-
 .../theme-switcher-list.component.scss        |   6 +-
 .../layouts/one-column/one-column.layout.scss |  26 +-
 .../@theme/layouts/sample/sample.layout.scss  |  26 +-
 .../three-columns/three-columns.layout.scss   |  26 +-
 .../two-columns/two-columns.layout.scss       |  26 +-
 .../src/app/@theme/styles/bootstrap-rtl.scss  | 374 +++++++++---------
 .../src/app/@theme/styles/everdark.theme.scss |   2 +-
 .../app/@theme/styles/everlight.theme.scss    |   2 +-
 .../src/app/@theme/styles/pace.theme.scss     |  26 +-
 .../src/app/@theme/styles/themes.scss         |   1 +
 .../src/app/@theme/theme.module.ts            |   2 +
 admin/website-angular/src/app/app.module.ts   |   2 +
 .../+carrier-edit/carrier-edit.component.ts   |   4 +-
 .../carrier-map/carrier-map.component.ts      |   2 +-
 .../carrier-orders-history.component.scss     |  10 +-
 .../carrier-orders.component.scss             |  20 +-
 .../+carriers/+carrier/carrier.component.ts   |   2 +-
 .../location/carrier-location.component.scss  |   2 +-
 .../location/carrier-location.component.ts    |   2 +-
 .../pages/+carriers/carriers.component.scss   |   4 +-
 .../app/pages/+carriers/carriers.component.ts |   2 +-
 .../carrier-tracking.component.ts             |   2 +-
 .../+customer-edit/customer-edit.component.ts |   4 +-
 .../ea-customer-location.component.scss       |   6 +-
 .../ea-customer-location.component.ts         |   2 +-
 .../ea-customer-orders.component.scss         |   2 +-
 .../custom-order/custom-order.component.scss  |   6 +-
 .../ea-customer-products.scss                 |   8 +-
 .../ea-customer-products.scss                 |   8 +-
 .../pages/+customers/customers.component.scss |   4 +-
 .../chart-panel-header.component.scss         |   6 +-
 .../chart-panel-header.component.ts           |   2 +-
 .../chart-panel-summary.component.scss        |  13 +-
 .../charts-panel/charts-panel.component.scss  |   2 +-
 .../charts-panel/charts-panel.component.ts    |   6 +-
 .../legend-chart/legend-chart.component.scss  |   2 +-
 .../pages/+dashboard/dashboard.component.scss |  14 +-
 .../app/pages/+device/device.component.scss   |   2 +-
 .../order-products.component.scss             |   2 +-
 .../+categories/categories.component.scss     |   2 +-
 .../+categories/categories.component.ts       |   2 +-
 .../product-edit/product-edit.component.ts    |   2 +-
 .../pages/+products/products.component.scss   |   2 +-
 .../app/pages/+products/products.component.ts |   2 +-
 .../components/account/account.component.ts   |   2 +-
 .../basic-info/basic-info.component.ts        |   4 +-
 .../contact-info/contact-info.component.ts    |   2 +-
 .../components/location/location.component.ts |   2 +-
 .../payPal-gateway.component.ts               |   2 +-
 .../payment-gateways.component.ts             |   4 +-
 .../stripe-gateway.component.ts               |   2 +-
 .../components/payments/payments.component.ts |   2 +-
 .../product-categories.component.ts           |   4 +-
 .../add-products/add-products.component.ts    |   2 +-
 .../product-mutation.component.ts             |   2 +-
 .../products-catalog.component.ts             |   2 +-
 .../components/products/products.component.ts |   8 +-
 .../add-new-carrier.component.ts              |   2 +-
 .../delivery-takeaway.component.ts            |   6 +-
 .../shared-carriers.component.ts              |   2 +-
 .../+setup/+merchants/merchants.component.ts  |  18 +-
 .../+simulation/simulation.component.scss     |   4 +-
 .../pages/+simulation/simulation.component.ts |   4 +-
 .../warehouse-track.component.ts              |   2 +-
 .../warehouse-manage.component.ts             |   6 +-
 .../warehouse-order.component.scss            |   6 +-
 .../warehouse-order.component.ts              |   8 +-
 .../warehouse-products-view.component.scss    |   4 +-
 .../products-table.component.scss             |   2 +-
 .../products-table.component.ts               |   2 +-
 .../warehouse-main-info.component.scss        |   4 +-
 .../warehouse-order-view.component.scss       |   9 +-
 .../warehouse-order-view.component.ts         |   2 +-
 .../warehouse-orders-table.component.scss     |   4 +-
 .../+warehouse/warehouse.component.scss       |  10 +-
 .../+warehouse/warehouse.component.ts         |   4 +-
 .../+warehouses/warehouses.component.scss     |   4 +-
 .../charts/chartjs/chartjs.component.scss     |  30 +-
 .../src/app/pages/charts/d3/d3.component.scss |  64 +--
 .../charts/echarts/echarts.component.scss     |  30 +-
 .../notifications.component.scss              |   2 +-
 .../pages/components/tree/tree.component.scss |  27 +-
 .../pages/dashboard/dashboard.component.scss  |   2 +-
 .../form-inputs/form-inputs.component.scss    |  14 +-
 .../app/pages/maps/gmaps/gmaps.component.scss |  15 +-
 .../pages/maps/leaflet/leaflet.component.scss |  15 +-
 .../maps/search-map/map/map.component.scss    |  15 +-
 .../search-map/search/search.component.ts     |   2 +-
 .../src/app/pages/pages.component.ts          |  14 +-
 .../action-groups.component.scss              |   8 +-
 .../buttons/buttons.component.scss            |  18 +-
 .../hero-buttons/hero-buttons.component.scss  | 237 +++++------
 .../labeled-actions-group.component.scss      |   6 +-
 .../shape-buttons.component.scss              |  41 +-
 .../size-buttons/size-buttons.component.scss  |  35 +-
 .../popovers/popovers.component.scss          |  24 +-
 .../ui-features/tabs/tabs.component.scss      |  12 +-
 .../typography/typography.component.scss      | 259 ++++++------
 admin/website-angular/yarn.lock               | 195 +++++----
 143 files changed, 1220 insertions(+), 1155 deletions(-)

diff --git a/admin/website-angular/.angular-cli.json b/admin/website-angular/.angular-cli.json
index 0d5100649..b0009edbf 100644
--- a/admin/website-angular/.angular-cli.json
+++ b/admin/website-angular/.angular-cli.json
@@ -30,7 +30,6 @@
 				"../node_modules/ionicons/dist/scss/ionicons.scss",
 				"../node_modules/@fortawesome/fontawesome-free/css/all.css",
 				"../node_modules/socicon/css/socicon.css",
-				"../node_modules/nebular-icons/scss/nebular-icons.scss",
 				"../node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
 				"../node_modules/leaflet/dist/leaflet.css",
 				"./app/@theme/styles/styles.scss"
diff --git a/admin/website-angular/angular.json b/admin/website-angular/angular.json
index 1da373899..8b9bc874d 100644
--- a/admin/website-angular/angular.json
+++ b/admin/website-angular/angular.json
@@ -34,7 +34,6 @@
 							"node_modules/ionicons/dist/scss/ionicons.scss",
 							"node_modules/@fortawesome/fontawesome-free/css/all.css",
 							"node_modules/socicon/css/socicon.css",
-							"node_modules/nebular-icons/scss/nebular-icons.scss",
 							"node_modules/angular-tree-component/dist/angular-tree-component.css",
 							"node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
 							"node_modules/leaflet/dist/leaflet.css",
@@ -116,7 +115,6 @@
 							"node_modules/ionicons/dist/scss/ionicons.scss",
 							"node_modules/@fortawesome/fontawesome-free/css/all.css",
 							"node_modules/socicon/css/socicon.css",
-							"node_modules/nebular-icons/scss/nebular-icons.scss",
 							"node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
 							"node_modules/leaflet/dist/leaflet.css",
 							"src/app/@theme/styles/styles.scss"
diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 7221a0baa..1fafc61e8 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -69,12 +69,13 @@
 		"@angular/platform-browser-dynamic": "^8.0.0",
 		"@angular/router": "^8.0.0",
 		"@asymmetrik/ngx-leaflet": "^5.0.2",
-		"@ng-bootstrap/ng-bootstrap": "^4.2.1",
-		"@fortawesome/fontawesome-free": "^5.9.0",
+		"@fortawesome/fontawesome-free": "~5.8.1",
 		"@nebular/auth": "^4.0.0",
 		"@nebular/bootstrap": "^4.0.0",
+		"@nebular/eva-icons": "^4.0.0",
 		"@nebular/security": "^4.0.0",
 		"@nebular/theme": "^4.0.0",
+		"@ng-bootstrap/ng-bootstrap": "^4.2.1",
 		"@ng-select/ng-select": "^2.18.0",
 		"@ngx-translate/core": "^11.0.1",
 		"@ngx-translate/http-loader": "^4.0.0",
@@ -85,14 +86,14 @@
 		"angular2-logger": "^0.7.0",
 		"angular2-toaster": "^7.0.0",
 		"angular2-wizard": "github:maiyaporn/angular2-wizard#pull/56/head",
-		"apollo-angular": "^1.5.0",
-		"apollo-angular-link-http": "^1.6.0",
-		"apollo-cache-inmemory": "^1.5.1",
-		"apollo-client": "^2.5.1",
+		"apollo-angular": "^1.6.0",
+		"apollo-angular-link-http": "^1.7.0",
+		"apollo-cache-inmemory": "^1.6.2",
+		"apollo-client": "^2.6.2",
 		"apollo-link": "^1.2.11",
 		"apollo-link-context": "^1.0.17",
 		"apollo-link-ws": "^1.0.17",
-		"apollo-upload-client": "^10.0.0",
+		"apollo-upload-client": "^10.0.1",
 		"bootstrap": "^4.3.1",
 		"buffer": "^5.2.1",
 		"chart.js": "^2.8.0",
@@ -115,7 +116,6 @@
 		"jsbarcode": "^3.11.0",
 		"leaflet": "^1.4.0",
 		"moment": "^2.24.0",
-		"nebular-icons": "1.1.0",
 		"ng-simple-slideshow": "^1.2.9",
 		"ng2-ckeditor": "^1.2.2",
 		"ng2-completer": "2.0.8",
@@ -134,8 +134,8 @@
 		"qrcode": "^1.3.3",
 		"reflect-metadata": "^0.1.13",
 		"roboto-fontface": "^0.10.0",
-		"rxjs": "^6.5.1",
-		"rxjs-compat": "^6.5.1",
+		"rxjs": "^6.5.2",
+		"rxjs-compat": "^6.5.2",
 		"socicon": "^3.0.5",
 		"socket.io-client": "^2.2.0",
 		"stripe": "^7.0.0",
@@ -146,7 +146,7 @@
 		"uuid": "^3.3.2",
 		"web-animations-js": "^2.3.1",
 		"zen-observable": "^0.8.14",
-		"zone.js": "^0.9.0"
+		"zone.js": "^0.9.1"
 	},
 	"devDependencies": {
 		"@angular-devkit/architect": "^0.800.1",
diff --git a/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.scss b/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.scss
index 6a8708991..bab7aedd9 100644
--- a/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.scss
+++ b/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.scss
@@ -3,13 +3,13 @@
 	border-left: 5px solid #42a948; /* green */
 }
 
-:host /deep/ .card-footer button {
+:host ::ng-deep .card-footer button {
 	background-color: #111111 !important;
 	border: none !important;
 	color: white !important;
 	cursor: pointer !important;
 }
-:host /deep/ .card-footer button:hover {
+:host ::ng-deep .card-footer button:hover {
 	background-color: #bebebe !important;
 	color: #111111 !important;
 }
diff --git a/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts b/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts
index ecb27792f..bd95b2cc7 100644
--- a/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts
@@ -17,10 +17,10 @@ import { TranslateService } from '@ngx-translate/core';
 	styleUrls: ['./carrier-mutation.component.scss']
 })
 export class CarrierMutationComponent {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	readonly form: FormGroup = this.formBuilder.group({
diff --git a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
index d848f1d9b..2bfef7bbd 100644
--- a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
+++ b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
@@ -17,7 +17,7 @@ import { NgModel } from '@angular/forms';
 	styleUrls: ['./file-uploader.component.scss']
 })
 export class FileUploaderComponent {
-	@ViewChild('shownInput', { static: false })
+	@ViewChild('shownInput', { static: true })
 	shownInput: NgModel;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts b/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
index 2fb6122f7..31731bad6 100644
--- a/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
+++ b/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
@@ -10,7 +10,7 @@ import { takeUntil } from 'rxjs/operators';
 	`
 })
 export class GoogleMapComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	mapElement: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
index 164fa651c..06314a563 100644
--- a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
+++ b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
@@ -12,7 +12,7 @@ import { InviteRequestRouter } from '@modules/client.common.angular2/routers/inv
 	styleUrls: ['/invite-request-modal.component.scss']
 })
 export class InviteRequestModalComponent {
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts b/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
index f756a2f76..7a56a2a16 100644
--- a/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
+++ b/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
@@ -16,7 +16,7 @@ import { environment } from 'environments/environment';
 	`
 })
 export class CarrierLocationComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 	public map: google.maps.Map;
 	private directionsDisplay = new google.maps.DirectionsRenderer();
diff --git a/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts b/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
index 975cad233..d6aaa1c41 100644
--- a/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
+++ b/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
@@ -22,7 +22,7 @@ const userIcon = environment.MAP_USER_ICON_LINK;
 })
 export class UserWarehouseLocationComponent
 	implements AfterViewInit, OnDestroy, OnChanges {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 
 	public map: google.maps.Map;
diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.scss b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.scss
index 5e78ff137..35f7e1bde 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.scss
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.scss
@@ -1,4 +1,4 @@
-:host /deep/ ng2-smart-table table {
+:host ::ng-deep ng2-smart-table table {
 	th.image {
 		text-align: center;
 	}
diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
index fd9567f1e..e3e03236b 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
@@ -12,7 +12,7 @@ export class CategoryImageComponent implements ViewCell, OnInit {
 	value: string;
 	rowData: any;
 
-	@ViewChild('image', { static: false })
+	@ViewChild('image', { static: true })
 	image: ElementRef;
 
 	ngOnInit() {
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
index da5ddb500..b284932f2 100644
--- a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
@@ -24,7 +24,7 @@ import { IProductsCategoryCreateObject } from '@modules/server.common/interfaces
 	styleUrls: ['basic-info-form.component.scss']
 })
 export class BasicInfoFormComponent implements OnInit, AfterViewInit {
-	@ViewChild('imagePreview', { static: false })
+	@ViewChild('imagePreview', { static: true })
 	imagePreviewElement: ElementRef;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss
index bf88c5135..050298c28 100644
--- a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss
+++ b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss
@@ -1,5 +1,5 @@
 .product-basic-info {
-	/deep/ .categoryOptions-dropdown {
+	::ng-deep .categoryOptions-dropdown {
 		.ng-star-inserted {
 			margin-top: 0 !important;
 		}
diff --git a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
index 7e9e6a9c3..7758d192d 100644
--- a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
@@ -35,9 +35,9 @@ import { TranslateService } from '@ngx-translate/core';
 	templateUrl: 'basic-info-form.component.html'
 })
 export class BasicInfoFormComponent implements OnDestroy, OnInit {
-	@ViewChild('fileInput', { static: false })
+	@ViewChild('fileInput', { static: true })
 	fileInput: any;
-	@ViewChild('productImagePreview', { static: false })
+	@ViewChild('productImagePreview', { static: true })
 	productImagePreview: ElementRef;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.scss b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.scss
index 79105a45a..17bcf0b1e 100644
--- a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.scss
+++ b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.scss
@@ -1,15 +1,15 @@
-:host /deep/ .card-footer button {
+:host ::ng-deep .card-footer button {
 	background-color: #111111 !important;
 	border: none !important;
 	color: white !important;
 	cursor: pointer !important;
 }
 
-:host /deep/ .card-footer button:hover {
+:host ::ng-deep .card-footer button:hover {
 	background-color: #bebebe !important;
 	color: #111111 !important;
 }
 
-:host /deep/ nb-card {
+:host ::ng-deep nb-card {
 	background-color: white !important;
 }
diff --git a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
index d649a0cd5..1be2c8c5e 100644
--- a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
+++ b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
@@ -14,7 +14,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	styleUrls: ['./product-create.component.scss']
 })
 export class ProductCreateComponent implements OnInit {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
 	public loading: boolean;
diff --git a/admin/website-angular/src/app/@shared/render-component/created.component.ts b/admin/website-angular/src/app/@shared/render-component/created.component.ts
index 1b99257f9..46b825e6b 100644
--- a/admin/website-angular/src/app/@shared/render-component/created.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/created.component.ts
@@ -25,7 +25,7 @@ import OrderStatus from '@modules/server.common/enums/OrderStatus';
 	`
 })
 export class CreatedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('createdTimer', { static: false })
+	@ViewChild('createdTimer', { static: true })
 	createdTimer: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/created/created.component.ts b/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
index 76501213d..4998ea497 100644
--- a/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
@@ -16,7 +16,7 @@ import OrderStatus from '@modules/server.common/enums/OrderStatus';
 	templateUrl: './created.component.html'
 })
 export class CreatedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('createdTimer', { static: false })
+	@ViewChild('createdTimer', { static: true })
 	createdTimer: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
index 71a32b5e9..8f4ec00d6 100644
--- a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
@@ -20,7 +20,7 @@ import OrderWarehouseStatus from '@modules/server.common/enums/OrderWarehouseSta
 	`
 })
 export class ElapsedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('elapsedTime', { static: false })
+	@ViewChild('elapsedTime', { static: true })
 	elapsedTime: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
index 9fd653fab..27a442858 100644
--- a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
@@ -20,7 +20,7 @@ import OrderWarehouseStatus from '@modules/server.common/enums/OrderWarehouseSta
 	`
 })
 export class ElapsedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('elapsedTime', { static: false })
+	@ViewChild('elapsedTime', { static: true })
 	elapsedTime: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/styles/control-icon.shared.scss b/admin/website-angular/src/app/@shared/styles/control-icon.shared.scss
index aefba7791..7c0720552 100644
--- a/admin/website-angular/src/app/@shared/styles/control-icon.shared.scss
+++ b/admin/website-angular/src/app/@shared/styles/control-icon.shared.scss
@@ -2,28 +2,29 @@
 @import '~@nebular/theme/components/card/card.component.theme';
 
 @mixin optionally-clickable {
-	&[routerLink], &[href], &.clickable {
+	&[routerLink],
+	&[href],
+	&.clickable {
 		cursor: pointer;
 	}
 }
 
 @mixin control-icon {
-
 	.control-icon {
 		width: 1.4em;
 		height: 1.4em;
 		outline: none;
 
 		path {
-			fill: nb-theme(color-fg);
+			fill: nb-theme(text-basic-color);
 		}
 
 		&:hover path {
-			fill: nb-theme(color-fg-text);
+			fill: nb-theme(text-control-color);
 		}
 
 		&:active path {
-			fill: nb-theme(color-fg-highlight);
+			fill: nb-theme(text-hint-color);
 		}
 
 		&.control-icon-left {
@@ -38,5 +39,4 @@
 
 		@include optionally-clickable;
 	}
-
 }
diff --git a/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.scss b/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.scss
index d252672e0..ff71bd9f3 100644
--- a/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.scss
+++ b/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.scss
@@ -1,11 +1,11 @@
-:host /deep/ .card-footer button {
+:host ::ng-deep .card-footer button {
 	background-color: #111111 !important;
 	border: none !important;
 	color: white !important;
 	cursor: pointer !important;
 }
 
-:host /deep/ .card-footer button:hover {
+:host ::ng-deep .card-footer button:hover {
 	background-color: #bebebe !important;
 	color: #111111 !important;
 }
diff --git a/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts b/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts
index 9709db525..b911b189f 100644
--- a/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts
@@ -13,10 +13,10 @@ import { TranslateService } from '@ngx-translate/core';
 	styleUrls: ['/user-mutation.component.scss']
 })
 export class UserMutationComponent {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.scss b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.scss
index 0f4e8edd7..92ab4775c 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.scss
+++ b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.scss
@@ -3,14 +3,14 @@
 	border-left: 5px solid #42a948;
 }
 
-:host /deep/ .card-footer button {
+:host ::ng-deep .card-footer button {
 	background-color: #111111 !important;
 	border: none !important;
 	color: white !important;
 	cursor: pointer !important;
 }
 
-:host /deep/ .card-footer button:hover {
+:host ::ng-deep .card-footer button:hover {
 	background-color: #bebebe !important;
 	color: #111111 !important;
 }
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
index 281cad797..ebc6aeaaf 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
@@ -41,7 +41,7 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 	perPage: number;
 	choiced: string;
 
-	@ViewChild('warehouseAddChoice', { static: false })
+	@ViewChild('warehouseAddChoice', { static: true })
 	warehouseAddChoice: WarehouseAddChoiceComponent;
 
 	@ViewChild('basicInfoForm', { static: false })
@@ -56,7 +56,7 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 	@ViewChild('wizzardFrom', { static: false })
 	wizzardFrom: WizardComponent;
 
-	@ViewChild('wizzardFromStep1', { static: false })
+	@ViewChild('wizzardFromStep1', { static: true })
 	wizzardFromStep1: any;
 
 	hasSelectedProducts = () => false;
diff --git a/admin/website-angular/src/app/@shared/warehouse/customer-warehouses-table/customer-warehouses-table.component.scss b/admin/website-angular/src/app/@shared/warehouse/customer-warehouses-table/customer-warehouses-table.component.scss
index 3265dca6c..0ee900711 100644
--- a/admin/website-angular/src/app/@shared/warehouse/customer-warehouses-table/customer-warehouses-table.component.scss
+++ b/admin/website-angular/src/app/@shared/warehouse/customer-warehouses-table/customer-warehouses-table.component.scss
@@ -1,4 +1,4 @@
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	tr {
 		th {
 			padding: 18px !important;
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.scss b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.scss
index f60e71316..f675fda70 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.scss
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.scss
@@ -1,4 +1,4 @@
-/deep/ .carriers-dropdown {
+::ng-deep .carriers-dropdown {
 	.dropdown {
 		width: 100%;
 	}
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
index e44febcb1..2ebd9c191 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
@@ -32,7 +32,7 @@ export type WarehouseBasicInfo = Pick<
 	templateUrl: 'basic-info-form.component.html'
 })
 export class BasicInfoFormComponent implements OnInit {
-	@ViewChild('fileInput', { static: false })
+	@ViewChild('fileInput', { static: true })
 	fileInput: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
index 159e43efe..5eea0a425 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
@@ -10,7 +10,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 })
 export class WarehouseManageTabsDeliveryAreasComponent
 	implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	mapElement: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.scss b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.scss
index 6600ceb0c..9f1410092 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.scss
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.scss
@@ -1,4 +1,4 @@
-/deep/ .carriers-dropdown {
+::ng-deep .carriers-dropdown {
 	.dropdown {
 		width: 100%;
 	}
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
index 112251044..d13d46610 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
@@ -41,7 +41,7 @@ export type WarehouseManageTabsDetails = Pick<
 })
 export class WarehouseManageTabsDetailsComponent
 	implements OnInit, AfterViewInit {
-	@ViewChild('fileInput', { static: false })
+	@ViewChild('fileInput', { static: true })
 	fileInput: ElementRef;
 	@ViewChild('logoPreview', { static: false })
 	logoPreviewElement: ElementRef;
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
index 5acee8cbe..e2d6c98dd 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
@@ -39,19 +39,19 @@ export class WarehouseManageTabsComponent {
 	@Input()
 	readonly form: FormGroup;
 
-	@ViewChild('detailsComponent', { static: false })
+	@ViewChild('detailsComponent', { static: true })
 	readonly detailsComponent: WarehouseManageTabsDetailsComponent;
 
-	@ViewChild('accountComponent', { static: false })
+	@ViewChild('accountComponent', { static: true })
 	readonly accountComponent: WarehouseManageTabsAccountComponent;
 
-	@ViewChild('contactInfoForm', { static: false })
+	@ViewChild('contactInfoForm', { static: true })
 	readonly contactInfoForm: ContactInfoFormComponent;
 
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	readonly locationForm: LocationFormComponent;
 
-	@ViewChild('tabSet', { static: false })
+	@ViewChild('tabSet', { static: true })
 	readonly tabSet;
 
 	mapCoordEmitter = new EventEmitter<number[]>();
diff --git a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.scss b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.scss
index b8a4e8336..bf0a4dcf2 100644
--- a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.scss
+++ b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.scss
@@ -3,6 +3,6 @@
 	border-left: 5px solid #42a948;
 }
 
-:host /deep/ .card-footer button {
+:host ::ng-deep .card-footer button {
 	cursor: pointer !important;
 }
diff --git a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
index 420008e97..361cd6d32 100644
--- a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
@@ -27,7 +27,7 @@ export class WarehouseMutationComponent implements AfterViewInit {
 	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('contactInfoForm', { static: false })
+	@ViewChild('contactInfoForm', { static: true })
 	contactInfoForm: ContactInfoFormComponent;
 
 	@ViewChild('locationForm', { static: false })
diff --git a/admin/website-angular/src/app/@theme/components/footer/footer.component.scss b/admin/website-angular/src/app/@theme/components/footer/footer.component.scss
index 29db9dcea..73bf51c6d 100644
--- a/admin/website-angular/src/app/@theme/components/footer/footer.component.scss
+++ b/admin/website-angular/src/app/@theme/components/footer/footer.component.scss
@@ -13,11 +13,11 @@
 
 		a {
 			padding: 0.4rem;
-			color: nb-theme(color-fg);
+			color: nb-theme(text-basic-color);
 			transition: color ease-out 0.1s;
 
 			&:hover {
-				color: nb-theme(color-fg-heading);
+				color: nb-theme(text-basic-color);
 			}
 		}
 	}
diff --git a/admin/website-angular/src/app/@theme/components/header/header.component.html b/admin/website-angular/src/app/@theme/components/header/header.component.html
index 66072d193..7841e0f21 100644
--- a/admin/website-angular/src/app/@theme/components/header/header.component.html
+++ b/admin/website-angular/src/app/@theme/components/header/header.component.html
@@ -1,17 +1,37 @@
-<div class="header-container" [class.left]="position === 'normal'" [class.right]="position === 'inverse'">
+<div
+	class="header-container"
+	[class.left]="position === 'normal'"
+	[class.right]="position === 'inverse'"
+>
 	<div class="logo-containter">
-		<a (click)="toggleSidebar()" href="#" class="navigation"><i class="nb-menu"></i></a>
-		<div class="logo" (click)="goToHome()"><span>
-				{{"HEADER_VIEW.EVER" | translate}}</span><span class="ever-simbol">®</span>
-			<span>{{"HEADER_VIEW.ADMIN" | translate}}</span></div>
+		<a (click)="toggleSidebar()" href="#" class="navigation"
+			><i icon="menu-outline"></i
+		></a>
+		<div class="logo" (click)="goToHome()">
+			<span> {{ 'HEADER_VIEW.EVER' | translate }}</span
+			><span class="ever-simbol">®</span>
+			<span>{{ 'HEADER_VIEW.ADMIN' | translate }}</span>
+		</div>
 	</div>
 </div>
 
 <div class="header-container">
-	<nb-actions size="medium" [class.right]="position === 'normal'" [class.left]="position === 'inverse'">
-		<nb-action icon="nb-gear" class="toggle-layout" (click)="toggleSettings()"></nb-action>
+	<nb-actions
+		size="medium"
+		[class.right]="position === 'normal'"
+		[class.left]="position === 'inverse'"
+	>
+		<nb-action
+			icon="settings-2-outline"
+			class="toggle-layout"
+			(click)="toggleSettings()"
+		></nb-action>
 		<nb-action class="admin-menu" *ngIf="admin$ | async; let admin">
-			<nb-user [nbContextMenu]="adminMenu" [name]="admin?.name" [picture]="admin?.pictureUrl"></nb-user>
+			<nb-user
+				[nbContextMenu]="adminMenu"
+				[name]="admin?.name"
+				[picture]="admin?.pictureUrl"
+			></nb-user>
 		</nb-action>
 		<!-- <nb-action class="control-item" disabled icon="nb-notifications"></nb-action>
     	<nb-action class="control-item" icon="nb-email"></nb-action>
@@ -19,4 +39,4 @@
 		<nb-search [hidden]='true' type="rotate-layout" (click)="startSearch()"></nb-search>
 		</nb-action>-->
 	</nb-actions>
-</div>
\ No newline at end of file
+</div>
diff --git a/admin/website-angular/src/app/@theme/components/header/header.component.scss b/admin/website-angular/src/app/@theme/components/header/header.component.scss
index 42a8d6682..6582f0ef2 100644
--- a/admin/website-angular/src/app/@theme/components/header/header.component.scss
+++ b/admin/website-angular/src/app/@theme/components/header/header.component.scss
@@ -34,8 +34,10 @@
 		width: auto;
 
 		.navigation {
-			@include nb-ltr(padding-right, nb-theme(padding));
-			@include nb-rtl(padding-left, nb-theme(padding));
+			// TODO get padding form the theme
+			@include nb-ltr(padding-right, 1.25rem);
+			@include nb-rtl(padding-left, 1.25rem);
+
 			font-size: 2.5rem;
 			text-decoration: none;
 
@@ -45,11 +47,13 @@
 		}
 
 		.logo {
-			padding: 0 nb-theme(padding);
+			// TODO get padding form the theme
+			padding: 0 1.25rem;
+
 			font-size: 1.75rem;
-			font-weight: nb-theme(font-weight-bolder);
-			@include nb-ltr(border-left, 1px solid nb-theme(separator));
-			@include nb-rtl(border-right, 1px solid nb-theme(separator));
+			font-weight: nb-theme(text-subtitle-font-weight);
+			@include nb-ltr(border-left, 1px solid nb-theme(divider-color));
+			@include nb-rtl(border-right, 1px solid nb-theme(divider-color));
 			white-space: nowrap;
 
 			display: flex;
@@ -57,7 +61,7 @@
 			justify-content: center;
 
 			span {
-				font-weight: nb-theme(font-weight-normal);
+				font-weight: nb-theme(text-heading-3-font-weight);
 			}
 
 			.ever-simbol {
@@ -83,8 +87,8 @@
 			@include nb-rtl(border, none);
 		}
 
-		.header-container /deep/ ngx-theme-switcher .dropdown-toggle {
-			color: nb-theme(color-white);
+		.header-container ::ng-deep ngx-theme-switcher .dropdown-toggle {
+			color: #ffffff;
 			background: transparent;
 		}
 	}
@@ -105,13 +109,13 @@
 		}
 	}
 
-	.toggle-layout /deep/ a {
+	.toggle-layout ::ng-deep a {
 		display: block;
 		text-decoration: none;
 		line-height: 1;
 
 		i {
-			color: nb-theme(color-fg-highlight);
+			color: nb-theme(text-hint-color);
 			font-size: 2.25rem;
 			border-radius: 50%;
 			position: relative;
@@ -140,18 +144,17 @@
 		}
 	}
 
-	// TODO style
-	// @include keyframes(pulse) {
-	// 	0% {
-	// 		box-shadow: 0 0 1px 0 rgba(nb-theme(color-fg-highlight), 0);
-	// 	}
-	// 	20% {
-	// 		box-shadow: 0 0 3px 10px rgba(nb-theme(color-fg-highlight), 0.4);
-	// 	}
-	// 	100% {
-	// 		box-shadow: 0 0 5px 20px rgba(nb-theme(color-fg-highlight), 0);
-	// 	}
-	// }
+	@include keyframes(pulse) {
+		0% {
+			box-shadow: 0 0 1px 0 rgba(nb-theme(text-hint-color), 0);
+		}
+		20% {
+			box-shadow: 0 0 3px 10px rgba(nb-theme(text-hint-color), 0.4);
+		}
+		100% {
+			box-shadow: 0 0 5px 20px rgba(nb-theme(text-hint-color), 0);
+		}
+	}
 
 	@include keyframes(pulse-light) {
 		0% {
@@ -188,7 +191,7 @@
 	}
 
 	@include media-breakpoint-down(sm) {
-		nb-user /deep/ .user-name {
+		nb-user ::ng-deep .user-name {
 			display: none;
 		}
 	}
@@ -214,7 +217,7 @@
 	}
 
 	@include media-breakpoint-down(xs) {
-		.right /deep/ {
+		.right ::ng-deep {
 			display: none;
 		}
 	}
diff --git a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.scss b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.scss
index 5ef07efa5..8d9f0160e 100644
--- a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.scss
+++ b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.scss
@@ -1,33 +1,33 @@
 :host {
-  display: flex;
-  align-items: center;
+	display: flex;
+	align-items: center;
 
-  i.control-icon {
-    &::before {
-      font-size: 2.3rem;
-    }
+	i.control-icon {
+		&::before {
+			font-size: 2.3rem;
+		}
 
-    &:hover {
-      cursor: pointer;
-    }
-  }
+		&:hover {
+			cursor: pointer;
+		}
+	}
 
-  input {
-    border: none;
-    outline: none;
-    margin-left: 1rem;
-    width: 15rem;
-    transition: width 0.2s ease;
+	input {
+		border: none;
+		outline: none;
+		margin-left: 1rem;
+		width: 15rem;
+		transition: width 0.2s ease;
 
-    &.hidden {
-      width: 0;
-      margin: 0;
-    }
-  }
+		&.hidden {
+			width: 0;
+			margin: 0;
+		}
+	}
 
-  /deep/ search-input {
-    input {
-      background: transparent;
-    }
-  }
+	::ng-deep search-input {
+		input {
+			background: transparent;
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
index f14a7de7e..df83f26f4 100644
--- a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
+++ b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
@@ -21,7 +21,7 @@ import {
 	`
 })
 export class SearchInputComponent {
-	@ViewChild('input', { static: false }) input: ElementRef;
+	@ViewChild('input', { static: true }) input: ElementRef;
 
 	@Output() search: EventEmitter<string> = new EventEmitter<string>();
 
diff --git a/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss b/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
index 1adf8ca80..6a1cbc9b1 100644
--- a/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
+++ b/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
@@ -27,9 +27,9 @@
 
 		& > span {
 			font-size: 1.125rem;
-			font-weight: nb-theme(font-weight-bold);
+			font-weight: nb-theme(text-heading-2-font-weight);
 			transition: opacity 0.3s ease;
-			color: nb-theme(color-fg);
+			color: nb-theme(text-basic-color);
 
 			&.first {
 				@include nb-ltr(padding-right, 10px);
@@ -42,14 +42,14 @@
 			}
 
 			&.active {
-				color: nb-theme(color-fg-text);
+				color: nb-theme(text-control-color);
 			}
 
 			@include nb-for-theme(cosmic) {
-				color: nb-theme(color-fg);
+				color: nb-theme(text-basic-color);
 
 				&.active {
-					color: nb-theme(color-white);
+					color: #ffffff;
 				}
 			}
 
@@ -82,7 +82,7 @@
 			right: 0;
 			bottom: 0;
 			border-radius: 1.75rem;
-			background-color: nb-theme(layout-bg);
+			background-color: nb-theme(layout-background-color);
 		}
 
 		.slider::before {
@@ -91,18 +91,18 @@
 			height: 1.5rem;
 			width: 1.5rem;
 			border-radius: 50%;
-			background-color: nb-theme(color-success);
+			background-color: nb-theme(color-success-500);
 			transition: 0.2s;
 
-			// TODO style
-			// box-shadow: 0 0 0.25rem 0 rgba(nb-theme(color-fg), 0.4);
+			box-shadow: 0 0 0.25rem 0 rgba(nb-theme(text-basic-color), 0.4);
 
+			// // TODO style
 			// @include nb-for-theme(cosmic) {
 			// 	@include btn-hero-primary-gradient();
 			// }
 
 			@include nb-for-theme(corporate) {
-				background-color: nb-theme(color-primary);
+				background-color: nb-theme(color-primary-500);
 			}
 		}
 	}
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss
index 4f8a796be..60fb8d87b 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss
@@ -1,77 +1,78 @@
 @import '../../styles/themes';
 
 @include nb-install-component() {
-  h6 {
-    margin-bottom: 0.5rem;
-  }
+	h6 {
+		margin-bottom: 0.5rem;
+	}
 
-  .settings-row {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    flex-wrap: wrap;
+	.settings-row {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: wrap;
 
-    width: 90%;
-    margin: 0 0 1rem;
+		width: 90%;
+		margin: 0 0 1rem;
 
-    a {
-      text-decoration: none;
-      font-size: 2.25rem;
+		a {
+			text-decoration: none;
+			font-size: 2.25rem;
 
-      color: nb-theme(color-fg);
+			color: nb-theme(text-basic-color);
 
-      &.selected {
-        color: nb-theme(color-success);
-      }
+			&.selected {
+				color: nb-theme(color-success-500);
+			}
 
-      @include nb-for-theme(cosmic) {
-        &.selected {
-          color: nb-theme(link-color);
-        }
-      }
-    }
-  }
+			@include nb-for-theme(cosmic) {
+				&.selected {
+					// TODO nb-theme
+					color: #3dcc6d;
+				}
+			}
+		}
+	}
 
-  .settings {
-    margin-bottom: 1em;
-  }
+	.settings {
+		margin-bottom: 1em;
+	}
 
-  .switcher {
-    margin-bottom: 1rem;
+	.switcher {
+		margin-bottom: 1rem;
 
-    /deep/ ngx-switcher {
-      .switch-label span {
-        font-size: 1em;
-        font-weight: normal;
-      }
+		::ng-deep ngx-switcher {
+			.switch-label span {
+				font-size: 1em;
+				font-weight: normal;
+			}
 
-      .switch {
-        height: 1.5em;
-        width: 3em;
+			.switch {
+				height: 1.5em;
+				width: 3em;
 
-        .slider::before {
-          height: 1.5em;
-          width: 1.5em;
-        }
+				.slider::before {
+					height: 1.5em;
+					width: 1.5em;
+				}
 
-        input:checked + .slider::before {
-          @include nb-ltr(transform, translateX(1.5rem)!important);
-          @include nb-rtl(transform, translateX(-1.5rem)!important);
-        }
-      }
+				input:checked + .slider::before {
+					@include nb-ltr(transform, translateX(1.5rem) !important);
+					@include nb-rtl(transform, translateX(-1.5rem) !important);
+				}
+			}
 
-      @include nb-for-theme(cosmic) {
-        .switch .slider {
-          background-color: nb-theme(color-bg);
-        }
-      }
-    }
-  }
+			@include nb-for-theme(cosmic) {
+				.switch .slider {
+					background-color: nb-theme(background-basic-color-1);
+				}
+			}
+		}
+	}
 
-  .language-select {
-	max-height: 40px;
-	padding: 0;
-	padding-left: 10px;
-	font-size: 0.9rem;
-  }
+	.language-select {
+		max-height: 40px;
+		padding: 0;
+		padding-left: 10px;
+		font-size: 0.9rem;
+	}
 }
diff --git a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.scss b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
index dea58a630..163b19fef 100644
--- a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
+++ b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
@@ -3,48 +3,46 @@
 @import '~@nebular/theme/styles/core/functions';
 
 @include nb-install-component() {
-  .themes-switcher {
-    display: flex;
-    font-size: 0.9rem;
-    padding: 0.8rem 0.8rem;
-    align-items: center;
-    cursor: pointer;
-    background-color: nb-theme(switcher-background);
-    border-radius: nb-theme(radius);
-
-    &:hover {
-      $color: nb-theme(switcher-background);
-      $percentage: nb-theme(switcher-background-percentage);
-
-      background-color: tint($color, $percentage);
-    }
-
-    span {
-      margin: 0 0.7rem;
-    }
-
-    i {
-      color: nb-theme(color-primary);
-      font-size: 1.1rem;
-      border-radius: 50%;
-      position: relative;
-
-      @include nb-for-theme(default) {
-        color: nb-theme(color-success);
-      }
-
-      @include nb-for-theme(corporate) {
-        color: nb-theme(color-fg-highlight);
-      }
-
-      &::before {
-        // Hack for IE11, IE11 should not set background
-        background: nb-theme(drops-icon-line-gadient);
-        -webkit-background-clip: text;
-        -webkit-text-fill-color: transparent;
-      }
-    }
-  }
+	.themes-switcher {
+		display: flex;
+		font-size: 0.9rem;
+		padding: 0.8rem 0.8rem;
+		align-items: center;
+		cursor: pointer;
+		background-color: nb-theme(switcher-background);
+		border-radius: nb-theme(border-radius);
+
+		&:hover {
+			$color: nb-theme(switcher-background);
+			$percentage: nb-theme(switcher-background-percentage);
+
+			background-color: tint($color, $percentage);
+		}
+
+		span {
+			margin: 0 0.7rem;
+		}
+
+		i {
+			color: nb-theme(color-primary-500);
+			font-size: 1.1rem;
+			border-radius: 50%;
+			position: relative;
+
+			@include nb-for-theme(default) {
+				color: nb-theme(color-success-500);
+			}
+
+			@include nb-for-theme(corporate) {
+				color: nb-theme(text-hint-color);
+			}
+
+			&::before {
+				// Hack for IE11, IE11 should not set background
+				background: nb-theme(drops-icon-line-gadient);
+				-webkit-background-clip: text;
+				-webkit-text-fill-color: transparent;
+			}
+		}
+	}
 }
-
-
diff --git a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
index 9ecf57c4a..a04914d45 100644
--- a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
+++ b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
@@ -10,7 +10,7 @@ import { AnalyticsService } from 'app/@core/utils/analytics.service';
 	styleUrls: ['./theme-switcher.component.scss']
 })
 export class ThemeSwitcherComponent {
-	@ViewChild(NbPopoverDirective, { static: false })
+	@ViewChild(NbPopoverDirective, { static: true })
 	popover: NbPopoverDirective;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss b/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
index b93e52902..9eee7a893 100644
--- a/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
+++ b/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
@@ -16,7 +16,7 @@ $icon-top-color-everlight: gray;
 $icon-top-color-everdark: black;
 
 @include nb-install-component() {
-	/deep/ .themes-switcher-list {
+	::ng-deep .themes-switcher-list {
 		padding: 1rem 2rem 1.25rem 0.5rem;
 		margin: 0;
 
@@ -97,13 +97,13 @@ $icon-top-color-everdark: black;
 				font-weight: 300;
 				vertical-align: super;
 				padding-left: 1rem;
-				color: nb-theme(color-fg-heading);
+				color: nb-theme(text-basic-color);
 			}
 		}
 	}
 
 	@include media-breakpoint-down(is) {
-		/deep/ .themes-switcher-list {
+		::ng-deep .themes-switcher-list {
 			display: none;
 		}
 	}
diff --git a/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss b/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss
index 500b750bf..cb2c009c1 100644
--- a/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss
@@ -17,7 +17,7 @@
 		&.collapsed {
 			width: 0;
 
-			/deep/ .main-container {
+			::ng-deep .main-container {
 				width: 0;
 
 				.scrollable {
@@ -27,9 +27,9 @@
 			}
 		}
 
-		/deep/ .main-container {
+		::ng-deep .main-container {
 			width: $sidebar-width;
-			background: nb-theme(color-bg);
+			background: nb-theme(background-basic-color-1);
 			transition: width 0.3s ease;
 			overflow: hidden;
 
@@ -38,7 +38,7 @@
 			}
 
 			@include nb-for-theme(cosmic) {
-				background: nb-theme(layout-bg);
+				background: nb-theme(layout-background-color);
 			}
 		}
 	}
@@ -50,24 +50,24 @@
 			margin-top: 0;
 		}
 
-		/deep/ .main-container {
+		::ng-deep .main-container {
 			height: calc(
 				#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
 						sidebar-header-gap
 					)}
 			) !important;
-			@include nb-ltr(border-top-right-radius, nb-theme(radius));
-			@include nb-rtl(border-top-left-radius, nb-theme(radius));
+			@include nb-ltr(border-top-right-radius, nb-theme(border-radius));
+			@include nb-rtl(border-top-left-radius, nb-theme(border-radius));
 
 			@include nb-for-theme(corporate) {
-				border: 1px solid nb-theme(separator);
+				border: 1px solid nb-theme(divider-color);
 				height: calc(
 					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
 				) !important;
 			}
 		}
 
-		/deep/ .scrollable {
+		::ng-deep .scrollable {
 			@include nb-for-theme(corporate) {
 				padding-top: 0;
 
@@ -77,7 +77,7 @@
 			}
 		}
 
-		/deep/ nb-sidebar-header {
+		::ng-deep nb-sidebar-header {
 			padding-bottom: 0.5rem;
 			text-align: center;
 		}
@@ -91,7 +91,7 @@
 			transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
 
 			@include nb-for-theme(corporate) {
-				border-radius: nb-theme(radius);
+				border-radius: nb-theme(border-radius);
 			}
 
 			i {
@@ -110,7 +110,7 @@
 		}
 
 		&.compacted {
-			/deep/ nb-sidebar-header {
+			::ng-deep nb-sidebar-header {
 				padding-left: 0;
 				padding-right: 0;
 			}
@@ -139,7 +139,7 @@
 		nb-sidebar.menu-sidebar {
 			margin-top: 0;
 
-			/deep/ .main-container {
+			::ng-deep .main-container {
 				height: calc(
 					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
 				) !important;
diff --git a/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss b/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss
index d5fe35b16..f6ee202ce 100644
--- a/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss
@@ -17,7 +17,7 @@
 		&.collapsed {
 			width: 0;
 
-			/deep/ .main-container {
+			::ng-deep .main-container {
 				width: 0;
 
 				.scrollable {
@@ -27,9 +27,9 @@
 			}
 		}
 
-		/deep/ .main-container {
+		::ng-deep .main-container {
 			width: $sidebar-width;
-			background: nb-theme(color-bg);
+			background: nb-theme(background-basic-color-1);
 			transition: width 0.3s ease;
 			overflow: hidden;
 
@@ -38,7 +38,7 @@
 			}
 
 			@include nb-for-theme(cosmic) {
-				background: nb-theme(layout-bg);
+				background: nb-theme(layout-background-color);
 			}
 		}
 	}
@@ -50,24 +50,24 @@
 			margin-top: 0;
 		}
 
-		/deep/ .main-container {
+		::ng-deep .main-container {
 			height: calc(
 				#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
 						sidebar-header-gap
 					)}
 			) !important;
-			@include nb-ltr(border-top-right-radius, nb-theme(radius));
-			@include nb-rtl(border-top-left-radius, nb-theme(radius));
+			@include nb-ltr(border-top-right-radius, nb-theme(border-radius));
+			@include nb-rtl(border-top-left-radius, nb-theme(border-radius));
 
 			@include nb-for-theme(corporate) {
-				border: 1px solid nb-theme(separator);
+				border: 1px solid nb-theme(divider-color);
 				height: calc(
 					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
 				) !important;
 			}
 		}
 
-		/deep/ .scrollable {
+		::ng-deep .scrollable {
 			@include nb-for-theme(corporate) {
 				padding-top: 0;
 
@@ -77,7 +77,7 @@
 			}
 		}
 
-		/deep/ nb-sidebar-header {
+		::ng-deep nb-sidebar-header {
 			padding-bottom: 0.5rem;
 			text-align: center;
 		}
@@ -91,7 +91,7 @@
 			transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
 
 			@include nb-for-theme(corporate) {
-				border-radius: nb-theme(radius);
+				border-radius: nb-theme(border-radius);
 			}
 
 			i {
@@ -110,7 +110,7 @@
 		}
 
 		&.compacted {
-			/deep/ nb-sidebar-header {
+			::ng-deep nb-sidebar-header {
 				padding-left: 0;
 				padding-right: 0;
 			}
@@ -139,7 +139,7 @@
 		nb-sidebar.menu-sidebar {
 			margin-top: 0;
 
-			/deep/ .main-container {
+			::ng-deep .main-container {
 				height: calc(
 					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
 				) !important;
diff --git a/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss b/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss
index 500b750bf..cb2c009c1 100644
--- a/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss
@@ -17,7 +17,7 @@
 		&.collapsed {
 			width: 0;
 
-			/deep/ .main-container {
+			::ng-deep .main-container {
 				width: 0;
 
 				.scrollable {
@@ -27,9 +27,9 @@
 			}
 		}
 
-		/deep/ .main-container {
+		::ng-deep .main-container {
 			width: $sidebar-width;
-			background: nb-theme(color-bg);
+			background: nb-theme(background-basic-color-1);
 			transition: width 0.3s ease;
 			overflow: hidden;
 
@@ -38,7 +38,7 @@
 			}
 
 			@include nb-for-theme(cosmic) {
-				background: nb-theme(layout-bg);
+				background: nb-theme(layout-background-color);
 			}
 		}
 	}
@@ -50,24 +50,24 @@
 			margin-top: 0;
 		}
 
-		/deep/ .main-container {
+		::ng-deep .main-container {
 			height: calc(
 				#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
 						sidebar-header-gap
 					)}
 			) !important;
-			@include nb-ltr(border-top-right-radius, nb-theme(radius));
-			@include nb-rtl(border-top-left-radius, nb-theme(radius));
+			@include nb-ltr(border-top-right-radius, nb-theme(border-radius));
+			@include nb-rtl(border-top-left-radius, nb-theme(border-radius));
 
 			@include nb-for-theme(corporate) {
-				border: 1px solid nb-theme(separator);
+				border: 1px solid nb-theme(divider-color);
 				height: calc(
 					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
 				) !important;
 			}
 		}
 
-		/deep/ .scrollable {
+		::ng-deep .scrollable {
 			@include nb-for-theme(corporate) {
 				padding-top: 0;
 
@@ -77,7 +77,7 @@
 			}
 		}
 
-		/deep/ nb-sidebar-header {
+		::ng-deep nb-sidebar-header {
 			padding-bottom: 0.5rem;
 			text-align: center;
 		}
@@ -91,7 +91,7 @@
 			transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
 
 			@include nb-for-theme(corporate) {
-				border-radius: nb-theme(radius);
+				border-radius: nb-theme(border-radius);
 			}
 
 			i {
@@ -110,7 +110,7 @@
 		}
 
 		&.compacted {
-			/deep/ nb-sidebar-header {
+			::ng-deep nb-sidebar-header {
 				padding-left: 0;
 				padding-right: 0;
 			}
@@ -139,7 +139,7 @@
 		nb-sidebar.menu-sidebar {
 			margin-top: 0;
 
-			/deep/ .main-container {
+			::ng-deep .main-container {
 				height: calc(
 					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
 				) !important;
diff --git a/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss b/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss
index 500b750bf..cb2c009c1 100644
--- a/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss
@@ -17,7 +17,7 @@
 		&.collapsed {
 			width: 0;
 
-			/deep/ .main-container {
+			::ng-deep .main-container {
 				width: 0;
 
 				.scrollable {
@@ -27,9 +27,9 @@
 			}
 		}
 
-		/deep/ .main-container {
+		::ng-deep .main-container {
 			width: $sidebar-width;
-			background: nb-theme(color-bg);
+			background: nb-theme(background-basic-color-1);
 			transition: width 0.3s ease;
 			overflow: hidden;
 
@@ -38,7 +38,7 @@
 			}
 
 			@include nb-for-theme(cosmic) {
-				background: nb-theme(layout-bg);
+				background: nb-theme(layout-background-color);
 			}
 		}
 	}
@@ -50,24 +50,24 @@
 			margin-top: 0;
 		}
 
-		/deep/ .main-container {
+		::ng-deep .main-container {
 			height: calc(
 				#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
 						sidebar-header-gap
 					)}
 			) !important;
-			@include nb-ltr(border-top-right-radius, nb-theme(radius));
-			@include nb-rtl(border-top-left-radius, nb-theme(radius));
+			@include nb-ltr(border-top-right-radius, nb-theme(border-radius));
+			@include nb-rtl(border-top-left-radius, nb-theme(border-radius));
 
 			@include nb-for-theme(corporate) {
-				border: 1px solid nb-theme(separator);
+				border: 1px solid nb-theme(divider-color);
 				height: calc(
 					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
 				) !important;
 			}
 		}
 
-		/deep/ .scrollable {
+		::ng-deep .scrollable {
 			@include nb-for-theme(corporate) {
 				padding-top: 0;
 
@@ -77,7 +77,7 @@
 			}
 		}
 
-		/deep/ nb-sidebar-header {
+		::ng-deep nb-sidebar-header {
 			padding-bottom: 0.5rem;
 			text-align: center;
 		}
@@ -91,7 +91,7 @@
 			transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
 
 			@include nb-for-theme(corporate) {
-				border-radius: nb-theme(radius);
+				border-radius: nb-theme(border-radius);
 			}
 
 			i {
@@ -110,7 +110,7 @@
 		}
 
 		&.compacted {
-			/deep/ nb-sidebar-header {
+			::ng-deep nb-sidebar-header {
 				padding-left: 0;
 				padding-right: 0;
 			}
@@ -139,7 +139,7 @@
 		nb-sidebar.menu-sidebar {
 			margin-top: 0;
 
-			/deep/ .main-container {
+			::ng-deep .main-container {
 				height: calc(
 					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
 				) !important;
diff --git a/admin/website-angular/src/app/@theme/styles/bootstrap-rtl.scss b/admin/website-angular/src/app/@theme/styles/bootstrap-rtl.scss
index 6719faba3..fdfd2b19c 100644
--- a/admin/website-angular/src/app/@theme/styles/bootstrap-rtl.scss
+++ b/admin/website-angular/src/app/@theme/styles/bootstrap-rtl.scss
@@ -1,195 +1,207 @@
 @import './themes';
 .nb-theme-cosmic .whiteDiv {
-  color: white !important;
+	color: white !important;
 }
 @mixin bootstrap-rtl() {
-  .btn-group:not(.btn-divided-group) > .btn:not(.dropdown-toggle) {
-    &:first-child {
-      @include nb-ltr() {
-        border-top-left-radius: nb-theme(btn-border-radius);
-        border-bottom-left-radius: nb-theme(btn-border-radius);
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-      };
-      @include nb-rtl() {
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
-        border-top-right-radius: nb-theme(btn-border-radius);
-        border-bottom-right-radius: nb-theme(btn-border-radius);
-      };
-    }
-    &:last-child {
-      @include nb-ltr() {
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
-        border-top-right-radius: nb-theme(btn-border-radius);
-        border-bottom-right-radius: nb-theme(btn-border-radius);
-      };
-      @include nb-rtl() {
-        border-top-left-radius: nb-theme(btn-border-radius);
-        border-bottom-left-radius: nb-theme(btn-border-radius);
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-      };
-    }
-  }
+	.btn-group:not(.btn-divided-group) > .btn:not(.dropdown-toggle) {
+		&:first-child {
+			@include nb-ltr() {
+				border-top-left-radius: nb-theme(border-radius);
+				border-bottom-left-radius: nb-theme(border-radius);
+				border-top-right-radius: 0;
+				border-bottom-right-radius: 0;
+			}
+			@include nb-rtl() {
+				border-top-left-radius: 0;
+				border-bottom-left-radius: 0;
+				border-top-right-radius: nb-theme(border-radius);
+				border-bottom-right-radius: nb-theme(border-radius);
+			}
+		}
+		&:last-child {
+			@include nb-ltr() {
+				border-top-left-radius: 0;
+				border-bottom-left-radius: 0;
+				border-top-right-radius: nb-theme(border-radius);
+				border-bottom-right-radius: nb-theme(border-radius);
+			}
+			@include nb-rtl() {
+				border-top-left-radius: nb-theme(border-radius);
+				border-bottom-left-radius: nb-theme(border-radius);
+				border-top-right-radius: 0;
+				border-bottom-right-radius: 0;
+			}
+		}
+	}
 
-  .btn-group.dropdown {
-    & > .btn:first-of-type.dropdown-toggle {
-      @include nb-ltr() {
-        border-top-left-radius: nb-theme(btn-border-radius);
-        border-top-right-radius: 0;
-      };
-      @include nb-rtl() {
-        border-top-left-radius: 0;
-        border-top-right-radius: nb-theme(btn-border-radius);
-      };
-    }
-    & > .btn:last-of-type.dropdown-toggle {
-      @include nb-ltr() {
-        border-top-left-radius: 0;
-        border-top-right-radius: nb-theme(btn-border-radius);
-      };
-      @include nb-rtl() {
-        border-top-left-radius: nb-theme(btn-border-radius);
-        border-top-right-radius: 0;
-      };
-    }
+	.btn-group.dropdown {
+		& > .btn:first-of-type.dropdown-toggle {
+			@include nb-ltr() {
+				border-top-left-radius: nb-theme(border-radius);
+				border-top-right-radius: 0;
+			}
+			@include nb-rtl() {
+				border-top-left-radius: 0;
+				border-top-right-radius: nb-theme(border-radius);
+			}
+		}
+		& > .btn:last-of-type.dropdown-toggle {
+			@include nb-ltr() {
+				border-top-left-radius: 0;
+				border-top-right-radius: nb-theme(border-radius);
+			}
+			@include nb-rtl() {
+				border-top-left-radius: nb-theme(border-radius);
+				border-top-right-radius: 0;
+			}
+		}
 
-    &:not(.show) {
-      & > .btn:first-of-type.dropdown-toggle {
-        @include nb-ltr() {
-          border-bottom-left-radius: nb-theme(btn-border-radius);
-          border-bottom-right-radius: 0;
-        };
-        @include nb-rtl() {
-          border-bottom-left-radius: 0;
-          border-bottom-right-radius: nb-theme(btn-border-radius);
-        };
-      }
-      & > .btn:last-of-type.dropdown-toggle {
-        @include nb-ltr() {
-          border-bottom-left-radius: 0;
-          border-bottom-right-radius: nb-theme(btn-border-radius);
-        };
-        @include nb-rtl() {
-          border-bottom-left-radius: nb-theme(btn-border-radius);
-          border-bottom-right-radius: 0;
-        };
-      }
-    }
-  }
+		&:not(.show) {
+			& > .btn:first-of-type.dropdown-toggle {
+				@include nb-ltr() {
+					border-bottom-left-radius: nb-theme(border-radius);
+					border-bottom-right-radius: 0;
+				}
+				@include nb-rtl() {
+					border-bottom-left-radius: 0;
+					border-bottom-right-radius: nb-theme(border-radius);
+				}
+			}
+			& > .btn:last-of-type.dropdown-toggle {
+				@include nb-ltr() {
+					border-bottom-left-radius: 0;
+					border-bottom-right-radius: nb-theme(border-radius);
+				}
+				@include nb-rtl() {
+					border-bottom-left-radius: nb-theme(border-radius);
+					border-bottom-right-radius: 0;
+				}
+			}
+		}
+	}
 
-  .btn-group.dropup {
-    & > .btn:first-of-type.dropdown-toggle {
-      @include nb-ltr() {
-        border-bottom-left-radius: nb-theme(btn-border-radius);
-        border-bottom-right-radius: 0;
-      };
-      @include nb-rtl() {
-        border-bottom-left-radius: 0;
-        border-bottom-right-radius: nb-theme(btn-border-radius);
-      };
-    }
-    & > .btn:last-of-type.dropdown-toggle {
-      @include nb-ltr() {
-        border-bottom-left-radius: 0;
-        border-bottom-right-radius: nb-theme(btn-border-radius);
-      };
-      @include nb-rtl() {
-        border-bottom-left-radius: nb-theme(btn-border-radius);
-        border-bottom-right-radius: 0;
-      };
-    }
+	.btn-group.dropup {
+		& > .btn:first-of-type.dropdown-toggle {
+			@include nb-ltr() {
+				border-bottom-left-radius: nb-theme(border-radius);
+				border-bottom-right-radius: 0;
+			}
+			@include nb-rtl() {
+				border-bottom-left-radius: 0;
+				border-bottom-right-radius: nb-theme(border-radius);
+			}
+		}
+		& > .btn:last-of-type.dropdown-toggle {
+			@include nb-ltr() {
+				border-bottom-left-radius: 0;
+				border-bottom-right-radius: nb-theme(border-radius);
+			}
+			@include nb-rtl() {
+				border-bottom-left-radius: nb-theme(border-radius);
+				border-bottom-right-radius: 0;
+			}
+		}
 
-    &:not(.show) {
-      & > .btn:first-of-type.dropdown-toggle {
-        @include nb-ltr() {
-          border-top-left-radius: nb-theme(btn-border-radius);
-          border-top-right-radius: 0;
-        };
-        @include nb-rtl() {
-          border-top-left-radius: 0;
-          border-top-right-radius: nb-theme(btn-border-radius);
-        };
-      }
-      & > .btn:last-of-type.dropdown-toggle {
-        @include nb-ltr() {
-          border-top-left-radius: 0;
-          border-top-right-radius: nb-theme(btn-border-radius);
-        };
-        @include nb-rtl() {
-          border-top-left-radius: nb-theme(btn-border-radius);
-          border-top-right-radius: 0;
-        };
-      }
-    }
-  }
+		&:not(.show) {
+			& > .btn:first-of-type.dropdown-toggle {
+				@include nb-ltr() {
+					border-top-left-radius: nb-theme(border-radius);
+					border-top-right-radius: 0;
+				}
+				@include nb-rtl() {
+					border-top-left-radius: 0;
+					border-top-right-radius: nb-theme(border-radius);
+				}
+			}
+			& > .btn:last-of-type.dropdown-toggle {
+				@include nb-ltr() {
+					border-top-left-radius: 0;
+					border-top-right-radius: nb-theme(border-radius);
+				}
+				@include nb-rtl() {
+					border-top-left-radius: nb-theme(border-radius);
+					border-top-right-radius: 0;
+				}
+			}
+		}
+	}
 
-  .btn-divided-group {
-    .btn:not(:first-child) {
-      @include nb-ltr(margin-left, 0.5rem);
-      @include nb-rtl(margin-right, 0.5rem);
-      border-radius: nb-theme(btn-border-radius);
-    }
-  }
+	.btn-divided-group {
+		.btn:not(:first-child) {
+			@include nb-ltr(margin-left, 0.5rem);
+			@include nb-rtl(margin-right, 0.5rem);
+			border-radius: nb-theme(border-radius);
+		}
+	}
 
-  .input-group-addon,
-  .input-group-icon {
-    @include nb-ltr() {
-      border-left: nb-theme(form-control-border);
-      border-right: none;
-    };
-    @include nb-rtl() {
-      border-left: none;
-      border-right: nb-theme(form-control-border);
-    };
-  }
+	.input-group-addon,
+	.input-group-icon {
+		@include nb-ltr() {
+			border-left: nb-theme(input-border-width);
+			border-right: none;
+		}
+		@include nb-rtl() {
+			border-left: none;
+			border-right: nb-theme(input-border-width);
+		}
+	}
 
-  .input-group {
-    .form-control:first-child:not(:only-child),
-    .input-group-addon:first-child,
-    .input-group-prepend .btn:first-child,
-    .input-group-btn .btn:first-child {
-      @include nb-ltr() {
-        border-top-left-radius: nb-theme(form-control-border-radius);
-        border-bottom-left-radius: nb-theme(form-control-border-radius);
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-      };
-      @include nb-rtl() {
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
-        border-top-right-radius: nb-theme(form-control-border-radius);
-        border-bottom-right-radius: nb-theme(form-control-border-radius);
-      };
-    }
-    .form-control:last-child:not(:only-child),
-    .input-group-addon:last-child,
-    .input-group-append .btn:last-child,
-    .input-group-btn .btn:last-child {
-      @include nb-ltr() {
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
-        border-top-right-radius: nb-theme(form-control-border-radius);
-        border-bottom-right-radius: nb-theme(form-control-border-radius);
-      };
-      @include nb-rtl() {
-        border-top-left-radius: nb-theme(form-control-border-radius);
-        border-bottom-left-radius: nb-theme(form-control-border-radius);
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-      };
-    }
+	.input-group {
+		.form-control:first-child:not(:only-child),
+		.input-group-addon:first-child,
+		.input-group-prepend .btn:first-child,
+		.input-group-btn .btn:first-child {
+			@include nb-ltr() {
+				border-top-left-radius: nb-theme(input-rectangle-border-radius);
+				border-bottom-left-radius: nb-theme(
+					input-rectangle-border-radius
+				);
+				border-top-right-radius: 0;
+				border-bottom-right-radius: 0;
+			}
+			@include nb-rtl() {
+				border-top-left-radius: 0;
+				border-bottom-left-radius: 0;
+				border-top-right-radius: nb-theme(
+					input-rectangle-border-radius
+				);
+				border-bottom-right-radius: nb-theme(
+					input-rectangle-border-radius
+				);
+			}
+		}
+		.form-control:last-child:not(:only-child),
+		.input-group-addon:last-child,
+		.input-group-append .btn:last-child,
+		.input-group-btn .btn:last-child {
+			@include nb-ltr() {
+				border-top-left-radius: 0;
+				border-bottom-left-radius: 0;
+				border-top-right-radius: nb-theme(
+					input-rectangle-border-radius
+				);
+				border-bottom-right-radius: nb-theme(
+					input-rectangle-border-radius
+				);
+			}
+			@include nb-rtl() {
+				border-top-left-radius: nb-theme(input-rectangle-border-radius);
+				border-bottom-left-radius: nb-theme(
+					input-rectangle-border-radius
+				);
+				border-top-right-radius: 0;
+				border-bottom-right-radius: 0;
+			}
+		}
 
-    .dropdown.show .btn.dropdown-toggle {
-      border-bottom-left-radius: 0;
-      border-bottom-right-radius: 0;
-    }
+		.dropdown.show .btn.dropdown-toggle {
+			border-bottom-left-radius: 0;
+			border-bottom-right-radius: 0;
+		}
 
-    .dropup.show .btn.dropdown-toggle {
-      border-top-left-radius: 0;
-      border-top-right-radius: 0;
-    }
-  }
+		.dropup.show .btn.dropdown-toggle {
+			border-top-left-radius: 0;
+			border-top-right-radius: 0;
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/@theme/styles/everdark.theme.scss b/admin/website-angular/src/app/@theme/styles/everdark.theme.scss
index f8258850d..5ef1bb2bd 100644
--- a/admin/website-angular/src/app/@theme/styles/everdark.theme.scss
+++ b/admin/website-angular/src/app/@theme/styles/everdark.theme.scss
@@ -60,7 +60,7 @@ $nb-themes: nb-register-theme(
 		// text
 			color-fg-text: #8b8b8b,
 		color-fg: #8b8b8b,
-		color-fg-highlight: white,
+		text-hint-color: white,
 		card-header-fg: #8b8b8b,
 		footer-fg: #8b8b8b,
 		link-color: white !important,
diff --git a/admin/website-angular/src/app/@theme/styles/everlight.theme.scss b/admin/website-angular/src/app/@theme/styles/everlight.theme.scss
index 6319c02cd..1a66d2e31 100644
--- a/admin/website-angular/src/app/@theme/styles/everlight.theme.scss
+++ b/admin/website-angular/src/app/@theme/styles/everlight.theme.scss
@@ -5,7 +5,7 @@ $dark: hsl(234, 26, 25);
 $nb-themes: nb-register-theme(
 	(
 		color-success: #47d26f,
-		color-fg-highlight: #47d26f,
+		text-hint-color: #47d26f,
 		color-primary: #888,
 		color-danger: #ce4843,
 		color-info: #888,
diff --git a/admin/website-angular/src/app/@theme/styles/pace.theme.scss b/admin/website-angular/src/app/@theme/styles/pace.theme.scss
index e3bc9b62e..73e167936 100644
--- a/admin/website-angular/src/app/@theme/styles/pace.theme.scss
+++ b/admin/website-angular/src/app/@theme/styles/pace.theme.scss
@@ -4,19 +4,19 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
 
- @mixin ngx-pace-theme() {
+@mixin ngx-pace-theme() {
+	.pace .pace-progress {
+		background: nb-theme(text-hint-color);
+	}
 
-  .pace .pace-progress {
-    background: nb-theme(color-fg-highlight);
-  }
+	.pace .pace-progress-inner {
+		box-shadow: 0 0 10px nb-theme(text-hint-color),
+			0 0 5px nb-theme(text-hint-color);
+	}
 
-  .pace .pace-progress-inner {
-    box-shadow: 0 0 10px nb-theme(color-fg-highlight), 0 0 5px nb-theme(color-fg-highlight);
-  }
-
-  .pace .pace-activity {
-    display: none;
-    // border-top-color: nb-theme(color-fg-highlight);
-    // border-left-color: nb-theme(color-fg-highlight);
-  }
+	.pace .pace-activity {
+		display: none;
+		// border-top-color: nb-theme(text-hint-color);
+		// border-left-color: nb-theme(text-hint-color);
+	}
 }
diff --git a/admin/website-angular/src/app/@theme/styles/themes.scss b/admin/website-angular/src/app/@theme/styles/themes.scss
index 3927d91c3..43d1c2568 100644
--- a/admin/website-angular/src/app/@theme/styles/themes.scss
+++ b/admin/website-angular/src/app/@theme/styles/themes.scss
@@ -8,6 +8,7 @@ $nb-enabled-themes: (default, cosmic, corporate, everlight, everdark);
 
 $nb-themes: nb-register-theme(
 	(
+		padding: 1.25rem,
 		// app wise variables for each theme
 			sidebar-header-gap: 2rem,
 		sidebar-header-height: initial,
diff --git a/admin/website-angular/src/app/@theme/theme.module.ts b/admin/website-angular/src/app/@theme/theme.module.ts
index a8d0229ae..b6aa9835a 100644
--- a/admin/website-angular/src/app/@theme/theme.module.ts
+++ b/admin/website-angular/src/app/@theme/theme.module.ts
@@ -52,6 +52,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { AdminsService } from '../@core/data/admins.service';
 import { PipesModule } from '@modules/client.common.angular2/pipes/pipes.module';
+import { NbEvaIconsModule } from '@nebular/eva-icons';
 
 export function HttpLoaderFactory(http: HttpClient) {
 	return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -117,6 +118,7 @@ const NB_THEME_PROVIDERS = [
 	imports: [
 		...BASE_MODULES,
 		...NB_MODULES,
+		NbEvaIconsModule,
 		HttpClientModule,
 		TranslateModule.forChild({
 			loader: {
diff --git a/admin/website-angular/src/app/app.module.ts b/admin/website-angular/src/app/app.module.ts
index 3a5e29e35..46f0bfad1 100644
--- a/admin/website-angular/src/app/app.module.ts
+++ b/admin/website-angular/src/app/app.module.ts
@@ -30,6 +30,7 @@ import { AppModuleGuard } from './app.module.guard';
 import { MaintenanceModuleGuard } from './pages/+maintenance-info/maintenance-info.module.guard';
 import { first } from 'rxjs/operators';
 import { ServerConnectionService } from '@modules/client.common.angular2/services/server-connection.service';
+import { NbEvaIconsModule } from '@nebular/eva-icons';
 
 // It's more 'standard' way to use Font-Awesome module and special package,
 // but for some reason ngx-admin works without it. So we leave next line commented for now.
@@ -47,6 +48,7 @@ import { ServerConnectionService } from '@modules/client.common.angular2/service
 		AppRoutingModule,
 		ApolloModule,
 		HttpLinkModule,
+		NbEvaIconsModule,
 		TranslateModule.forRoot({
 			loader: {
 				provide: TranslateLoader,
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts
index 17e4fcab6..69f4a36d9 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts
@@ -15,10 +15,10 @@ import { first, map, switchMap } from 'rxjs/operators';
 	styleUrls: ['./carrier-edit.component.scss']
 })
 export class CarrierEditComponent implements OnInit {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
index b0bdf0459..289071116 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
@@ -26,7 +26,7 @@ export class CarrierMapComponent {
 	private ngDestroy$ = new Subject();
 	public carrierId: string;
 
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-history/carrier-orders-history.component.scss b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-history/carrier-orders-history.component.scss
index 39834b297..d4339bbb6 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-history/carrier-orders-history.component.scss
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-history/carrier-orders-history.component.scss
@@ -1,7 +1,6 @@
 @import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
-
 	/*@include nb-for-theme(default) {
 		.header-color {
 			color: rgb(24, 22, 22);
@@ -24,12 +23,13 @@
 		padding: 0;
 	}
 
-	/deep/ ng2-smart-table {
+	::ng-deep ng2-smart-table {
 		th {
 			border-top: 0;
 		}
 
-		th, td {
+		th,
+		td {
 			&:first-of-type {
 				border-left: none;
 			}
@@ -39,10 +39,10 @@
 		}
 
 		tr:last-of-type {
-			th, td {
+			th,
+			td {
 				border-bottom: none;
 			}
 		}
 	}
-
 }
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders/carrier-orders.component.scss b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders/carrier-orders.component.scss
index a69ae111e..f9bf7fd81 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders/carrier-orders.component.scss
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders/carrier-orders.component.scss
@@ -1,7 +1,6 @@
 @import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
-
 	/*@include nb-for-theme(default) {
 		.header-color {
 			color: rgb(24, 22, 22);
@@ -24,12 +23,13 @@
 		padding: 0;
 	}
 
-	/deep/ ng2-smart-table {
+	::ng-deep ng2-smart-table {
 		th {
 			border-top: 0;
 		}
 
-		th, td {
+		th,
+		td {
 			&:first-of-type {
 				border-left: none;
 			}
@@ -39,15 +39,15 @@
 		}
 
 		tr:last-of-type {
-			th, td {
+			th,
+			td {
 				border-bottom: none;
 			}
 		}
-  }
-
-  .carrier-buttons{
-    width: 100%;
-    margin: 0; 
-  }
+	}
 
+	.carrier-buttons {
+		width: 100%;
+		margin: 0;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
index f7c2bcb55..ff6ce2397 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
@@ -19,7 +19,7 @@ import { CarrierOrdersComponent } from './carrier-orders/carrier-orders.componen
 	styleUrls: ['./carrier.component.scss']
 })
 export class CarrierComponent implements OnInit, OnDestroy {
-	@ViewChild('carrierOrders', { static: false })
+	@ViewChild('carrierOrders', { static: true })
 	public carrierOrders: CarrierOrdersComponent;
 
 	private ngDestroy$ = new Subject();
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.scss b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.scss
index 740cd128e..379ec92c6 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.scss
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.scss
@@ -5,7 +5,7 @@
 		padding: 0;
 	}
 
-	/deep/ .leaflet-container {
+	::ng-deep .leaflet-container {
 		width: 100%;
 		height: nb-theme(card-height-large);
 	}
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
index d5ec41ed0..f8c771261 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
@@ -22,7 +22,7 @@ const directionsService = new google.maps.DirectionsService();
 export class CarrierLocationComponent implements OnDestroy, OnInit {
 	private ngDestroy$ = new Subject();
 
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.scss b/admin/website-angular/src/app/pages/+carriers/carriers.component.scss
index 4deaec4b8..52c4e4cc3 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.scss
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.scss
@@ -8,7 +8,7 @@ nb-card-body {
 	border-bottom-right-radius: 0.5rem;
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	tr {
 		th {
 			padding: 18px !important;
@@ -51,6 +51,6 @@ nb-card-body {
 	}
 }
 
-:host /deep/ ng2-smart-table .carrier-image {
+:host ::ng-deep ng2-smart-table .carrier-image {
 	width: 74px;
 }
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
index 127c9f13d..d75c0eeb1 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
@@ -20,7 +20,7 @@ const perPage = 5;
 	styleUrls: ['carriers.component.scss']
 })
 export class CarriersComponent implements OnDestroy, AfterViewInit {
-	@ViewChild('carriersTable', { static: false })
+	@ViewChild('carriersTable', { static: true })
 	carriersTable: CarriersSmartTableComponent;
 
 	loading: boolean;
diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
index e0e0f9136..d95726f80 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
@@ -34,7 +34,7 @@ export class CarrierTrackingComponent implements OnInit, OnDestroy {
 	private ngDestroy$ = new Subject();
 	public carrierId: string;
 
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts
index 3f1bc4b61..c53efd8dd 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts
@@ -14,10 +14,10 @@ import User from '@modules/server.common/entities/User';
 	styleUrls: ['./customer-edit.component.scss']
 })
 export class CustomerEditComponent implements OnInit {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.scss b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.scss
index 6e975b7ae..12ea87610 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.scss
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.scss
@@ -1,16 +1,14 @@
 @import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
-
 	nb-card-body {
 		padding: 0;
 	}
 
-	/deep/ .leaflet-container {
+	::ng-deep .leaflet-container {
 		width: 100%;
 		height: nb-theme(card-height-large);
 	}
-
 }
 
 .header-color {
@@ -21,4 +19,4 @@
 .googleMap {
 	width: 100%;
 	height: 200px !important;
-}
\ No newline at end of file
+}
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
index 62a21addd..88f2cea4c 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
@@ -10,7 +10,7 @@ declare var google: any;
 	templateUrl: './ea-customer-location.component.html'
 })
 export class CustomerLocationComponent implements OnDestroy, OnInit {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 	marker: any;
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-orders/ea-customer-orders.component.scss b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-orders/ea-customer-orders.component.scss
index db0a5a6a9..3ef0b79eb 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-orders/ea-customer-orders.component.scss
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-orders/ea-customer-orders.component.scss
@@ -16,7 +16,7 @@
 		padding: 0;
 	}
 
-	/deep/ ng2-smart-table {
+	::ng-deep ng2-smart-table {
 		.redirectBtn {
 			font-size: 0.9em !important;
 			text-align: left !important;
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/custom-order/custom-order.component.scss b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/custom-order/custom-order.component.scss
index dee61a660..81d7efa51 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/custom-order/custom-order.component.scss
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/custom-order/custom-order.component.scss
@@ -1,15 +1,15 @@
-:host /deep/ .modal-footer .btn-primary {
+:host ::ng-deep .modal-footer .btn-primary {
 	background-color: #111111 !important;
 	border: none !important;
 	color: white !important;
 	cursor: pointer !important;
 }
 
-:host /deep/ .modal-footer .btn-primary:hover {
+:host ::ng-deep .modal-footer .btn-primary:hover {
 	background-color: #bebebe !important;
 	color: #111111 !important;
 }
-:host /deep/ .modal-footer .btn-neutral {
+:host ::ng-deep .modal-footer .btn-neutral {
 	background-color: #111111;
 	color: #ffffff;
 }
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products.scss b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products.scss
index b2fd2a31b..26d9d80f1 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products.scss
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products.scss
@@ -17,7 +17,7 @@
 		padding: 0;
 	}
 
-	/deep/ ng2-smart-table {
+	::ng-deep ng2-smart-table {
 		.redirectBtn {
 			font-size: 0.9em !important;
 			text-align: left !important;
@@ -25,7 +25,7 @@
 		}
 	}
 
-	/deep/ .productBtn {
+	::ng-deep .productBtn {
 		cursor: pointer;
 
 		&:hover {
@@ -40,7 +40,7 @@
 		}
 	}
 
-	/deep/ .warhouseBtn {
+	::ng-deep .warhouseBtn {
 		cursor: pointer;
 
 		&:hover {
@@ -49,7 +49,7 @@
 		}
 	}
 
-	/deep/ .btn {
+	::ng-deep .btn {
 		-moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
 		-webkit-box-shadow: inset 0px 1px 0px 0px #ffffff;
 		box-shadow: inset 0px 1px 0px 0px #ffffff;
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.scss b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.scss
index bdfde283e..26a571686 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.scss
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.scss
@@ -17,7 +17,7 @@
 		padding: 0;
 	}
 
-	/deep/ ng2-smart-table {
+	::ng-deep ng2-smart-table {
 		.redirectBtn {
 			font-size: 0.9em !important;
 			text-align: left !important;
@@ -25,7 +25,7 @@
 		}
 	}
 
-	/deep/ .productBtn {
+	::ng-deep .productBtn {
 		cursor: pointer;
 
 		&:hover {
@@ -40,7 +40,7 @@
 		}
 	}
 
-	/deep/ .warhouseBtn {
+	::ng-deep .warhouseBtn {
 		cursor: pointer;
 
 		&:hover {
@@ -49,7 +49,7 @@
 		}
 	}
 
-	/deep/ .btn {
+	::ng-deep .btn {
 		-moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
 		-webkit-box-shadow: inset 0px 1px 0px 0px #ffffff;
 		box-shadow: inset 0px 1px 0px 0px #ffffff;
diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.scss b/admin/website-angular/src/app/pages/+customers/customers.component.scss
index c2fc50cb7..6232ac676 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.component.scss
+++ b/admin/website-angular/src/app/pages/+customers/customers.component.scss
@@ -8,7 +8,7 @@ nb-card-body {
 	border-bottom-right-radius: 0.5rem;
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	tr {
 		th {
 			padding: 18px !important;
@@ -52,6 +52,6 @@ nb-card-body {
 	}
 }
 
-:host /deep/ ng2-smart-table .customer-image {
+:host ::ng-deep ng2-smart-table .customer-image {
 	width: 74px;
 }
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss
index 0029e00e9..b729c0313 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss
@@ -46,12 +46,12 @@
 		ea-legend-chart {
 			align-self: flex-start;
 
-			/deep/ .legends {
+			::ng-deep .legends {
 				padding-left: 0;
-				font-size: nb-theme(font-size-sm);
+				font-size: nb-theme(text-heading-6-font-size);
 			}
 
-			/deep/ .legend {
+			::ng-deep .legend {
 				margin-left: 1rem;
 			}
 		}
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
index c5ad4bcb4..d1a03149a 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
@@ -48,7 +48,7 @@ export class ChartPanelHeaderComponent implements OnInit, OnDestroy {
 		daysDiff: number;
 	}>();
 
-	@ViewChild('customDateRangeButton', { static: false })
+	@ViewChild('customDateRangeButton', { static: true })
 	customDateRangeButton: ElementRef;
 
 	isDateRangeSelected = false;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
index 5d541957e..c5acec27d 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
@@ -23,7 +23,7 @@
 
 	.value {
 		font-size: 2rem;
-		color: nb-theme(color-fg-heading);
+		color: nb-theme(text-basic-color);
 
 		span div small {
 			font-size: 0.5em;
@@ -34,22 +34,23 @@
 	@include media-breakpoint-down(sm) {
 		.value,
 		.title {
-			font-weight: nb-theme(font-weight-bold);
+			font-weight: nb-theme(text-heading-2-font-weight);
 		}
 
 		.title {
-			font-size: nb-theme(font-size-sm);
+			font-size: nb-theme(text-heading-6-font-size);
 		}
 
 		.value {
-			font-size: nb-theme(font-size-xlg);
+			font-size: nb-theme(text-heading-1-font-size);
 		}
 	}
 
 	@include media-breakpoint-down(is) {
 		.summary-container {
-			padding-left: nb-theme(padding);
-			padding-right: nb-theme(padding);
+			// TODO get padding form the theme
+			padding-left: 1.25rem;
+			padding-right: 1.25rem;
 		}
 
 		.value {
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.scss
index 2e2de06e5..4cf8b654f 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.scss
@@ -5,7 +5,7 @@ $legend-payment-color: #6935ca;
 $legend-canceled-color: #3f4fda;
 
 @include nb-install-component() {
-	/deep/ nb-tabset {
+	::ng-deep nb-tabset {
 		display: flex;
 		flex-direction: column;
 		flex: 1;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
index 47a2447d5..18ac63716 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
@@ -40,11 +40,11 @@ export class ChartsPanelComponent implements OnInit, OnDestroy {
 	ordersChartData: OrdersChart;
 	profitChartData: ProfitChart;
 
-	@ViewChild('ordersChart', { static: false })
+	@ViewChild('ordersChart', { static: true })
 	ordersChart: OrdersChartComponent;
-	@ViewChild('profitChart', { static: false })
+	@ViewChild('profitChart', { static: true })
 	profitChart: ProfitChartComponent;
-	@ViewChild('ordersProfitTab', { static: false })
+	@ViewChild('ordersProfitTab', { static: true })
 	ordersProfitTab: any;
 
 	private _ordersToday: IOrdersChartModel;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss
index a15f0206d..10c85df38 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss
@@ -6,7 +6,7 @@
 	.legends {
 		display: flex;
 		@include nb-rtl(flex-direction, row-reverse);
-		color: nb-theme(color-fg);
+		color: nb-theme(text-basic-color);
 		padding: 0 0 0 2.85rem;
 	}
 
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
index 0acac61aa..efdc8e4f2 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
@@ -4,7 +4,7 @@ $shadow-green: #00977e;
 
 @include nb-install-component() {
 	.progress-info {
-		color: nb-theme(color-fg-heading);
+		color: nb-theme(text-basic-color);
 		margin-top: 2.5rem;
 
 		&:first-child {
@@ -14,22 +14,22 @@ $shadow-green: #00977e;
 
 	.title {
 		font-family: nb-theme(font-secondary);
-		font-size: nb-theme(font-size-lg);
-		font-weight: nb-theme(font-weight-bold);
+		font-size: nb-theme(text-heading-6-font-size);
+		font-weight: nb-theme(text-heading-1-font-weight);
 	}
 
 	.value {
-		font-size: 3rem;
-		font-weight: nb-theme(font-weight-light);
+		font-size: 2rem;
+		font-weight: nb-theme(text-subtitle-font-weight);
 		margin-top: 0.5rem;
 	}
 
 	.description {
-		color: nb-theme(color-fg);
+		color: nb-theme(text-basic-color);
 		margin-top: 0.5rem;
 	}
 
-	/deep/ nb-progress-bar {
+	::ng-deep nb-progress-bar {
 		margin-top: 0.2rem;
 
 		.progress-container {
diff --git a/admin/website-angular/src/app/pages/+device/device.component.scss b/admin/website-angular/src/app/pages/+device/device.component.scss
index 686119f04..4155bed66 100644
--- a/admin/website-angular/src/app/pages/+device/device.component.scss
+++ b/admin/website-angular/src/app/pages/+device/device.component.scss
@@ -10,7 +10,7 @@ nb-card-body {
 	border-bottom-right-radius: 0.5rem;
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	tr.ng2-smart-titles > th:nth-child(1) {
 		text-align: center;
 		cursor: pointer;
diff --git a/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.scss b/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.scss
index 43f826187..e11e9c84c 100644
--- a/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.scss
+++ b/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.scss
@@ -1,4 +1,4 @@
-:host /deep/ .order-product ng2-smart-table {
+:host ::ng-deep .order-product ng2-smart-table {
 	.ng2-smart-th.qty input {
 		text-align: center;
 	}
diff --git a/admin/website-angular/src/app/pages/+products/+categories/categories.component.scss b/admin/website-angular/src/app/pages/+products/+categories/categories.component.scss
index 496f85ffa..cfff344cd 100644
--- a/admin/website-angular/src/app/pages/+products/+categories/categories.component.scss
+++ b/admin/website-angular/src/app/pages/+products/+categories/categories.component.scss
@@ -8,7 +8,7 @@ nb-card-body {
 	border-bottom-right-radius: 0.5rem;
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	tr {
 		td:nth-child(1),
 		th:nth-child(1) {
diff --git a/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts b/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
index 49c1ab60d..3d6fea288 100644
--- a/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
+++ b/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
@@ -15,7 +15,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	styleUrls: ['/categories.component.scss']
 })
 export class CategoriesComponent implements OnDestroy {
-	@ViewChild('categoriesTable', { static: false })
+	@ViewChild('categoriesTable', { static: true })
 	categoriesTable: CategoriesTableComponent;
 
 	protected settingsSmartTable: object;
diff --git a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
index abc3a1c2d..82a1d27bc 100644
--- a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
@@ -17,7 +17,7 @@ import 'rxjs/add/operator/switchMap';
 export class ProductEditComponent implements OnInit, OnDestroy {
 	private ngDestroy$ = new Subject<void>();
 
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	public basicInfoForm: BasicInfoFormComponent;
 
 	public readonly form: FormGroup = this.formBuilder.group({
diff --git a/admin/website-angular/src/app/pages/+products/products.component.scss b/admin/website-angular/src/app/pages/+products/products.component.scss
index 845fbcc25..91361b5be 100644
--- a/admin/website-angular/src/app/pages/+products/products.component.scss
+++ b/admin/website-angular/src/app/pages/+products/products.component.scss
@@ -8,7 +8,7 @@ nb-card-body {
 	border-bottom-right-radius: 0.5rem;
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	tr {
 		th {
 			padding: 18px !important;
diff --git a/admin/website-angular/src/app/pages/+products/products.component.ts b/admin/website-angular/src/app/pages/+products/products.component.ts
index 8ec304d19..499b5ba43 100644
--- a/admin/website-angular/src/app/pages/+products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+products/products.component.ts
@@ -18,7 +18,7 @@ const perPage = 5;
 	styleUrls: ['/products.component.scss']
 })
 export class ProductsComponent implements OnDestroy, AfterViewInit {
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	protected productsTable: ProductsTableComponent;
 
 	public productsCategories: any;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
index 041c42527..8b478336b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
@@ -7,7 +7,7 @@ import { NgForm } from '@angular/forms';
 	styleUrls: ['./account.component.scss']
 })
 export class SetupMerchantAccountComponent {
-	@ViewChild('accountForm', { static: false })
+	@ViewChild('accountForm', { static: true })
 	accountForm: NgForm;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index 40ceec21c..013db56fe 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -19,10 +19,10 @@ import { getDummyImage } from '@modules/server.common/utils';
 	styleUrls: ['./basic-info.component.scss']
 })
 export class SetupMerchantBasicInfoComponent implements OnInit, OnDestroy {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: NgForm;
 
-	@ViewChild('name', { static: false })
+	@ViewChild('name', { static: true })
 	name: NgModel;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
index 3da546ea1..81c1e7c54 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
@@ -7,7 +7,7 @@ import { NgForm } from '@angular/forms';
 	styleUrls: ['./contact-info.component.scss']
 })
 export class SetupMerchantContactInfoComponent {
-	@ViewChild('contactInfoForm', { static: false })
+	@ViewChild('contactInfoForm', { static: true })
 	contactInfoForm: NgForm;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
index 61e9b5151..595d698a1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
@@ -8,7 +8,7 @@ import { FormBuilder } from '@angular/forms';
 	styleUrls: ['./location.component.scss']
 })
 export class SetupMerchantLocationComponent {
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
index b84fda026..f7ac0fec2 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
@@ -12,7 +12,7 @@ import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaym
 	templateUrl: './payPal-gateway.component.html'
 })
 export class PayPalGatewayComponent implements OnChanges {
-	@ViewChild('payPalConfigForm', { static: false })
+	@ViewChild('payPalConfigForm', { static: true })
 	payPalConfigForm: NgForm;
 
 	isPayPalEnabled: boolean;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index 3c75c97ff..0a2e89f3f 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -11,10 +11,10 @@ import { first } from 'rxjs/operators';
 	templateUrl: './payment-gateways.component.html'
 })
 export class PaymentGatewaysComponent {
-	@ViewChild('stripeGateway', { static: false })
+	@ViewChild('stripeGateway', { static: true })
 	stripeGateway: StripeGatewayComponent;
 
-	@ViewChild('payPalGateway', { static: false })
+	@ViewChild('payPalGateway', { static: true })
 	payPalGateway: PayPalGatewayComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index a78802901..bca5c1b0e 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -15,7 +15,7 @@ import { Subject } from 'rxjs';
 	templateUrl: './stripe-gateway.component.html'
 })
 export class StripeGatewayComponent implements OnChanges {
-	@ViewChild('stripeConfigForm', { static: false })
+	@ViewChild('stripeConfigForm', { static: true })
 	stripeConfigForm: NgForm;
 
 	isStripeEnabled: boolean;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
index adbb901e8..db1f7a479 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -15,7 +15,7 @@ import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaym
 	styleUrls: ['./payments.component.scss']
 })
 export class SetupMerchantPaymentsComponent {
-	@ViewChild('paymentGateways', { static: false })
+	@ViewChild('paymentGateways', { static: true })
 	paymentGateways: PaymentGatewaysComponent;
 	@Output()
 	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
index 30230883d..a0d64decb 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
@@ -14,10 +14,10 @@ import { CategoriesTableComponent } from 'app/@shared/product/categories/categor
 	styleUrls: ['./product-categories.component.scss']
 })
 export class SetupMerchantProductCategoriesComponent {
-	@ViewChild('basicInfo', { static: false })
+	@ViewChild('basicInfo', { static: true })
 	basicInfo: BasicInfoFormComponent;
 
-	@ViewChild('categoriesTable', { static: false })
+	@ViewChild('categoriesTable', { static: true })
 	categoriesTable: CategoriesTableComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
index 642860c29..7f9bceb65 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
@@ -17,7 +17,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	templateUrl: './add-products.component.html'
 })
 export class SetupMerchantAddProductsComponent implements OnInit {
-	@ViewChild('addWarehouseProductsTable', { static: false })
+	@ViewChild('addWarehouseProductsTable', { static: true })
 	addWarehouseProductsTable: AddWarehouseProductsComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
index 0a06ef1b8..92408777c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
@@ -21,7 +21,7 @@ import Product from '@modules/server.common/entities/Product';
 	templateUrl: './product-mutation.component.html'
 })
 export class SetupMerchantProductMutationComponent {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
index d0d0f75d7..f36e39371 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
@@ -10,7 +10,7 @@ import { Subject } from 'rxjs';
 })
 export class SetupMerchantProductsCatalogComponent
 	implements OnInit, OnDestroy {
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	productsTable: ProductsTableComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index 54e144771..8411083b7 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -26,13 +26,13 @@ import { Router } from '@angular/router';
 	styleUrls: ['./products.component.scss']
 })
 export class SetupMerchantProductsComponent implements OnChanges, OnDestroy {
-	@ViewChild('productsCatalog', { static: false })
+	@ViewChild('productsCatalog', { static: true })
 	productsCatalog: SetupMerchantProductsCatalogComponent;
-	@ViewChild('addProducts', { static: false })
+	@ViewChild('addProducts', { static: true })
 	addProducts: SetupMerchantAddProductsComponent;
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	productsTable: WarehouseProductsComponent;
-	@ViewChild('productMutation', { static: false })
+	@ViewChild('productMutation', { static: true })
 	productMutation: SetupMerchantProductMutationComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
index 6fbe200db..9c9bb5fbe 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
@@ -16,7 +16,7 @@ import { first } from 'rxjs/operators';
 })
 export class SetupMerchantAddNewCarrierComponent
 	implements AfterViewInit, OnInit {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index 472f08021..3adeffd3b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -24,11 +24,11 @@ import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-r
 })
 export class SetupMerchantDeliveryAndTakeawayComponent
 	implements AfterViewInit, OnDestroy {
-	@ViewChild('newCarrier', { static: false })
+	@ViewChild('newCarrier', { static: true })
 	newCarrier: SetupMerchantAddNewCarrierComponent;
-	@ViewChild('sharedCarriers', { static: false })
+	@ViewChild('sharedCarriers', { static: true })
 	sharedCarriers: SetupMerchantSharedCarriersComponent;
-	@ViewChild('carriersTable', { static: false })
+	@ViewChild('carriersTable', { static: true })
 	carriersTable: CarriersSmartTableComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
index c3d4d2ccf..1a5efb0cc 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
@@ -21,7 +21,7 @@ const perPage = 5;
 })
 export class SetupMerchantSharedCarriersComponent
 	implements OnDestroy, AfterViewInit {
-	@ViewChild('carriersTable', { static: false })
+	@ViewChild('carriersTable', { static: true })
 	carriersTable: CarriersSmartTableComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
index 144fc92cd..29a08792b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
@@ -19,24 +19,24 @@ import Warehouse from '@modules/server.common/entities/Warehouse';
 	templateUrl: './merchants.component.html'
 })
 export class SetupMerchantsComponent {
-	@ViewChild('nbStepper', { static: false })
+	@ViewChild('nbStepper', { static: true })
 	nbStepper: NbStepperComponent;
 
-	@ViewChild('account', { static: false })
+	@ViewChild('account', { static: true })
 	stepAccount: SetupMerchantAccountComponent;
-	@ViewChild('basicInfo', { static: false })
+	@ViewChild('basicInfo', { static: true })
 	stepBasicInfo: SetupMerchantBasicInfoComponent;
-	@ViewChild('contactInfo', { static: false })
+	@ViewChild('contactInfo', { static: true })
 	stepContactInfo: SetupMerchantContactInfoComponent;
-	@ViewChild('location', { static: false })
+	@ViewChild('location', { static: true })
 	stepLocation: SetupMerchantLocationComponent;
-	@ViewChild('payments', { static: false })
+	@ViewChild('payments', { static: true })
 	stepPayments: SetupMerchantPaymentsComponent;
-	@ViewChild('manufacturing', { static: false })
+	@ViewChild('manufacturing', { static: true })
 	stepManufacturing: SetupMerchantManufacturingComponent;
-	@ViewChild('deliveryAndTakeaway', { static: false })
+	@ViewChild('deliveryAndTakeaway', { static: true })
 	stepDeliveryAndTakeaway: SetupMerchantDeliveryAndTakeawayComponent;
-	@ViewChild('ordersSettings', { static: false })
+	@ViewChild('ordersSettings', { static: true })
 	stepOrdersSettings: SetupMerchantOrdersSettingsComponent;
 
 	currentStore: Warehouse;
diff --git a/admin/website-angular/src/app/pages/+simulation/simulation.component.scss b/admin/website-angular/src/app/pages/+simulation/simulation.component.scss
index 8e6c9ad08..6fb9e0af6 100644
--- a/admin/website-angular/src/app/pages/+simulation/simulation.component.scss
+++ b/admin/website-angular/src/app/pages/+simulation/simulation.component.scss
@@ -1,4 +1,4 @@
-:host /deep/ .ng2-smart-titles:first-child {
+:host ::ng-deep .ng2-smart-titles:first-child {
 	text-align: center !important;
 }
 
@@ -6,7 +6,7 @@
 	text-align: center !important;
 }
 
-:host /deep/ ng2-smart-table .tableImg {
+:host ::ng-deep ng2-smart-table .tableImg {
 	height: 100px;
 	width: 100px;
 }
diff --git a/admin/website-angular/src/app/pages/+simulation/simulation.component.ts b/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
index a54c5835f..255f7ea5d 100644
--- a/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
+++ b/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
@@ -36,10 +36,10 @@ import { IOrderCreateInput } from '@modules/server.common/routers/IWarehouseOrde
 	styleUrls: ['/simulation.component.scss']
 })
 export class SimulationComponent implements OnDestroy, OnInit {
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	productsTable: SimulationProductsComponent;
 
-	@ViewChild('instructions', { static: false })
+	@ViewChild('instructions', { static: true })
 	instructions: SimulationInstructionsComponent;
 
 	public hasProductsForOrder: boolean;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index 5d1400323..be3e888f8 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -13,7 +13,7 @@ import {
 	styleUrls: ['./warehouse-track.component.scss']
 })
 export class WarehouseTrackComponent implements OnInit {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
index c1117c1da..b0526f01b 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
@@ -18,13 +18,13 @@ import 'rxjs/add/operator/withLatestFrom';
 export class WarehouseManageComponent implements OnInit {
 	loading: boolean;
 
-	@ViewChild('warehouseManageTabs', { static: false })
+	@ViewChild('warehouseManageTabs', { static: true })
 	warehouseManageTabs: WarehouseManageTabsComponent;
 
-	@ViewChild('contactInfoForm', { static: false })
+	@ViewChild('contactInfoForm', { static: true })
 	contactInfoForm: ContactInfoFormComponent;
 
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	readonly form: FormGroup = this._formBuilder.group({
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.scss
index 4f94e8c04..0aec0f899 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.scss
@@ -13,7 +13,7 @@ form-wizard {
 }
 
 // Align only last child (address column) because text is too long.
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	thead tr {
 		text-align: center;
 		input {
@@ -36,14 +36,14 @@ form-wizard {
 	border-left: 5px solid #42a948;
 }
 
-:host /deep/ .card-footer button {
+:host ::ng-deep .card-footer button {
 	background-color: #111111 !important;
 	border: none !important;
 	color: white !important;
 	cursor: pointer !important;
 }
 
-:host /deep/ .card-footer button:hover {
+:host ::ng-deep .card-footer button:hover {
 	background-color: #bebebe !important;
 	color: #111111 !important;
 }
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
index 11adad435..39a6b8aa2 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
@@ -45,16 +45,16 @@ export class WarehouseOrderComponent implements OnInit, OnDestroy {
 	createUserEmitter = new EventEmitter<void>();
 	orderFinishedEmitter = new EventEmitter<void>();
 
-	@ViewChild('wizardForm', { static: false })
+	@ViewChild('wizardForm', { static: true })
 	private _wizardForm: WizardComponent;
 
-	@ViewChild('wizardFormStepTwo', { static: false })
+	@ViewChild('wizardFormStepTwo', { static: true })
 	public wizardFormStepTwo: WizardComponent;
 
-	@ViewChild('warehouseOrderCreateUser', { static: false })
+	@ViewChild('warehouseOrderCreateUser', { static: true })
 	private _warehouseOrderCreateUser: WarehouseOrderCreateUserComponent;
 
-	@ViewChild('warehouseOrderModal', { static: false })
+	@ViewChild('warehouseOrderModal', { static: true })
 	private _warehouseOrderModal: WarehouseOrderModalComponent;
 
 	private _userIdToOrder: string;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-products-view/warehouse-products-view.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-products-view/warehouse-products-view.component.scss
index f44e89409..efdcb403f 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-products-view/warehouse-products-view.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-products-view/warehouse-products-view.component.scss
@@ -13,7 +13,7 @@ nb-card {
 	margin-bottom: 1.5rem;
 }
 
-:host /deep/ .productsContainer a {
+:host ::ng-deep .productsContainer a {
 	border: none;
 	background-color: rgba(182, 176, 176, 0.05) !important;
 	color: #111111 !important;
@@ -30,7 +30,7 @@ nb-card {
 	}
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	.tableImg {
 		height: 100px;
 		width: 100px;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.scss
index 68fac7441..98d725327 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.scss
@@ -1,4 +1,4 @@
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	.ng2-smart-th.qty input {
 		text-align: center;
 	}
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
index c06651569..b52556adb 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
@@ -30,7 +30,7 @@ import {
 	styleUrls: ['./products-table.component.scss']
 })
 export class ProductsTableComponent implements OnDestroy {
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	productsTable: WarehouseProductsComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-main-info/warehouse-main-info.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-main-info/warehouse-main-info.component.scss
index 77fbc3fb2..1dcdbc615 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-main-info/warehouse-main-info.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-main-info/warehouse-main-info.component.scss
@@ -26,7 +26,7 @@ nb-card {
 	}
 }
 
-:host /deep/ .productsContainer a {
+:host ::ng-deep .productsContainer a {
 	border: none;
 	background-color: rgba(182, 176, 176, 0.05) !important;
 	color: #111111 !important;
@@ -43,7 +43,7 @@ nb-card {
 	}
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	.tableImg {
 		height: 100px;
 		width: 100px;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
index 42f0de4ef..89ce1cf80 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
@@ -44,9 +44,8 @@ $brand-darken: darken($brand, 5%);
 .subheader {
 	margin-bottom: 0.75rem;
 	font-size: 0.875rem;
-	// TODO style
-	// font-weight: nb-theme(font-weight-bolder);
-	// color: nb-theme(color-fg-heading);
+	font-weight: nb-theme(text-subtitle-font-weight);
+	color: nb-theme(text-basic-color);
 }
 
 .example-container:not(:last-child) {
@@ -86,7 +85,7 @@ nb-card {
 	}
 }
 
-:host /deep/ .productsContainer a {
+:host ::ng-deep .productsContainer a {
 	border: none;
 	background-color: rgba(182, 176, 176, 0.05) !important;
 	color: #111111 !important;
@@ -103,7 +102,7 @@ nb-card {
 	}
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	.tableImg {
 		height: 100px;
 		width: 100px;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
index 58df0b683..5bbfb4c6f 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
@@ -30,7 +30,7 @@ export class WarehouseOrderViewComponent
 	selectedOrder: Order;
 	@Input()
 	hideHeader: boolean;
-	@ViewChild('slideshow', { static: false })
+	@ViewChild('slideshow', { static: true })
 	slideshow: any;
 
 	isSelectedOrderActionsAvailable: boolean = true;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.scss
index f44e89409..efdcb403f 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.scss
@@ -13,7 +13,7 @@ nb-card {
 	margin-bottom: 1.5rem;
 }
 
-:host /deep/ .productsContainer a {
+:host ::ng-deep .productsContainer a {
 	border: none;
 	background-color: rgba(182, 176, 176, 0.05) !important;
 	color: #111111 !important;
@@ -30,7 +30,7 @@ nb-card {
 	}
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	.tableImg {
 		height: 100px;
 		width: 100px;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
index fe43f77ed..8deef734a 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
@@ -44,9 +44,9 @@ $brand-darken: darken($brand, 5%);
 .subheader {
 	margin-bottom: 0.75rem;
 	font-size: 0.875rem;
-	// TODO style
-	// font-weight: nb-theme(font-weight-bolder);
-	// color: nb-theme(color-fg-heading);
+
+	font-weight: nb-theme(text-subtitle-font-weight);
+	color: nb-theme(text-basic-color);
 }
 
 .example-container:not(:last-child) {
@@ -85,7 +85,7 @@ nb-card {
 	}
 }
 
-:host /deep/ .productsContainer a {
+:host ::ng-deep .productsContainer a {
 	border: none;
 	background-color: rgba(182, 176, 176, 0.05) !important;
 	color: #111111 !important;
@@ -102,7 +102,7 @@ nb-card {
 	}
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	.tableImg {
 		height: 100px;
 		width: 100px;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
index 6084e2c37..993d8cf2e 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
@@ -42,10 +42,10 @@ const perPage = 3;
 export class WarehouseComponent implements OnDestroy, AfterViewInit, OnChanges {
 	private ngDestroy$ = new Subject<void>();
 
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	public productsTable: ProductsTableComponent;
 
-	@ViewChild('warehouseSelectView', { static: false })
+	@ViewChild('warehouseSelectView', { static: true })
 	public warehouseSelectView: WarehouseSelectViewComponent;
 
 	public filterMode: OrdersFilterModes = 'all';
diff --git a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.scss b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.scss
index 14e30ec7a..99d20cb53 100644
--- a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.scss
@@ -8,7 +8,7 @@ nb-card-body {
 	border-bottom-right-radius: 0.5rem;
 }
 
-:host /deep/ ng2-smart-table {
+:host ::ng-deep ng2-smart-table {
 	tr {
 		th {
 			padding: 18px !important;
@@ -74,7 +74,7 @@ nb-card-body {
 	// }
 }
 
-:host /deep/ ng2-smart-table .warehouse-image {
+:host ::ng-deep ng2-smart-table .warehouse-image {
 	width: 74px;
 }
 
diff --git a/admin/website-angular/src/app/pages/charts/chartjs/chartjs.component.scss b/admin/website-angular/src/app/pages/charts/chartjs/chartjs.component.scss
index 90f4b0a03..f46a67ffc 100644
--- a/admin/website-angular/src/app/pages/charts/chartjs/chartjs.component.scss
+++ b/admin/website-angular/src/app/pages/charts/chartjs/chartjs.component.scss
@@ -1,20 +1,20 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  ngx-chartjs-pie,
-  ngx-chartjs-bar,
-  ngx-chartjs-line,
-  ngx-chartjs-multiple-xaxis,
-  ngx-chartjs-bar-horizontal,
-  ngx-chartjs-radar {
-    display: block;
-    height: nb-theme(card-height-medium);
-    width: 100%;
+	ngx-chartjs-pie,
+	ngx-chartjs-bar,
+	ngx-chartjs-line,
+	ngx-chartjs-multiple-xaxis,
+	ngx-chartjs-bar-horizontal,
+	ngx-chartjs-radar {
+		display: block;
+		height: nb-theme(card-height-medium);
+		width: 100%;
 
-    /deep/ chart {
-      display: block;
-      height: 100%;
-      width: 100%;
-    }
-  }
+		::ng-deep chart {
+			display: block;
+			height: 100%;
+			width: 100%;
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/charts/d3/d3.component.scss b/admin/website-angular/src/app/pages/charts/d3/d3.component.scss
index b11c36b04..3c70c472a 100644
--- a/admin/website-angular/src/app/pages/charts/d3/d3.component.scss
+++ b/admin/website-angular/src/app/pages/charts/d3/d3.component.scss
@@ -1,40 +1,40 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  ngx-d3-bar,
-  ngx-d3-pie,
-  ngx-d3-advanced-pie,
-  ngx-d3-area-stack,
-  ngx-d3-line,
-  ngx-d3-polar {
-    display: block;
-    width: 100%;
-    height: nb-theme(card-height-medium);
+	ngx-d3-bar,
+	ngx-d3-pie,
+	ngx-d3-advanced-pie,
+	ngx-d3-area-stack,
+	ngx-d3-line,
+	ngx-d3-polar {
+		display: block;
+		width: 100%;
+		height: nb-theme(card-height-medium);
 
-    /deep/ {
-      .pie-label {
-        fill: nb-theme(color-fg-heading);
-      }
+		::ng-deep {
+			.pie-label {
+				fill: nb-theme(text-basic-color);
+			}
 
-      .grid-line-path {
-        stroke: nb-theme(separator);
-      }
+			.grid-line-path {
+				stroke: nb-theme(divider-color);
+			}
 
-      text {
-        fill: nb-theme(color-fg-heading);
-      }
+			text {
+				fill: nb-theme(text-basic-color);
+			}
 
-      .chart-legend {
-        .legend-labels {
-          background: nb-theme(color-bg);
-        }
-        .legend-label {
-          color: nb-theme(color-fg-heading);
-          .active .legend-label-text {
-            color: nb-theme(color-fg-heading);
-          }
-        }
-      }
-    }
-  }
+			.chart-legend {
+				.legend-labels {
+					background: nb-theme(background-basic-color-1);
+				}
+				.legend-label {
+					color: nb-theme(text-basic-color);
+					.active .legend-label-text {
+						color: nb-theme(text-basic-color);
+					}
+				}
+			}
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/charts/echarts/echarts.component.scss b/admin/website-angular/src/app/pages/charts/echarts/echarts.component.scss
index bd7f3998c..39cb1a9c4 100644
--- a/admin/website-angular/src/app/pages/charts/echarts/echarts.component.scss
+++ b/admin/website-angular/src/app/pages/charts/echarts/echarts.component.scss
@@ -1,20 +1,20 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  ngx-echarts-pie,
-  ngx-echarts-bar,
-  ngx-echarts-line,
-  ngx-echarts-multiple-xaxis,
-  ngx-echarts-area-stack,
-  ngx-echarts-bar-animation,
-  ngx-echarts-radar {
-    display: block;
-    height: nb-theme(card-height-medium);
-    width: 100%;
-  }
+	ngx-echarts-pie,
+	ngx-echarts-bar,
+	ngx-echarts-line,
+	ngx-echarts-multiple-xaxis,
+	ngx-echarts-area-stack,
+	ngx-echarts-bar-animation,
+	ngx-echarts-radar {
+		display: block;
+		height: nb-theme(card-height-medium);
+		width: 100%;
+	}
 
-  /deep/ .echart {
-    height: 100%;
-    width: 100%;
-  }
+	::ng-deep .echart {
+		height: 100%;
+		width: 100%;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/components/notifications/notifications.component.scss b/admin/website-angular/src/app/pages/components/notifications/notifications.component.scss
index b8ca0ce65..f8117b049 100644
--- a/admin/website-angular/src/app/pages/components/notifications/notifications.component.scss
+++ b/admin/website-angular/src/app/pages/components/notifications/notifications.component.scss
@@ -13,7 +13,7 @@
 	}
 
 	/* stylelint-disable */
-	toaster-container /deep/ {
+	toaster-container ::ng-deep {
 		#toast-container .toast-close-button {
 			right: 0;
 		}
diff --git a/admin/website-angular/src/app/pages/components/tree/tree.component.scss b/admin/website-angular/src/app/pages/components/tree/tree.component.scss
index adc434924..be7912108 100644
--- a/admin/website-angular/src/app/pages/components/tree/tree.component.scss
+++ b/admin/website-angular/src/app/pages/components/tree/tree.component.scss
@@ -1,20 +1,19 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
+	::ng-deep .angular-tree-component {
+		cursor: default;
 
-  /deep/ .angular-tree-component {
-    cursor: default;
+		.node-wrapper {
+			.node-content-wrapper {
+				background: none;
+				box-shadow: none;
+				cursor: default;
+			}
 
-    .node-wrapper {
-      .node-content-wrapper {
-        background: none;
-        box-shadow: none;
-        cursor: default;
-      }
-
-      .toggle-children-wrapper {
-        cursor: pointer;
-      }
-    }
-  }
+			.toggle-children-wrapper {
+				cursor: pointer;
+			}
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/dashboard/dashboard.component.scss b/admin/website-angular/src/app/pages/dashboard/dashboard.component.scss
index a3df34df6..58f4b84a7 100644
--- a/admin/website-angular/src/app/pages/dashboard/dashboard.component.scss
+++ b/admin/website-angular/src/app/pages/dashboard/dashboard.component.scss
@@ -15,7 +15,7 @@
 	}
 
 	@include media-breakpoint-down(is) {
-		/deep/ nb-card.large-card {
+		::ng-deep nb-card.large-card {
 			height: nb-theme(card-height-medium);
 		}
 	}
diff --git a/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss b/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss
index 9c1eeaa85..4762a0e01 100644
--- a/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss
+++ b/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss
@@ -51,11 +51,11 @@
 
 	.star {
 		font-size: 1.5rem;
-		color: nb-theme(color-fg);
+		color: nb-theme(text-basic-color);
 	}
 
 	.filled {
-		color: nb-theme(color-fg);
+		color: nb-theme(text-basic-color);
 	}
 
 	// TODO: Replace with the card header styles mixin
@@ -63,15 +63,15 @@
 		line-height: 2rem;
 		font-size: 1.25rem;
 		font-family: nb-theme(font-secondary);
-		font-weight: nb-theme(font-weight-bolder);
-		color: nb-theme(color-fg-heading);
+		font-weight: nb-theme(text-subtitle-font-weight);
+		color: nb-theme(text-basic-color);
 	}
 
 	.current-rate {
 		font-size: 1.5rem;
 		@include nb-ltr(padding-left, 1rem);
 		@include nb-rtl(padding-right, 1rem);
-		color: nb-theme(color-fg-heading);
+		color: nb-theme(text-basic-color);
 	}
 
 	.full-name-inputs {
@@ -113,9 +113,9 @@
 	}
 
 	ngb-rating i {
-		color: nb-theme(color-success);
+		color: nb-theme(color-success-500);
 		@include nb-for-theme(cosmic) {
-			color: nb-theme(color-primary);
+			color: nb-theme(color-primary-500);
 		}
 	}
 
diff --git a/admin/website-angular/src/app/pages/maps/gmaps/gmaps.component.scss b/admin/website-angular/src/app/pages/maps/gmaps/gmaps.component.scss
index 7c96244f0..ce6a5b549 100644
--- a/admin/website-angular/src/app/pages/maps/gmaps/gmaps.component.scss
+++ b/admin/website-angular/src/app/pages/maps/gmaps/gmaps.component.scss
@@ -1,13 +1,12 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
+	nb-card-body {
+		padding: 0;
+	}
 
-  nb-card-body {
-    padding: 0;
-  }
-
-  /deep/ agm-map {
-    width: 100%;
-    height: nb-theme(card-height-large);
-  }
+	::ng-deep agm-map {
+		width: 100%;
+		height: nb-theme(card-height-large);
+	}
 }
diff --git a/admin/website-angular/src/app/pages/maps/leaflet/leaflet.component.scss b/admin/website-angular/src/app/pages/maps/leaflet/leaflet.component.scss
index 2d6a82169..e9e9eb274 100644
--- a/admin/website-angular/src/app/pages/maps/leaflet/leaflet.component.scss
+++ b/admin/website-angular/src/app/pages/maps/leaflet/leaflet.component.scss
@@ -1,13 +1,12 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
+	nb-card-body {
+		padding: 0;
+	}
 
-  nb-card-body {
-    padding: 0;
-  }
-
-  /deep/ .leaflet-container {
-    width: 100%;
-    height: nb-theme(card-height-large);
-  }
+	::ng-deep .leaflet-container {
+		width: 100%;
+		height: nb-theme(card-height-large);
+	}
 }
diff --git a/admin/website-angular/src/app/pages/maps/search-map/map/map.component.scss b/admin/website-angular/src/app/pages/maps/search-map/map/map.component.scss
index a051dacb1..d1ac4c32d 100644
--- a/admin/website-angular/src/app/pages/maps/search-map/map/map.component.scss
+++ b/admin/website-angular/src/app/pages/maps/search-map/map/map.component.scss
@@ -1,13 +1,12 @@
 @import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
+	nb-card-body {
+		padding: 0;
+	}
 
-  nb-card-body {
-    padding: 0;
-  }
-
-  /deep/ agm-map {
-    width: 100%;
-    height: nb-theme(card-height-large);
-  }
+	::ng-deep agm-map {
+		width: 100%;
+		height: nb-theme(card-height-large);
+	}
 }
diff --git a/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts b/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
index 4441d5ee8..d348b9b58 100644
--- a/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
+++ b/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
@@ -17,7 +17,7 @@ import { Location } from '../entity/Location';
 export class SearchComponent implements OnInit {
 	@Output() positionChanged = new EventEmitter<Location>();
 
-	@ViewChild('search', { static: false })
+	@ViewChild('search', { static: true })
 	public searchElementRef: ElementRef;
 
 	constructor(private mapsAPILoader: MapsAPILoader, private ngZone: NgZone) {}
diff --git a/admin/website-angular/src/app/pages/pages.component.ts b/admin/website-angular/src/app/pages/pages.component.ts
index 3f352c847..92f0f2d44 100644
--- a/admin/website-angular/src/app/pages/pages.component.ts
+++ b/admin/website-angular/src/app/pages/pages.component.ts
@@ -19,19 +19,19 @@ export class PagesComponent {
 		this.menu = [
 			{
 				title: this.getTranslation('MENU_VIEW.DASHBOARD'),
-				icon: 'fa fa-tachometer-alt',
+				icon: 'person-outline',
 				link: '/dashboard',
 				pathMatch: 'prefix'
 			},
 			{
 				title: this.getTranslation('MENU_VIEW.STORES'),
-				icon: 'fa fa-home',
+				icon: 'home-outline',
 				link: '/stores',
 				pathMatch: 'prefix'
 			},
 			{
 				title: this.getTranslation('MENU_VIEW.PRODUCTS.PRODUCTS'),
-				icon: 'fa fa-cart-plus',
+				icon: 'shopping-cart-outline',
 				link: '/products',
 				children: [
 					{
@@ -51,7 +51,7 @@ export class PagesComponent {
 			},
 			{
 				title: this.getTranslation('MENU_VIEW.CUSTOMERS.CUSTOMERS'),
-				icon: 'fa fa-user',
+				icon: 'person-outline',
 				link: '/customers',
 				children: [
 					{
@@ -71,20 +71,20 @@ export class PagesComponent {
 			},
 			{
 				title: this.getTranslation('MENU_VIEW.CARRIERS'),
-				icon: 'fa fa-truck',
+				icon: 'car-outline',
 				link: '/carriers',
 				pathMatch: 'prefix'
 			},
 			{
 				title: this.getTranslation('MENU_VIEW.SIMULATION'),
-				icon: 'fa fa-star',
+				icon: 'star-outline',
 				link: '/simulation',
 				pathMatch: 'prefix',
 				home: true
 			},
 			{
 				title: this.getTranslation('MENU_VIEW.SETUP'),
-				icon: 'fa fa-cog',
+				icon: 'settings-2-outline',
 				link: '/setup',
 				pathMatch: 'prefix'
 			}
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss
index cec6ec268..298719786 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss
@@ -36,11 +36,11 @@
 
 		nb-action {
 			padding: 0 0.5rem;
-			/deep/ .control-icon {
+			::ng-deep .control-icon {
 				font-size: 1.75rem;
 			}
 		}
-		nb-user /deep/ {
+		nb-user ::ng-deep {
 			.user-container {
 				font-size: 0.875rem;
 			}
@@ -54,11 +54,11 @@
 	@include media-breakpoint-down(xs) {
 		nb-action {
 			padding: 0 0.375rem;
-			/deep/ .control-icon {
+			::ng-deep .control-icon {
 				font-size: 1.5rem;
 			}
 		}
-		nb-user /deep/ {
+		nb-user ::ng-deep {
 			.user-container {
 				font-size: 0.75rem;
 			}
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/buttons.component.scss
index 06e608771..303110f50 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/buttons.component.scss
@@ -4,11 +4,11 @@
 @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-	/deep/ {
+	::ng-deep {
 		$button-size: 50px;
 
 		.container-title {
-			color: nb-theme(color-fg);
+			color: nb-theme(text-basic-color);
 			font-family: nb-theme(font-secondary);
 			margin-bottom: 0.5rem;
 		}
@@ -20,8 +20,8 @@
 
 		.subheader {
 			font-size: 0.75rem;
-			font-weight: nb-theme(font-weight-light);
-			color: nb-theme(color-fg);
+			font-weight: nb-theme(text-subtitle-font-weight);
+			color: nb-theme(text-basic-color);
 		}
 
 		.btn-demo {
@@ -38,7 +38,7 @@
 			.state-value {
 				width: $button-size;
 				height: $button-size;
-				border-radius: nb-theme(btn-border-radius);
+				border-radius: nb-theme(border-radius);
 
 				@include nb-for-theme(corporate) {
 					border-radius: nb-theme(btn-semi-round-border-radius);
@@ -70,7 +70,7 @@
 	}
 
 	@include media-breakpoint-down(is) {
-		ngx-default-buttons /deep/ nb-card-header {
+		ngx-default-buttons ::ng-deep nb-card-header {
 			flex-direction: column;
 			align-items: left;
 
@@ -81,19 +81,19 @@
 	}
 
 	@include media-breakpoint-down(xs) {
-		/deep/.icon-buttons .icon-button-examples {
+		::ng-deep.icon-buttons .icon-button-examples {
 			button {
 				@include nb-ltr(margin-right, 1rem);
 				@include nb-rtl(margin-left, 1rem);
 			}
 		}
 
-		ngx-default-buttons /deep/ nb-card-header {
+		ngx-default-buttons ::ng-deep nb-card-header {
 			flex-direction: column;
 			margin-bottom: 0.5rem;
 		}
 
-		ngx-block-level-buttons /deep/ {
+		ngx-block-level-buttons ::ng-deep {
 			.btn-primary {
 				padding: 0.75rem 1rem;
 			}
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss
index 0da57c7b7..239521554 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss
@@ -2,134 +2,135 @@
 @import '~@nebular/theme/styles/global/bootstrap/buttons';
 
 @include nb-install-component() {
+	nb-card-body {
+		padding-bottom: 0;
+	}
 
-  nb-card-body {
-    padding-bottom: 0;
-  }
+	.none {
+		position: relative;
+		transform: rotate(45deg);
 
-  .none {
-    position: relative;
-    transform: rotate(45deg);
+		&::before,
+		&::after {
+			position: absolute;
+			content: '';
+			background: nb-theme(form-control-border-color);
+		}
 
-    &::before, &::after {
-      position: absolute;
-      content: '';
-      background: nb-theme(form-control-border-color);
-    }
+		&::before {
+			left: 50%;
+			top: 10%;
+			transform: translateX(-50%);
+			width: 1px;
+			height: 80%;
+		}
 
-    &::before {
-      left: 50%;
-      top: 10%;
-      transform: translateX(-50%);
-      width: 1px;
-      height: 80%;
-    }
+		&::after {
+			top: 50%;
+			left: 10%;
+			transform: translateY(-50%);
+			height: 1px;
+			width: 80%;
+		}
+	}
 
-    &::after {
-      top: 50%;
-      left: 10%;
-      transform: translateY(-50%);
-      height: 1px;
-      width: 80%;
-    }
-  }
+	.shadow {
+		box-shadow: nb-theme(btn-hero-shadow);
+	}
 
-  .shadow {
-    box-shadow: nb-theme(btn-hero-shadow);
-  }
+	.primary-container {
+		.color {
+			background-color: nb-theme(color-primary-500);
+		}
+		.gradient {
+			@include btn-hero-primary-gradient();
+		}
+		.glow {
+			box-shadow: btn-hero-primary-glow();
+		}
+		.bevel {
+			box-shadow: btn-hero-primary-bevel();
+		}
+	}
 
-  .primary-container {
-    .color {
-      background-color: nb-theme(color-primary);
-    }
-    .gradient {
-      @include btn-hero-primary-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-primary-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-primary-bevel();
-    }
-  }
+	.warning-container {
+		.color {
+			background-color: nb-theme(color-warning);
+		}
+		.gradient {
+			@include btn-hero-warning-gradient();
+		}
+		.glow {
+			box-shadow: btn-hero-warning-glow();
+		}
+		.bevel {
+			box-shadow: btn-hero-warning-bevel();
+		}
+	}
 
-  .warning-container {
-    .color {
-      background-color: nb-theme(color-warning);
-    }
-    .gradient {
-      @include btn-hero-warning-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-warning-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-warning-bevel();
-    }
-  }
+	.success-container {
+		.color {
+			background-color: nb-theme(color-success-500);
+		}
+		.gradient {
+			@include btn-hero-success-gradient();
+		}
+		.glow {
+			box-shadow: btn-hero-success-glow();
+		}
+		.bevel {
+			box-shadow: btn-hero-success-bevel();
+		}
+	}
 
-  .success-container {
-    .color {
-      background-color: nb-theme(color-success);
-    }
-    .gradient {
-      @include btn-hero-success-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-success-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-success-bevel();
-    }
-  }
+	.info-container {
+		.color {
+			background-color: nb-theme(color-info);
+		}
+		.gradient {
+			@include btn-hero-info-gradient();
+		}
+		.glow {
+			box-shadow: btn-hero-info-glow();
+		}
+		.bevel {
+			box-shadow: btn-hero-info-bevel();
+		}
+	}
 
-  .info-container {
-    .color {
-      background-color: nb-theme(color-info);
-    }
-    .gradient {
-      @include btn-hero-info-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-info-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-info-bevel();
-    }
-  }
+	.danger-container {
+		.color {
+			background-color: nb-theme(color-danger);
+		}
+		.gradient {
+			@include btn-hero-danger-gradient();
+		}
+		.glow {
+			box-shadow: btn-hero-danger-glow();
+		}
+		.bevel {
+			box-shadow: btn-hero-danger-bevel();
+		}
+	}
 
-  .danger-container {
-    .color {
-      background-color: nb-theme(color-danger);
-    }
-    .gradient {
-      @include btn-hero-danger-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-danger-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-danger-bevel();
-    }
-  }
+	.secondary-container {
+		.color {
+			background-color: nb-theme(btn-secondary-bg);
+		}
+		.border {
+			color: nb-theme(btn-secondary-color);
+			border: nb-theme(btn-secondary-border-width) solid
+				nb-theme(btn-secondary-border);
+		}
+		.glow {
+			box-shadow: btn-hero-secondary-glow();
+		}
+		.bevel {
+			box-shadow: btn-hero-secondary-bevel();
+		}
+	}
 
-  .secondary-container {
-    .color {
-      background-color: nb-theme(btn-secondary-bg);
-    }
-    .border {
-      color: nb-theme(btn-secondary-color);
-      border: nb-theme(btn-secondary-border-width) solid nb-theme(btn-secondary-border);
-    }
-    .glow {
-      box-shadow: btn-hero-secondary-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-secondary-bevel();
-    }
-  }
-
-  .example-container {
-    margin-bottom: 1.5rem;
-  }
+	.example-container {
+		margin-bottom: 1.5rem;
+	}
 }
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
index 2b104cbb7..88bc996bd 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
@@ -9,7 +9,7 @@
 
 	nb-action {
 		i {
-			color: nb-theme(color-fg);
+			color: nb-theme(text-basic-color);
 			font-size: 2.5rem;
 			@include nb-ltr(margin-right, 1rem);
 			@include nb-rtl(margin-left, 1rem);
@@ -21,8 +21,8 @@
 
 		span {
 			font-family: nb-theme(font-secondary);
-			font-weight: nb-theme(font-weight-bold);
-			color: nb-theme(color-fg-heading);
+			font-weight: nb-theme(text-heading-2-font-weight);
+			color: nb-theme(text-basic-color);
 			text-transform: uppercase;
 		}
 	}
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
index 10f295112..02e461ade 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
@@ -2,29 +2,28 @@
 @import '~@nebular/theme/styles/global/bootstrap/buttons';
 
 @include nb-install-component() {
+	nb-card-body {
+		padding: 0 0 29px;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+	}
 
-  nb-card-body {
-    padding: 0 0 29px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-  }
+	.shape-container {
+		margin: 1.25rem 1.25rem 0;
+	}
 
-  .shape-container {
-    margin: 1.25rem 1.25rem 0;
-  }
+	.container-title {
+		margin-bottom: 0.25rem;
+	}
 
-  .container-title {
-    margin-bottom: 0.25rem;
-  }
+	.subheader {
+		margin-bottom: 1rem;
+		font-size: 0.875rem;
 
-  .subheader {
-    margin-bottom: 1rem;
-    font-size: 0.875rem;
-
-    span:nth-child(2) {
-      color: nb-theme(color-fg-heading);
-      font-weight: nb-theme(font-weight-bold);
-    }
-  }
+		span:nth-child(2) {
+			color: nb-theme(text-basic-color);
+			font-weight: nb-theme(text-heading-2-font-weight);
+		}
+	}
 }
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
index ba0c956c2..d7a4ddf19 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
@@ -2,25 +2,24 @@
 @import '~@nebular/theme/styles/global/bootstrap/buttons';
 
 @include nb-install-component() {
+	nb-card-body {
+		padding: 0 1.25rem 1.25rem 0;
+		display: flex;
+		flex-wrap: wrap;
+	}
 
-  nb-card-body {
-    padding: 0 1.25rem 1.25rem 0;
-    display: flex;
-    flex-wrap: wrap;
-  }
+	.container-title {
+		margin-bottom: 0.25rem;
+	}
 
-  .container-title {
-    margin-bottom: 0.25rem;
-  }
+	.size-container {
+		margin: 1.25rem 0 0 1.25rem;
+	}
 
-  .size-container {
-    margin: 1.25rem 0 0 1.25rem;
-  }
-
-  .subheader {
-    margin-bottom: 0.75rem;
-    font-size: 0.875rem;
-    font-weight: nb-theme(font-weight-bolder);
-    color: nb-theme(color-fg-heading);
-  }
+	.subheader {
+		margin-bottom: 0.75rem;
+		font-size: 0.875rem;
+		font-weight: nb-theme(text-subtitle-font-weight);
+		color: nb-theme(text-basic-color);
+	}
 }
diff --git a/admin/website-angular/src/app/pages/ui-features/popovers/popovers.component.scss b/admin/website-angular/src/app/pages/ui-features/popovers/popovers.component.scss
index 589bfcfbb..e0b59a65e 100644
--- a/admin/website-angular/src/app/pages/ui-features/popovers/popovers.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/popovers/popovers.component.scss
@@ -1,19 +1,19 @@
 @import '~@nebular/theme/styles/core/mixins';
 
-/deep/ nb-card.popover-card {
-  margin-bottom: 0;
-  width: 300px;
-  box-shadow: none;
+::ng-deep nb-card.popover-card {
+	margin-bottom: 0;
+	width: 300px;
+	box-shadow: none;
 }
 
 :host {
-  button.with-margins {
-    @include nb-ltr(margin, 0 0.75rem 2rem 0);
-    @include nb-rtl(margin, 0 0 2rem 0.75rem);
-  }
+	button.with-margins {
+		@include nb-ltr(margin, 0 0.75rem 2rem 0);
+		@include nb-rtl(margin, 0 0 2rem 0.75rem);
+	}
 
-  /deep/ .btn-outline-secondary {
-    @include nb-ltr(margin, 0 0.5rem 0.5rem 0);
-    @include nb-rtl(margin, 0 0 0.5rem 0.5rem);
-  }
+	::ng-deep .btn-outline-secondary {
+		@include nb-ltr(margin, 0 0.5rem 0.5rem 0);
+		@include nb-rtl(margin, 0 0 0.5rem 0.5rem);
+	}
 }
diff --git a/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss b/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss
index 98fa89056..f812e3c30 100644
--- a/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss
@@ -10,17 +10,19 @@
 	}
 
 	nb-tab {
-		padding: nb-theme(padding);
+		// TODO get padding form the theme
+		padding: nb-theme(1.25rem);
 	}
 
-	/deep/ ngx-tab1,
-	/deep/ ngx-tab2 {
+	::ng-deep ngx-tab1,
+	::ng-deep ngx-tab2 {
 		display: block;
-		padding: nb-theme(padding);
+		// TODO get padding form the theme
+		padding: nb-theme(1.25rem);
 	}
 
 	@include media-breakpoint-down(xs) {
-		nb-tabset /deep/ul {
+		nb-tabset ::ng-deepul {
 			font-size: 1rem;
 			padding: 0 0.25rem;
 		}
diff --git a/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss b/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss
index c664ffea3..afd33bfb4 100644
--- a/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss
@@ -1,128 +1,139 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-
-  .font-secondary .font-header .name {
-    font-size: 4.5rem;
-    line-height: 4rem;
-    font-weight: nb-theme(font-weight-bold);
-  }
-
-  .font-main .font-header .name {
-    font-size: 3rem;
-    font-weight: nb-theme(font-weight-bold);
-  }
-
-  .font-row {
-    &:first-child {
-      margin-bottom: 2rem;
-    }
-
-    .header {
-      align-items: baseline;
-    }
-
-    p {
-      margin: 0;
-    }
-  }
-
-  .headings-card {
-    nb-card-body {
-      padding: 1rem 1.25rem;
-    }
-    .header {
-      padding-bottom: 0.675rem;
-      margin-bottom: 0.675rem;
-
-      &:last-child {
-        padding-bottom: 0;
-        margin-bottom: 0;
-      }
-    }
-  }
-
-  .header {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    padding-bottom: 1rem;
-    margin-bottom: 1rem;
-    border-bottom: 1px solid nb-theme(separator);
-    color: nb-theme(color-fg-heading);
-
-    &:last-child {
-      border-bottom: none;
-      padding: 0;
-      margin: 0;
-    }
-
-    div:first-child {
-      flex: 2;
-      -ms-flex: 2 1 auto;
-      line-height: 1;
-      align-items: flex-end;
-
-      h1, h2, h3, h4, h5, h6 {
-        margin-bottom: 0;
-      }
-    }
-
-    .variants {
-      flex: 1;
-      -ms-flex: 1 1 auto;
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-end;
-
-      span {
-        padding-right: 1rem;
-        padding-left: 1rem;
-        font-size: 1.5rem;
-      }
-    }
-
-    .detail {
-      flex: 1;
-      display: flex;
-      justify-content: flex-end;
-      align-items: flex-end;
-      color: nb-theme(color-fg);
-    }
-  }
-
-  .colors {
-    display: flex;
-    flex-direction: column;
-
-    .item {
-      display: flex;
-      align-items: center;
-      margin-bottom: 1.25rem;
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    .color {
-      width: 86px;
-      height: 60px;
-      border-top-right-radius: 1rem;
-      border-bottom-left-radius: 1rem;
-      @include nb-ltr(margin-right, 1rem);
-      @include nb-rtl(margin-left, 1rem);
-    }
-
-    h1, h2, h3, h4, h5, h6 {
-      margin-bottom: 0.25rem;
-    }
-  }
-
-  .text-link {
-    color: nb-theme(link-color);
-  }
-
-  .bg-link {
-    background: nb-theme(link-color);
-  }
+	.font-secondary .font-header .name {
+		font-size: 4.5rem;
+		line-height: 4rem;
+		font-weight: nb-theme(text-heading-2-font-weight);
+	}
+
+	.font-main .font-header .name {
+		font-size: 3rem;
+		font-weight: nb-theme(text-heading-2-font-weight);
+	}
+
+	.font-row {
+		&:first-child {
+			margin-bottom: 2rem;
+		}
+
+		.header {
+			align-items: baseline;
+		}
+
+		p {
+			margin: 0;
+		}
+	}
+
+	.headings-card {
+		nb-card-body {
+			padding: 1rem 1.25rem;
+		}
+		.header {
+			padding-bottom: 0.675rem;
+			margin-bottom: 0.675rem;
+
+			&:last-child {
+				padding-bottom: 0;
+				margin-bottom: 0;
+			}
+		}
+	}
+
+	.header {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		padding-bottom: 1rem;
+		margin-bottom: 1rem;
+		border-bottom: 1px solid nb-theme(divider-color);
+		color: nb-theme(text-basic-color);
+
+		&:last-child {
+			border-bottom: none;
+			padding: 0;
+			margin: 0;
+		}
+
+		div:first-child {
+			flex: 2;
+			-ms-flex: 2 1 auto;
+			line-height: 1;
+			align-items: flex-end;
+
+			h1,
+			h2,
+			h3,
+			h4,
+			h5,
+			h6 {
+				margin-bottom: 0;
+			}
+		}
+
+		.variants {
+			flex: 1;
+			-ms-flex: 1 1 auto;
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-end;
+
+			span {
+				padding-right: 1rem;
+				padding-left: 1rem;
+				font-size: 1.5rem;
+			}
+		}
+
+		.detail {
+			flex: 1;
+			display: flex;
+			justify-content: flex-end;
+			align-items: flex-end;
+			color: nb-theme(text-basic-color);
+		}
+	}
+
+	.colors {
+		display: flex;
+		flex-direction: column;
+
+		.item {
+			display: flex;
+			align-items: center;
+			margin-bottom: 1.25rem;
+			&:last-child {
+				margin-bottom: 0;
+			}
+		}
+
+		.color {
+			width: 86px;
+			height: 60px;
+			border-top-right-radius: 1rem;
+			border-bottom-left-radius: 1rem;
+			@include nb-ltr(margin-right, 1rem);
+			@include nb-rtl(margin-left, 1rem);
+		}
+
+		h1,
+		h2,
+		h3,
+		h4,
+		h5,
+		h6 {
+			margin-bottom: 0.25rem;
+		}
+	}
+
+	.text-link {
+		// TODO nb-theme
+		color: #3dcc6d;
+	}
+
+	.bg-link {
+		// TODO nb-theme
+		background: #3dcc6d;
+	}
 }
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 30de9c875..636117707 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -1091,10 +1091,10 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e"
   integrity sha512-n/VQ4mbfr81aqkx/XmVicOLjviMuy02eenSdJY33SVA7S2J42EU0P1H0mOogfYedb3wXA0d/LVtBrgTSm04WEA==
 
-"@fortawesome/fontawesome-free@^5.9.0":
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.9.0.tgz#1aa5c59efb1b8c6eb6277d1e3e8c8f31998b8c8e"
-  integrity sha512-g795BBEzM/Hq2SYNPm/NQTIp3IWd4eXSH0ds87Na2jnrAUFX3wkyZAI4Gwj9DOaWMuz2/01i8oWI7P7T/XLkhg==
+"@fortawesome/fontawesome-free@~5.8.1":
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.2.tgz#fae4112c4fb47086f6ae167e32524b280000abd5"
+  integrity sha512-E4fDUF4fbu9AxKpaQQqCN3XBnNzb/5e0Gvd9OaQsYkK574LVI57v/EqqPfIm/mC7jYbxaPNrhvT5AF+Yzwyizg==
 
 "@icons/material@^0.2.4":
   version "0.2.4"
@@ -1119,6 +1119,11 @@
   resolved "https://registry.yarnpkg.com/@nebular/bootstrap/-/bootstrap-4.0.0.tgz#7c26a111f6ea3e1b617672f7175ff48369ec166a"
   integrity sha512-YiHPeAp2HOXf0yGmA0wfDVTonc1Aiy4I6yn42Xd2PlBKv7a8sXq+W7vBkUNdMiS/+8vQeCCvCxelcdXDsTxjXw==
 
+"@nebular/eva-icons@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@nebular/eva-icons/-/eva-icons-4.0.0.tgz#08d5f64143d4c3e7f772a7829e182d34c8ebc876"
+  integrity sha512-Cce27XeE1U8opWyf4jXZWXDxx0EsaxLuz5SA5iyyBPV21JcXXdhmO8+jFwnu0YlqrwNePF0pKj/7GYJGs1JWfw==
+
 "@nebular/security@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@nebular/security/-/security-4.0.0.tgz#5c2c9ffc2491f2083fa1c865a7d261d6e4b1689e"
@@ -1676,6 +1681,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.4.tgz#f83ec3c3e05b174b7241fadeb6688267fe5b22ca"
   integrity sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==
 
+"@types/node@>=6":
+  version "12.0.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
+  integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
+
 "@types/node@^12.0.2":
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
@@ -1914,6 +1924,21 @@
     "@webassemblyjs/wast-parser" "1.8.5"
     "@xtuc/long" "4.2.2"
 
+"@wry/context@^0.4.0":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.4.3.tgz#5e5653ef4d2d2d9cbac7d984528a0d69c78becf9"
+  integrity sha512-CzjOb1sSDPT+uqCItFq7edIoNTBzeg53ye2h81hrfd24lcD2YiSkpJNKJ8jm2Q3UZf6Jth1vDHbS6ub8bGczxw==
+  dependencies:
+    "@types/node" ">=6"
+    tslib "^1.9.3"
+
+"@wry/equality@^0.1.2":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.7.tgz#512234d078341c32cabda66b89b5dddb5741d9b9"
+  integrity sha512-p1rhJ6PQzpsBr9cMJMHvvx3LQEA28HFX7fAQx6khAX+1lufFeBuk+iRCAyHwj3v6JbpGKvHNa66f+9cpU8c7ew==
+  dependencies:
+    tslib "^1.9.3"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -2199,61 +2224,60 @@ apache-md5@^1.0.6:
   resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
   integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
 
-apollo-angular-link-http-common@~1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.6.0.tgz#9f0431c009f816fe3f577d7a7ebf7d748671ecac"
-  integrity sha512-V3ONCeL0NpcY+0zG5vq3S40w1A32h4Nk6tJeCgD59Yfmay4TbIWxQ14vXqFMsraMyIERNoF31IMttsU9oeX4OA==
+apollo-angular-link-http-common@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http-common/-/apollo-angular-link-http-common-1.7.0.tgz#c4ece9832724437027a591e5840ebedef8e4609b"
+  integrity sha512-syKJD/AgSrfeaZ0XRGfDuRNT2CowTu7VugdlPxf41wJ+v3uPbUnNoha9/simuxOQuUR7ykUWVyKtNPpJO+MagA==
   dependencies:
     tslib "^1.9.0"
 
-apollo-angular-link-http@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.6.0.tgz#8cb6c9a3fd96fae8c318a60c14ae6a4eedad5b3d"
-  integrity sha512-6TWrmyF4ZO41FgkM0BOmYibukryjWxudiu9R0P8wnpBQSIYNUcb44dp5jdcNeh1maSH45fHdSKMRe8g8t6m7uA==
+apollo-angular-link-http@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular-link-http/-/apollo-angular-link-http-1.7.0.tgz#1d0b8a5a6cd94b5397c6a959330a0e2fb9f61d6a"
+  integrity sha512-YNZx1sQS8SleEadF4TPswRF/iq2M99/iwnwtxlqmlq7E+4ZSXXyxXjQO6LsXH8iWoG7aitCpzUZR7XAVuXGp+g==
   dependencies:
-    apollo-angular-link-http-common "~1.6.0"
+    apollo-angular-link-http-common "~1.7.0"
     extract-files "5.0.1"
     tslib "^1.9.0"
 
-apollo-angular@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.5.0.tgz#da653b76189fb72ea801c51996ea87fe19aa064f"
-  integrity sha512-zAyMev+bU7cdqRm2AbAH0hJqJOVRN/PpllJ+eqqA0O9dV570RUs2sGehn3dtOcwPHNRof/qrCRoWBEwGrP6hog==
+apollo-angular@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.6.0.tgz#d71cce64d388f4b8e46583f3bf87802eb3458f10"
+  integrity sha512-c8wEskvbGs7n6GNOnVzax6ng4RZtBctzUk9HqqjyLO8TCH4SWGBh1zuShG/9wDqJjTJAb3EcKd5XUJxFybAXeA==
   dependencies:
-    semver "^5.5.1"
+    semver "^6.0.0"
     tslib "^1.9.0"
 
-apollo-cache-inmemory@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz#265d1ee67b0bf0aca9c37629d410bfae44e62953"
-  integrity sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==
+apollo-cache-inmemory@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e"
+  integrity sha512-AyCl3PGFv5Qv1w4N9vlg63GBPHXgMCekZy5mhlS042ji0GW84uTySX+r3F61ZX3+KM1vA4m9hQyctrEGiv5XjQ==
   dependencies:
-    apollo-cache "^1.2.1"
-    apollo-utilities "^1.2.1"
-    optimism "^0.6.9"
-    ts-invariant "^0.2.1"
+    apollo-cache "^1.3.2"
+    apollo-utilities "^1.3.2"
+    optimism "^0.9.0"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
-apollo-cache@1.2.1, apollo-cache@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz#aae71eb4a11f1f7322adc343f84b1a39b0693644"
-  integrity sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==
+apollo-cache@1.3.2, apollo-cache@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a"
+  integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg==
   dependencies:
-    apollo-utilities "^1.2.1"
+    apollo-utilities "^1.3.2"
     tslib "^1.9.3"
 
-apollo-client@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz#36126ed1d32edd79c3713c6684546a3bea80e6d1"
-  integrity sha512-MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA==
+apollo-client@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.2.tgz#03b6af651e09b6e413e486ddc87464c85bd6e514"
+  integrity sha512-oks1MaT5x7gHcPeC8vPC1UzzsKaEIC0tye+jg72eMDt5OKc7BobStTeS/o2Ib3e0ii40nKxGBnMdl/Xa/p56Yg==
   dependencies:
     "@types/zen-observable" "^0.8.0"
-    apollo-cache "1.2.1"
+    apollo-cache "1.3.2"
     apollo-link "^1.0.0"
-    apollo-link-dedup "^1.0.0"
-    apollo-utilities "1.2.1"
+    apollo-utilities "1.3.2"
     symbol-observable "^1.0.2"
-    ts-invariant "^0.2.1"
+    ts-invariant "^0.4.0"
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
@@ -2265,15 +2289,7 @@ apollo-link-context@^1.0.17:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link-dedup@^1.0.0:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz#635cb5659b082e7f270f7649c4b0f71021f7bb4b"
-  integrity sha512-1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg==
-  dependencies:
-    apollo-link "^1.2.11"
-    tslib "^1.9.3"
-
-apollo-link-http-common@^0.2.8:
+apollo-link-http-common@^0.2.13:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz#c688f6baaffdc7b269b2db7ae89dae7c58b5b350"
   integrity sha512-Uyg1ECQpTTA691Fwx5e6Rc/6CPSu4TB4pQRTGIpwZ4l5JDOQ+812Wvi/e3IInmzOZpwx5YrrOfXrtN8BrsDXoA==
@@ -2290,7 +2306,7 @@ apollo-link-ws@^1.0.17:
     apollo-link "^1.2.11"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.6:
+apollo-link@^1.0.0, apollo-link@^1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
   integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
@@ -2300,16 +2316,26 @@ apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.6:
     tslib "^1.9.3"
     zen-observable-ts "^0.8.18"
 
-apollo-upload-client@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-10.0.0.tgz#6cc3d0ea2aef40bc237b655f5042809cacee1859"
-  integrity sha512-N0SENiEkZXoY4nl9xxrXFcj/cL0AVkSNQ4aYXSaruCBWE0aKpK6aCe4DBmiEHrK3FAsMxZPEJxBRIWNbsXT8dw==
+apollo-upload-client@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-10.0.1.tgz#e8446288d03edb1c582c91c26a18b27533f85013"
+  integrity sha512-K6WnuYQi0RRTNO+aSPVjoUWXp4QSr+eoKU4fE0OKQp25XRF2oXl2cTLs+Q4Nk0wOIHM76YGdo/IHtzuNR7jO+A==
   dependencies:
-    apollo-link "^1.2.6"
-    apollo-link-http-common "^0.2.8"
-    extract-files "^5.0.0"
+    apollo-link "^1.2.11"
+    apollo-link-http-common "^0.2.13"
+    extract-files "^5.0.1"
+
+apollo-utilities@1.3.2, apollo-utilities@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
+  integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
+  dependencies:
+    "@wry/equality" "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    ts-invariant "^0.4.0"
+    tslib "^1.9.3"
 
-apollo-utilities@1.2.1, apollo-utilities@^1.2.1:
+apollo-utilities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
   integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
@@ -5927,7 +5953,7 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-files@5.0.1, extract-files@^5.0.0:
+extract-files@5.0.1, extract-files@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz#c9492a8410be643e260a376f0151361993d5f659"
   integrity sha512-qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w==
@@ -7167,11 +7193,6 @@ immer@^1.12.0:
   resolved "https://registry.yarnpkg.com/immer/-/immer-1.12.1.tgz#40c6e5b292c00560836c2993bda3a24379d466f5"
   integrity sha512-3fmKM6ovaqDt0CdC9daXpNi5x/YCYS3i4cwLdTVkhJdk5jrDXoPs7lCm3IqM3yhfSnz4tjjxbRG2CziQ7m8ztg==
 
-immutable-tuple@^0.4.9:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.10.tgz#e0b1625384f514084a7a84b749a3bb26e9179929"
-  integrity sha512-45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q==
-
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -9161,11 +9182,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-nebular-icons@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/nebular-icons/-/nebular-icons-1.1.0.tgz#83a725822f963a60636e54be6c7145eff2306d3f"
-  integrity sha512-4TkJgDrjXw8qsOsc2NN6OBlRJYAJJpvqtjV+gpv+NV6amPgMPQNNuEvbenYXAMFmjs3uShgKOvmpnCX8Ua1oWQ==
-
 needle@^2.2.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.0.tgz#ce3fea21197267bacb310705a7bbe24f2a3a3492"
@@ -9743,12 +9759,12 @@ opn@latest:
   dependencies:
     is-wsl "^1.1.0"
 
-optimism@^0.6.9:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz#19258ff8b3be0cea29ac35f06bff818e026e30bb"
-  integrity sha512-xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ==
+optimism@^0.9.0:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.9.5.tgz#b8b5dc9150e97b79ddbf2d2c6c0e44de4d255527"
+  integrity sha512-lNvmuBgONAGrUbj/xpH69FjMOz1d0jvMNoOCKyVynUPzq2jgVlGL4jFYJqrUHzUfBv+jAFSCP61x5UkfbduYJA==
   dependencies:
-    immutable-tuple "^0.4.9"
+    "@wry/context" "^0.4.0"
 
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
@@ -11552,10 +11568,10 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs-compat@^6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.1.tgz#de928292c633a9a5f2f54a4431e6f9c468001c68"
-  integrity sha512-k0aaMAYFg+DCIUxo3yJcUamFRenWLR23e/VJCQvKOxwSd9DQlwcSn2ov+7b23rKaX4weKG7OrzEBWGqQPkQ07A==
+rxjs-compat@^6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.2.tgz#e469070adf6260bdad195e9d4a39f444ae28b458"
+  integrity sha512-TRMkTp4FgSxE2HtGvxmgRukh3JqdFM7ejAj1Ti/VdodbPGfWvZR5+KdLKRV9jVDFyu2SknM8RD+PR54KGnoLjg==
 
 rxjs-tslint@0.1.5:
   version "0.1.5"
@@ -11574,10 +11590,10 @@ rxjs@6.4.0, rxjs@^6.1.0, rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
-  integrity sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==
+rxjs@^6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
   dependencies:
     tslib "^1.9.0"
 
@@ -11745,7 +11761,7 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -13092,6 +13108,13 @@ ts-invariant@^0.3.2:
   dependencies:
     tslib "^1.9.3"
 
+ts-invariant@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.2.tgz#8685131b8083e67c66d602540e78763408be9113"
+  integrity sha512-PTAAn8lJPEdRBJJEs4ig6MVZWfO12yrFzV7YaPslmyhG7+4MA279y4BXT3f72gXeVl0mC1aAWq2rMX4eKTWU/Q==
+  dependencies:
+    tslib "^1.9.3"
+
 ts-loader@^5.3.2:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.3.tgz#8b4af042e773132d86b3c99ef0acf3b4d325f473"
@@ -14231,10 +14254,10 @@ zen-observable@^0.8.0, zen-observable@^0.8.14:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.14.tgz#d33058359d335bc0db1f0af66158b32872af3bf7"
   integrity sha512-kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g==
 
-zone.js@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.0.tgz#f42319d657f7616724ed40c5907d4614b4c683fa"
-  integrity sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q==
+zone.js@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==
 
 zrender@4.0.7:
   version "4.0.7"

From 7b7217be7289fe57ec91dca10c4d20f0bdd4c1a6 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 7 Jun 2019 16:48:42 +0300
Subject: [PATCH 366/382] fix(ever-admin): fix error on login page

---
 admin/website-angular/src/app/@core/auth/auth.module.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/website-angular/src/app/@core/auth/auth.module.ts b/admin/website-angular/src/app/@core/auth/auth.module.ts
index d1e3388c9..bf1292103 100644
--- a/admin/website-angular/src/app/@core/auth/auth.module.ts
+++ b/admin/website-angular/src/app/@core/auth/auth.module.ts
@@ -8,17 +8,17 @@ import { environment } from 'environments/environment';
 const socialLinks = [
 	{
 		url: environment.COMPANY_GITHUB_LINK,
-		icon: 'socicon-github'
+		icon: 'github-outline'
 	},
 	{
 		url: environment.COMPANY_FACEBOOK_LINK,
 		target: '_blank',
-		icon: 'socicon-facebook'
+		icon: 'facebook-outline'
 	},
 	{
 		url: environment.COMPANY_TWITTER_LINK,
 		target: '_blank',
-		icon: 'socicon-twitter'
+		icon: 'twitter-outline'
 	}
 ];
 

From b3dc3715769d776ec0e70a154d94ec51817118c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2019 21:28:26 +0000
Subject: [PATCH 367/382] chore(deps): bump ecstatic from 3.3.1 to 3.3.2 in
 /shop/website-angular

Bumps [ecstatic](https://github.com/jfhbrook/node-ecstatic) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/jfhbrook/node-ecstatic/releases)
- [Changelog](https://github.com/jfhbrook/node-ecstatic/blob/3.3.2/CHANGELOG.md)
- [Commits](https://github.com/jfhbrook/node-ecstatic/compare/3.3.1...3.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 shop/website-angular/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shop/website-angular/yarn.lock b/shop/website-angular/yarn.lock
index 93355fefd..fad175bdd 100644
--- a/shop/website-angular/yarn.lock
+++ b/shop/website-angular/yarn.lock
@@ -3310,9 +3310,9 @@ ecc-jsbn@~0.1.1:
     safer-buffer "^2.1.0"
 
 ecstatic@^3.0.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.1.tgz#b15b5b036c2233defc78d7bacbd8765226c95577"
-  integrity sha512-/rrctvxZ78HMI/tPIsqdvFKHHscxR3IJuKrZI2ZoUgkt2SiufyLFBmcco+aqQBIu6P1qBsUNG3drAAGLx80vTQ==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.2.tgz#6d1dd49814d00594682c652adb66076a69d46c48"
+  integrity sha512-fLf9l1hnwrHI2xn9mEDT7KIi22UDqA2jaCwyCbSUJh9a1V+LEUSL/JO/6TIz/QyuBURWUHrFL5Kg2TtO1bkkog==
   dependencies:
     he "^1.1.1"
     mime "^1.6.0"

From 7bfea5f528fa68c597d9a9c4aac6a68a85ca4dbf Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Mon, 10 Jun 2019 08:09:32 +0300
Subject: [PATCH 368/382] feat(ever-admin): added map component

---
 .../location/carrier-location.component.html  |   1 +
 .../location/carrier-location.component.scss  |   4 +
 .../location/carrier-location.component.ts    | 279 +++++++++---------
 .../app/+orders/order/order.component.html    | 115 ++++----
 .../app/+orders/order/order.component.scss    |  74 +++--
 .../src/app/+orders/order/order.component.ts  |  15 +-
 .../src/app/+orders/orders.module.ts          |   6 +-
 7 files changed, 267 insertions(+), 227 deletions(-)
 create mode 100644 shop/website-angular/src/app/+orders/location/carrier-location.component.html
 create mode 100644 shop/website-angular/src/app/+orders/location/carrier-location.component.scss

diff --git a/shop/website-angular/src/app/+orders/location/carrier-location.component.html b/shop/website-angular/src/app/+orders/location/carrier-location.component.html
new file mode 100644
index 000000000..ae2402114
--- /dev/null
+++ b/shop/website-angular/src/app/+orders/location/carrier-location.component.html
@@ -0,0 +1 @@
+<div #gmap class="googleMap"></div>
diff --git a/shop/website-angular/src/app/+orders/location/carrier-location.component.scss b/shop/website-angular/src/app/+orders/location/carrier-location.component.scss
new file mode 100644
index 000000000..6c0a0ec1e
--- /dev/null
+++ b/shop/website-angular/src/app/+orders/location/carrier-location.component.scss
@@ -0,0 +1,4 @@
+.googleMap {
+	width: 100%;
+	height: 400px !important;
+}
diff --git a/shop/website-angular/src/app/+orders/location/carrier-location.component.ts b/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
index 4d1518e23..b12ebe53b 100644
--- a/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
+++ b/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { Subject } from 'rxjs';
-import 'style-loader!leaflet/dist/leaflet.css';
+//import 'style-loader!leaflet/dist/leaflet.css';
 import { ActivatedRoute } from '@angular/router';
 import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-router.service';
 import { first } from 'rxjs/operators';
@@ -36,8 +36,7 @@ export class CarrierLocationComponent implements OnDestroy, OnInit {
 
 	constructor(
 		private route: ActivatedRoute,
-		private carrierRouter: CarrierRouter,
-		private carriersService: CarriersService
+		private carrierRouter: CarrierRouter
 	) {}
 
 	ngOnInit(): void {
@@ -64,153 +63,153 @@ export class CarrierLocationComponent implements OnDestroy, OnInit {
 					}
 					let isWorking = false;
 
-					this.interval = setInterval(async () => {
-						const order = await this.carriersService.getCarrierCurrentOrder(
-							carrierId
-						);
+					// this.interval = setInterval(async () => {
+					// 	const order = await this.carriersService.getCarrierCurrentOrder(
+					// 		carrierId
+					// 	);
 
-						if (order) {
-							if (!isWorking) {
-								const user = order.user;
-								const warehouse = order.warehouse;
-								const warehouseIcon =
-									'http://maps.google.com/mapfiles/kml/pal3/icon21.png';
-								const userIcon =
-									'http://maps.google.com/mapfiles/kml/pal3/icon48.png';
-								user.geoLocation = new GeoLocation(
-									user.geoLocation
-								);
-								this.userMarker = this.addMarker(
-									new google.maps.LatLng(
-										user.geoLocation.coordinates.lat,
-										user.geoLocation.coordinates.lng
-									),
-									this.map,
-									userIcon
-								);
-								warehouse.geoLocation = new GeoLocation(
-									warehouse.geoLocation
-								);
-								this.warehouseMarker = this.addMarker(
-									new google.maps.LatLng(
-										warehouse[
-											'geoLocation'
-										].coordinates.lat,
-										warehouse['geoLocation'].coordinates.lng
-									),
-									this.map,
-									warehouseIcon
-								);
-								const start = new google.maps.LatLng(
-									user.geoLocation.coordinates.lat,
-									user.geoLocation.coordinates.lng
-								);
-								const end = new google.maps.LatLng(
-									warehouse['geoLocation'].coordinates.lat,
-									warehouse['geoLocation'].coordinates.lng
-								);
-								const request = {
-									origin: start,
-									destination: end,
-									travelMode: 'DRIVING'
-								};
+					// 	if (order) {
+					// 		if (!isWorking) {
+					// 			const user = order.user;
+					// 			const warehouse = order.warehouse;
+					// 			const warehouseIcon =
+					// 				'http://maps.google.com/mapfiles/kml/pal3/icon21.png';
+					// 			const userIcon =
+					// 				'http://maps.google.com/mapfiles/kml/pal3/icon48.png';
+					// 			user.geoLocation = new GeoLocation(
+					// 				user.geoLocation
+					// 			);
+					// 			this.userMarker = this.addMarker(
+					// 				new google.maps.LatLng(
+					// 					user.geoLocation.coordinates.lat,
+					// 					user.geoLocation.coordinates.lng
+					// 				),
+					// 				this.map,
+					// 				userIcon
+					// 			);
+					// 			warehouse.geoLocation = new GeoLocation(
+					// 				warehouse.geoLocation
+					// 			);
+					// 			this.warehouseMarker = this.addMarker(
+					// 				new google.maps.LatLng(
+					// 					warehouse[
+					// 						'geoLocation'
+					// 					].coordinates.lat,
+					// 					warehouse['geoLocation'].coordinates.lng
+					// 				),
+					// 				this.map,
+					// 				warehouseIcon
+					// 			);
+					// 			const start = new google.maps.LatLng(
+					// 				user.geoLocation.coordinates.lat,
+					// 				user.geoLocation.coordinates.lng
+					// 			);
+					// 			const end = new google.maps.LatLng(
+					// 				warehouse['geoLocation'].coordinates.lat,
+					// 				warehouse['geoLocation'].coordinates.lng
+					// 			);
+					// 			const request = {
+					// 				origin: start,
+					// 				destination: end,
+					// 				travelMode: 'DRIVING'
+					// 			};
 
-								directionsService.route(request, function(
-									res,
-									stat
-								) {
-									if (stat === 'OK') {
-										directionsDisplay.setDirections(res);
-									}
-								});
-								directionsDisplay.setOptions({
-									suppressMarkers: true
-								});
-								directionsDisplay.setMap(this.map);
+					// 			directionsService.route(request, function(
+					// 				res,
+					// 				stat
+					// 			) {
+					// 				if (stat === 'OK') {
+					// 					directionsDisplay.setDirections(res);
+					// 				}
+					// 			});
+					// 			directionsDisplay.setOptions({
+					// 				suppressMarkers: true
+					// 			});
+					// 			directionsDisplay.setMap(this.map);
 
-								const bounds = new google.maps.LatLngBounds();
-								bounds.extend(this.marker.getPosition());
-								bounds.extend(
-									this.warehouseMarker.getPosition()
-								);
-								bounds.extend(this.userMarker.getPosition());
-								this.map.fitBounds(bounds);
+					// 			const bounds = new google.maps.LatLngBounds();
+					// 			bounds.extend(this.marker.getPosition());
+					// 			bounds.extend(
+					// 				this.warehouseMarker.getPosition()
+					// 			);
+					// 			bounds.extend(this.userMarker.getPosition());
+					// 			this.map.fitBounds(bounds);
 
-								isWorking = true;
-								this.isReverted = false;
+					// 			isWorking = true;
+					// 			this.isReverted = false;
 
-								const userInfoContent = `
-									<h3>  ${order.user.firstName + ' ' + order.user.lastName}</h3>
-									<ul>
-										<li><i style='margin-right:5px;' class="ion-md-mail"></i>${
-											order.user.email
-										}</li>
-										<li><i style='margin-right:5px;' class="ion-md-call"></i>${
-											order.user.phone
-										}</li>
-										<li><i style='margin-right:5px;' class="ion-md-locate"></i>${
-											order.user.geoLocation.streetAddress
-										}</li>
-									</ul>
-									`;
+					// 			const userInfoContent = `
+					// 				<h3>  ${order.user.firstName + ' ' + order.user.lastName}</h3>
+					// 				<ul>
+					// 					<li><i style='margin-right:5px;' class="ion-md-mail"></i>${
+					// 						order.user.email
+					// 					}</li>
+					// 					<li><i style='margin-right:5px;' class="ion-md-call"></i>${
+					// 						order.user.phone
+					// 					}</li>
+					// 					<li><i style='margin-right:5px;' class="ion-md-locate"></i>${
+					// 						order.user.geoLocation.streetAddress
+					// 					}</li>
+					// 				</ul>
+					// 				`;
 
-								const userInfoWindow = new google.maps.InfoWindow(
-									{
-										content: userInfoContent
-									}
-								);
+					// 			const userInfoWindow = new google.maps.InfoWindow(
+					// 				{
+					// 					content: userInfoContent
+					// 				}
+					// 			);
 
-								this.userMarker.addListener('click', () => {
-									userInfoWindow.open(
-										this.map,
-										this.userMarker
-									);
-								});
-								const warehouseInfoContent = `
-									<h3>  ${order.warehouse.name}</h3>
-									<ul>
-										<li>
-											<i style='margin-right:5px;' class="ion-md-mail"></i>
-											${order.warehouse.contactEmail}
-										</li>
-										<li>
-											<i style='margin-right:5px;' class="ion-md-phone"></i><i class="ion-md-call"></i>
-											${order.warehouse.contactPhone}
-										</li>
-										<li>
-											<i style='margin-right:5px;' class="ion-md-locate"></i>
-											${order.warehouse.geoLocation.streetAddress}
-										</li>
-									</ul>
-									`;
+					// 			this.userMarker.addListener('click', () => {
+					// 				userInfoWindow.open(
+					// 					this.map,
+					// 					this.userMarker
+					// 				);
+					// 			});
+					// 			const warehouseInfoContent = `
+					// 				<h3>  ${order.warehouse.name}</h3>
+					// 				<ul>
+					// 					<li>
+					// 						<i style='margin-right:5px;' class="ion-md-mail"></i>
+					// 						${order.warehouse.contactEmail}
+					// 					</li>
+					// 					<li>
+					// 						<i style='margin-right:5px;' class="ion-md-phone"></i><i class="ion-md-call"></i>
+					// 						${order.warehouse.contactPhone}
+					// 					</li>
+					// 					<li>
+					// 						<i style='margin-right:5px;' class="ion-md-locate"></i>
+					// 						${order.warehouse.geoLocation.streetAddress}
+					// 					</li>
+					// 				</ul>
+					// 				`;
 
-								const warehouseInfoWindow = new google.maps.InfoWindow(
-									{
-										content: warehouseInfoContent
-									}
-								);
+					// 			const warehouseInfoWindow = new google.maps.InfoWindow(
+					// 				{
+					// 					content: warehouseInfoContent
+					// 				}
+					// 			);
 
-								this.warehouseMarker.addListener(
-									'click',
-									() => {
-										warehouseInfoWindow.open(
-											this.map,
-											this.warehouseMarker
-										);
-									}
-								);
-							}
-						} else {
-							if (isWorking) {
-								this.revertMap();
-								isWorking = false;
-							}
+					// 			this.warehouseMarker.addListener(
+					// 				'click',
+					// 				() => {
+					// 					warehouseInfoWindow.open(
+					// 						this.map,
+					// 						this.warehouseMarker
+					// 					);
+					// 				}
+					// 			);
+					// 		}
+					// 	} else {
+					// 		if (isWorking) {
+					// 			this.revertMap();
+					// 			isWorking = false;
+					// 		}
 
-							if (!this.isReverted) {
-								this.revertMap();
-							}
-						}
-					}, 1500);
+					// 		if (!this.isReverted) {
+					// 			this.revertMap();
+					// 		}
+					// 	}
+					// }, 1500);
 
 					this.map.setCenter(newCoordinates);
 					const carierIcon =
diff --git a/shop/website-angular/src/app/+orders/order/order.component.html b/shop/website-angular/src/app/+orders/order/order.component.html
index 2754e2878..913167693 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.html
+++ b/shop/website-angular/src/app/+orders/order/order.component.html
@@ -1,18 +1,11 @@
 <mat-card class="order">
 	<div class="order-header">
-		<div class="warehouse-logo-container">
-			<warehouse-logo
-				[logo]="warehouse?.logo"
-				[border]="true"
-			></warehouse-logo>
-		</div>
 		<div class="order-status-container">
+			<!-- <h2 class="order-status-text" *ngIf="warehouse">{{warehouse.name}}</h2> -->
 			<p class="order-status-text">
-				{{ 'ORDER_VIEW.ORDER_ID' | translate }} {{ orderNumber }}
+				{{ 'ORDER_VIEW.ORDER_ID' | translate }} #{{ orderNumber }}
 			</p>
-			<!-- <p class="order-status-text">
-				{{ createdAt | date: 'yyyy-MM-dd HH:mm:ss' }}
-			</p> -->
+
 			<div class="order-status-text">
 				{{ order.orderType ? 'Takeout' : 'Delivery' }}
 			</div>
@@ -25,40 +18,41 @@
 					/>
 				</svg>
 			</p>
+			<p class="order-status-text">
+				{{ createdAt | date: 'yyyy-MM-dd HH:mm:ss' }}
+			</p>
 		</div>
 	</div>
-	<div class="order-details">
-		<div class="order-info">
-			<div class="product-info">
-				<h1 class="product-name">
-					{{ title }} <span class="product-price">${{ price }}</span>
-				</h1>
-				<h2 class="product-description">{{ description }}</h2>
+	<div class="warehouse-logo-container">
+		<warehouse-logo
+			[logo]="warehouse?.logo"
+			[border]="true"
+		></warehouse-logo>
+	</div>
+	<div class="products">
+		<div class="product-details" *ngFor="let product of products">
+			<div class="order-info">
+				<div class="product-info">
+					<h1 class="product-name">
+						{{ localeTranslate(product.product.title) }}
+						<span class="product-price">${{ product.price }}</span>
+					</h1>
+					<h2 class="product-description">
+						{{ localeTranslate(product.product.description) }}
+					</h2>
+				</div>
 			</div>
-			<div class="order-options">
-				<button
-					(click)="openDialog()"
-					mat-raised-button
-					color="accent"
-					class="cancel-button"
-				>
-					<svg viewBox="0 0 24 24">
-						<path
-							d="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z"
-						/>
-					</svg>
-					{{ 'ORDER_VIEW.CANCEL' | translate }}
-				</button>
-				<button mat-raised-button color="accent" class="pay-button">
-					<svg class="payment-button-icon" viewBox="0 0 24 24">
-						<path
-							d="M20,8H4V6H20M20,18H4V12H20M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z"
-						/></svg
-					>Pay
-				</button>
+			<div class="order-images">
+				<img
+					class="order-picture"
+					[src]="localeTranslate(product.product.images)"
+				/>
+				<span
+					*ngIf="!order.products.length"
+					class="no-product-img order-picture"
+				></span>
 			</div>
-		</div>
-		<div class="side-container">
+			<!-- <div class="side-container">
 			<div class="warehouse-info" *ngIf="warehouse">
 				<h5>{{ warehouse.name }}</h5>
 				<span>{{ warehouse.contactPhone }}</span>
@@ -69,17 +63,38 @@ <h5>{{ carrier.username }}</h5>
 				<span>{{ carrier.phone }}</span>
 				<span>{{ carrier.geoLocation.streetAddress }}</span>
 			</div>
+		</div> -->
 		</div>
 	</div>
-	<div class="order-images">
-		<img
-			*ngFor="let image of imgArray"
-			class="order-picture"
-			[src]="image"
-		/>
-		<span
-			*ngIf="!order.products.length"
-			class="no-product-img order-picture"
-		></span>
+	<div class="order-options">
+		<button
+			(click)="openDialog()"
+			mat-raised-button
+			color="accent"
+			class="cancel-button"
+		>
+			<svg viewBox="0 0 24 24">
+				<path
+					d="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z"
+				/>
+			</svg>
+			{{ 'ORDER_VIEW.CANCEL' | translate }}
+		</button>
+		<button mat-raised-button color="accent" class="pay-button">
+			<svg class="payment-button-icon" viewBox="0 0 24 24">
+				<path
+					d="M20,8H4V6H20M20,18H4V12H20M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z"
+				/></svg
+			>Pay
+		</button>
+		<button
+			mat-raised-button
+			color="accent"
+			(click)="openMap()"
+			class="pay-button"
+			*ngIf="carrier"
+		>
+			Carrier
+		</button>
 	</div>
 </mat-card>
diff --git a/shop/website-angular/src/app/+orders/order/order.component.scss b/shop/website-angular/src/app/+orders/order/order.component.scss
index 244e634eb..feb2e3273 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.scss
+++ b/shop/website-angular/src/app/+orders/order/order.component.scss
@@ -28,6 +28,7 @@
 		display: flex;
 		align-items: center;
 		width: 100%;
+		padding-left: 20px;
 		justify-content: space-between;
 	}
 
@@ -43,40 +44,47 @@
 		color: white;
 		margin: 0px;
 	}
+}
 
-	.warehouse-logo-container {
-		margin-right: 15px;
-	}
-
-	.warehouse-logo-container warehouse-logo {
-		width: 46px;
-		height: 46px;
-	}
+.warehouse-logo-container {
+	position: absolute;
+	right: calc(150px - 23px);
+	top: 100px;
+}
 
-	.warehouse-logo-container warehouse-logo img {
-		opacity: 1;
-	}
+.warehouse-logo-container warehouse-logo {
+	width: 46px;
+	height: 46px;
 }
 
-.order-details {
-	display: flex;
-	justify-content: space-between;
-	//border: 1px solid black;
-	height: fit-content;
-	width: 100%;
+.warehouse-logo-container warehouse-logo img {
+	opacity: 1;
+}
 
-	.side-container {
-		width: 25%;
-		display: flex;
-		flex-direction: column;
+.products {
+	.product-details:last-child {
+		border: none;
 	}
-
-	.order-info {
-		height: fit-content;
+	.product-details {
 		display: flex;
-		flex-direction: column;
-		padding-left: 20px;
-		padding-right: 20px;
+		justify-content: space-between;
+		height: fit-content;
+		width: 100%;
+		border-bottom: 1px solid rgba(#000, 0.3);
+
+		.side-container {
+			width: 25%;
+			display: flex;
+			flex-direction: column;
+		}
+
+		.order-info {
+			height: fit-content;
+			display: flex;
+			flex-direction: column;
+			padding-left: 20px;
+			padding-right: 20px;
+		}
 	}
 }
 
@@ -86,7 +94,9 @@
 	button {
 		margin-right: 20px;
 	}
-	margin-bottom: 20px;
+
+	margin-bottom: 20px !important;
+	margin-left: 20px;
 }
 
 .product-name {
@@ -144,9 +154,13 @@
 }
 
 .order-images {
-	display: flex;
+	min-width: 150px;
+	width: 150px;
 }
+
 .order-picture {
-	height: 110px;
+	width: 100%;
+	display: block;
+	height: auto;
 	user-select: none;
 }
diff --git a/shop/website-angular/src/app/+orders/order/order.component.ts b/shop/website-angular/src/app/+orders/order/order.component.ts
index 664b078f7..d4cc13526 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.ts
+++ b/shop/website-angular/src/app/+orders/order/order.component.ts
@@ -17,6 +17,7 @@ import { MessagePopUpComponent } from 'app/shared/message-pop-up/message-pop-up.
 import { first } from 'rxjs/operators';
 import Warehouse from '@modules/server.common/entities/Warehouse';
 import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-router.service';
+import { CarrierLocationComponent } from '../location/carrier-location.component';
 
 @Component({
 	selector: 'order',
@@ -38,7 +39,7 @@ export class OrderComponent implements OnInit {
 	public price: number;
 	public description: string;
 	public img: string;
-	public imgArray: string[];
+	public products;
 	public orderStatusText: string;
 	public orderNumber: number;
 	public orderType: number;
@@ -85,6 +86,13 @@ export class OrderComponent implements OnInit {
 		});
 	}
 
+	openMap(): void {
+		const mapDialog = this.dialog.open(CarrierLocationComponent, {
+			width: '560px',
+			data: {}
+		});
+	}
+
 	getTranslate(key: string): string {
 		let translationResult = '';
 
@@ -112,10 +120,7 @@ export class OrderComponent implements OnInit {
 			this.img = this.localeTranslate(
 				this.order.products[0].product.images
 			);
-			console.log(this.img);
-			this.imgArray = this.order.products[0].product.images.map(
-				(obj) => obj.url
-			);
+			this.products = this.order.products;
 		}
 		this.orderStatusText = this.order.warehouseStatusText;
 		this.orderStatusTextTranslates =
diff --git a/shop/website-angular/src/app/+orders/orders.module.ts b/shop/website-angular/src/app/+orders/orders.module.ts
index eb78192e0..9eecda897 100644
--- a/shop/website-angular/src/app/+orders/orders.module.ts
+++ b/shop/website-angular/src/app/+orders/orders.module.ts
@@ -18,6 +18,7 @@ import { HttpClient } from '@angular/common/http';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { MessagePopUpComponent } from 'app/shared/message-pop-up/message-pop-up.component';
 import { MessagePopUpModalModule } from 'app/shared/message-pop-up/message-pop-up.module';
+import { CarrierLocationComponent } from './location/carrier-location.component';
 
 export function HttpLoaderFactory(http: HttpClient) {
 	return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -27,10 +28,11 @@ export function HttpLoaderFactory(http: HttpClient) {
 	declarations: [
 		OrdersContainerComponent,
 		OrdersComponent,
-		OrderComponent
+		OrderComponent,
+		CarrierLocationComponent
 		// MessagePopUpComponent
 	],
-	// entryComponents: [MessagePopUpComponent],
+	entryComponents: [CarrierLocationComponent],
 	imports: [
 		CommonModule,
 		MessagePopUpModalModule,

From f53a22f405628e7e7d74aeca544fc77fbf6110da Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Mon, 10 Jun 2019 11:17:21 +0300
Subject: [PATCH 369/382] feat(ever-shop-web): added map icons, map button,
 fixed images

---
 .../location/carrier-location.component.scss  |   2 +-
 .../location/carrier-location.component.ts    | 318 ++++++------------
 .../app/+orders/order/order.component.html    |  26 +-
 .../app/+orders/order/order.component.scss    |  10 +-
 .../src/app/+orders/order/order.component.ts  |   9 +-
 shop/website-angular/src/styles/styles.scss   |   4 +
 6 files changed, 138 insertions(+), 231 deletions(-)

diff --git a/shop/website-angular/src/app/+orders/location/carrier-location.component.scss b/shop/website-angular/src/app/+orders/location/carrier-location.component.scss
index 6c0a0ec1e..1ed2995f3 100644
--- a/shop/website-angular/src/app/+orders/location/carrier-location.component.scss
+++ b/shop/website-angular/src/app/+orders/location/carrier-location.component.scss
@@ -1,4 +1,4 @@
 .googleMap {
 	width: 100%;
-	height: 400px !important;
+	height: 600px !important;
 }
diff --git a/shop/website-angular/src/app/+orders/location/carrier-location.component.ts b/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
index b12ebe53b..cda7c49cc 100644
--- a/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
+++ b/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewChild, Inject } from '@angular/core';
 import { Subject } from 'rxjs';
 //import 'style-loader!leaflet/dist/leaflet.css';
 import { ActivatedRoute } from '@angular/router';
@@ -9,6 +9,7 @@ import { ICarrierOrdersRouterGetOptions } from '@modules/server.common/routers/I
 import { environment } from 'environments/environment';
 import { CarriersService } from 'app/@core/data/carriers.service';
 import GeoLocation from '@modules/server.common/entities/GeoLocation';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 
 declare var google: any;
 const directionsDisplay = new google.maps.DirectionsRenderer();
@@ -19,226 +20,135 @@ const directionsService = new google.maps.DirectionsService();
 	styleUrls: ['./carrier-location.component.scss'],
 	templateUrl: './carrier-location.component.html'
 })
-export class CarrierLocationComponent implements OnDestroy, OnInit {
+export class CarrierLocationComponent implements OnInit {
 	private ngDestroy$ = new Subject();
 
 	@ViewChild('gmap')
 	gmapElement: any;
 	map: google.maps.Map;
-	carrierSub$: any;
 	marker: any;
 	userMarker: any;
 	warehouseMarker: any;
-	interval: NodeJS.Timer;
-	isReverted: boolean = true;
-	params$: any;
-	carrierId: string;
-
+	carrierLoc: any;
+	storeLoc: any;
+	userOrder: any;
 	constructor(
-		private route: ActivatedRoute,
-		private carrierRouter: CarrierRouter
-	) {}
+		private dialogRef: MatDialogRef<CarrierLocationComponent>,
+		@Inject(MAT_DIALOG_DATA)
+		data
+	) {
+		this.carrierLoc = data.carrier;
+		this.storeLoc = data.merchant;
+		this.userOrder = data.userOrder;
+	}
 
 	ngOnInit(): void {
 		this.showMap();
-		this._subscribeCarrier();
+		this.showIconsOnMap();
 	}
 
-	async _subscribeCarrier() {
-		this.params$ = this.route.params.subscribe((res) => {
-			const carrierId = res.id || this.carrierId;
-
-			this.carrierSub$ = this.carrierRouter
-				.get(carrierId)
-				.subscribe(async (carrier) => {
-					if (this.interval) {
-						clearInterval(this.interval);
-					}
-					const newCoordinates = new google.maps.LatLng(
-						carrier.geoLocation.coordinates.lat,
-						carrier.geoLocation.coordinates.lng
-					);
-					if (this.marker) {
-						this.marker.setMap(null);
-					}
-					let isWorking = false;
-
-					// this.interval = setInterval(async () => {
-					// 	const order = await this.carriersService.getCarrierCurrentOrder(
-					// 		carrierId
-					// 	);
-
-					// 	if (order) {
-					// 		if (!isWorking) {
-					// 			const user = order.user;
-					// 			const warehouse = order.warehouse;
-					// 			const warehouseIcon =
-					// 				'http://maps.google.com/mapfiles/kml/pal3/icon21.png';
-					// 			const userIcon =
-					// 				'http://maps.google.com/mapfiles/kml/pal3/icon48.png';
-					// 			user.geoLocation = new GeoLocation(
-					// 				user.geoLocation
-					// 			);
-					// 			this.userMarker = this.addMarker(
-					// 				new google.maps.LatLng(
-					// 					user.geoLocation.coordinates.lat,
-					// 					user.geoLocation.coordinates.lng
-					// 				),
-					// 				this.map,
-					// 				userIcon
-					// 			);
-					// 			warehouse.geoLocation = new GeoLocation(
-					// 				warehouse.geoLocation
-					// 			);
-					// 			this.warehouseMarker = this.addMarker(
-					// 				new google.maps.LatLng(
-					// 					warehouse[
-					// 						'geoLocation'
-					// 					].coordinates.lat,
-					// 					warehouse['geoLocation'].coordinates.lng
-					// 				),
-					// 				this.map,
-					// 				warehouseIcon
-					// 			);
-					// 			const start = new google.maps.LatLng(
-					// 				user.geoLocation.coordinates.lat,
-					// 				user.geoLocation.coordinates.lng
-					// 			);
-					// 			const end = new google.maps.LatLng(
-					// 				warehouse['geoLocation'].coordinates.lat,
-					// 				warehouse['geoLocation'].coordinates.lng
-					// 			);
-					// 			const request = {
-					// 				origin: start,
-					// 				destination: end,
-					// 				travelMode: 'DRIVING'
-					// 			};
-
-					// 			directionsService.route(request, function(
-					// 				res,
-					// 				stat
-					// 			) {
-					// 				if (stat === 'OK') {
-					// 					directionsDisplay.setDirections(res);
-					// 				}
-					// 			});
-					// 			directionsDisplay.setOptions({
-					// 				suppressMarkers: true
-					// 			});
-					// 			directionsDisplay.setMap(this.map);
-
-					// 			const bounds = new google.maps.LatLngBounds();
-					// 			bounds.extend(this.marker.getPosition());
-					// 			bounds.extend(
-					// 				this.warehouseMarker.getPosition()
-					// 			);
-					// 			bounds.extend(this.userMarker.getPosition());
-					// 			this.map.fitBounds(bounds);
-
-					// 			isWorking = true;
-					// 			this.isReverted = false;
-
-					// 			const userInfoContent = `
-					// 				<h3>  ${order.user.firstName + ' ' + order.user.lastName}</h3>
-					// 				<ul>
-					// 					<li><i style='margin-right:5px;' class="ion-md-mail"></i>${
-					// 						order.user.email
-					// 					}</li>
-					// 					<li><i style='margin-right:5px;' class="ion-md-call"></i>${
-					// 						order.user.phone
-					// 					}</li>
-					// 					<li><i style='margin-right:5px;' class="ion-md-locate"></i>${
-					// 						order.user.geoLocation.streetAddress
-					// 					}</li>
-					// 				</ul>
-					// 				`;
-
-					// 			const userInfoWindow = new google.maps.InfoWindow(
-					// 				{
-					// 					content: userInfoContent
-					// 				}
-					// 			);
-
-					// 			this.userMarker.addListener('click', () => {
-					// 				userInfoWindow.open(
-					// 					this.map,
-					// 					this.userMarker
-					// 				);
-					// 			});
-					// 			const warehouseInfoContent = `
-					// 				<h3>  ${order.warehouse.name}</h3>
-					// 				<ul>
-					// 					<li>
-					// 						<i style='margin-right:5px;' class="ion-md-mail"></i>
-					// 						${order.warehouse.contactEmail}
-					// 					</li>
-					// 					<li>
-					// 						<i style='margin-right:5px;' class="ion-md-phone"></i><i class="ion-md-call"></i>
-					// 						${order.warehouse.contactPhone}
-					// 					</li>
-					// 					<li>
-					// 						<i style='margin-right:5px;' class="ion-md-locate"></i>
-					// 						${order.warehouse.geoLocation.streetAddress}
-					// 					</li>
-					// 				</ul>
-					// 				`;
+	showIconsOnMap() {
+		const newCoordinates = new google.maps.LatLng(
+			this.carrierLoc.geoLocation.coordinates.lat,
+			this.carrierLoc.geoLocation.coordinates.lng
+		);
+
+		const warehouseIcon =
+			'http://maps.google.com/mapfiles/kml/pal3/icon21.png';
+		const userIcon = 'http://maps.google.com/mapfiles/kml/pal3/icon48.png';
+
+		this.userMarker = this.addMarker(
+			new google.maps.LatLng(
+				this.userOrder.geoLocation.coordinates.lat,
+				this.userOrder.geoLocation.coordinates.lng
+			),
+			this.map,
+			userIcon
+		);
+
+		this.warehouseMarker = this.addMarker(
+			new google.maps.LatLng(
+				this.storeLoc.geoLocation.coordinates.lat,
+				this.storeLoc.geoLocation.coordinates.lng
+			),
+			this.map,
+			warehouseIcon
+		);
+		const start = new google.maps.LatLng(
+			this.userOrder.geoLocation.coordinates.lat,
+			this.userOrder.geoLocation.coordinates.lng
+		);
+		const end = new google.maps.LatLng(
+			this.storeLoc.geoLocation.coordinates.lat,
+			this.storeLoc.geoLocation.coordinates.lng
+		);
+		const request = {
+			origin: start,
+			destination: end,
+			travelMode: 'DRIVING'
+		};
 
-					// 			const warehouseInfoWindow = new google.maps.InfoWindow(
-					// 				{
-					// 					content: warehouseInfoContent
-					// 				}
-					// 			);
+		directionsService.route(request, function(res, stat) {
+			if (stat === 'OK') {
+				directionsDisplay.setDirections(res);
+			}
+		});
 
-					// 			this.warehouseMarker.addListener(
-					// 				'click',
-					// 				() => {
-					// 					warehouseInfoWindow.open(
-					// 						this.map,
-					// 						this.warehouseMarker
-					// 					);
-					// 				}
-					// 			);
-					// 		}
-					// 	} else {
-					// 		if (isWorking) {
-					// 			this.revertMap();
-					// 			isWorking = false;
-					// 		}
+		directionsDisplay.setOptions({
+			suppressMarkers: true
+		});
+		directionsDisplay.setMap(this.map);
+
+		const warehouseInfoContent = `
+									<h3>  ${this.storeLoc.name}</h3>
+									<ul>
+										<li>
+											<i style='margin-right:5px;' class="ion-md-mail"></i>
+											${this.storeLoc.contactEmail}
+										</li>
+										<li>
+											<i style='margin-right:5px;' class="ion-md-phone"></i><i class="ion-md-call"></i>
+											${this.storeLoc.contactPhone}
+										</li>
+										<li>
+											<i style='margin-right:5px;' class="ion-md-locate"></i>
+											${this.storeLoc.geoLocation.streetAddress}
+										</li>
+									</ul>
+									`;
+
+		const warehouseInfoWindow = new google.maps.InfoWindow({
+			content: warehouseInfoContent
+		});
 
-					// 		if (!this.isReverted) {
-					// 			this.revertMap();
-					// 		}
-					// 	}
-					// }, 1500);
+		this.warehouseMarker.addListener('click', () => {
+			warehouseInfoWindow.open(this.map, this.warehouseMarker);
+		});
 
-					this.map.setCenter(newCoordinates);
-					const carierIcon =
-						'http://maps.google.com/mapfiles/kml/pal4/icon54.png';
+		this.map.setCenter(newCoordinates);
+		const carierIcon =
+			'http://maps.google.com/mapfiles/kml/pal4/icon54.png';
 
-					this.marker = this.addMarker(
-						newCoordinates,
-						this.map,
-						carierIcon
-					);
-					const carrierInfoContent = `
-					<h3>  ${carrier.fullName}</h3>
+		this.marker = this.addMarker(newCoordinates, this.map, carierIcon);
+		const carrierInfoContent = `
+					<h3>  ${this.carrierLoc.fullName}</h3>
 					<ul>
-						<li>${carrier.username}</li>
-						<li><i style='margin-right:5px;' class="ion-md-call"></i>${carrier.phone}</li>
+						<li>${this.carrierLoc.username}</li>
+						<li><i style='margin-right:5px;' class="ion-md-call"></i>${
+							this.carrierLoc.phone
+						}</li>
 						<li><i style='margin-right:5px;' class="ion-md-locate"></i>${
-							carrier.geoLocation.streetAddress
+							this.carrierLoc.geoLocation.streetAddress
 						}</li>
 					</ul>
 					`;
 
-					const carrierInfoWindow = new google.maps.InfoWindow({
-						content: carrierInfoContent
-					});
+		const carrierInfoWindow = new google.maps.InfoWindow({
+			content: carrierInfoContent
+		});
 
-					this.marker.addListener('click', () => {
-						carrierInfoWindow.open(this.map, this.marker);
-					});
-				});
+		this.marker.addListener('click', () => {
+			carrierInfoWindow.open(this.map, this.marker);
 		});
 	}
 
@@ -246,7 +156,6 @@ export class CarrierLocationComponent implements OnDestroy, OnInit {
 		this.map.setZoom(15);
 		this.warehouseMarker.setMap(null);
 		this.userMarker.setMap(null);
-		this.isReverted = true;
 	}
 
 	showMap() {
@@ -265,21 +174,4 @@ export class CarrierLocationComponent implements OnDestroy, OnInit {
 			icon
 		});
 	}
-
-	ngOnDestroy() {
-		this.ngDestroy$.next();
-		this.ngDestroy$.complete();
-
-		if (this.interval) {
-			clearInterval(this.interval);
-		}
-
-		if (this.carrierSub$) {
-			this.carrierSub$.unsubscribe();
-		}
-
-		if (this.params$) {
-			this.params$.unsubscribe();
-		}
-	}
 }
diff --git a/shop/website-angular/src/app/+orders/order/order.component.html b/shop/website-angular/src/app/+orders/order/order.component.html
index 913167693..0d10d7ef8 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.html
+++ b/shop/website-angular/src/app/+orders/order/order.component.html
@@ -1,7 +1,6 @@
 <mat-card class="order">
 	<div class="order-header">
 		<div class="order-status-container">
-			<!-- <h2 class="order-status-text" *ngIf="warehouse">{{warehouse.name}}</h2> -->
 			<p class="order-status-text">
 				{{ 'ORDER_VIEW.ORDER_ID' | translate }} #{{ orderNumber }}
 			</p>
@@ -52,18 +51,6 @@ <h2 class="product-description">
 					class="no-product-img order-picture"
 				></span>
 			</div>
-			<!-- <div class="side-container">
-			<div class="warehouse-info" *ngIf="warehouse">
-				<h5>{{ warehouse.name }}</h5>
-				<span>{{ warehouse.contactPhone }}</span>
-				<span>{{ warehouse.geoLocation.streetAddress }}</span>
-			</div>
-			<div class="warehouse-info" *ngIf="carrier">
-				<h5>{{ carrier.username }}</h5>
-				<span>{{ carrier.phone }}</span>
-				<span>{{ carrier.geoLocation.streetAddress }}</span>
-			</div>
-		</div> -->
 		</div>
 	</div>
 	<div class="order-options">
@@ -94,7 +81,18 @@ <h5>{{ carrier.username }}</h5>
 			class="pay-button"
 			*ngIf="carrier"
 		>
-			Carrier
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				width="24"
+				height="24"
+				viewBox="0 0 24 24"
+			>
+				<path
+					d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"
+				/>
+				<path d="M0 0h24v24H0z" fill="none" />
+			</svg>
+			Show carrier on map
 		</button>
 	</div>
 </mat-card>
diff --git a/shop/website-angular/src/app/+orders/order/order.component.scss b/shop/website-angular/src/app/+orders/order/order.component.scss
index feb2e3273..db64052ab 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.scss
+++ b/shop/website-angular/src/app/+orders/order/order.component.scss
@@ -64,6 +64,9 @@
 .products {
 	.product-details:last-child {
 		border: none;
+		.order-info {
+			padding-bottom: 50px;
+		}
 	}
 	.product-details {
 		display: flex;
@@ -90,7 +93,9 @@
 
 .order-options {
 	display: flex;
-
+	position: absolute;
+	left: 0;
+	bottom: 0;
 	button {
 		margin-right: 20px;
 	}
@@ -156,6 +161,9 @@
 .order-images {
 	min-width: 150px;
 	width: 150px;
+	display: flex;
+	align-items: center;
+	background: #2a2c39;
 }
 
 .order-picture {
diff --git a/shop/website-angular/src/app/+orders/order/order.component.ts b/shop/website-angular/src/app/+orders/order/order.component.ts
index d4cc13526..331d99aaf 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.ts
+++ b/shop/website-angular/src/app/+orders/order/order.component.ts
@@ -87,9 +87,14 @@ export class OrderComponent implements OnInit {
 	}
 
 	openMap(): void {
-		const mapDialog = this.dialog.open(CarrierLocationComponent, {
+		this.dialog.open(CarrierLocationComponent, {
 			width: '560px',
-			data: {}
+			panelClass: 'app-dialog-container',
+			data: {
+				carrier: this.carrier,
+				merchant: this.warehouse,
+				userOrder: this.order.user
+			}
 		});
 	}
 
diff --git a/shop/website-angular/src/styles/styles.scss b/shop/website-angular/src/styles/styles.scss
index d91467c6d..f2a3574d2 100644
--- a/shop/website-angular/src/styles/styles.scss
+++ b/shop/website-angular/src/styles/styles.scss
@@ -221,3 +221,7 @@ body {
 		}
 	}
 }
+
+.app-dialog-container .mat-dialog-container {
+	padding: 0;
+}

From f3817812505e642885f525c09e1b14c857c5f72a Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Mon, 10 Jun 2019 11:24:01 +0300
Subject: [PATCH 370/382] feat(ever-shop-web): removed obsolete button, fixed
 spacing

---
 .../src/app/+orders/order/order.component.html       |  5 +++--
 .../src/app/+orders/orders.component.html            | 12 ------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/shop/website-angular/src/app/+orders/order/order.component.html b/shop/website-angular/src/app/+orders/order/order.component.html
index 0d10d7ef8..a163ee294 100644
--- a/shop/website-angular/src/app/+orders/order/order.component.html
+++ b/shop/website-angular/src/app/+orders/order/order.component.html
@@ -71,8 +71,9 @@ <h2 class="product-description">
 			<svg class="payment-button-icon" viewBox="0 0 24 24">
 				<path
 					d="M20,8H4V6H20M20,18H4V12H20M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z"
-				/></svg
-			>Pay
+				/>
+			</svg>
+			Pay
 		</button>
 		<button
 			mat-raised-button
diff --git a/shop/website-angular/src/app/+orders/orders.component.html b/shop/website-angular/src/app/+orders/orders.component.html
index 2570dbad3..c2b48e17c 100644
--- a/shop/website-angular/src/app/+orders/orders.component.html
+++ b/shop/website-angular/src/app/+orders/orders.component.html
@@ -1,15 +1,3 @@
-<div class="payment">
-	<button class="payment-button" mat-raised-button color="accent">
-		<svg class="payment-button-icon" viewBox="0 0 24 24">
-			<path
-				d="M20,8H4V6H20M20,18H4V12H20M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z"
-			/>
-		</svg>
-		{{ 'ORDER_VIEW.PAY_NOW' | translate }} - ${{ ordersSum }}
-	</button>
-	<p class="payment-note">{{ 'ORDER_VIEW.PAY' | translate }}</p>
-</div>
-
 <div class="orders" *ngFor="let order of orders">
 	<order [order]="order"></order>
 </div>

From f730e5f5d8773426cbc0e14efbf88ed313aaef3c Mon Sep 17 00:00:00 2001
From: Emil Momchilov <emil@pernik.org>
Date: Mon, 10 Jun 2019 13:04:14 +0300
Subject: [PATCH 371/382] fix(ever-shop-web): fix build error

---
 .../src/app/+orders/location/carrier-location.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/website-angular/src/app/+orders/location/carrier-location.component.ts b/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
index cda7c49cc..d026fc9d7 100644
--- a/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
+++ b/shop/website-angular/src/app/+orders/location/carrier-location.component.ts
@@ -23,7 +23,7 @@ const directionsService = new google.maps.DirectionsService();
 export class CarrierLocationComponent implements OnInit {
 	private ngDestroy$ = new Subject();
 
-	@ViewChild('gmap')
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 	marker: any;

From 3d9b9cd8d859629e908fc2ca65236cf725ee92da Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2019 20:36:19 +0000
Subject: [PATCH 372/382] chore(package): update typescript-tslint-plugin to
 version 0.5.0

---
 admin/website-angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 1fafc61e8..c404080c1 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -203,7 +203,7 @@
 		"ts-node": "^8.1.0",
 		"tslint": "^5.16.0",
 		"typescript": "3.4.5",
-		"typescript-tslint-plugin": "^0.4.0",
+		"typescript-tslint-plugin": "^0.5.0",
 		"webpack-dev-server": "^3.3.1",
 		"yargs": "^13.2.4"
 	},

From 0bb4d118217b6ddcb9e821b96cd9d28a92f47af7 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2019 20:36:25 +0000
Subject: [PATCH 373/382] chore(package): update lockfile
 admin/website-angular/yarn.lock

---
 admin/website-angular/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 636117707..899e79957 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -13275,10 +13275,10 @@ typeface-exo@^0.0.61:
   resolved "https://registry.yarnpkg.com/typeface-exo/-/typeface-exo-0.0.61.tgz#10c6113292da354cb9f26ee9d0b0c996f1a7a3bd"
   integrity sha512-AH3bMVYnVpg2G+CJbgtogTuJpWGS0zspHJzzVR8cCgTtkbUI0pj8WBB+RFo14CHbF5MmZgYe7TVoWz+j4Yo6Jg==
 
-typescript-tslint-plugin@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.4.0.tgz#af1729e72b770489b2b912809694f46c3281bb72"
-  integrity sha512-83zipyk5bCqu/LHifaWPmJ7Xnl6lLn/3KmWINgr+XND79BrVWmkV8CudKc+a9Jhjs2opvVKq0n0P4O4NhHOixw==
+typescript-tslint-plugin@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.0.tgz#4cefc7f2583d5e663c5e60dc95667f5a93ce7dd0"
+  integrity sha512-qVejs4wVu6RmiNOTekPJIlztt6lN+QC+lArqbcP3CaBuABDsJ0BXYofZX1H2ZywAblOnx403FSrhQcgnRBUGQA==
   dependencies:
     minimatch "^3.0.4"
     mock-require "^3.0.2"

From 06eb14fa9a5a2504f0fd396224d7d296d1091d80 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Tue, 11 Jun 2019 23:49:24 +0300
Subject: [PATCH 374/382] chore: add snyk

---
 .snyk        |   5 +
 package.json |   8 +-
 yarn.lock    | 852 ++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 823 insertions(+), 42 deletions(-)
 create mode 100644 .snyk

diff --git a/.snyk b/.snyk
new file mode 100644
index 000000000..c261936d3
--- /dev/null
+++ b/.snyk
@@ -0,0 +1,5 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.5
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore: {}  
+patch: {}
diff --git a/package.json b/package.json
index b434ee422..bf34be1f9 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,9 @@
 		"build:carrier": "yarn --cwd ./carrier/mobile-ionic run build",
 		"build": "yarn run build:server && yarn run build:admin && yarn run build:merchant && yarn run build:shopmobile && yarn run build:shopweb && yarn run build:carrier",
 		"tslint-check": "tslint-config-prettier-check ./tslint.json",
-		"count": "cross-env yarn cloc backend/api/src admin/website-angular/src shop/mobile-ionic/src shop/website-angular/src carrier/mobile-ionic/src merchant/tablet-ionic/src shared/core-angular shared/core --exclude-dir='node_modules,modules'"
+		"count": "cross-env yarn cloc backend/api/src admin/website-angular/src shop/mobile-ionic/src shop/website-angular/src carrier/mobile-ionic/src merchant/tablet-ionic/src shared/core-angular shared/core --exclude-dir='node_modules,modules'",
+		"snyk-protect": "snyk protect",
+		"prepare": "yarn run snyk-protect"
 	},
 	"resolutions": {},
 	"dependencies": {
@@ -113,6 +115,7 @@
 		"rxjs-tslint": "0.1.5",
 		"tslint": "^5.16.0",
 		"tslint-config-prettier": "^1.18.0",
+		"snyk": "^1.175.2",
 		"typescript": "~3.4.5"
 	},
 	"config": {
@@ -129,5 +132,6 @@
 	"engines": {
 		"node": ">=10.15.0",
 		"yarn": ">=1.13.0"
-	}
+	},
+	"snyk": true
 }
diff --git a/yarn.lock b/yarn.lock
index 83239a464..65a6e7593 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -982,6 +982,21 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
+"@snyk/dep-graph@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.4.1.tgz#035e96224d12d260388d00abc46da02fb9d92d94"
+  integrity sha512-7L096NNuNggcSjyOlITaU17n0dz0J4K4WpIHvatP4K0kIbhxolil1QbJF/+xKMRpW6OuaXILiP0hp7szhkEIzQ==
+  dependencies:
+    graphlib "^2.1.5"
+    lodash "^4"
+    source-map-support "^0.5.9"
+    tslib "^1.9.3"
+
+"@snyk/gemfile@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457"
+  integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==
+
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -989,6 +1004,14 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@types/agent-base@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@types/agent-base/-/agent-base-4.2.0.tgz#00644e8b395b40e1bf50aaf1d22cabc1200d5051"
+  integrity sha512-8mrhPstU+ZX0Ugya8tl5DsDZ1I5ZwQzbL/8PA0z8Gj0k9nql7nkaMzmPVLj+l/nixWaliXi+EBiLA8bptw3z7Q==
+  dependencies:
+    "@types/events" "*"
+    "@types/node" "*"
+
 "@types/async@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/async/-/async-3.0.0.tgz#d403560ee2aabccdb7936cb9a3fee5f147d626bd"
@@ -1005,6 +1028,11 @@
   resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.2.2.tgz#80cf7cfff7401587b8f89307ba36fe4a576bc7cf"
   integrity sha512-6pBxzJ8ZP3dYEQ4YjQ+NVbQaOflfgXq/JbDiS99oLobM2o72uAST4q6yPxHv6FOTCRC/n35ktuo8pvw/S4M7sw==
 
+"@types/debug@^4.1.4":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.4.tgz#56eec47706f0fd0b7c694eae2f3172e6b0b769da"
+  integrity sha512-D9MyoQFI7iP5VdpEyPZyjjqIJ8Y8EDNQFIFVLOmeg1rI1xiHOChyUPMPRUVfqFCerxfE+yS3vMyj37F6IdtOoQ==
+
 "@types/events@*":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
@@ -1090,6 +1118,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
   integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
 
+"@types/node@^8.0.7":
+  version "8.10.49"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.49.tgz#f331afc5efed0796798e5591d6e0ece636969b7b"
+  integrity sha512-YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -1112,6 +1145,11 @@
   dependencies:
     "@types/node" "*"
 
+"@yarnpkg/lockfile@^1.0.2":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
 JSONStream@^1.0.4, JSONStream@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
@@ -1132,7 +1170,7 @@ JSONStream@^1.3.5:
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
   integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=
 
-abbrev@1, abbrev@~1.1.1:
+abbrev@1, abbrev@^1.1.1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
@@ -1147,12 +1185,19 @@ after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
 
-agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0, agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   dependencies:
     es6-promisify "^5.0.0"
 
+agent-base@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
 agentkeepalive@^3.4.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.1.tgz#4eba75cf2ad258fc09efd506cdb8d8c2971d35a4"
@@ -1182,6 +1227,18 @@ ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
 
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+
+ansi-escapes@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.2.0.tgz#c38600259cefba178ee3f7166c5ea3a5dd2e88fc"
+  integrity sha512-0+VX4uhi8m3aNbzoqKmkAVOEj6uQzcUHXoFPkKjhZPTpGRUBqVh930KbB6PS4zIyDZccphlLIYlu8nsjFzkXwg==
+  dependencies:
+    type-fest "^0.5.2"
+
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -1210,7 +1267,7 @@ ansi-styles@~1.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
   integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
 
-ansicolors@~0.3.2:
+ansicolors@^0.3.2, ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
 
@@ -1251,7 +1308,7 @@ aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
 
-archy@~1.0.0:
+archy@^1.0.0, archy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
@@ -1327,7 +1384,7 @@ arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
-asap@^2.0.0:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
@@ -1350,6 +1407,11 @@ ast-types-flow@0.0.7:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
+ast-types@0.x.x:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.1.tgz#9461428a270c5a27fda44b738dd3bab2e9353003"
+  integrity sha512-b+EeK0WlzrSmpMw5jktWvQGxblpWnvMrV+vOp69RLjzGiHwWV0vgq75DPKtUjppKni3yWwSW8WLGV3Ch/XIWcQ==
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -1358,6 +1420,11 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
+async@^1.4.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+
 async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
@@ -1611,6 +1678,11 @@ bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
 cacache@^11.0.1:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
@@ -1958,6 +2030,16 @@ cloc@^2.4.0:
   resolved "https://registry.yarnpkg.com/cloc/-/cloc-2.4.0.tgz#9711bf45177a681e38acaf2f9194067bfda7475c"
   integrity sha512-uDJwmipIYX1rjkaPYaYhvwvq7YBDgKrX1gdDRLGAH3374u/ZRC+wQBpSL+zhEWoXfxW26rDGhYkfX4YTXphK5Q==
 
+clone-deep@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
+  integrity sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=
+  dependencies:
+    for-own "^1.0.0"
+    is-plain-object "^2.0.1"
+    kind-of "^3.2.2"
+    shallow-clone "^0.1.2"
+
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -2129,7 +2211,7 @@ config-chain@^1.1.12:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-configstore@^3.0.0, configstore@^3.1.1:
+configstore@^3.0.0, configstore@^3.1.1, configstore@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
   dependencies:
@@ -2529,6 +2611,13 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-uri-to-buffer@2:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz#ca8f56fe38b1fd329473e9d1b4a9afcd8ce1c045"
+  integrity sha512-OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A==
+  dependencies:
+    "@types/node" "^8.0.7"
+
 date-fns@^1.23.0:
   version "1.30.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
@@ -2560,19 +2649,26 @@ debug@3.1.0, debug@=3.1.0, debug@^3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^4.0.1, debug@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.1.1:
+debug@4, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
+debug@^3.2.5, debug@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.0.1, debug@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
+  dependencies:
+    ms "^2.1.1"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -2613,6 +2709,11 @@ deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
 
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
 deepmerge@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
@@ -2660,6 +2761,15 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
+degenerator@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=
+  dependencies:
+    ast-types "0.x.x"
+    escodegen "1.x.x"
+    esprima "3.x.x"
+
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
@@ -2721,6 +2831,11 @@ diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
+diff@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
+  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+
 dir-glob@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
@@ -2728,6 +2843,13 @@ dir-glob@^2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
+dockerfile-ast@0.0.16:
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz#10b329d343329dab1de70375833495f85ad65913"
+  integrity sha512-+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw==
+  dependencies:
+    vscode-languageserver-types "^3.5.0"
+
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -2795,6 +2917,11 @@ elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
 
+email-validator@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed"
+  integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==
+
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -2926,10 +3053,32 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
+escodegen@1.x.x:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
+  integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+esprima@3.x.x, esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
 
+estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -3036,7 +3185,7 @@ external-editor@^2.0.4:
     iconv-lite "^0.4.17"
     tmp "^0.0.33"
 
-external-editor@^3.0.0:
+external-editor@^3.0.0, external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   dependencies:
@@ -3089,6 +3238,11 @@ fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
 
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
 fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
@@ -3115,6 +3269,11 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+file-uri-to-path@1:
+  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==
+
 fileset@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
@@ -3193,10 +3352,22 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "=3.1.0"
 
-for-in@^1.0.2:
+for-in@^0.1.3:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
+
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
+  dependencies:
+    for-in "^1.0.1"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -3298,6 +3469,14 @@ fstream@^1.0.12:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+ftp@~0.3.10:
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
+  dependencies:
+    readable-stream "1.1.x"
+    xregexp "2.0.0"
+
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3406,6 +3585,18 @@ get-stream@^4.1.0:
   dependencies:
     pump "^3.0.0"
 
+get-uri@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.3.tgz#fa13352269781d75162c6fc813c9e905323fbab5"
+  integrity sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==
+  dependencies:
+    data-uri-to-buffer "2"
+    debug "4"
+    extend "~3.0.2"
+    file-uri-to-path "1"
+    ftp "~0.3.10"
+    readable-stream "3"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -3461,7 +3652,7 @@ git-up@^4.0.0:
     is-ssh "^1.3.0"
     parse-url "^5.0.0"
 
-git-url-parse@^11.1.2:
+git-url-parse@11.1.2, git-url-parse@^11.1.2:
   version "11.1.2"
   resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67"
   integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ==
@@ -3570,6 +3761,13 @@ graceful-fs@^4.1.15, graceful-fs@^4.1.3:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
+graphlib@^2.1.1, graphlib@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz#b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc"
+  integrity sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==
+  dependencies:
+    lodash "^4.17.5"
+
 handlebars@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
@@ -3685,6 +3883,17 @@ http-errors@1.6.3, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-link-header@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/http-link-header/-/http-link-header-0.8.0.tgz#a22b41a0c9b1e2d8fac1bf1b697c6bd532d5f5e4"
@@ -3747,7 +3956,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
@@ -3781,6 +3990,11 @@ image-ssim@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/image-ssim/-/image-ssim-0.2.0.tgz#83b42c7a2e6e4b85505477fe6917f5dbc56420e5"
 
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+
 import-fresh@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
@@ -3843,7 +4057,7 @@ inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, i
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.0, ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
@@ -3897,6 +4111,25 @@ inquirer@^6.2.0:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
+inquirer@^6.2.2:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.11"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
 intl-messageformat-parser@1.4.0, intl-messageformat-parser@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz#b43d45a97468cadbe44331d74bb1e8dea44fc075"
@@ -3947,7 +4180,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5, is-buffer@~1.1.1:
+is-buffer@^1.0.2, is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -4327,7 +4560,7 @@ js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.12.2, js-yaml@^3.13.0:
+js-yaml@^3.12.2, js-yaml@^3.13.0, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -4417,6 +4650,16 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jszip@^3.1.5:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.1.tgz#c5d32df7274042282b157efb16e522b43435e01a"
+  integrity sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw==
+  dependencies:
+    lie "~3.3.0"
+    pako "~1.0.2"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
+
 karma-chrome-launcher@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
@@ -4489,7 +4732,14 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+kind-of@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
+  integrity sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=
+  dependencies:
+    is-buffer "^1.0.2"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
@@ -4520,6 +4770,11 @@ latest-version@^3.0.0:
   dependencies:
     package-json "^4.0.0"
 
+lazy-cache@^0.2.3:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
+  integrity sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=
+
 lazy-property@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz#84ddc4b370679ba8bd4cdcfa4c06b43d57111147"
@@ -4576,6 +4831,14 @@ lerna@^3.13.4:
     import-local "^1.0.0"
     npmlog "^4.1.2"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 libcipm@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/libcipm/-/libcipm-3.0.3.tgz#2e764effe0b90d458790dab3165794c804075ed3"
@@ -4725,6 +4988,13 @@ libnpx@^10.2.0:
     y18n "^4.0.0"
     yargs "^11.0.0"
 
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
+  dependencies:
+    immediate "~3.0.5"
+
 lighthouse-logger@^1.0.0, lighthouse-logger@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz#b76d56935e9c137e86a04741f6bb9b2776e886ca"
@@ -4912,7 +5182,22 @@ lodash._root@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
 
-lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0:
+lodash.assign@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
+
+lodash.assignin@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
+  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+
+lodash.clone@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
+  integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
+
+lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -4921,6 +5206,11 @@ lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
 
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -4978,7 +5268,7 @@ lodash.without@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
 
-lodash@4.17.11, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.2.0, lodash@^4.3.0:
+lodash@4.17.11, lodash@^4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -5037,7 +5327,7 @@ lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
-lru-cache@4.1.x, lru-cache@^4.1.5:
+lru-cache@4.1.x, lru-cache@^4.0.0, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -5331,6 +5621,14 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mixin-object@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
+  dependencies:
+    for-in "^0.1.3"
+    is-extendable "^0.1.1"
+
 mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -5415,6 +5713,16 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+nconf@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2"
+  integrity sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q==
+  dependencies:
+    async "^1.4.0"
+    ini "^1.3.0"
+    secure-keys "^1.0.0"
+    yargs "^3.19.0"
+
 needle@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
@@ -5423,6 +5731,15 @@ needle@^2.2.1:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
+needle@^2.2.4:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
+  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@@ -5437,6 +5754,11 @@ nested-error-stacks@~2.0.1:
   resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz#d2cc9fc5235ddb371fc44d506234339c8e4b0a4b"
   integrity sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A==
 
+netmask@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
+  integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -5924,6 +6246,13 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
+opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+  dependencies:
+    is-wsl "^1.1.0"
+
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -5931,6 +6260,18 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
+optionator@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -6056,6 +6397,31 @@ p-waterfall@^1.0.0:
   dependencies:
     p-reduce "^1.0.0"
 
+pac-proxy-agent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
+  integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^3.1.0"
+    get-uri "^2.0.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    pac-resolver "^3.0.0"
+    raw-body "^2.2.0"
+    socks-proxy-agent "^4.0.1"
+
+pac-resolver@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
+  integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==
+  dependencies:
+    co "^4.6.0"
+    degenerator "^1.0.4"
+    ip "^1.1.5"
+    netmask "^1.0.6"
+    thunkify "^2.1.2"
+
 package-json@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
@@ -6174,6 +6540,11 @@ pacote@^9.5.0:
     unique-filename "^1.1.1"
     which "^1.3.1"
 
+pako@~1.0.2:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
+
 parallel-transform@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
@@ -6359,6 +6730,11 @@ posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
@@ -6421,6 +6797,13 @@ promise-retry@^1.1.1:
     err-code "^1.0.0"
     retry "^0.10.0"
 
+"promise@>=3.2 <8":
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
 prompts@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.4.tgz#179f9d4db3128b9933aa35f93a800d8fce76a682"
@@ -6456,6 +6839,25 @@ protoduck@^5.0.1:
   dependencies:
     genfun "^5.0.0"
 
+proxy-agent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
+  integrity sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^3.1.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    pac-proxy-agent "^3.0.0"
+    proxy-from-env "^1.0.0"
+    socks-proxy-agent "^4.0.1"
+
+proxy-from-env@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -6561,6 +6963,16 @@ raw-body@2.3.3:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
+raw-body@^2.2.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 rc-config-loader@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/rc-config-loader/-/rc-config-loader-2.0.2.tgz#46eb2f98fb5b2aa7b1119d66c0554de5133f1bc1"
@@ -6696,7 +7108,7 @@ read@1, read@~1.0.1, read@~1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -6708,6 +7120,16 @@ read@1, read@~1.0.1, read@~1.0.7:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@1.1.x, readable-stream@~1.1.10:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 "readable-stream@2 || 3":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9"
@@ -6717,6 +7139,15 @@ read@1, read@~1.0.1, read@~1.0.7:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-stream@3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
+  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readable-stream@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
@@ -6726,16 +7157,6 @@ readable-stream@^3.1.1:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~1.1.10:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
@@ -7080,6 +7501,13 @@ rxjs@^6.1.0, rxjs@^6.3.3:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.4.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  dependencies:
+    tslib "^1.9.0"
+
 rxjs@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
@@ -7105,6 +7533,11 @@ sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
+secure-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca"
+  integrity sha1-8MgtmKOxOah3aogIBQuCRDEIf8o=
+
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -7140,6 +7573,11 @@ semver@6.0.0, semver@^6.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -7148,6 +7586,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
 
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
@@ -7170,6 +7613,11 @@ setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
 sha@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/sha/-/sha-2.0.1.tgz#6030822fbd2c9823949f8f72ed6411ee5cf25aae"
@@ -7177,6 +7625,16 @@ sha@~2.0.1:
     graceful-fs "^4.1.2"
     readable-stream "^2.0.2"
 
+shallow-clone@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
+  integrity sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=
+  dependencies:
+    is-extendable "^0.1.1"
+    kind-of "^2.0.1"
+    lazy-cache "^0.2.3"
+    mixin-object "^2.0.1"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -7219,6 +7677,11 @@ slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
+smart-buffer@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
+  integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
+
 smart-buffer@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
@@ -7250,6 +7713,229 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+snyk-config@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-2.2.1.tgz#bdacf79193158ec659bdcc4194140fd8d3772f9d"
+  integrity sha512-eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA==
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.17.11"
+    nconf "^0.10.0"
+
+snyk-docker-plugin@1.25.1:
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-1.25.1.tgz#3f97dda88adfac2e1938151372d07905767bc8a1"
+  integrity sha512-n/LfA7VXjPEcSz2ZfZonT/DPSC89Zs1/HD0inPFN4RLQT3WiQnjqJUXct+D0nWwEVfhLWNc+Y7PLcTjpnZ9R3Q==
+  dependencies:
+    debug "^4.1.1"
+    dockerfile-ast "0.0.16"
+    semver "^6.1.0"
+    tslib "^1"
+
+snyk-go-parser@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/snyk-go-parser/-/snyk-go-parser-1.3.0.tgz#7539a5d191029c688e1b7effbeb2f17533f40375"
+  integrity sha512-qXzmvPyehnrqXMqROtM2PqkvRG7AEBPDDOAywxHdumgDgMPOwOQOZj9t94halDlqb3qVTYgNTupox9kg0tqovA==
+  dependencies:
+    toml "^3.0.0"
+    tslib "^1.9.3"
+
+snyk-go-plugin@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.9.0.tgz#fc6b3ae897949fad60f65bfc3033dd3d50b4661e"
+  integrity sha512-8keL4KKHZUXHK2R9DSaejzs4/UPokT1LsSLBxNsqxC9PJ8JSfXIErNmUCyZbCraVt3TPUbUyAfIYoekhokMgpQ==
+  dependencies:
+    debug "^4.1.1"
+    graphlib "^2.1.1"
+    snyk-go-parser "1.3.0"
+    tmp "0.0.33"
+
+snyk-gradle-plugin@2.12.4:
+  version "2.12.4"
+  resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-2.12.4.tgz#646c787af92985035c25c2bb7f2609ef64acece7"
+  integrity sha512-kVqBOtMZ4EMwUhQ3nj/7R1Pa7FXIl13xTLQehWNKGEkkOu4ljjnXWsktWTOpLQmOgjHd436WF5SIulwUnNG54Q==
+  dependencies:
+    "@types/debug" "^4.1.4"
+    chalk "^2.4.2"
+    clone-deep "^0.3.0"
+    debug "^4.1.1"
+    tmp "0.0.33"
+    tslib "^1.9.3"
+
+snyk-module@1.9.1, snyk-module@^1.6.0, snyk-module@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.9.1.tgz#b2a78f736600b0ab680f1703466ed7309c980804"
+  integrity sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA==
+  dependencies:
+    debug "^3.1.0"
+    hosted-git-info "^2.7.1"
+
+snyk-mvn-plugin@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.3.0.tgz#a76cfc0041ecc4333f2c6f6f72138f1e4621da24"
+  integrity sha512-LOSiJu+XUPVqKCXcnQPLhlyTGm3ikDwjvYw5fpiEnvjMWkMDd8IfzZqulqreebJDmadUpP7Cn0fabfx7TszqxA==
+  dependencies:
+    lodash "4.17.11"
+    tslib "1.9.3"
+
+snyk-nodejs-lockfile-parser@1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.13.0.tgz#f3c81fd9a1870fdb5f71370e510d760326f3ee21"
+  integrity sha512-fC1o9SJ+iM+IYeBUYtvCIYh005WAvWMzqhEH3hI4zGPdCYQqGYIfVpXf29aCOKoorkTR345k5g6Etx54+BbrTQ==
+  dependencies:
+    "@yarnpkg/lockfile" "^1.0.2"
+    graphlib "^2.1.5"
+    lodash "^4.17.11"
+    source-map-support "^0.5.7"
+    tslib "^1.9.3"
+    uuid "^3.3.2"
+
+snyk-nuget-plugin@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.10.0.tgz#58aba49e37ca4ac99afcecb3d3c3917188daad84"
+  integrity sha512-V69AIWcHw4KrgEFC8kNWoqHo54wZkWGfqyVv+kJjQxARWYmQqV4YL/vxfLAoZ7mDsNXgjPn5M4ZEaeHFCeWcyA==
+  dependencies:
+    debug "^3.1.0"
+    jszip "^3.1.5"
+    lodash "^4.17.10"
+    snyk-paket-parser "1.4.3"
+    xml2js "^0.4.17"
+
+snyk-paket-parser@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/snyk-paket-parser/-/snyk-paket-parser-1.4.3.tgz#380ae8c5fb598f81c110f6b645c728c9cc50b7a5"
+  integrity sha512-6m736zGVoeT/zS9KEtlmqTSPEPjAfLe8iYoQ3AwbyxDhzuLY49lTaV67MyZtGwjhi1x4KBe+XOgeWwyf6Avf/A==
+  dependencies:
+    tslib "^1.9.3"
+
+snyk-php-plugin@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/snyk-php-plugin/-/snyk-php-plugin-1.5.3.tgz#a4de181ee0f186f75095cba7931c7b7e603b2d89"
+  integrity sha512-iZB3UpleLbeOL1D1bNLMFfh5hSflbQnepxmtXxXSD3S+euAhqJTZz/26QrsUIAtLQ2eHl3LfAXGTp6131tWyGw==
+  dependencies:
+    debug "^3.1.0"
+    lodash "^4.17.5"
+
+snyk-policy@1.13.5:
+  version "1.13.5"
+  resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.13.5.tgz#c5cf262f759879a65ab0810dd58d59c8ec7e9e47"
+  integrity sha512-KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ==
+  dependencies:
+    debug "^3.1.0"
+    email-validator "^2.0.4"
+    js-yaml "^3.13.1"
+    lodash.clonedeep "^4.5.0"
+    semver "^6.0.0"
+    snyk-module "^1.9.1"
+    snyk-resolve "^1.0.1"
+    snyk-try-require "^1.3.1"
+    then-fs "^2.0.0"
+
+snyk-python-plugin@1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.10.2.tgz#e89548a47d4cfe98351604ed8a3372bfd9fbebbd"
+  integrity sha512-dLswHfVI9Ax8+Ia/onhv1p9S5y+Ie/oELOfpfNApbb0BPTJ5k1c2CQ7WcgQ5/nDRMUOgoKn4VTObaAGmD5or9A==
+  dependencies:
+    tmp "0.0.33"
+
+snyk-resolve-deps@4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.0.3.tgz#f44389430c3712af8f574952e9ff188c6448dbd7"
+  integrity sha512-GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A==
+  dependencies:
+    ansicolors "^0.3.2"
+    debug "^3.2.5"
+    lodash.assign "^4.2.0"
+    lodash.assignin "^4.2.0"
+    lodash.clone "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.get "^4.4.2"
+    lodash.set "^4.3.2"
+    lru-cache "^4.0.0"
+    semver "^5.5.1"
+    snyk-module "^1.6.0"
+    snyk-resolve "^1.0.0"
+    snyk-tree "^1.0.0"
+    snyk-try-require "^1.1.1"
+    then-fs "^2.0.0"
+
+snyk-resolve@1.0.1, snyk-resolve@^1.0.0, snyk-resolve@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.1.tgz#eaa4a275cf7e2b579f18da5b188fe601b8eed9ab"
+  integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==
+  dependencies:
+    debug "^3.1.0"
+    then-fs "^2.0.0"
+
+snyk-sbt-plugin@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/snyk-sbt-plugin/-/snyk-sbt-plugin-2.2.0.tgz#77c07e8d9ed041a55629dbea39c909db3faf11c2"
+  integrity sha512-me/Su5J0ZVoOag3SrbfezHD6kkFymovGhZ0eK2P3T8607iWAOeGVEIbOXAAwMLSFmv8TpihQeWmnRgrCvPLfKw==
+
+snyk-tree@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/snyk-tree/-/snyk-tree-1.0.0.tgz#0fb73176dbf32e782f19100294160448f9111cc8"
+  integrity sha1-D7cxdtvzLngvGRAClBYESPkRHMg=
+  dependencies:
+    archy "^1.0.0"
+
+snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.3.1.tgz#6e026f92e64af7fcccea1ee53d524841e418a212"
+  integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI=
+  dependencies:
+    debug "^3.1.0"
+    lodash.clonedeep "^4.3.0"
+    lru-cache "^4.0.0"
+    then-fs "^2.0.0"
+
+snyk@^1.175.2:
+  version "1.175.2"
+  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.175.2.tgz#b35f0e6aaf446c1228d110c004a06a239d5a1e36"
+  integrity sha512-xs47Gw3rYggOeY867kGeFRzWZQFM5mwQsTla5JgKaUiEvaiyugbwRPfy6PgIcB+mYST1PaxZhzHec2UBKaOTnw==
+  dependencies:
+    "@snyk/dep-graph" "1.4.1"
+    "@snyk/gemfile" "1.2.0"
+    "@types/agent-base" "^4.2.0"
+    abbrev "^1.1.1"
+    ansi-escapes "^4.1.0"
+    chalk "^2.4.2"
+    configstore "^3.1.2"
+    debug "^3.1.0"
+    diff "^4.0.1"
+    git-url-parse "11.1.2"
+    glob "^7.1.3"
+    inquirer "^6.2.2"
+    lodash "^4.17.11"
+    needle "^2.2.4"
+    opn "^5.5.0"
+    os-name "^3.0.0"
+    proxy-agent "^3.1.0"
+    proxy-from-env "^1.0.0"
+    semver "^6.0.0"
+    snyk-config "^2.2.1"
+    snyk-docker-plugin "1.25.1"
+    snyk-go-plugin "1.9.0"
+    snyk-gradle-plugin "2.12.4"
+    snyk-module "1.9.1"
+    snyk-mvn-plugin "2.3.0"
+    snyk-nodejs-lockfile-parser "1.13.0"
+    snyk-nuget-plugin "1.10.0"
+    snyk-php-plugin "1.5.3"
+    snyk-policy "1.13.5"
+    snyk-python-plugin "1.10.2"
+    snyk-resolve "1.0.1"
+    snyk-resolve-deps "4.0.3"
+    snyk-sbt-plugin "2.2.0"
+    snyk-tree "^1.0.0"
+    snyk-try-require "1.3.1"
+    source-map-support "^0.5.11"
+    strip-ansi "^5.2.0"
+    tempfile "^2.0.0"
+    then-fs "^2.0.0"
+    update-notifier "^2.5.0"
+    uuid "^3.3.2"
+
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
@@ -7326,6 +8012,14 @@ socks-proxy-agent@^4.0.0:
     agent-base "~4.2.0"
     socks "~2.2.0"
 
+socks-proxy-agent@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
+  dependencies:
+    agent-base "~4.2.1"
+    socks "~2.3.2"
+
 socks@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
@@ -7333,6 +8027,14 @@ socks@~2.2.0:
     ip "^1.1.5"
     smart-buffer "^4.0.1"
 
+socks@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
+  integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "4.0.2"
+
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
@@ -7361,6 +8063,14 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-support@^0.5.11, source-map-support@^0.5.7, source-map-support@^0.5.9:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -7369,7 +8079,7 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
@@ -7475,7 +8185,7 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
 
@@ -7596,7 +8306,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.1.0:
+strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -7723,6 +8433,14 @@ temp-write@^3.4.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
+tempfile@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265"
+  integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU=
+  dependencies:
+    temp-dir "^1.0.0"
+    uuid "^3.0.1"
+
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -7737,6 +8455,13 @@ text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
+then-fs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2"
+  integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI=
+  dependencies:
+    promise ">=3.2 <8"
+
 thenify-all@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
@@ -7767,6 +8492,11 @@ through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.4, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
+thunkify@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
+  integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
+
 timed-out@4.0.1, timed-out@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
@@ -7817,6 +8547,16 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+toml@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
+  integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
+
 toposort@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
@@ -7856,10 +8596,15 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@1.9.3, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
 
+tslib@^1, tslib@^1.9.3:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+
 tslint-config-prettier@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
@@ -7918,11 +8663,23 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
 type-fest@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
   integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
 
+type-fest@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2"
+  integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -8136,6 +8893,11 @@ void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
+vscode-languageserver-types@^3.5.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
+  integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
+
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
@@ -8196,6 +8958,11 @@ wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
 worker-farm@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
@@ -8304,6 +9071,11 @@ xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
 
+xregexp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
+
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
@@ -8370,7 +9142,7 @@ yargs-parser@^9.0.2:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@3.32.0:
+yargs@3.32.0, yargs@^3.19.0:
   version "3.32.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
   dependencies:

From c7f9042b31906e96e2f13d1989d018fc5b225bb8 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Tue, 11 Jun 2019 23:57:46 +0300
Subject: [PATCH 375/382] chore: fix CircleCI config

---
 .circleci/config.yml | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90298d280..872c50f48 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,6 +16,46 @@ defaults: &defaults
     working_directory: /tmp/workspace
 
 jobs:
+    build-monorepo-root:
+        <<: *defaults
+        working_directory: /tmp/workspace/monorepo-root
+        docker:
+            - image: circleci/node:10.15.0
+        steps:
+            - checkout
+            - run:
+                  name: 'Installing latest Yarn'
+                  command: |
+                      # remove default yarn
+                      sudo rm -rf $(dirname $(which yarn))/yarn*
+                      # download latest
+                      rm -rf ~/.yarn
+                      curl -o- -L https://yarnpkg.com/install.sh | bash
+                      echo 'export PATH="${PATH}:${HOME}/.yarn/bin:${HOME}/.config/yarn/global/node_modules/.bin"' >> $BASH_ENV
+            - run:
+                  name: 'Pull Submodules'
+                  command: |
+                      git submodule init
+                      git submodule update --remote
+            - restore_cache:
+                  name: Restore Yarn Package Cache
+                  keys:
+                      - yarn-packages-monorepo-root-{{ checksum "yarn.lock" }}
+            - run:
+                  name: Install Dependencies
+                  command: yarn install
+            - run:
+                  name: Run Bootstrap
+                  command: yarn bootstrap
+            - save_cache:
+                  name: Save Yarn Package Cache
+                  key: yarn-packages-monorepo-root-{{ checksum "yarn.lock" }}
+                  paths:
+                      - ~/.cache/yarn
+            - persist_to_workspace:
+                  root: /tmp/workspace/monorepo-root
+                  paths:
+                      - '*'
     build-backend-api:
         <<: *defaults
         working_directory: /tmp/workspace/backend/api
@@ -434,6 +474,7 @@ workflows:
     version: 2
     build_and_test:
         jobs:
+            - build-monorepo-root
             - build-backend-api
             - build-admin-website-angular
             - build-merchant-tablet-ionic

From 6dd2907e5c4652b94039605afcd4948435f0a8d7 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 13 Jun 2019 12:24:07 +0300
Subject: [PATCH 376/382] fix(ever-admin): fixed header and side-menu EV-1240

---
 admin/website-angular/package.json            |  14 +-
 .../carrier-mutation.component.ts             |   4 +-
 .../file-uploader/file-uploader.component.ts  |   2 +-
 .../forms/google-map/google-map.component.ts  |   2 +-
 .../invite-request-modal.component.ts         |   2 +-
 .../carreir-location/carreir-location.ts      |   2 +-
 .../user-warehouse-map/user-warehouse-map.ts  |   2 +-
 .../category-image.component.ts               |   2 +-
 .../basic-info/basic-info-form.component.ts   |   2 +-
 .../basic-info/basic-info-form.component.ts   |   4 +-
 .../product-create.component.ts               |   2 +-
 .../render-component/created.component.ts     |   2 +-
 .../created/created.component.ts              |   2 +-
 .../warehouse-table/elapsed.component.ts      |   2 +-
 .../elapsed/elapsed.component.ts              |   2 +-
 .../@shared/styles/control-icon.shared.scss   |  18 +-
 .../user-mutation/user-mutation.component.ts  |   4 +-
 .../warehouse-product-create.component.ts     |   4 +-
 .../basic-info/basic-info-form.component.ts   |   2 +-
 ...se-manage-tabs-delivery-areas.component.ts |   2 +-
 ...warehouse-manage-tabs-details.component.ts |   2 +-
 .../warehouse-manage-tabs.component.ts        |  10 +-
 .../warehouse-mutation.component.ts           |   2 +-
 .../components/footer/footer.component.scss   |   8 +-
 .../components/header/header.component.html   |  20 +-
 .../components/header/header.component.scss   | 330 +++++++++---------
 .../components/header/header.component.ts     |   6 +-
 .../search-input/search-input.component.ts    |   2 +-
 .../switcher/switcher.component.scss          | 227 ++++++------
 .../theme-settings.component.html             |  16 +-
 .../theme-settings.component.scss             |  25 +-
 .../theme-settings.component.ts               |  29 +-
 .../theme-switcher.component.scss             |  22 +-
 .../theme-switcher.component.ts               |   2 +-
 .../theme-switcher-list.component.scss        |   2 +-
 .../layouts/one-column/one-column.layout.scss |  74 ++--
 .../@theme/layouts/sample/sample.layout.scss  |  54 +--
 .../three-columns/three-columns.layout.scss   |  54 +--
 .../two-columns/two-columns.layout.scss       |  50 +--
 .../src/app/@theme/styles/bootstrap-rtl.scss  |  82 ++---
 .../src/app/@theme/styles/everdark.theme.scss |   2 +-
 .../app/@theme/styles/everlight.theme.scss    |   2 +-
 .../src/app/@theme/styles/font-size.scss      |   3 +-
 .../src/app/@theme/styles/pace.theme.scss     |  17 +-
 .../src/app/@theme/styles/styles.scss         |   6 +-
 .../src/app/@theme/styles/themes.scss         | 120 +++----
 .../src/app/@theme/theme.module.ts            |  14 +-
 admin/website-angular/src/app/app.module.ts   |   2 -
 .../+carrier-edit/carrier-edit.component.ts   |   4 +-
 .../carrier-map/carrier-map.component.ts      |   2 +-
 .../+carriers/+carrier/carrier.component.ts   |   2 +-
 .../location/carrier-location.component.scss  |   2 +-
 .../location/carrier-location.component.ts    |   2 +-
 .../app/pages/+carriers/carriers.component.ts |   2 +-
 .../carrier-tracking.component.ts             |   2 +-
 .../+customer-edit/customer-edit.component.ts |   4 +-
 .../ea-customer-location.component.scss       |   2 +-
 .../ea-customer-location.component.ts         |   2 +-
 .../chart-panel-header.component.scss         |   2 +-
 .../chart-panel-header.component.ts           |   2 +-
 .../chart-panel-summary.component.scss        |  39 +--
 .../charts-panel/charts-panel.component.ts    |   6 +-
 .../legend-chart/legend-chart.component.scss  |   2 +-
 .../pages/+dashboard/dashboard.component.scss |  20 +-
 .../+categories/categories.component.ts       |   2 +-
 .../product-edit/product-edit.component.ts    |   2 +-
 .../app/pages/+products/products.component.ts |   2 +-
 .../components/account/account.component.ts   |   2 +-
 .../basic-info/basic-info.component.ts        |   4 +-
 .../contact-info/contact-info.component.ts    |   2 +-
 .../components/location/location.component.ts |   2 +-
 .../payPal-gateway.component.ts               |   2 +-
 .../payment-gateways.component.ts             |   4 +-
 .../stripe-gateway.component.ts               |   2 +-
 .../components/payments/payments.component.ts |   2 +-
 .../product-categories.component.ts           |   4 +-
 .../add-products/add-products.component.ts    |   2 +-
 .../product-mutation.component.ts             |   2 +-
 .../products-catalog.component.ts             |   2 +-
 .../components/products/products.component.ts |   8 +-
 .../add-new-carrier.component.ts              |   2 +-
 .../delivery-takeaway.component.ts            |   6 +-
 .../shared-carriers.component.ts              |   2 +-
 .../+setup/+merchants/merchants.component.ts  |  18 +-
 .../pages/+simulation/simulation.component.ts |   4 +-
 .../warehouse-track.component.ts              |   2 +-
 .../warehouse-manage.component.ts             |   6 +-
 .../warehouse-order.component.ts              |   8 +-
 .../products-table.component.ts               |   2 +-
 .../warehouse-order-view.component.scss       |   5 +-
 .../warehouse-order-view.component.ts         |   2 +-
 .../+warehouse/warehouse.component.scss       |   6 +-
 .../+warehouse/warehouse.component.ts         |   4 +-
 .../charts/chartjs/chartjs.component.scss     |   2 +-
 .../src/app/pages/charts/d3/d3.component.scss |  70 ++--
 .../charts/echarts/echarts.component.scss     |   2 +-
 .../pages/dashboard/dashboard.component.scss  |  10 +-
 .../form-inputs/form-inputs.component.scss    | 256 +++++++-------
 .../maps/bubble/bubble-map.component.scss     |  20 +-
 .../app/pages/maps/gmaps/gmaps.component.scss |   2 +-
 .../pages/maps/leaflet/leaflet.component.scss |   2 +-
 .../maps/search-map/map/map.component.scss    |   2 +-
 .../search-map/search/search.component.ts     |   2 +-
 .../action-groups.component.scss              | 134 +++----
 .../buttons/buttons.component.scss            | 204 +++++------
 .../default-buttons.component.scss            | 252 ++++++-------
 .../hero-buttons/hero-buttons.component.scss  | 245 +++++++------
 .../labeled-actions-group.component.scss      | 104 +++---
 .../shape-buttons.component.scss              |  49 +--
 .../size-buttons/size-buttons.component.scss  |  43 +--
 .../ui-features/grid/grid.component.scss      |  54 +--
 .../ui-features/tabs/tabs.component.scss      |  50 ++-
 .../typography/typography.component.scss      | 267 +++++++-------
 admin/website-angular/yarn.lock               | 120 +++----
 114 files changed, 1688 insertions(+), 1667 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 1fafc61e8..78e8db4b7 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -40,7 +40,7 @@
 		"config": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn ts-node ./scripts/configure.ts",
 		"config:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=dev",
 		"config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=prod",
-		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng serve",
+		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng serve --port 4444",
 		"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng build",
 		"build:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn run build -- --prod --aot",
 		"test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng test",
@@ -149,12 +149,12 @@
 		"zone.js": "^0.9.1"
 	},
 	"devDependencies": {
-		"@angular-devkit/architect": "^0.800.1",
-		"@angular-devkit/build-angular": "^0.800.1",
-		"@angular-devkit/build-webpack": "^0.800.1",
-		"@angular-devkit/core": "^8.0.1",
-		"@angular-devkit/schematics": "^8.0.1",
-		"@angular/cli": "^8.0.1",
+		"@angular-devkit/architect": "^0.800.2",
+		"@angular-devkit/build-angular": "^0.800.2",
+		"@angular-devkit/build-webpack": "^0.800.2",
+		"@angular-devkit/core": "^8.0.2",
+		"@angular-devkit/schematics": "^8.0.2",
+		"@angular/cli": "^8.0.2",
 		"@angular/compiler-cli": "^8.0.0",
 		"@angular/language-service": "^8.0.0",
 		"@babel/core": "^7.4.3",
diff --git a/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts b/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts
index bd95b2cc7..ecb27792f 100644
--- a/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/carrier-mutation/carrier-mutation.component.ts
@@ -17,10 +17,10 @@ import { TranslateService } from '@ngx-translate/core';
 	styleUrls: ['./carrier-mutation.component.scss']
 })
 export class CarrierMutationComponent {
-	@ViewChild('basicInfoForm', { static: true })
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm', { static: true })
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	readonly form: FormGroup = this.formBuilder.group({
diff --git a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
index 2bfef7bbd..d848f1d9b 100644
--- a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
+++ b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
@@ -17,7 +17,7 @@ import { NgModel } from '@angular/forms';
 	styleUrls: ['./file-uploader.component.scss']
 })
 export class FileUploaderComponent {
-	@ViewChild('shownInput', { static: true })
+	@ViewChild('shownInput', { static: false })
 	shownInput: NgModel;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts b/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
index 31731bad6..2fb6122f7 100644
--- a/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
+++ b/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
@@ -10,7 +10,7 @@ import { takeUntil } from 'rxjs/operators';
 	`
 })
 export class GoogleMapComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: true })
+	@ViewChild('gmap', { static: false })
 	mapElement: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
index 06314a563..164fa651c 100644
--- a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
+++ b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
@@ -12,7 +12,7 @@ import { InviteRequestRouter } from '@modules/client.common.angular2/routers/inv
 	styleUrls: ['/invite-request-modal.component.scss']
 })
 export class InviteRequestModalComponent {
-	@ViewChild('locationForm', { static: true })
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts b/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
index 7a56a2a16..f756a2f76 100644
--- a/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
+++ b/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
@@ -16,7 +16,7 @@ import { environment } from 'environments/environment';
 	`
 })
 export class CarrierLocationComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: true })
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 	public map: google.maps.Map;
 	private directionsDisplay = new google.maps.DirectionsRenderer();
diff --git a/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts b/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
index d6aaa1c41..975cad233 100644
--- a/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
+++ b/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
@@ -22,7 +22,7 @@ const userIcon = environment.MAP_USER_ICON_LINK;
 })
 export class UserWarehouseLocationComponent
 	implements AfterViewInit, OnDestroy, OnChanges {
-	@ViewChild('gmap', { static: true })
+	@ViewChild('gmap', { static: false })
 	gmapElement: ElementRef;
 
 	public map: google.maps.Map;
diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
index e3e03236b..fd9567f1e 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
@@ -12,7 +12,7 @@ export class CategoryImageComponent implements ViewCell, OnInit {
 	value: string;
 	rowData: any;
 
-	@ViewChild('image', { static: true })
+	@ViewChild('image', { static: false })
 	image: ElementRef;
 
 	ngOnInit() {
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
index b284932f2..da5ddb500 100644
--- a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
@@ -24,7 +24,7 @@ import { IProductsCategoryCreateObject } from '@modules/server.common/interfaces
 	styleUrls: ['basic-info-form.component.scss']
 })
 export class BasicInfoFormComponent implements OnInit, AfterViewInit {
-	@ViewChild('imagePreview', { static: true })
+	@ViewChild('imagePreview', { static: false })
 	imagePreviewElement: ElementRef;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
index 7758d192d..7e9e6a9c3 100644
--- a/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
@@ -35,9 +35,9 @@ import { TranslateService } from '@ngx-translate/core';
 	templateUrl: 'basic-info-form.component.html'
 })
 export class BasicInfoFormComponent implements OnDestroy, OnInit {
-	@ViewChild('fileInput', { static: true })
+	@ViewChild('fileInput', { static: false })
 	fileInput: any;
-	@ViewChild('productImagePreview', { static: true })
+	@ViewChild('productImagePreview', { static: false })
 	productImagePreview: ElementRef;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
index 1be2c8c5e..d649a0cd5 100644
--- a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
+++ b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
@@ -14,7 +14,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	styleUrls: ['./product-create.component.scss']
 })
 export class ProductCreateComponent implements OnInit {
-	@ViewChild('basicInfoForm', { static: true })
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
 	public loading: boolean;
diff --git a/admin/website-angular/src/app/@shared/render-component/created.component.ts b/admin/website-angular/src/app/@shared/render-component/created.component.ts
index 46b825e6b..1b99257f9 100644
--- a/admin/website-angular/src/app/@shared/render-component/created.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/created.component.ts
@@ -25,7 +25,7 @@ import OrderStatus from '@modules/server.common/enums/OrderStatus';
 	`
 })
 export class CreatedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('createdTimer', { static: true })
+	@ViewChild('createdTimer', { static: false })
 	createdTimer: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/created/created.component.ts b/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
index 4998ea497..76501213d 100644
--- a/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
@@ -16,7 +16,7 @@ import OrderStatus from '@modules/server.common/enums/OrderStatus';
 	templateUrl: './created.component.html'
 })
 export class CreatedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('createdTimer', { static: true })
+	@ViewChild('createdTimer', { static: false })
 	createdTimer: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
index 8f4ec00d6..71a32b5e9 100644
--- a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
@@ -20,7 +20,7 @@ import OrderWarehouseStatus from '@modules/server.common/enums/OrderWarehouseSta
 	`
 })
 export class ElapsedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('elapsedTime', { static: true })
+	@ViewChild('elapsedTime', { static: false })
 	elapsedTime: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
index 27a442858..9fd653fab 100644
--- a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
@@ -20,7 +20,7 @@ import OrderWarehouseStatus from '@modules/server.common/enums/OrderWarehouseSta
 	`
 })
 export class ElapsedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('elapsedTime', { static: true })
+	@ViewChild('elapsedTime', { static: false })
 	elapsedTime: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/styles/control-icon.shared.scss b/admin/website-angular/src/app/@shared/styles/control-icon.shared.scss
index 7c0720552..8d2821a4b 100644
--- a/admin/website-angular/src/app/@shared/styles/control-icon.shared.scss
+++ b/admin/website-angular/src/app/@shared/styles/control-icon.shared.scss
@@ -15,17 +15,17 @@
 		height: 1.4em;
 		outline: none;
 
-		path {
-			fill: nb-theme(text-basic-color);
-		}
+		// path {
+		// 	fill: nb-theme(color-fg);
+		// }
 
-		&:hover path {
-			fill: nb-theme(text-control-color);
-		}
+		// &:hover path {
+		// 	fill: nb-theme(color-fg-text);
+		// }
 
-		&:active path {
-			fill: nb-theme(text-hint-color);
-		}
+		// &:active path {
+		// 	fill: nb-theme(color-fg-highlight);
+		// }
 
 		&.control-icon-left {
 			float: left !important;
diff --git a/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts b/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts
index b911b189f..9709db525 100644
--- a/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/user/user-mutation/user-mutation.component.ts
@@ -13,10 +13,10 @@ import { TranslateService } from '@ngx-translate/core';
 	styleUrls: ['/user-mutation.component.scss']
 })
 export class UserMutationComponent {
-	@ViewChild('basicInfoForm', { static: true })
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm', { static: true })
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
index ebc6aeaaf..281cad797 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
@@ -41,7 +41,7 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 	perPage: number;
 	choiced: string;
 
-	@ViewChild('warehouseAddChoice', { static: true })
+	@ViewChild('warehouseAddChoice', { static: false })
 	warehouseAddChoice: WarehouseAddChoiceComponent;
 
 	@ViewChild('basicInfoForm', { static: false })
@@ -56,7 +56,7 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 	@ViewChild('wizzardFrom', { static: false })
 	wizzardFrom: WizardComponent;
 
-	@ViewChild('wizzardFromStep1', { static: true })
+	@ViewChild('wizzardFromStep1', { static: false })
 	wizzardFromStep1: any;
 
 	hasSelectedProducts = () => false;
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
index 2ebd9c191..e44febcb1 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
@@ -32,7 +32,7 @@ export type WarehouseBasicInfo = Pick<
 	templateUrl: 'basic-info-form.component.html'
 })
 export class BasicInfoFormComponent implements OnInit {
-	@ViewChild('fileInput', { static: true })
+	@ViewChild('fileInput', { static: false })
 	fileInput: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
index 5eea0a425..159e43efe 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
@@ -10,7 +10,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 })
 export class WarehouseManageTabsDeliveryAreasComponent
 	implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: true })
+	@ViewChild('gmap', { static: false })
 	mapElement: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
index d13d46610..112251044 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
@@ -41,7 +41,7 @@ export type WarehouseManageTabsDetails = Pick<
 })
 export class WarehouseManageTabsDetailsComponent
 	implements OnInit, AfterViewInit {
-	@ViewChild('fileInput', { static: true })
+	@ViewChild('fileInput', { static: false })
 	fileInput: ElementRef;
 	@ViewChild('logoPreview', { static: false })
 	logoPreviewElement: ElementRef;
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
index e2d6c98dd..5acee8cbe 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/warehouse-manage-tabs.component.ts
@@ -39,19 +39,19 @@ export class WarehouseManageTabsComponent {
 	@Input()
 	readonly form: FormGroup;
 
-	@ViewChild('detailsComponent', { static: true })
+	@ViewChild('detailsComponent', { static: false })
 	readonly detailsComponent: WarehouseManageTabsDetailsComponent;
 
-	@ViewChild('accountComponent', { static: true })
+	@ViewChild('accountComponent', { static: false })
 	readonly accountComponent: WarehouseManageTabsAccountComponent;
 
-	@ViewChild('contactInfoForm', { static: true })
+	@ViewChild('contactInfoForm', { static: false })
 	readonly contactInfoForm: ContactInfoFormComponent;
 
-	@ViewChild('locationForm', { static: true })
+	@ViewChild('locationForm', { static: false })
 	readonly locationForm: LocationFormComponent;
 
-	@ViewChild('tabSet', { static: true })
+	@ViewChild('tabSet', { static: false })
 	readonly tabSet;
 
 	mapCoordEmitter = new EventEmitter<number[]>();
diff --git a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
index 361cd6d32..420008e97 100644
--- a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
@@ -27,7 +27,7 @@ export class WarehouseMutationComponent implements AfterViewInit {
 	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('contactInfoForm', { static: true })
+	@ViewChild('contactInfoForm', { static: false })
 	contactInfoForm: ContactInfoFormComponent;
 
 	@ViewChild('locationForm', { static: false })
diff --git a/admin/website-angular/src/app/@theme/components/footer/footer.component.scss b/admin/website-angular/src/app/@theme/components/footer/footer.component.scss
index 73bf51c6d..77b2437ec 100644
--- a/admin/website-angular/src/app/@theme/components/footer/footer.component.scss
+++ b/admin/website-angular/src/app/@theme/components/footer/footer.component.scss
@@ -13,12 +13,12 @@
 
 		a {
 			padding: 0.4rem;
-			color: nb-theme(text-basic-color);
+			// color: nb-theme(color-fg);
 			transition: color ease-out 0.1s;
 
-			&:hover {
-				color: nb-theme(text-basic-color);
-			}
+			// &:hover {
+			// color: nb-theme(color-fg-heading);
+			// }
 		}
 	}
 
diff --git a/admin/website-angular/src/app/@theme/components/header/header.component.html b/admin/website-angular/src/app/@theme/components/header/header.component.html
index 7841e0f21..86a1220f6 100644
--- a/admin/website-angular/src/app/@theme/components/header/header.component.html
+++ b/admin/website-angular/src/app/@theme/components/header/header.component.html
@@ -3,11 +3,12 @@
 	[class.left]="position === 'normal'"
 	[class.right]="position === 'inverse'"
 >
-	<div class="logo-containter">
-		<a (click)="toggleSidebar()" href="#" class="navigation"
-			><i icon="menu-outline"></i
-		></a>
-		<div class="logo" (click)="goToHome()">
+	<div class="logo-container">
+		<a (click)="toggleSidebar()" href="#" class="navigation">
+			<nb-icon icon="menu-2-outline"></nb-icon>
+		</a>
+
+		<div class="logo" (click)="navigateHome()">
 			<span> {{ 'HEADER_VIEW.EVER' | translate }}</span
 			><span class="ever-simbol">®</span>
 			<span>{{ 'HEADER_VIEW.ADMIN' | translate }}</span>
@@ -17,7 +18,7 @@
 
 <div class="header-container">
 	<nb-actions
-		size="medium"
+		size="small"
 		[class.right]="position === 'normal'"
 		[class.left]="position === 'inverse'"
 	>
@@ -33,10 +34,11 @@
 				[picture]="admin?.pictureUrl"
 			></nb-user>
 		</nb-action>
-		<!-- <nb-action class="control-item" disabled icon="nb-notifications"></nb-action>
-    	<nb-action class="control-item" icon="nb-email"></nb-action>
+		<!--
+		<nb-action class="control-item" icon="bell-outline"></nb-action>
+    <nb-action class="control-item" icon="email-outline"></nb-action>
     	<nb-action class="control-item">
-		<nb-search [hidden]='true' type="rotate-layout" (click)="startSearch()"></nb-search>
+		 <nb-search type="rotate-layout"></nb-search>
 		</nb-action>-->
 	</nb-actions>
 </div>
diff --git a/admin/website-angular/src/app/@theme/components/header/header.component.scss b/admin/website-angular/src/app/@theme/components/header/header.component.scss
index 6582f0ef2..595f88c40 100644
--- a/admin/website-angular/src/app/@theme/components/header/header.component.scss
+++ b/admin/website-angular/src/app/@theme/components/header/header.component.scss
@@ -1,6 +1,6 @@
 @import '../../styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
+// @import '~bootstrap/scss/mixins/breakpoints';
+// @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
 	display: flex;
@@ -18,14 +18,24 @@
 		flex-direction: row-reverse;
 	}
 
-	.logo-containter {
+	.logo-container {
 		display: flex;
 		align-items: center;
-		width: calc(#{nb-theme(sidebar-width)} - #{nb-theme(header-padding)});
+		// width: calc(#{nb-theme(sidebar-width)} - #{nb-theme(header-padding)});
 	}
 
-	.control-item {
-		display: block;
+	nb-action {
+		height: auto;
+		display: flex;
+		align-content: center;
+	}
+
+	nb-user {
+		cursor: pointer;
+	}
+
+	::ng-deep nb-search button {
+		padding: 0 !important;
 	}
 
 	.header-container {
@@ -34,24 +44,19 @@
 		width: auto;
 
 		.navigation {
-			// TODO get padding form the theme
 			@include nb-ltr(padding-right, 1.25rem);
 			@include nb-rtl(padding-left, 1.25rem);
-
 			font-size: 2.5rem;
 			text-decoration: none;
 
-			i {
-				display: block;
+			nb-icon {
+				font-size: 2.5rem;
 			}
 		}
 
 		.logo {
-			// TODO get padding form the theme
 			padding: 0 1.25rem;
-
 			font-size: 1.75rem;
-			font-weight: nb-theme(text-subtitle-font-weight);
 			@include nb-ltr(border-left, 1px solid nb-theme(divider-color));
 			@include nb-rtl(border-right, 1px solid nb-theme(divider-color));
 			white-space: nowrap;
@@ -60,10 +65,6 @@
 			align-items: flex-start;
 			justify-content: center;
 
-			span {
-				font-weight: nb-theme(text-heading-3-font-weight);
-			}
-
 			.ever-simbol {
 				font-size: 1rem;
 				margin-right: 5px;
@@ -74,153 +75,154 @@
 		}
 	}
 
-	@include nb-for-theme(corporate) {
-		$menu-action-separator-color: #3f4550;
-
-		nb-action {
-			@include nb-ltr(border-left-color, $menu-action-separator-color);
-			@include nb-rtl(border-right-color, $menu-action-separator-color);
-		}
-
-		.header-container .logo {
-			@include nb-ltr(border, none);
-			@include nb-rtl(border, none);
-		}
-
-		.header-container ::ng-deep ngx-theme-switcher .dropdown-toggle {
-			color: #ffffff;
-			background: transparent;
-		}
-	}
-
-	ngx-layout-direction-switcher {
-		margin: 0 1.5rem;
-	}
-
-	ngx-theme-switcher {
-		margin: nb-theme(layout-padding);
-		margin-top: 0;
-		margin-bottom: 0;
-	}
-
-	@include media-breakpoint-down(xl) {
-		ngx-layout-direction-switcher {
-			display: none;
-		}
-	}
-
-	.toggle-layout ::ng-deep a {
-		display: block;
-		text-decoration: none;
-		line-height: 1;
-
-		i {
-			color: nb-theme(text-hint-color);
-			font-size: 2.25rem;
-			border-radius: 50%;
-			position: relative;
-			animation-name: pulse-light;
-
-			&::after {
-				content: ' ';
-				// hack to be able to set border-radius
-				background-image: url('data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7');
-				border-radius: 50%;
-				pointer-events: none;
-
-				position: absolute;
-				top: 52.3%;
-				left: 50%;
-				transform: translate(-50%, -50%);
-				width: 13%;
-				height: 13%;
-
-				animation: 3s linear infinite pulse;
-
-				@include nb-for-theme(default) {
-					animation-name: pulse-light;
-				}
-			}
-		}
-	}
-
-	@include keyframes(pulse) {
-		0% {
-			box-shadow: 0 0 1px 0 rgba(nb-theme(text-hint-color), 0);
-		}
-		20% {
-			box-shadow: 0 0 3px 10px rgba(nb-theme(text-hint-color), 0.4);
-		}
-		100% {
-			box-shadow: 0 0 5px 20px rgba(nb-theme(text-hint-color), 0);
-		}
-	}
-
-	@include keyframes(pulse-light) {
-		0% {
-			box-shadow: 0 0 1px 0 rgba(115, 255, 208, 0);
-		}
-		20% {
-			box-shadow: 0 0 3px 10px rgba(115, 255, 208, 0.4);
-		}
-		100% {
-			box-shadow: 0 0 5px 20px rgba(115, 255, 208, 0);
-		}
-	}
-
-	@include media-breakpoint-down(md) {
-		nb-action:not(.toggle-layout) {
-			border: none;
-		}
-
-		.control-item {
-			display: none;
-		}
-
-		.toggle-layout {
-			padding: 0;
-		}
-
-		ngx-layout-direction-switcher {
-			display: none;
-		}
-
-		ngx-theme-switcher {
-			margin: 0 0.5rem;
-		}
-	}
-
-	@include media-breakpoint-down(sm) {
-		nb-user ::ng-deep .user-name {
-			display: none;
-		}
-	}
-
-	@include media-breakpoint-down(is) {
-		.header-container {
-			.logo {
-				font-size: 1.25rem;
-			}
-		}
-
-		.toggle-layout {
-			display: none;
-		}
-
-		ngx-theme-switcher {
-			display: none;
-		}
-
-		nb-action:not(.toggle-layout) {
-			padding: 0;
-		}
-	}
-
-	@include media-breakpoint-down(xs) {
-		.right ::ng-deep {
-			display: none;
-		}
-	}
+	// @include nb-for-theme(corporate) {
+	// 	$menu-action-separator-color: #3f4550;
+
+	// 	nb-action {
+	// 		@include nb-ltr(border-left-color, $menu-action-separator-color);
+	// 		@include nb-rtl(border-right-color, $menu-action-separator-color);
+	// 	}
+
+	// 	.header-container .logo {
+	// 		@include nb-ltr(border, none);
+	// 		@include nb-rtl(border, none);
+	// 	}
+
+	// 	// .header-container ::ng-deep ngx-theme-switcher .dropdown-toggle {
+	// 	// 	color: nb-theme(color-white);
+	// 	// 	background: transparent;
+	// 	// }
+	// }
+
+	// ngx-layout-direction-switcher {
+	// 	margin: 0 1.5rem;
+	// }
+
+	// ngx-theme-switcher {
+	// 	// margin: nb-theme(layout-padding);
+	// 	margin-top: 0;
+	// 	margin-bottom: 0;
+	// }
+
+	// @include media-breakpoint-down(xl) {
+	// 	ngx-layout-direction-switcher {
+	// 		display: none;
+	// 	}
+	// }
+
+	// .toggle-layout ::ng-deep a {
+	// 	display: block;
+	// 	text-decoration: none;
+	// 	line-height: 1;
+
+	// 	i {
+	// 		// color: nb-theme(color-fg-highlight);
+	// 		font-size: 2.25rem;
+	// 		border-radius: 50%;
+	// 		position: relative;
+	// 		animation-name: pulse-light;
+
+	// 		&::after {
+	// 			content: ' ';
+	// 			// hack to be able to set border-radius
+	// 			background-image: url('data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7');
+	// 			border-radius: 50%;
+	// 			pointer-events: none;
+
+	// 			position: absolute;
+	// 			top: 52.3%;
+	// 			left: 50%;
+	// 			transform: translate(-50%, -50%);
+	// 			width: 13%;
+	// 			height: 13%;
+
+	// 			animation: 3s linear infinite pulse;
+
+	// 			@include nb-for-theme(default) {
+	// 				animation-name: pulse-light;
+	// 			}
+	// 		}
+	// 	}
+	// }
+
+	// TODO style
+	// @include keyframes(pulse) {
+	// 	0% {
+	// 		box-shadow: 0 0 1px 0 rgba(nb-theme(color-fg-highlight), 0);
+	// 	}
+	// 	20% {
+	// 		box-shadow: 0 0 3px 10px rgba(nb-theme(color-fg-highlight), 0.4);
+	// 	}
+	// 	100% {
+	// 		box-shadow: 0 0 5px 20px rgba(nb-theme(color-fg-highlight), 0);
+	// 	}
+	// }
+
+	// @include keyframes(pulse-light) {
+	// 	0% {
+	// 		box-shadow: 0 0 1px 0 rgba(115, 255, 208, 0);
+	// 	}
+	// 	20% {
+	// 		box-shadow: 0 0 3px 10px rgba(115, 255, 208, 0.4);
+	// 	}
+	// 	100% {
+	// 		box-shadow: 0 0 5px 20px rgba(115, 255, 208, 0);
+	// 	}
+	// }
+
+	// @include media-breakpoint-down(md) {
+	// 	nb-action:not(.toggle-layout) {
+	// 		border: none;
+	// 	}
+
+	// 	.control-item {
+	// 		display: none;
+	// 	}
+
+	// 	.toggle-layout {
+	// 		padding: 0;
+	// 	}
+
+	// 	ngx-layout-direction-switcher {
+	// 		display: none;
+	// 	}
+
+	// 	ngx-theme-switcher {
+	// 		margin: 0 0.5rem;
+	// 	}
+	// }
+
+	// @include media-breakpoint-down(sm) {
+	// 	nb-user ::ng-deep .user-name {
+	// 		display: none;
+	// 	}
+	// }
+
+	// @include media-breakpoint-down(is) {
+	// 	.header-container {
+	// 		.logo {
+	// 			font-size: 1.25rem;
+	// 		}
+	// 	}
+
+	// 	.toggle-layout {
+	// 		display: none;
+	// 	}
+
+	// 	ngx-theme-switcher {
+	// 		display: none;
+	// 	}
+
+	// 	nb-action:not(.toggle-layout) {
+	// 		padding: 0;
+	// 	}
+	// }
+
+	// @include media-breakpoint-down(xs) {
+	// 	.right ::ng-deep {
+	// 		display: none;
+	// 	}
+	// }
 
 	.admin-menu {
 		cursor: pointer;
diff --git a/admin/website-angular/src/app/@theme/components/header/header.component.ts b/admin/website-angular/src/app/@theme/components/header/header.component.ts
index e580382b4..45d2d02a3 100644
--- a/admin/website-angular/src/app/@theme/components/header/header.component.ts
+++ b/admin/website-angular/src/app/@theme/components/header/header.component.ts
@@ -1,6 +1,5 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { NbMenuService, NbSidebarService, NbMenuItem } from '@nebular/theme';
-import { AnalyticsService } from '../../../@core/utils/analytics.service';
 import { Subject, Observable } from 'rxjs';
 import { AdminsService } from '../../../@core/data/admins.service';
 import { Store } from '../../../@core/data/store.service';
@@ -25,7 +24,6 @@ export class HeaderComponent implements OnInit, OnDestroy {
 	constructor(
 		private sidebarService: NbSidebarService,
 		private menuService: NbMenuService,
-		private analyticsService: AnalyticsService,
 		private adminsService: AdminsService,
 		private store: Store,
 		private translateService: TranslateService
@@ -74,12 +72,12 @@ export class HeaderComponent implements OnInit, OnDestroy {
 		return false;
 	}
 
-	goToHome() {
+	navigateHome() {
 		this.menuService.navigateHome();
 	}
 
 	startSearch() {
-		this.analyticsService.trackEvent('startSearch');
+		return false;
 	}
 
 	ngOnDestroy() {
diff --git a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
index df83f26f4..f14a7de7e 100644
--- a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
+++ b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
@@ -21,7 +21,7 @@ import {
 	`
 })
 export class SearchInputComponent {
-	@ViewChild('input', { static: true }) input: ElementRef;
+	@ViewChild('input', { static: false }) input: ElementRef;
 
 	@Output() search: EventEmitter<string> = new EventEmitter<string>();
 
diff --git a/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss b/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
index 6a1cbc9b1..abadd6837 100644
--- a/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
+++ b/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
@@ -1,113 +1,114 @@
-@import '../../styles/themes';
-@import '~@nebular/bootstrap/styles/hero-buttons';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-	.switch-label {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		cursor: pointer;
-		margin: 0;
-
-		&.vertical {
-			flex-direction: column;
-			align-items: flex-start;
-
-			.first,
-			.second {
-				padding: 0;
-			}
-
-			.switch {
-				margin-top: 0.5em;
-			}
-		}
-
-		& > span {
-			font-size: 1.125rem;
-			font-weight: nb-theme(text-heading-2-font-weight);
-			transition: opacity 0.3s ease;
-			color: nb-theme(text-basic-color);
-
-			&.first {
-				@include nb-ltr(padding-right, 10px);
-				@include nb-rtl(padding-left, 10px);
-			}
-
-			&.second {
-				@include nb-ltr(padding-left, 10px);
-				@include nb-rtl(padding-right, 10px);
-			}
-
-			&.active {
-				color: nb-theme(text-control-color);
-			}
-
-			@include nb-for-theme(cosmic) {
-				color: nb-theme(text-basic-color);
-
-				&.active {
-					color: #ffffff;
-				}
-			}
-
-			&:active {
-				opacity: 0.78;
-			}
-		}
-	}
-
-	.switch {
-		position: relative;
-		display: inline-block;
-		width: 3rem;
-		height: 1.5rem;
-		margin: 0;
-
-		input {
-			display: none;
-
-			&:checked + .slider::before {
-				@include nb-ltr(transform, translateX(1.5rem));
-				@include nb-rtl(transform, translateX(-1.5rem));
-			}
-		}
-
-		.slider {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			border-radius: 1.75rem;
-			background-color: nb-theme(layout-background-color);
-		}
-
-		.slider::before {
-			position: absolute;
-			content: '';
-			height: 1.5rem;
-			width: 1.5rem;
-			border-radius: 50%;
-			background-color: nb-theme(color-success-500);
-			transition: 0.2s;
-
-			box-shadow: 0 0 0.25rem 0 rgba(nb-theme(text-basic-color), 0.4);
-
-			// // TODO style
-			// @include nb-for-theme(cosmic) {
-			// 	@include btn-hero-primary-gradient();
-			// }
-
-			@include nb-for-theme(corporate) {
-				background-color: nb-theme(color-primary-500);
-			}
-		}
-	}
-
-	@include media-breakpoint-down(xs) {
-		align-items: flex-end;
-	}
-}
+// TODO style
+// @import '../../styles/themes';
+// @import '~@nebular/bootstrap/styles/hero-buttons';
+// @import '~bootstrap/scss/mixins/breakpoints';
+// @import '~@nebular/theme/styles/global/breakpoints';
+
+// @include nb-install-component() {
+// 	.switch-label {
+// 		display: flex;
+// 		justify-content: space-between;
+// 		align-items: center;
+// 		cursor: pointer;
+// 		margin: 0;
+
+// 		&.vertical {
+// 			flex-direction: column;
+// 			align-items: flex-start;
+
+// 			.first,
+// 			.second {
+// 				padding: 0;
+// 			}
+
+// 			.switch {
+// 				margin-top: 0.5em;
+// 			}
+// 		}
+
+// 		& > span {
+// 			font-size: 1.125rem;
+// 			font-weight: nb-theme(font-weight-bold);
+// 			transition: opacity 0.3s ease;
+// 			color: nb-theme(color-fg);
+
+// 			&.first {
+// 				@include nb-ltr(padding-right, 10px);
+// 				@include nb-rtl(padding-left, 10px);
+// 			}
+
+// 			&.second {
+// 				@include nb-ltr(padding-left, 10px);
+// 				@include nb-rtl(padding-right, 10px);
+// 			}
+
+// 			&.active {
+// 				color: nb-theme(color-fg-text);
+// 			}
+
+// 			@include nb-for-theme(cosmic) {
+// 				color: nb-theme(color-fg);
+
+// 				&.active {
+// 					color: nb-theme(color-white);
+// 				}
+// 			}
+
+// 			&:active {
+// 				opacity: 0.78;
+// 			}
+// 		}
+// 	}
+
+// 	.switch {
+// 		position: relative;
+// 		display: inline-block;
+// 		width: 3rem;
+// 		height: 1.5rem;
+// 		margin: 0;
+
+// 		input {
+// 			display: none;
+
+// 			&:checked + .slider::before {
+// 				@include nb-ltr(transform, translateX(1.5rem));
+// 				@include nb-rtl(transform, translateX(-1.5rem));
+// 			}
+// 		}
+
+// 		.slider {
+// 			position: absolute;
+// 			top: 0;
+// 			left: 0;
+// 			right: 0;
+// 			bottom: 0;
+// 			border-radius: 1.75rem;
+// 			background-color: nb-theme(layout-bg);
+// 		}
+
+// 		.slider::before {
+// 			position: absolute;
+// 			content: '';
+// 			height: 1.5rem;
+// 			width: 1.5rem;
+// 			border-radius: 50%;
+// 			background-color: nb-theme(color-success);
+// 			transition: 0.2s;
+
+// 			// TODO style
+// 			// box-shadow: 0 0 0.25rem 0 rgba(nb-theme(color-fg), 0.4);
+
+// 			// @include nb-for-theme(cosmic) {
+// 			// 	@include btn-hero-primary-gradient();
+// 			// }
+
+// 			@include nb-for-theme(corporate) {
+// 				background-color: nb-theme(color-primary);
+// 			}
+// 		}
+// 	}
+
+// 	@include media-breakpoint-down(xs) {
+// 		align-items: flex-end;
+// 	}
+// }
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
index d5957243e..0674ceb5c 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
@@ -25,7 +25,16 @@ <h6 [hidden]="true">SIDEBAR</h6>
 
 <h6>THEMES</h6>
 <div class="settings-row theme-button">
-	<ngx-theme-switcher></ngx-theme-switcher>
+	<!-- <ngx-theme-switcher></ngx-theme-switcher> -->
+	<nb-select
+		[(selected)]="currentTheme"
+		(selectedChange)="toggleTheme()"
+		status="primary"
+	>
+		<nb-option *ngFor="let theme of themes" [value]="theme.value">
+			{{ theme.name }}</nb-option
+		>
+	</nb-select>
 </div>
 
 <h6>LANGUAGE</h6>
@@ -47,7 +56,8 @@ <h6>LANGUAGE</h6>
 </div>
 
 <div class="switcher">
-	<ngx-layout-direction-switcher
+	<!-- TODO  -->
+	<!-- <ngx-layout-direction-switcher
 		[vertical]="true"
-	></ngx-layout-direction-switcher>
+	></ngx-layout-direction-switcher> -->
 </div>
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss
index 60fb8d87b..6e593655e 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss
@@ -18,18 +18,17 @@
 			text-decoration: none;
 			font-size: 2.25rem;
 
-			color: nb-theme(text-basic-color);
+			//   color: nb-theme(color-fg);
 
-			&.selected {
-				color: nb-theme(color-success-500);
-			}
+			//   &.selected {
+			//     color: nb-theme(color-success);
+			//   }
 
-			@include nb-for-theme(cosmic) {
-				&.selected {
-					// TODO nb-theme
-					color: #3dcc6d;
-				}
-			}
+			//   @include nb-for-theme(cosmic) {
+			//     &.selected {
+			//       color: nb-theme(link-color);
+			//     }
+			//   }
 		}
 	}
 
@@ -62,9 +61,9 @@
 			}
 
 			@include nb-for-theme(cosmic) {
-				.switch .slider {
-					background-color: nb-theme(background-basic-color-1);
-				}
+				// .switch .slider {
+				// background-color: nb-theme(color-bg);
+				// }
 			}
 		}
 	}
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
index f6acca80f..6595ec03a 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
 import { StateService } from '../../../@core/data/state.service';
 import { TranslateService } from '@ngx-translate/core';
+import { NbThemeService } from '@nebular/theme';
 
 @Component({
 	selector: 'ngx-theme-settings',
@@ -13,9 +14,31 @@ export class ThemeSettingsComponent {
 
 	languages = { en: 'English', bg: 'Bulgarian', he: 'Hebrew', ru: 'Russian' };
 
+	themes = [
+		{
+			value: 'default',
+			name: 'Light'
+		},
+		{
+			value: 'dark',
+			name: 'Dark'
+		},
+		{
+			value: 'cosmic',
+			name: 'Cosmic'
+		},
+		{
+			value: 'corporate',
+			name: 'Corporate'
+		}
+	];
+
+	currentTheme = 'default';
+
 	constructor(
 		protected stateService: StateService,
-		public translate: TranslateService
+		public translate: TranslateService,
+		private themeService: NbThemeService
 	) {
 		translate.addLangs(['en', 'bg', 'he', 'ru']);
 		translate.setDefaultLang('en');
@@ -32,6 +55,10 @@ export class ThemeSettingsComponent {
 			.subscribe((sidebars: any[]) => (this.sidebars = sidebars));
 	}
 
+	toggleTheme() {
+		this.themeService.changeTheme(this.currentTheme);
+	}
+
 	switchLanguage(language: string) {
 		if (language === 'he') {
 			this.stateService.setSidebarState(this.sidebars[1]);
diff --git a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.scss b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
index 163b19fef..e47262d5c 100644
--- a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
+++ b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
@@ -9,37 +9,37 @@
 		padding: 0.8rem 0.8rem;
 		align-items: center;
 		cursor: pointer;
-		background-color: nb-theme(switcher-background);
-		border-radius: nb-theme(border-radius);
+		// background-color: nb-theme(switcher-background);
+		// border-radius: nb-theme(radius);
 
-		&:hover {
-			$color: nb-theme(switcher-background);
-			$percentage: nb-theme(switcher-background-percentage);
+		// &:hover {
+		//   $color: nb-theme(switcher-background);
+		//   $percentage: nb-theme(switcher-background-percentage);
 
-			background-color: tint($color, $percentage);
-		}
+		// background-color: tint($color, $percentage);
+		// }
 
 		span {
 			margin: 0 0.7rem;
 		}
 
 		i {
-			color: nb-theme(color-primary-500);
+			//   color: nb-theme(color-primary);
 			font-size: 1.1rem;
 			border-radius: 50%;
 			position: relative;
 
 			@include nb-for-theme(default) {
-				color: nb-theme(color-success-500);
+				// color: nb-theme(color-success);
 			}
 
 			@include nb-for-theme(corporate) {
-				color: nb-theme(text-hint-color);
+				// color: nb-theme(color-fg-highlight);
 			}
 
 			&::before {
 				// Hack for IE11, IE11 should not set background
-				background: nb-theme(drops-icon-line-gadient);
+				// background: nb-theme(drops-icon-line-gadient);
 				-webkit-background-clip: text;
 				-webkit-text-fill-color: transparent;
 			}
diff --git a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
index a04914d45..9ecf57c4a 100644
--- a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
+++ b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
@@ -10,7 +10,7 @@ import { AnalyticsService } from 'app/@core/utils/analytics.service';
 	styleUrls: ['./theme-switcher.component.scss']
 })
 export class ThemeSwitcherComponent {
-	@ViewChild(NbPopoverDirective, { static: true })
+	@ViewChild(NbPopoverDirective, { static: false })
 	popover: NbPopoverDirective;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss b/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
index 9eee7a893..22f1a1e7a 100644
--- a/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
+++ b/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
@@ -97,7 +97,7 @@ $icon-top-color-everdark: black;
 				font-weight: 300;
 				vertical-align: super;
 				padding-left: 1rem;
-				color: nb-theme(text-basic-color);
+				// color: nb-theme(color-fg-heading);
 			}
 		}
 	}
diff --git a/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss b/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss
index cb2c009c1..330751d07 100644
--- a/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss
@@ -29,7 +29,7 @@
 
 		::ng-deep .main-container {
 			width: $sidebar-width;
-			background: nb-theme(background-basic-color-1);
+			// background: nb-theme(color-bg);
 			transition: width 0.3s ease;
 			overflow: hidden;
 
@@ -37,45 +37,45 @@
 				width: $sidebar-width;
 			}
 
-			@include nb-for-theme(cosmic) {
-				background: nb-theme(layout-background-color);
-			}
+			// @include nb-for-theme(cosmic) {
+			// background: nb-theme(layout-bg);
+			// }
 		}
 	}
 
 	nb-sidebar.menu-sidebar {
-		margin-top: nb-theme(sidebar-header-gap);
+		// margin-top: nb-theme(sidebar-header-gap);
 
 		@include nb-for-theme(corporate) {
 			margin-top: 0;
 		}
 
-		::ng-deep .main-container {
-			height: calc(
-				#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
-						sidebar-header-gap
-					)}
-			) !important;
-			@include nb-ltr(border-top-right-radius, nb-theme(border-radius));
-			@include nb-rtl(border-top-left-radius, nb-theme(border-radius));
-
-			@include nb-for-theme(corporate) {
-				border: 1px solid nb-theme(divider-color);
-				height: calc(
-					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-				) !important;
-			}
-		}
-
-		::ng-deep .scrollable {
-			@include nb-for-theme(corporate) {
-				padding-top: 0;
-
-				.menu-item:first-child {
-					border-top: none;
-				}
-			}
-		}
+		// ::ng-deep .main-container {
+		// height: calc(
+		// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
+		// 			sidebar-header-gap
+		// 		)}
+		// ) !important;
+		// @include nb-ltr(border-top-right-radius, nb-theme(radius));
+		// @include nb-rtl(border-top-left-radius, nb-theme(radius));
+
+		// @include nb-for-theme(corporate) {
+		// 	border: 1px solid nb-theme(separator);
+		// 	height: calc(
+		// 		#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+		// 	) !important;
+		// }
+		// }
+
+		// ::ng-deep .scrollable {
+		// 	@include nb-for-theme(corporate) {
+		// 		padding-top: 0;
+
+		// 		.menu-item:first-child {
+		// 			border-top: none;
+		// 		}
+		// 	}
+		// }
 
 		::ng-deep nb-sidebar-header {
 			padding-bottom: 0.5rem;
@@ -90,9 +90,9 @@
 			font-weight: bold;
 			transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
 
-			@include nb-for-theme(corporate) {
-				border-radius: nb-theme(border-radius);
-			}
+			// @include nb-for-theme(corporate) {
+			// 	border-radius: nb-theme(radius);
+			// }
 
 			i {
 				font-size: 2rem;
@@ -140,9 +140,9 @@
 			margin-top: 0;
 
 			::ng-deep .main-container {
-				height: calc(
-					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-				) !important;
+				// height: calc(
+				// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+				// ) !important;
 				@include nb-ltr(border-top-right-radius, 0);
 				@include nb-rtl(border-top-left-radius, 0);
 
diff --git a/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss b/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss
index f6ee202ce..d2fcce9f6 100644
--- a/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss
@@ -29,7 +29,7 @@
 
 		::ng-deep .main-container {
 			width: $sidebar-width;
-			background: nb-theme(background-basic-color-1);
+			// background: nb-theme(color-bg);
 			transition: width 0.3s ease;
 			overflow: hidden;
 
@@ -37,35 +37,35 @@
 				width: $sidebar-width;
 			}
 
-			@include nb-for-theme(cosmic) {
-				background: nb-theme(layout-background-color);
-			}
+			// @include nb-for-theme(cosmic) {
+			// 	background: nb-theme(layout-bg);
+			// }
 		}
 	}
 
 	nb-sidebar.menu-sidebar {
-		margin-top: nb-theme(sidebar-header-gap);
+		// margin-top: nb-theme(sidebar-header-gap);
 
 		@include nb-for-theme(corporate) {
 			margin-top: 0;
 		}
 
-		::ng-deep .main-container {
-			height: calc(
-				#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
-						sidebar-header-gap
-					)}
-			) !important;
-			@include nb-ltr(border-top-right-radius, nb-theme(border-radius));
-			@include nb-rtl(border-top-left-radius, nb-theme(border-radius));
-
-			@include nb-for-theme(corporate) {
-				border: 1px solid nb-theme(divider-color);
-				height: calc(
-					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-				) !important;
-			}
-		}
+		// ::ng-deep .main-container {
+		// height: calc(
+		// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
+		// 			sidebar-header-gap
+		// 		)}
+		// ) !important;
+		// @include nb-ltr(border-top-right-radius, nb-theme(radius));
+		// @include nb-rtl(border-top-left-radius, nb-theme(radius));
+
+		// @include nb-for-theme(corporate) {
+		// 	border: 1px solid nb-theme(separator);
+		// 	height: calc(
+		// 		#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+		// 	) !important;
+		// }
+		// }
 
 		::ng-deep .scrollable {
 			@include nb-for-theme(corporate) {
@@ -90,9 +90,9 @@
 			font-weight: bold;
 			transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
 
-			@include nb-for-theme(corporate) {
-				border-radius: nb-theme(border-radius);
-			}
+			// @include nb-for-theme(corporate) {
+			// 	border-radius: nb-theme(radius);
+			// }
 
 			i {
 				font-size: 2rem;
@@ -140,9 +140,9 @@
 			margin-top: 0;
 
 			::ng-deep .main-container {
-				height: calc(
-					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-				) !important;
+				// height: calc(
+				// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+				// ) !important;
 				@include nb-ltr(border-top-right-radius, 0);
 				@include nb-rtl(border-top-left-radius, 0);
 
diff --git a/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss b/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss
index cb2c009c1..e51af3096 100644
--- a/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss
@@ -29,7 +29,7 @@
 
 		::ng-deep .main-container {
 			width: $sidebar-width;
-			background: nb-theme(background-basic-color-1);
+			// background: nb-theme(color-bg);
 			transition: width 0.3s ease;
 			overflow: hidden;
 
@@ -37,35 +37,35 @@
 				width: $sidebar-width;
 			}
 
-			@include nb-for-theme(cosmic) {
-				background: nb-theme(layout-background-color);
-			}
+			// @include nb-for-theme(cosmic) {
+			// 	background: nb-theme(layout-bg);
+			// }
 		}
 	}
 
 	nb-sidebar.menu-sidebar {
-		margin-top: nb-theme(sidebar-header-gap);
+		// margin-top: nb-theme(sidebar-header-gap);
 
 		@include nb-for-theme(corporate) {
 			margin-top: 0;
 		}
 
-		::ng-deep .main-container {
-			height: calc(
-				#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
-						sidebar-header-gap
-					)}
-			) !important;
-			@include nb-ltr(border-top-right-radius, nb-theme(border-radius));
-			@include nb-rtl(border-top-left-radius, nb-theme(border-radius));
-
-			@include nb-for-theme(corporate) {
-				border: 1px solid nb-theme(divider-color);
-				height: calc(
-					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-				) !important;
-			}
-		}
+		// ::ng-deep .main-container {
+		// 	height: calc(
+		// 		#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
+		// 				sidebar-header-gap
+		// 			)}
+		// 	) !important;
+		// 	@include nb-ltr(border-top-right-radius, nb-theme(radius));
+		// 	@include nb-rtl(border-top-left-radius, nb-theme(radius));
+
+		// 	@include nb-for-theme(corporate) {
+		// 		border: 1px solid nb-theme(separator);
+		// 		height: calc(
+		// 			#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+		// 		) !important;
+		// 	}
+		// }
 
 		::ng-deep .scrollable {
 			@include nb-for-theme(corporate) {
@@ -90,9 +90,9 @@
 			font-weight: bold;
 			transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
 
-			@include nb-for-theme(corporate) {
-				border-radius: nb-theme(border-radius);
-			}
+			// @include nb-for-theme(corporate) {
+			// 	border-radius: nb-theme(radius);
+			// }
 
 			i {
 				font-size: 2rem;
@@ -140,9 +140,9 @@
 			margin-top: 0;
 
 			::ng-deep .main-container {
-				height: calc(
-					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-				) !important;
+				// height: calc(
+				// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+				// ) !important;
 				@include nb-ltr(border-top-right-radius, 0);
 				@include nb-rtl(border-top-left-radius, 0);
 
diff --git a/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss b/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss
index cb2c009c1..77abce194 100644
--- a/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss
@@ -29,7 +29,7 @@
 
 		::ng-deep .main-container {
 			width: $sidebar-width;
-			background: nb-theme(background-basic-color-1);
+			// background: nb-theme(color-bg);
 			transition: width 0.3s ease;
 			overflow: hidden;
 
@@ -38,34 +38,34 @@
 			}
 
 			@include nb-for-theme(cosmic) {
-				background: nb-theme(layout-background-color);
+				// background: nb-theme(layout-bg);
 			}
 		}
 	}
 
 	nb-sidebar.menu-sidebar {
-		margin-top: nb-theme(sidebar-header-gap);
+		// margin-top: nb-theme(sidebar-header-gap);
 
 		@include nb-for-theme(corporate) {
 			margin-top: 0;
 		}
 
-		::ng-deep .main-container {
-			height: calc(
-				#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
-						sidebar-header-gap
-					)}
-			) !important;
-			@include nb-ltr(border-top-right-radius, nb-theme(border-radius));
-			@include nb-rtl(border-top-left-radius, nb-theme(border-radius));
-
-			@include nb-for-theme(corporate) {
-				border: 1px solid nb-theme(divider-color);
-				height: calc(
-					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-				) !important;
-			}
-		}
+		// ::ng-deep .main-container {
+		// 	height: calc(
+		// 		#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
+		// 				sidebar-header-gap
+		// 			)}
+		// 	) !important;
+		// 	@include nb-ltr(border-top-right-radius, nb-theme(radius));
+		// 	@include nb-rtl(border-top-left-radius, nb-theme(radius));
+
+		// 	@include nb-for-theme(corporate) {
+		// 		border: 1px solid nb-theme(separator);
+		// 		height: calc(
+		// 			#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+		// 		) !important;
+		// 	}
+		// }
 
 		::ng-deep .scrollable {
 			@include nb-for-theme(corporate) {
@@ -90,9 +90,9 @@
 			font-weight: bold;
 			transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
 
-			@include nb-for-theme(corporate) {
-				border-radius: nb-theme(border-radius);
-			}
+			// @include nb-for-theme(corporate) {
+			// 	border-radius: nb-theme(radius);
+			// }
 
 			i {
 				font-size: 2rem;
@@ -140,9 +140,9 @@
 			margin-top: 0;
 
 			::ng-deep .main-container {
-				height: calc(
-					#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-				) !important;
+				// height: calc(
+				// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+				// ) !important;
 				@include nb-ltr(border-top-right-radius, 0);
 				@include nb-rtl(border-top-left-radius, 0);
 
diff --git a/admin/website-angular/src/app/@theme/styles/bootstrap-rtl.scss b/admin/website-angular/src/app/@theme/styles/bootstrap-rtl.scss
index fdfd2b19c..a2637b87d 100644
--- a/admin/website-angular/src/app/@theme/styles/bootstrap-rtl.scss
+++ b/admin/website-angular/src/app/@theme/styles/bootstrap-rtl.scss
@@ -6,28 +6,28 @@
 	.btn-group:not(.btn-divided-group) > .btn:not(.dropdown-toggle) {
 		&:first-child {
 			@include nb-ltr() {
-				border-top-left-radius: nb-theme(border-radius);
-				border-bottom-left-radius: nb-theme(border-radius);
+				// border-top-left-radius: nb-theme(btn-border-radius);
+				// border-bottom-left-radius: nb-theme(btn-border-radius);
 				border-top-right-radius: 0;
 				border-bottom-right-radius: 0;
 			}
 			@include nb-rtl() {
 				border-top-left-radius: 0;
 				border-bottom-left-radius: 0;
-				border-top-right-radius: nb-theme(border-radius);
-				border-bottom-right-radius: nb-theme(border-radius);
+				// border-top-right-radius: nb-theme(btn-border-radius);
+				// border-bottom-right-radius: nb-theme(btn-border-radius);
 			}
 		}
 		&:last-child {
 			@include nb-ltr() {
 				border-top-left-radius: 0;
 				border-bottom-left-radius: 0;
-				border-top-right-radius: nb-theme(border-radius);
-				border-bottom-right-radius: nb-theme(border-radius);
+				// border-top-right-radius: nb-theme(btn-border-radius);
+				// border-bottom-right-radius: nb-theme(btn-border-radius);
 			}
 			@include nb-rtl() {
-				border-top-left-radius: nb-theme(border-radius);
-				border-bottom-left-radius: nb-theme(border-radius);
+				// border-top-left-radius: nb-theme(btn-border-radius);
+				// border-bottom-left-radius: nb-theme(btn-border-radius);
 				border-top-right-radius: 0;
 				border-bottom-right-radius: 0;
 			}
@@ -37,21 +37,21 @@
 	.btn-group.dropdown {
 		& > .btn:first-of-type.dropdown-toggle {
 			@include nb-ltr() {
-				border-top-left-radius: nb-theme(border-radius);
+				// border-top-left-radius: nb-theme(btn-border-radius);
 				border-top-right-radius: 0;
 			}
 			@include nb-rtl() {
 				border-top-left-radius: 0;
-				border-top-right-radius: nb-theme(border-radius);
+				// border-top-right-radius: nb-theme(btn-border-radius);
 			}
 		}
 		& > .btn:last-of-type.dropdown-toggle {
 			@include nb-ltr() {
 				border-top-left-radius: 0;
-				border-top-right-radius: nb-theme(border-radius);
+				// border-top-right-radius: nb-theme(btn-border-radius);
 			}
 			@include nb-rtl() {
-				border-top-left-radius: nb-theme(border-radius);
+				// border-top-left-radius: nb-theme(btn-border-radius);
 				border-top-right-radius: 0;
 			}
 		}
@@ -59,21 +59,21 @@
 		&:not(.show) {
 			& > .btn:first-of-type.dropdown-toggle {
 				@include nb-ltr() {
-					border-bottom-left-radius: nb-theme(border-radius);
+					//   border-bottom-left-radius: nb-theme(btn-border-radius);
 					border-bottom-right-radius: 0;
 				}
 				@include nb-rtl() {
 					border-bottom-left-radius: 0;
-					border-bottom-right-radius: nb-theme(border-radius);
+					//   border-bottom-right-radius: nb-theme(btn-border-radius);
 				}
 			}
 			& > .btn:last-of-type.dropdown-toggle {
 				@include nb-ltr() {
 					border-bottom-left-radius: 0;
-					border-bottom-right-radius: nb-theme(border-radius);
+					//   border-bottom-right-radius: nb-theme(btn-border-radius);
 				}
 				@include nb-rtl() {
-					border-bottom-left-radius: nb-theme(border-radius);
+					//   border-bottom-left-radius: nb-theme(btn-border-radius);
 					border-bottom-right-radius: 0;
 				}
 			}
@@ -83,21 +83,21 @@
 	.btn-group.dropup {
 		& > .btn:first-of-type.dropdown-toggle {
 			@include nb-ltr() {
-				border-bottom-left-radius: nb-theme(border-radius);
+				// border-bottom-left-radius: nb-theme(btn-border-radius);
 				border-bottom-right-radius: 0;
 			}
 			@include nb-rtl() {
 				border-bottom-left-radius: 0;
-				border-bottom-right-radius: nb-theme(border-radius);
+				// border-bottom-right-radius: nb-theme(btn-border-radius);
 			}
 		}
 		& > .btn:last-of-type.dropdown-toggle {
 			@include nb-ltr() {
 				border-bottom-left-radius: 0;
-				border-bottom-right-radius: nb-theme(border-radius);
+				// border-bottom-right-radius: nb-theme(btn-border-radius);
 			}
 			@include nb-rtl() {
-				border-bottom-left-radius: nb-theme(border-radius);
+				// border-bottom-left-radius: nb-theme(btn-border-radius);
 				border-bottom-right-radius: 0;
 			}
 		}
@@ -105,21 +105,21 @@
 		&:not(.show) {
 			& > .btn:first-of-type.dropdown-toggle {
 				@include nb-ltr() {
-					border-top-left-radius: nb-theme(border-radius);
+					//   border-top-left-radius: nb-theme(btn-border-radius);
 					border-top-right-radius: 0;
 				}
 				@include nb-rtl() {
 					border-top-left-radius: 0;
-					border-top-right-radius: nb-theme(border-radius);
+					//   border-top-right-radius: nb-theme(btn-border-radius);
 				}
 			}
 			& > .btn:last-of-type.dropdown-toggle {
 				@include nb-ltr() {
 					border-top-left-radius: 0;
-					border-top-right-radius: nb-theme(border-radius);
+					//   border-top-right-radius: nb-theme(btn-border-radius);
 				}
 				@include nb-rtl() {
-					border-top-left-radius: nb-theme(border-radius);
+					//   border-top-left-radius: nb-theme(btn-border-radius);
 					border-top-right-radius: 0;
 				}
 			}
@@ -130,19 +130,19 @@
 		.btn:not(:first-child) {
 			@include nb-ltr(margin-left, 0.5rem);
 			@include nb-rtl(margin-right, 0.5rem);
-			border-radius: nb-theme(border-radius);
+			//   border-radius: nb-theme(btn-border-radius);
 		}
 	}
 
 	.input-group-addon,
 	.input-group-icon {
 		@include nb-ltr() {
-			border-left: nb-theme(input-border-width);
+			//   border-left: nb-theme(form-control-border);
 			border-right: none;
 		}
 		@include nb-rtl() {
 			border-left: none;
-			border-right: nb-theme(input-border-width);
+			//   border-right: nb-theme(form-control-border);
 		}
 	}
 
@@ -152,22 +152,16 @@
 		.input-group-prepend .btn:first-child,
 		.input-group-btn .btn:first-child {
 			@include nb-ltr() {
-				border-top-left-radius: nb-theme(input-rectangle-border-radius);
-				border-bottom-left-radius: nb-theme(
-					input-rectangle-border-radius
-				);
+				// border-top-left-radius: nb-theme(form-control-border-radius);
+				// border-bottom-left-radius: nb-theme(form-control-border-radius);
 				border-top-right-radius: 0;
 				border-bottom-right-radius: 0;
 			}
 			@include nb-rtl() {
 				border-top-left-radius: 0;
 				border-bottom-left-radius: 0;
-				border-top-right-radius: nb-theme(
-					input-rectangle-border-radius
-				);
-				border-bottom-right-radius: nb-theme(
-					input-rectangle-border-radius
-				);
+				// border-top-right-radius: nb-theme(form-control-border-radius);
+				// border-bottom-right-radius: nb-theme(form-control-border-radius);
 			}
 		}
 		.form-control:last-child:not(:only-child),
@@ -177,18 +171,12 @@
 			@include nb-ltr() {
 				border-top-left-radius: 0;
 				border-bottom-left-radius: 0;
-				border-top-right-radius: nb-theme(
-					input-rectangle-border-radius
-				);
-				border-bottom-right-radius: nb-theme(
-					input-rectangle-border-radius
-				);
+				// border-top-right-radius: nb-theme(form-control-border-radius);
+				// border-bottom-right-radius: nb-theme(form-control-border-radius);
 			}
 			@include nb-rtl() {
-				border-top-left-radius: nb-theme(input-rectangle-border-radius);
-				border-bottom-left-radius: nb-theme(
-					input-rectangle-border-radius
-				);
+				// border-top-left-radius: nb-theme(form-control-border-radius);
+				// border-bottom-left-radius: nb-theme(form-control-border-radius);
 				border-top-right-radius: 0;
 				border-bottom-right-radius: 0;
 			}
diff --git a/admin/website-angular/src/app/@theme/styles/everdark.theme.scss b/admin/website-angular/src/app/@theme/styles/everdark.theme.scss
index 5ef1bb2bd..f8258850d 100644
--- a/admin/website-angular/src/app/@theme/styles/everdark.theme.scss
+++ b/admin/website-angular/src/app/@theme/styles/everdark.theme.scss
@@ -60,7 +60,7 @@ $nb-themes: nb-register-theme(
 		// text
 			color-fg-text: #8b8b8b,
 		color-fg: #8b8b8b,
-		text-hint-color: white,
+		color-fg-highlight: white,
 		card-header-fg: #8b8b8b,
 		footer-fg: #8b8b8b,
 		link-color: white !important,
diff --git a/admin/website-angular/src/app/@theme/styles/everlight.theme.scss b/admin/website-angular/src/app/@theme/styles/everlight.theme.scss
index 1a66d2e31..6319c02cd 100644
--- a/admin/website-angular/src/app/@theme/styles/everlight.theme.scss
+++ b/admin/website-angular/src/app/@theme/styles/everlight.theme.scss
@@ -5,7 +5,7 @@ $dark: hsl(234, 26, 25);
 $nb-themes: nb-register-theme(
 	(
 		color-success: #47d26f,
-		text-hint-color: #47d26f,
+		color-fg-highlight: #47d26f,
 		color-primary: #888,
 		color-danger: #ce4843,
 		color-info: #888,
diff --git a/admin/website-angular/src/app/@theme/styles/font-size.scss b/admin/website-angular/src/app/@theme/styles/font-size.scss
index 1c7a72171..3b8d84b7d 100644
--- a/admin/website-angular/src/app/@theme/styles/font-size.scss
+++ b/admin/website-angular/src/app/@theme/styles/font-size.scss
@@ -1,5 +1,6 @@
 html {
-	font-size: 14px;
+	// TODO style
+	// font-size: 14px;
 }
 
 span.space {
diff --git a/admin/website-angular/src/app/@theme/styles/pace.theme.scss b/admin/website-angular/src/app/@theme/styles/pace.theme.scss
index 73e167936..622660d79 100644
--- a/admin/website-angular/src/app/@theme/styles/pace.theme.scss
+++ b/admin/website-angular/src/app/@theme/styles/pace.theme.scss
@@ -5,18 +5,17 @@
  */
 
 @mixin ngx-pace-theme() {
-	.pace .pace-progress {
-		background: nb-theme(text-hint-color);
-	}
+	//   .pace .pace-progress {
+	// background: nb-theme(color-fg-highlight);
+	//   }
 
-	.pace .pace-progress-inner {
-		box-shadow: 0 0 10px nb-theme(text-hint-color),
-			0 0 5px nb-theme(text-hint-color);
-	}
+	//   .pace .pace-progress-inner {
+	// box-shadow: 0 0 10px nb-theme(color-fg-highlight), 0 0 5px nb-theme(color-fg-highlight);
+	//   }
 
 	.pace .pace-activity {
 		display: none;
-		// border-top-color: nb-theme(text-hint-color);
-		// border-left-color: nb-theme(text-hint-color);
+		// border-top-color: nb-theme(color-fg-highlight);
+		// border-left-color: nb-theme(color-fg-highlight);
 	}
 }
diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index 3e66b02a8..16e479bc6 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -3,7 +3,8 @@
 // framework component themes (styles tied to theme variables)
 @import '~@nebular/theme/styles/globals';
 @import '~@nebular/auth/styles/all';
-@import '~@nebular/bootstrap/styles/globals';
+// TODO style
+// @import '~@nebular/bootstrap/styles/globals';
 //angular2-toaster
 @import 'node_modules/angular2-toaster/toaster';
 // global app font size
@@ -29,7 +30,8 @@
 // install the framework and custom global styles
 @include nb-install() {
 	// framework global styles
-	@include nb-bootstrap-global();
+	// TODO style
+	// @include nb-bootstrap-global();
 	@include nb-auth-global();
 	@include nb-theme-global();
 
diff --git a/admin/website-angular/src/app/@theme/styles/themes.scss b/admin/website-angular/src/app/@theme/styles/themes.scss
index 43d1c2568..921668cdc 100644
--- a/admin/website-angular/src/app/@theme/styles/themes.scss
+++ b/admin/website-angular/src/app/@theme/styles/themes.scss
@@ -4,32 +4,34 @@
 @import '~@nebular/theme/styles/themes';
 
 // which themes you what to enable (empty to enable all)
-$nb-enabled-themes: (default, cosmic, corporate, everlight, everdark);
+$nb-enabled-themes: (default /*, cosmic, corporate, everlight, everdark*/);
 
 $nb-themes: nb-register-theme(
 	(
-		padding: 1.25rem,
 		// app wise variables for each theme
 			sidebar-header-gap: 2rem,
 		sidebar-header-height: initial,
 		layout-content-width: 1400px,
-		font-main: Roboto,
-		font-secondary: Exo,
-		switcher-background: #ebeff5,
-		switcher-background-percentage: 50%,
-		drops-icon-line-gadient: -webkit-linear-gradient(#01dbb5, #0bbb79),
-		list-item-border-width: 1px,
-		slide-out-container-width: 30%,
-		slide-out-background: linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
-		slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
-		slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
-		chart-panel-summary-box-shadow: none,
-		chart-panel-summary-background-color: #ecf2f5,
-		chart-panel-summary-border-color: #ebeff1,
-		chart-panel-summary-border-width: 1px,
-		ecommerce-card-border-width: 1px,
-		progress-bar-background:
-			linear-gradient(90deg, #3edd81 0%, #3bddaf 100%)
+		header-height: 5.45rem,
+		font-family-primary: Roboto,
+		font-family-secondary: Exo,
+		// font-main: Roboto,
+			// font-secondary: Exo,
+			// switcher-background: #ebeff5,
+			// switcher-background-percentage: 50%,
+			// drops-icon-line-gadient: -webkit-linear-gradient(#01dbb5, #0bbb79),
+			// list-item-border-width: 1px,
+			// slide-out-container-width: 30%,
+			// slide-out-background: linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
+			// slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
+			// slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
+			// chart-panel-summary-box-shadow: none,
+			// chart-panel-summary-background-color: #ecf2f5,
+			// chart-panel-summary-border-color: #ebeff1,
+			// chart-panel-summary-border-width: 1px,
+			// ecommerce-card-border-width: 1px,
+			// progress-bar-background:
+			// 	linear-gradient(90deg, #3edd81 0%, #3bddaf 100%)
 	),
 	default,
 	default
@@ -38,26 +40,26 @@ $nb-themes: nb-register-theme(
 $nb-themes: nb-register-theme(
 	(
 		// app wise variables for each theme
-			sidebar-header-gap: 2rem,
-		sidebar-header-height: initial,
-		layout-content-width: 1400px,
-		font-main: Roboto,
-		font-secondary: Exo,
-		switcher-background: #4e41a5,
-		switcher-background-percentage: 14%,
-		drops-icon-line-gadient: -webkit-linear-gradient(#a258fe, #7958fa),
-		list-item-border-width: 1px,
-		slide-out-container-width: 30%,
-		slide-out-background: radial-gradient(circle, #302c6e 0%, #423f8c 100%),
-		slide-out-shadow-color: 2px 0 3px rgba(19, 19, 94, 0.9),
-		slide-out-shadow-color-rtl: -2px 0 3px rgba(19, 19, 94, 0.9),
-		chart-panel-summary-box-shadow: none,
-		chart-panel-summary-background-color: rgba(0, 0, 0, 0.1),
-		chart-panel-summary-border-color: #332e73,
-		chart-panel-summary-border-width: 1px,
-		ecommerce-card-border-width: 1px,
-		progress-bar-background:
-			linear-gradient(90deg, #00c7c7 0%, #00d977 100%) !important
+			// 	sidebar-header-gap: 2rem,
+			// sidebar-header-height: initial,
+			// layout-content-width: 1400px,
+			// font-main: Roboto,
+			// font-secondary: Exo,
+			// switcher-background: #4e41a5,
+			// switcher-background-percentage: 14%,
+			// drops-icon-line-gadient: -webkit-linear-gradient(#a258fe, #7958fa),
+			// list-item-border-width: 1px,
+			// slide-out-container-width: 30%,
+			// slide-out-background: radial-gradient(circle, #302c6e 0%, #423f8c 100%),
+			// slide-out-shadow-color: 2px 0 3px rgba(19, 19, 94, 0.9),
+			// slide-out-shadow-color-rtl: -2px 0 3px rgba(19, 19, 94, 0.9),
+			// chart-panel-summary-box-shadow: none,
+			// chart-panel-summary-background-color: rgba(0, 0, 0, 0.1),
+			// chart-panel-summary-border-color: #332e73,
+			// chart-panel-summary-border-width: 1px,
+			// ecommerce-card-border-width: 1px,
+			// progress-bar-background:
+			// 	linear-gradient(90deg, #00c7c7 0%, #00d977 100%) !important
 	),
 	cosmic,
 	cosmic
@@ -66,26 +68,26 @@ $nb-themes: nb-register-theme(
 $nb-themes: nb-register-theme(
 	(
 		// app wise variables for each theme
-			sidebar-header-gap: 2rem,
-		sidebar-header-height: initial,
-		layout-content-width: 1400px,
-		font-main: Roboto,
-		font-secondary: Exo,
-		switcher-background: #2b2d34,
-		switcher-background-percentage: 14%,
-		drops-icon-line-gadient: -webkit-linear-gradient(#e9e8eb, #a7a2be),
-		list-item-border-width: 1px,
-		slide-out-container-width: 30%,
-		slide-out-background: linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
-		slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
-		slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
-		chart-panel-summary-box-shadow: none,
-		chart-panel-summary-background-color: #f7fafb,
-		chart-panel-summary-border-color: #ebeff1,
-		chart-panel-summary-border-width: 1px,
-		ecommerce-card-border-width: 1px,
-		progress-bar-background:
-			linear-gradient(90deg, #ff9f6f 0%, #ff8b97 100%)
+			// 	sidebar-header-gap: 2rem,
+			// sidebar-header-height: initial,
+			// layout-content-width: 1400px,
+			// font-main: Roboto,
+			// font-secondary: Exo,
+			// switcher-background: #2b2d34,
+			// switcher-background-percentage: 14%,
+			// drops-icon-line-gadient: -webkit-linear-gradient(#e9e8eb, #a7a2be),
+			// list-item-border-width: 1px,
+			// slide-out-container-width: 30%,
+			// slide-out-background: linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
+			// slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
+			// slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
+			// chart-panel-summary-box-shadow: none,
+			// chart-panel-summary-background-color: #f7fafb,
+			// chart-panel-summary-border-color: #ebeff1,
+			// chart-panel-summary-border-width: 1px,
+			// ecommerce-card-border-width: 1px,
+			// progress-bar-background:
+			// 	linear-gradient(90deg, #ff9f6f 0%, #ff8b97 100%)
 	),
 	corporate,
 	corporate
diff --git a/admin/website-angular/src/app/@theme/theme.module.ts b/admin/website-angular/src/app/@theme/theme.module.ts
index b6aa9835a..d9cb7dec4 100644
--- a/admin/website-angular/src/app/@theme/theme.module.ts
+++ b/admin/website-angular/src/app/@theme/theme.module.ts
@@ -17,9 +17,12 @@ import {
 	NbCheckboxModule,
 	NbPopoverModule,
 	NbContextMenuModule,
-	NbProgressBarModule
+	NbProgressBarModule,
+	NbIconModule,
+	NbSelectModule
 } from '@nebular/theme';
 
+import { NbEvaIconsModule } from '@nebular/eva-icons';
 import { NbSecurityModule } from '@nebular/security';
 
 import {
@@ -52,7 +55,6 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { AdminsService } from '../@core/data/admins.service';
 import { PipesModule } from '@modules/client.common.angular2/pipes/pipes.module';
-import { NbEvaIconsModule } from '@nebular/eva-icons';
 
 export function HttpLoaderFactory(http: HttpClient) {
 	return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -75,7 +77,10 @@ const NB_MODULES = [
 	NbContextMenuModule,
 	NgbModule,
 	NbSecurityModule, // *nbIsGranted directive
-	NbProgressBarModule
+	NbProgressBarModule,
+	NbIconModule,
+	NbEvaIconsModule,
+	NbSelectModule
 ];
 
 const COMPONENTS = [
@@ -99,7 +104,7 @@ const ENTRY_COMPONENTS = [ThemeSwitcherListComponent];
 const NB_THEME_PROVIDERS = [
 	...NbThemeModule.forRoot(
 		{
-			name: 'everlight'
+			name: 'default'
 		},
 		[
 			DEFAULT_THEME,
@@ -118,7 +123,6 @@ const NB_THEME_PROVIDERS = [
 	imports: [
 		...BASE_MODULES,
 		...NB_MODULES,
-		NbEvaIconsModule,
 		HttpClientModule,
 		TranslateModule.forChild({
 			loader: {
diff --git a/admin/website-angular/src/app/app.module.ts b/admin/website-angular/src/app/app.module.ts
index 46f0bfad1..3a5e29e35 100644
--- a/admin/website-angular/src/app/app.module.ts
+++ b/admin/website-angular/src/app/app.module.ts
@@ -30,7 +30,6 @@ import { AppModuleGuard } from './app.module.guard';
 import { MaintenanceModuleGuard } from './pages/+maintenance-info/maintenance-info.module.guard';
 import { first } from 'rxjs/operators';
 import { ServerConnectionService } from '@modules/client.common.angular2/services/server-connection.service';
-import { NbEvaIconsModule } from '@nebular/eva-icons';
 
 // It's more 'standard' way to use Font-Awesome module and special package,
 // but for some reason ngx-admin works without it. So we leave next line commented for now.
@@ -48,7 +47,6 @@ import { NbEvaIconsModule } from '@nebular/eva-icons';
 		AppRoutingModule,
 		ApolloModule,
 		HttpLinkModule,
-		NbEvaIconsModule,
 		TranslateModule.forRoot({
 			loader: {
 				provide: TranslateLoader,
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts
index 69f4a36d9..17e4fcab6 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.ts
@@ -15,10 +15,10 @@ import { first, map, switchMap } from 'rxjs/operators';
 	styleUrls: ['./carrier-edit.component.scss']
 })
 export class CarrierEditComponent implements OnInit {
-	@ViewChild('basicInfoForm', { static: true })
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm', { static: true })
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
index 289071116..b0bdf0459 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
@@ -26,7 +26,7 @@ export class CarrierMapComponent {
 	private ngDestroy$ = new Subject();
 	public carrierId: string;
 
-	@ViewChild('gmap', { static: true })
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
index ff6ce2397..f7c2bcb55 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
@@ -19,7 +19,7 @@ import { CarrierOrdersComponent } from './carrier-orders/carrier-orders.componen
 	styleUrls: ['./carrier.component.scss']
 })
 export class CarrierComponent implements OnInit, OnDestroy {
-	@ViewChild('carrierOrders', { static: true })
+	@ViewChild('carrierOrders', { static: false })
 	public carrierOrders: CarrierOrdersComponent;
 
 	private ngDestroy$ = new Subject();
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.scss b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.scss
index 379ec92c6..f32c4efac 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.scss
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.scss
@@ -7,7 +7,7 @@
 
 	::ng-deep .leaflet-container {
 		width: 100%;
-		height: nb-theme(card-height-large);
+		// height: nb-theme(card-height-large);
 	}
 }
 
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
index f8c771261..d5ec41ed0 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
@@ -22,7 +22,7 @@ const directionsService = new google.maps.DirectionsService();
 export class CarrierLocationComponent implements OnDestroy, OnInit {
 	private ngDestroy$ = new Subject();
 
-	@ViewChild('gmap', { static: true })
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
index d75c0eeb1..127c9f13d 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
@@ -20,7 +20,7 @@ const perPage = 5;
 	styleUrls: ['carriers.component.scss']
 })
 export class CarriersComponent implements OnDestroy, AfterViewInit {
-	@ViewChild('carriersTable', { static: true })
+	@ViewChild('carriersTable', { static: false })
 	carriersTable: CarriersSmartTableComponent;
 
 	loading: boolean;
diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
index d95726f80..e0e0f9136 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
@@ -34,7 +34,7 @@ export class CarrierTrackingComponent implements OnInit, OnDestroy {
 	private ngDestroy$ = new Subject();
 	public carrierId: string;
 
-	@ViewChild('gmap', { static: true })
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts
index c53efd8dd..3f1bc4b61 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.ts
@@ -14,10 +14,10 @@ import User from '@modules/server.common/entities/User';
 	styleUrls: ['./customer-edit.component.scss']
 })
 export class CustomerEditComponent implements OnInit {
-	@ViewChild('basicInfoForm', { static: true })
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('locationForm', { static: true })
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.scss b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.scss
index 12ea87610..bbbf69b55 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.scss
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.scss
@@ -7,7 +7,7 @@
 
 	::ng-deep .leaflet-container {
 		width: 100%;
-		height: nb-theme(card-height-large);
+		// height: nb-theme(card-height-large);
 	}
 }
 
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
index 88f2cea4c..62a21addd 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
@@ -10,7 +10,7 @@ declare var google: any;
 	templateUrl: './ea-customer-location.component.html'
 })
 export class CustomerLocationComponent implements OnDestroy, OnInit {
-	@ViewChild('gmap', { static: true })
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 	marker: any;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss
index b729c0313..a9405be22 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss
@@ -48,7 +48,7 @@
 
 			::ng-deep .legends {
 				padding-left: 0;
-				font-size: nb-theme(text-heading-6-font-size);
+				// font-size: nb-theme(font-size-sm);
 			}
 
 			::ng-deep .legend {
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
index d1a03149a..c5ad4bcb4 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
@@ -48,7 +48,7 @@ export class ChartPanelHeaderComponent implements OnInit, OnDestroy {
 		daysDiff: number;
 	}>();
 
-	@ViewChild('customDateRangeButton', { static: true })
+	@ViewChild('customDateRangeButton', { static: false })
 	customDateRangeButton: ElementRef;
 
 	isDateRangeSelected = false;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
index c5acec27d..cf95d258f 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
@@ -6,13 +6,13 @@
 	.summary-container {
 		display: flex;
 		flex: 1;
-		background-color: nb-theme(chart-panel-summary-background-color);
-		box-shadow: nb-theme(chart-panel-summary-box-shadow);
+		// background-color: nb-theme(chart-panel-summary-background-color);
+		// box-shadow: nb-theme(chart-panel-summary-box-shadow);
 		justify-content: space-between;
 		padding: 1.8rem 4rem 1.2rem;
 		margin-bottom: 1rem;
-		border: nb-theme(chart-panel-summary-border-width) solid
-			nb-theme(chart-panel-summary-border-color);
+		// border: nb-theme(chart-panel-summary-border-width) solid
+		// 	nb-theme(chart-panel-summary-border-color);
 		border-left: none;
 		border-right: none;
 
@@ -23,7 +23,7 @@
 
 	.value {
 		font-size: 2rem;
-		color: nb-theme(text-basic-color);
+		// color: nb-theme(color-fg-heading);
 
 		span div small {
 			font-size: 0.5em;
@@ -32,26 +32,25 @@
 	}
 
 	@include media-breakpoint-down(sm) {
-		.value,
-		.title {
-			font-weight: nb-theme(text-heading-2-font-weight);
-		}
+		// .value,
+		// .title {
+		// font-weight: nb-theme(font-weight-bold);
+		// }
 
-		.title {
-			font-size: nb-theme(text-heading-6-font-size);
-		}
+		// .title {
+		// 	font-size: nb-theme(font-size-sm);
+		// }
 
-		.value {
-			font-size: nb-theme(text-heading-1-font-size);
-		}
+		// .value {
+		// 	font-size: nb-theme(font-size-xlg);
+		// }
 	}
 
 	@include media-breakpoint-down(is) {
-		.summary-container {
-			// TODO get padding form the theme
-			padding-left: 1.25rem;
-			padding-right: 1.25rem;
-		}
+		// .summary-container {
+		// padding-left: nb-theme(padding);
+		// padding-right: nb-theme(padding);
+		// }
 
 		.value {
 			margin-top: 0.5rem;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
index 18ac63716..47a2447d5 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
@@ -40,11 +40,11 @@ export class ChartsPanelComponent implements OnInit, OnDestroy {
 	ordersChartData: OrdersChart;
 	profitChartData: ProfitChart;
 
-	@ViewChild('ordersChart', { static: true })
+	@ViewChild('ordersChart', { static: false })
 	ordersChart: OrdersChartComponent;
-	@ViewChild('profitChart', { static: true })
+	@ViewChild('profitChart', { static: false })
 	profitChart: ProfitChartComponent;
-	@ViewChild('ordersProfitTab', { static: true })
+	@ViewChild('ordersProfitTab', { static: false })
 	ordersProfitTab: any;
 
 	private _ordersToday: IOrdersChartModel;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss
index 10c85df38..7ddb834fd 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss
@@ -6,7 +6,7 @@
 	.legends {
 		display: flex;
 		@include nb-rtl(flex-direction, row-reverse);
-		color: nb-theme(text-basic-color);
+		// color: nb-theme(color-fg);
 		padding: 0 0 0 2.85rem;
 	}
 
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
index efdc8e4f2..646325d33 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
@@ -4,7 +4,7 @@ $shadow-green: #00977e;
 
 @include nb-install-component() {
 	.progress-info {
-		color: nb-theme(text-basic-color);
+		// color: nb-theme(color-fg-heading);
 		margin-top: 2.5rem;
 
 		&:first-child {
@@ -12,20 +12,20 @@ $shadow-green: #00977e;
 		}
 	}
 
-	.title {
-		font-family: nb-theme(font-secondary);
-		font-size: nb-theme(text-heading-6-font-size);
-		font-weight: nb-theme(text-heading-1-font-weight);
-	}
+	// .title {
+	// 	font-family: nb-theme(font-secondary);
+	// 	font-size: nb-theme(font-size-lg);
+	// 	font-weight: nb-theme(font-weight-bold);
+	// }
 
 	.value {
-		font-size: 2rem;
-		font-weight: nb-theme(text-subtitle-font-weight);
+		font-size: 3rem;
+		// font-weight: nb-theme(font-weight-light);
 		margin-top: 0.5rem;
 	}
 
 	.description {
-		color: nb-theme(text-basic-color);
+		// color: nb-theme(color-fg);
 		margin-top: 0.5rem;
 	}
 
@@ -39,7 +39,7 @@ $shadow-green: #00977e;
 
 		.progress-value {
 			height: 0.6rem;
-			background: nb-theme(progress-bar-background);
+			// background: nb-theme(progress-bar-background);
 
 			@include nb-for-theme(cosmic) {
 				box-shadow: 0 0.2rem $shadow-green;
diff --git a/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts b/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
index 3d6fea288..49c1ab60d 100644
--- a/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
+++ b/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
@@ -15,7 +15,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	styleUrls: ['/categories.component.scss']
 })
 export class CategoriesComponent implements OnDestroy {
-	@ViewChild('categoriesTable', { static: true })
+	@ViewChild('categoriesTable', { static: false })
 	categoriesTable: CategoriesTableComponent;
 
 	protected settingsSmartTable: object;
diff --git a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
index 82a1d27bc..abc3a1c2d 100644
--- a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
@@ -17,7 +17,7 @@ import 'rxjs/add/operator/switchMap';
 export class ProductEditComponent implements OnInit, OnDestroy {
 	private ngDestroy$ = new Subject<void>();
 
-	@ViewChild('basicInfoForm', { static: true })
+	@ViewChild('basicInfoForm', { static: false })
 	public basicInfoForm: BasicInfoFormComponent;
 
 	public readonly form: FormGroup = this.formBuilder.group({
diff --git a/admin/website-angular/src/app/pages/+products/products.component.ts b/admin/website-angular/src/app/pages/+products/products.component.ts
index 499b5ba43..8ec304d19 100644
--- a/admin/website-angular/src/app/pages/+products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+products/products.component.ts
@@ -18,7 +18,7 @@ const perPage = 5;
 	styleUrls: ['/products.component.scss']
 })
 export class ProductsComponent implements OnDestroy, AfterViewInit {
-	@ViewChild('productsTable', { static: true })
+	@ViewChild('productsTable', { static: false })
 	protected productsTable: ProductsTableComponent;
 
 	public productsCategories: any;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
index 8b478336b..041c42527 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
@@ -7,7 +7,7 @@ import { NgForm } from '@angular/forms';
 	styleUrls: ['./account.component.scss']
 })
 export class SetupMerchantAccountComponent {
-	@ViewChild('accountForm', { static: true })
+	@ViewChild('accountForm', { static: false })
 	accountForm: NgForm;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index 013db56fe..40ceec21c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -19,10 +19,10 @@ import { getDummyImage } from '@modules/server.common/utils';
 	styleUrls: ['./basic-info.component.scss']
 })
 export class SetupMerchantBasicInfoComponent implements OnInit, OnDestroy {
-	@ViewChild('basicInfoForm', { static: true })
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: NgForm;
 
-	@ViewChild('name', { static: true })
+	@ViewChild('name', { static: false })
 	name: NgModel;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
index 81c1e7c54..3da546ea1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
@@ -7,7 +7,7 @@ import { NgForm } from '@angular/forms';
 	styleUrls: ['./contact-info.component.scss']
 })
 export class SetupMerchantContactInfoComponent {
-	@ViewChild('contactInfoForm', { static: true })
+	@ViewChild('contactInfoForm', { static: false })
 	contactInfoForm: NgForm;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
index 595d698a1..61e9b5151 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
@@ -8,7 +8,7 @@ import { FormBuilder } from '@angular/forms';
 	styleUrls: ['./location.component.scss']
 })
 export class SetupMerchantLocationComponent {
-	@ViewChild('locationForm', { static: true })
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
index f7ac0fec2..b84fda026 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
@@ -12,7 +12,7 @@ import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaym
 	templateUrl: './payPal-gateway.component.html'
 })
 export class PayPalGatewayComponent implements OnChanges {
-	@ViewChild('payPalConfigForm', { static: true })
+	@ViewChild('payPalConfigForm', { static: false })
 	payPalConfigForm: NgForm;
 
 	isPayPalEnabled: boolean;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
index 0a2e89f3f..3c75c97ff 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payment-gateways.component.ts
@@ -11,10 +11,10 @@ import { first } from 'rxjs/operators';
 	templateUrl: './payment-gateways.component.html'
 })
 export class PaymentGatewaysComponent {
-	@ViewChild('stripeGateway', { static: true })
+	@ViewChild('stripeGateway', { static: false })
 	stripeGateway: StripeGatewayComponent;
 
-	@ViewChild('payPalGateway', { static: true })
+	@ViewChild('payPalGateway', { static: false })
 	payPalGateway: PayPalGatewayComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index bca5c1b0e..a78802901 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -15,7 +15,7 @@ import { Subject } from 'rxjs';
 	templateUrl: './stripe-gateway.component.html'
 })
 export class StripeGatewayComponent implements OnChanges {
-	@ViewChild('stripeConfigForm', { static: true })
+	@ViewChild('stripeConfigForm', { static: false })
 	stripeConfigForm: NgForm;
 
 	isStripeEnabled: boolean;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
index db1f7a479..adbb901e8 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -15,7 +15,7 @@ import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaym
 	styleUrls: ['./payments.component.scss']
 })
 export class SetupMerchantPaymentsComponent {
-	@ViewChild('paymentGateways', { static: true })
+	@ViewChild('paymentGateways', { static: false })
 	paymentGateways: PaymentGatewaysComponent;
 	@Output()
 	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
index a0d64decb..30230883d 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
@@ -14,10 +14,10 @@ import { CategoriesTableComponent } from 'app/@shared/product/categories/categor
 	styleUrls: ['./product-categories.component.scss']
 })
 export class SetupMerchantProductCategoriesComponent {
-	@ViewChild('basicInfo', { static: true })
+	@ViewChild('basicInfo', { static: false })
 	basicInfo: BasicInfoFormComponent;
 
-	@ViewChild('categoriesTable', { static: true })
+	@ViewChild('categoriesTable', { static: false })
 	categoriesTable: CategoriesTableComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
index 7f9bceb65..642860c29 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
@@ -17,7 +17,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	templateUrl: './add-products.component.html'
 })
 export class SetupMerchantAddProductsComponent implements OnInit {
-	@ViewChild('addWarehouseProductsTable', { static: true })
+	@ViewChild('addWarehouseProductsTable', { static: false })
 	addWarehouseProductsTable: AddWarehouseProductsComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
index 92408777c..0a06ef1b8 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
@@ -21,7 +21,7 @@ import Product from '@modules/server.common/entities/Product';
 	templateUrl: './product-mutation.component.html'
 })
 export class SetupMerchantProductMutationComponent {
-	@ViewChild('basicInfoForm', { static: true })
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
index f36e39371..d0d0f75d7 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
@@ -10,7 +10,7 @@ import { Subject } from 'rxjs';
 })
 export class SetupMerchantProductsCatalogComponent
 	implements OnInit, OnDestroy {
-	@ViewChild('productsTable', { static: true })
+	@ViewChild('productsTable', { static: false })
 	productsTable: ProductsTableComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
index 8411083b7..54e144771 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
@@ -26,13 +26,13 @@ import { Router } from '@angular/router';
 	styleUrls: ['./products.component.scss']
 })
 export class SetupMerchantProductsComponent implements OnChanges, OnDestroy {
-	@ViewChild('productsCatalog', { static: true })
+	@ViewChild('productsCatalog', { static: false })
 	productsCatalog: SetupMerchantProductsCatalogComponent;
-	@ViewChild('addProducts', { static: true })
+	@ViewChild('addProducts', { static: false })
 	addProducts: SetupMerchantAddProductsComponent;
-	@ViewChild('productsTable', { static: true })
+	@ViewChild('productsTable', { static: false })
 	productsTable: WarehouseProductsComponent;
-	@ViewChild('productMutation', { static: true })
+	@ViewChild('productMutation', { static: false })
 	productMutation: SetupMerchantProductMutationComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
index 9c9bb5fbe..6fbe200db 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
@@ -16,7 +16,7 @@ import { first } from 'rxjs/operators';
 })
 export class SetupMerchantAddNewCarrierComponent
 	implements AfterViewInit, OnInit {
-	@ViewChild('basicInfoForm', { static: true })
+	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
index 3adeffd3b..472f08021 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
@@ -24,11 +24,11 @@ import { CarrierRouter } from '@modules/client.common.angular2/routers/carrier-r
 })
 export class SetupMerchantDeliveryAndTakeawayComponent
 	implements AfterViewInit, OnDestroy {
-	@ViewChild('newCarrier', { static: true })
+	@ViewChild('newCarrier', { static: false })
 	newCarrier: SetupMerchantAddNewCarrierComponent;
-	@ViewChild('sharedCarriers', { static: true })
+	@ViewChild('sharedCarriers', { static: false })
 	sharedCarriers: SetupMerchantSharedCarriersComponent;
-	@ViewChild('carriersTable', { static: true })
+	@ViewChild('carriersTable', { static: false })
 	carriersTable: CarriersSmartTableComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
index 1a5efb0cc..c3d4d2ccf 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
@@ -21,7 +21,7 @@ const perPage = 5;
 })
 export class SetupMerchantSharedCarriersComponent
 	implements OnDestroy, AfterViewInit {
-	@ViewChild('carriersTable', { static: true })
+	@ViewChild('carriersTable', { static: false })
 	carriersTable: CarriersSmartTableComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
index 29a08792b..144fc92cd 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
@@ -19,24 +19,24 @@ import Warehouse from '@modules/server.common/entities/Warehouse';
 	templateUrl: './merchants.component.html'
 })
 export class SetupMerchantsComponent {
-	@ViewChild('nbStepper', { static: true })
+	@ViewChild('nbStepper', { static: false })
 	nbStepper: NbStepperComponent;
 
-	@ViewChild('account', { static: true })
+	@ViewChild('account', { static: false })
 	stepAccount: SetupMerchantAccountComponent;
-	@ViewChild('basicInfo', { static: true })
+	@ViewChild('basicInfo', { static: false })
 	stepBasicInfo: SetupMerchantBasicInfoComponent;
-	@ViewChild('contactInfo', { static: true })
+	@ViewChild('contactInfo', { static: false })
 	stepContactInfo: SetupMerchantContactInfoComponent;
-	@ViewChild('location', { static: true })
+	@ViewChild('location', { static: false })
 	stepLocation: SetupMerchantLocationComponent;
-	@ViewChild('payments', { static: true })
+	@ViewChild('payments', { static: false })
 	stepPayments: SetupMerchantPaymentsComponent;
-	@ViewChild('manufacturing', { static: true })
+	@ViewChild('manufacturing', { static: false })
 	stepManufacturing: SetupMerchantManufacturingComponent;
-	@ViewChild('deliveryAndTakeaway', { static: true })
+	@ViewChild('deliveryAndTakeaway', { static: false })
 	stepDeliveryAndTakeaway: SetupMerchantDeliveryAndTakeawayComponent;
-	@ViewChild('ordersSettings', { static: true })
+	@ViewChild('ordersSettings', { static: false })
 	stepOrdersSettings: SetupMerchantOrdersSettingsComponent;
 
 	currentStore: Warehouse;
diff --git a/admin/website-angular/src/app/pages/+simulation/simulation.component.ts b/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
index 255f7ea5d..a54c5835f 100644
--- a/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
+++ b/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
@@ -36,10 +36,10 @@ import { IOrderCreateInput } from '@modules/server.common/routers/IWarehouseOrde
 	styleUrls: ['/simulation.component.scss']
 })
 export class SimulationComponent implements OnDestroy, OnInit {
-	@ViewChild('productsTable', { static: true })
+	@ViewChild('productsTable', { static: false })
 	productsTable: SimulationProductsComponent;
 
-	@ViewChild('instructions', { static: true })
+	@ViewChild('instructions', { static: false })
 	instructions: SimulationInstructionsComponent;
 
 	public hasProductsForOrder: boolean;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index be3e888f8..5d1400323 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -13,7 +13,7 @@ import {
 	styleUrls: ['./warehouse-track.component.scss']
 })
 export class WarehouseTrackComponent implements OnInit {
-	@ViewChild('gmap', { static: true })
+	@ViewChild('gmap', { static: false })
 	gmapElement: any;
 	map: google.maps.Map;
 
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
index b0526f01b..c1117c1da 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.ts
@@ -18,13 +18,13 @@ import 'rxjs/add/operator/withLatestFrom';
 export class WarehouseManageComponent implements OnInit {
 	loading: boolean;
 
-	@ViewChild('warehouseManageTabs', { static: true })
+	@ViewChild('warehouseManageTabs', { static: false })
 	warehouseManageTabs: WarehouseManageTabsComponent;
 
-	@ViewChild('contactInfoForm', { static: true })
+	@ViewChild('contactInfoForm', { static: false })
 	contactInfoForm: ContactInfoFormComponent;
 
-	@ViewChild('locationForm', { static: true })
+	@ViewChild('locationForm', { static: false })
 	locationForm: LocationFormComponent;
 
 	readonly form: FormGroup = this._formBuilder.group({
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
index 39a6b8aa2..11adad435 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
@@ -45,16 +45,16 @@ export class WarehouseOrderComponent implements OnInit, OnDestroy {
 	createUserEmitter = new EventEmitter<void>();
 	orderFinishedEmitter = new EventEmitter<void>();
 
-	@ViewChild('wizardForm', { static: true })
+	@ViewChild('wizardForm', { static: false })
 	private _wizardForm: WizardComponent;
 
-	@ViewChild('wizardFormStepTwo', { static: true })
+	@ViewChild('wizardFormStepTwo', { static: false })
 	public wizardFormStepTwo: WizardComponent;
 
-	@ViewChild('warehouseOrderCreateUser', { static: true })
+	@ViewChild('warehouseOrderCreateUser', { static: false })
 	private _warehouseOrderCreateUser: WarehouseOrderCreateUserComponent;
 
-	@ViewChild('warehouseOrderModal', { static: true })
+	@ViewChild('warehouseOrderModal', { static: false })
 	private _warehouseOrderModal: WarehouseOrderModalComponent;
 
 	private _userIdToOrder: string;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
index b52556adb..c06651569 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
@@ -30,7 +30,7 @@ import {
 	styleUrls: ['./products-table.component.scss']
 })
 export class ProductsTableComponent implements OnDestroy {
-	@ViewChild('productsTable', { static: true })
+	@ViewChild('productsTable', { static: false })
 	productsTable: WarehouseProductsComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
index 89ce1cf80..f2be6a4c1 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
@@ -44,8 +44,9 @@ $brand-darken: darken($brand, 5%);
 .subheader {
 	margin-bottom: 0.75rem;
 	font-size: 0.875rem;
-	font-weight: nb-theme(text-subtitle-font-weight);
-	color: nb-theme(text-basic-color);
+	// TODO style
+	// font-weight: nb-theme(font-weight-bolder);
+	// color: nb-theme(color-fg-heading);
 }
 
 .example-container:not(:last-child) {
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
index 5bbfb4c6f..58df0b683 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
@@ -30,7 +30,7 @@ export class WarehouseOrderViewComponent
 	selectedOrder: Order;
 	@Input()
 	hideHeader: boolean;
-	@ViewChild('slideshow', { static: true })
+	@ViewChild('slideshow', { static: false })
 	slideshow: any;
 
 	isSelectedOrderActionsAvailable: boolean = true;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
index 8deef734a..36235f9d2 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
@@ -44,9 +44,9 @@ $brand-darken: darken($brand, 5%);
 .subheader {
 	margin-bottom: 0.75rem;
 	font-size: 0.875rem;
-
-	font-weight: nb-theme(text-subtitle-font-weight);
-	color: nb-theme(text-basic-color);
+	// TODO style
+	// font-weight: nb-theme(font-weight-bolder);
+	// color: nb-theme(color-fg-heading);
 }
 
 .example-container:not(:last-child) {
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
index 993d8cf2e..6084e2c37 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
@@ -42,10 +42,10 @@ const perPage = 3;
 export class WarehouseComponent implements OnDestroy, AfterViewInit, OnChanges {
 	private ngDestroy$ = new Subject<void>();
 
-	@ViewChild('productsTable', { static: true })
+	@ViewChild('productsTable', { static: false })
 	public productsTable: ProductsTableComponent;
 
-	@ViewChild('warehouseSelectView', { static: true })
+	@ViewChild('warehouseSelectView', { static: false })
 	public warehouseSelectView: WarehouseSelectViewComponent;
 
 	public filterMode: OrdersFilterModes = 'all';
diff --git a/admin/website-angular/src/app/pages/charts/chartjs/chartjs.component.scss b/admin/website-angular/src/app/pages/charts/chartjs/chartjs.component.scss
index f46a67ffc..a1777821c 100644
--- a/admin/website-angular/src/app/pages/charts/chartjs/chartjs.component.scss
+++ b/admin/website-angular/src/app/pages/charts/chartjs/chartjs.component.scss
@@ -8,7 +8,7 @@
 	ngx-chartjs-bar-horizontal,
 	ngx-chartjs-radar {
 		display: block;
-		height: nb-theme(card-height-medium);
+		// height: nb-theme(card-height-medium);
 		width: 100%;
 
 		::ng-deep chart {
diff --git a/admin/website-angular/src/app/pages/charts/d3/d3.component.scss b/admin/website-angular/src/app/pages/charts/d3/d3.component.scss
index 3c70c472a..bf6a16c9c 100644
--- a/admin/website-angular/src/app/pages/charts/d3/d3.component.scss
+++ b/admin/website-angular/src/app/pages/charts/d3/d3.component.scss
@@ -1,40 +1,40 @@
-@import '../../../@theme/styles/themes';
+// @import '../../../@theme/styles/themes';
 
-@include nb-install-component() {
-	ngx-d3-bar,
-	ngx-d3-pie,
-	ngx-d3-advanced-pie,
-	ngx-d3-area-stack,
-	ngx-d3-line,
-	ngx-d3-polar {
-		display: block;
-		width: 100%;
-		height: nb-theme(card-height-medium);
+// @include nb-install-component() {
+//   ngx-d3-bar,
+//   ngx-d3-pie,
+//   ngx-d3-advanced-pie,
+//   ngx-d3-area-stack,
+//   ngx-d3-line,
+//   ngx-d3-polar {
+//     display: block;
+//     width: 100%;
+//     height: nb-theme(card-height-medium);
 
-		::ng-deep {
-			.pie-label {
-				fill: nb-theme(text-basic-color);
-			}
+//     ::ng-deep {
+//       .pie-label {
+//         fill: nb-theme(color-fg-heading);
+//       }
 
-			.grid-line-path {
-				stroke: nb-theme(divider-color);
-			}
+//       .grid-line-path {
+//         stroke: nb-theme(separator);
+//       }
 
-			text {
-				fill: nb-theme(text-basic-color);
-			}
+//       text {
+//         fill: nb-theme(color-fg-heading);
+//       }
 
-			.chart-legend {
-				.legend-labels {
-					background: nb-theme(background-basic-color-1);
-				}
-				.legend-label {
-					color: nb-theme(text-basic-color);
-					.active .legend-label-text {
-						color: nb-theme(text-basic-color);
-					}
-				}
-			}
-		}
-	}
-}
+//       .chart-legend {
+//         .legend-labels {
+//           background: nb-theme(color-bg);
+//         }
+//         .legend-label {
+//           color: nb-theme(color-fg-heading);
+//           .active .legend-label-text {
+//             color: nb-theme(color-fg-heading);
+//           }
+//         }
+//       }
+//     }
+//   }
+// }
diff --git a/admin/website-angular/src/app/pages/charts/echarts/echarts.component.scss b/admin/website-angular/src/app/pages/charts/echarts/echarts.component.scss
index 39cb1a9c4..ba6f096ce 100644
--- a/admin/website-angular/src/app/pages/charts/echarts/echarts.component.scss
+++ b/admin/website-angular/src/app/pages/charts/echarts/echarts.component.scss
@@ -9,7 +9,7 @@
 	ngx-echarts-bar-animation,
 	ngx-echarts-radar {
 		display: block;
-		height: nb-theme(card-height-medium);
+		// height: nb-theme(card-height-medium);
 		width: 100%;
 	}
 
diff --git a/admin/website-angular/src/app/pages/dashboard/dashboard.component.scss b/admin/website-angular/src/app/pages/dashboard/dashboard.component.scss
index 58f4b84a7..9e7c99db9 100644
--- a/admin/website-angular/src/app/pages/dashboard/dashboard.component.scss
+++ b/admin/website-angular/src/app/pages/dashboard/dashboard.component.scss
@@ -14,9 +14,9 @@
 		}
 	}
 
-	@include media-breakpoint-down(is) {
-		::ng-deep nb-card.large-card {
-			height: nb-theme(card-height-medium);
-		}
-	}
+	// @include media-breakpoint-down(is) {
+	// 	::ng-deep nb-card.large-card {
+	// 		height: nb-theme(card-height-medium);
+	// 	}
+	// }
 }
diff --git a/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss b/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss
index 4762a0e01..d63c5a5d1 100644
--- a/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss
+++ b/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss
@@ -1,128 +1,128 @@
-@import '../../../@theme/styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-	nb-card-body {
-		overflow: visible;
-	}
-
-	.input-group {
-		margin-bottom: 1rem;
-	}
-
-	.validation-checkboxes {
-		display: flex;
-		justify-content: space-between;
-
-		.custom-control {
-			margin-left: 1rem;
-		}
-	}
-
-	.demo-checkboxes {
-		display: flex;
-		flex-direction: column;
-		margin-bottom: 1rem;
-	}
-
-	.demo-radio {
-		display: flex;
-		flex-direction: column;
-		margin-bottom: 1rem;
-	}
-
-	.demo-disabled-checkbox-radio {
-		display: flex;
-		flex-direction: column;
-		margin-bottom: 1rem;
-	}
-
-	.demo-checkboxes-radio {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.demo-rating {
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-	}
-
-	.star {
-		font-size: 1.5rem;
-		color: nb-theme(text-basic-color);
-	}
-
-	.filled {
-		color: nb-theme(text-basic-color);
-	}
-
-	// TODO: Replace with the card header styles mixin
-	.rating-header {
-		line-height: 2rem;
-		font-size: 1.25rem;
-		font-family: nb-theme(font-secondary);
-		font-weight: nb-theme(text-subtitle-font-weight);
-		color: nb-theme(text-basic-color);
-	}
-
-	.current-rate {
-		font-size: 1.5rem;
-		@include nb-ltr(padding-left, 1rem);
-		@include nb-rtl(padding-right, 1rem);
-		color: nb-theme(text-basic-color);
-	}
-
-	.full-name-inputs {
-		display: flex;
-	}
-
-	.input-group.has-person-icon {
-		position: relative;
-
-		.form-control {
-			padding-left: 3rem;
-		}
-
-		&::before {
-			content: '\F47D';
-			font-family: 'Ionicons';
-			font-size: 2rem;
-			position: absolute;
-			z-index: 100;
-			left: 1rem;
-			top: 0.25rem;
-		}
-	}
-
-	.dropdown {
-		min-width: 7rem;
-	}
-
-	.dropdown-menu {
-		width: auto;
-	}
-
-	.form-group label {
-		padding: 0 0 0.75rem;
-	}
-
-	ngb-rating {
-		outline: none;
-	}
-
-	ngb-rating i {
-		color: nb-theme(color-success-500);
-		@include nb-for-theme(cosmic) {
-			color: nb-theme(color-primary-500);
-		}
-	}
-
-	@include media-breakpoint-down(xs) {
-		button:not(.btn-icon) {
-			padding: 0.75rem 1rem;
-			font-size: 0.75rem;
-		}
-	}
-}
+// @import '../../../@theme/styles/themes';
+// @import '~bootstrap/scss/mixins/breakpoints';
+// @import '~@nebular/theme/styles/global/breakpoints';
+
+// @include nb-install-component() {
+// 	nb-card-body {
+// 		overflow: visible;
+// 	}
+
+// 	.input-group {
+// 		margin-bottom: 1rem;
+// 	}
+
+// 	.validation-checkboxes {
+// 		display: flex;
+// 		justify-content: space-between;
+
+// 		.custom-control {
+// 			margin-left: 1rem;
+// 		}
+// 	}
+
+// 	.demo-checkboxes {
+// 		display: flex;
+// 		flex-direction: column;
+// 		margin-bottom: 1rem;
+// 	}
+
+// 	.demo-radio {
+// 		display: flex;
+// 		flex-direction: column;
+// 		margin-bottom: 1rem;
+// 	}
+
+// 	.demo-disabled-checkbox-radio {
+// 		display: flex;
+// 		flex-direction: column;
+// 		margin-bottom: 1rem;
+// 	}
+
+// 	.demo-checkboxes-radio {
+// 		display: flex;
+// 		justify-content: space-between;
+// 	}
+
+// 	.demo-rating {
+// 		display: flex;
+// 		justify-content: space-between;
+// 		flex-wrap: wrap;
+// 	}
+
+// 	.star {
+// 		font-size: 1.5rem;
+// 		color: nb-theme(color-fg);
+// 	}
+
+// 	.filled {
+// 		color: nb-theme(color-fg);
+// 	}
+
+// 	// TODO: Replace with the card header styles mixin
+// 	.rating-header {
+// 		line-height: 2rem;
+// 		font-size: 1.25rem;
+// 		font-family: nb-theme(font-secondary);
+// 		font-weight: nb-theme(font-weight-bolder);
+// 		color: nb-theme(color-fg-heading);
+// 	}
+
+// 	.current-rate {
+// 		font-size: 1.5rem;
+// 		@include nb-ltr(padding-left, 1rem);
+// 		@include nb-rtl(padding-right, 1rem);
+// 		color: nb-theme(color-fg-heading);
+// 	}
+
+// 	.full-name-inputs {
+// 		display: flex;
+// 	}
+
+// 	.input-group.has-person-icon {
+// 		position: relative;
+
+// 		.form-control {
+// 			padding-left: 3rem;
+// 		}
+
+// 		&::before {
+// 			content: '\F47D';
+// 			font-family: 'Ionicons';
+// 			font-size: 2rem;
+// 			position: absolute;
+// 			z-index: 100;
+// 			left: 1rem;
+// 			top: 0.25rem;
+// 		}
+// 	}
+
+// 	.dropdown {
+// 		min-width: 7rem;
+// 	}
+
+// 	.dropdown-menu {
+// 		width: auto;
+// 	}
+
+// 	.form-group label {
+// 		padding: 0 0 0.75rem;
+// 	}
+
+// 	ngb-rating {
+// 		outline: none;
+// 	}
+
+// 	ngb-rating i {
+// 		color: nb-theme(color-success);
+// 		@include nb-for-theme(cosmic) {
+// 			color: nb-theme(color-primary);
+// 		}
+// 	}
+
+// 	@include media-breakpoint-down(xs) {
+// 		button:not(.btn-icon) {
+// 			padding: 0.75rem 1rem;
+// 			font-size: 0.75rem;
+// 		}
+// 	}
+// }
diff --git a/admin/website-angular/src/app/pages/maps/bubble/bubble-map.component.scss b/admin/website-angular/src/app/pages/maps/bubble/bubble-map.component.scss
index 5cd1e5771..2d05f1d1e 100644
--- a/admin/website-angular/src/app/pages/maps/bubble/bubble-map.component.scss
+++ b/admin/website-angular/src/app/pages/maps/bubble/bubble-map.component.scss
@@ -1,13 +1,13 @@
-@import '../../../@theme/styles/themes';
+// @import '../../../@theme/styles/themes';
 
-@include nb-install-component() {
+// @include nb-install-component() {
 
-  nb-card-body {
-    padding: nb-theme(card-padding) 0 0 0;
-  }
+//   nb-card-body {
+//     padding: nb-theme(card-padding) 0 0 0;
+//   }
 
-  .echarts {
-    width: 100%;
-    height: nb-theme(card-height-large);
-  }
-}
+//   .echarts {
+//     width: 100%;
+//     height: nb-theme(card-height-large);
+//   }
+// }
diff --git a/admin/website-angular/src/app/pages/maps/gmaps/gmaps.component.scss b/admin/website-angular/src/app/pages/maps/gmaps/gmaps.component.scss
index ce6a5b549..c10bacd04 100644
--- a/admin/website-angular/src/app/pages/maps/gmaps/gmaps.component.scss
+++ b/admin/website-angular/src/app/pages/maps/gmaps/gmaps.component.scss
@@ -7,6 +7,6 @@
 
 	::ng-deep agm-map {
 		width: 100%;
-		height: nb-theme(card-height-large);
+		// height: nb-theme(card-height-large);
 	}
 }
diff --git a/admin/website-angular/src/app/pages/maps/leaflet/leaflet.component.scss b/admin/website-angular/src/app/pages/maps/leaflet/leaflet.component.scss
index e9e9eb274..1ec52f87d 100644
--- a/admin/website-angular/src/app/pages/maps/leaflet/leaflet.component.scss
+++ b/admin/website-angular/src/app/pages/maps/leaflet/leaflet.component.scss
@@ -7,6 +7,6 @@
 
 	::ng-deep .leaflet-container {
 		width: 100%;
-		height: nb-theme(card-height-large);
+		// height: nb-theme(card-height-large);
 	}
 }
diff --git a/admin/website-angular/src/app/pages/maps/search-map/map/map.component.scss b/admin/website-angular/src/app/pages/maps/search-map/map/map.component.scss
index d1ac4c32d..fb9c0d1d7 100644
--- a/admin/website-angular/src/app/pages/maps/search-map/map/map.component.scss
+++ b/admin/website-angular/src/app/pages/maps/search-map/map/map.component.scss
@@ -7,6 +7,6 @@
 
 	::ng-deep agm-map {
 		width: 100%;
-		height: nb-theme(card-height-large);
+		// height: nb-theme(card-height-large);
 	}
 }
diff --git a/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts b/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
index d348b9b58..4441d5ee8 100644
--- a/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
+++ b/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
@@ -17,7 +17,7 @@ import { Location } from '../entity/Location';
 export class SearchComponent implements OnInit {
 	@Output() positionChanged = new EventEmitter<Location>();
 
-	@ViewChild('search', { static: true })
+	@ViewChild('search', { static: false })
 	public searchElementRef: ElementRef;
 
 	constructor(private mapsAPILoader: MapsAPILoader, private ngZone: NgZone) {}
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss
index 298719786..359e5ccac 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/action-groups/action-groups.component.scss
@@ -1,75 +1,75 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/theme/components/card/card.component.theme';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
+// @import '../../../../@theme/styles/themes';
+// @import '~@nebular/theme/components/card/card.component.theme';
+// @import '~bootstrap/scss/mixins/breakpoints';
+// @import '~@nebular/theme/styles/global/breakpoints';
 
-@include nb-install-component() {
-	nb-card-body {
-		display: flex;
-		align-items: center;
-	}
+// @include nb-install-component() {
+// 	nb-card-body {
+// 		display: flex;
+// 		align-items: center;
+// 	}
 
-	.action-groups-header {
-		flex-basis: 20%;
+// 	.action-groups-header {
+// 		flex-basis: 20%;
 
-		color: nb-theme(card-header-fg-heading);
-		font-family: nb-theme(card-header-font-family);
-		font-size: nb-theme(card-header-font-size);
-		font-weight: nb-theme(card-header-font-weight);
-	}
+// 		color: nb-theme(card-header-fg-heading);
+// 		font-family: nb-theme(card-header-font-family);
+// 		font-size: nb-theme(card-header-font-size);
+// 		font-weight: nb-theme(card-header-font-weight);
+// 	}
 
-	.nb-actions {
-		flex-basis: 80%;
-	}
+// 	.nb-actions {
+// 		flex-basis: 80%;
+// 	}
 
-	@include media-breakpoint-down(sm) {
-		nb-card-body {
-			flex-direction: column;
-			align-items: flex-start;
-			padding: 0.75rem;
+// 	@include media-breakpoint-down(sm) {
+// 		nb-card-body {
+// 			flex-direction: column;
+// 			align-items: flex-start;
+// 			padding: 0.75rem;
 
-			.action-groups-header {
-				@include nb-ltr(margin, 0 0 0.5rem 0.25rem);
-				@include nb-rtl(margin, 0 0.25rem 0.5rem 0);
-			}
-		}
+// 			.action-groups-header {
+// 				@include nb-ltr(margin, 0 0 0.5rem 0.25rem);
+// 				@include nb-rtl(margin, 0 0.25rem 0.5rem 0);
+// 			}
+// 		}
 
-		nb-action {
-			padding: 0 0.5rem;
-			::ng-deep .control-icon {
-				font-size: 1.75rem;
-			}
-		}
-		nb-user ::ng-deep {
-			.user-container {
-				font-size: 0.875rem;
-			}
-			.user-picture {
-				height: 1.75rem;
-				width: 1.75rem;
-			}
-		}
-	}
+// 		nb-action {
+// 			padding: 0 0.5rem;
+// 			::ng-deep .control-icon {
+// 				font-size: 1.75rem;
+// 			}
+// 		}
+// 		nb-user ::ng-deep {
+// 			.user-container {
+// 				font-size: 0.875rem;
+// 			}
+// 			.user-picture {
+// 				height: 1.75rem;
+// 				width: 1.75rem;
+// 			}
+// 		}
+// 	}
 
-	@include media-breakpoint-down(xs) {
-		nb-action {
-			padding: 0 0.375rem;
-			::ng-deep .control-icon {
-				font-size: 1.5rem;
-			}
-		}
-		nb-user ::ng-deep {
-			.user-container {
-				font-size: 0.75rem;
-			}
-			.user-picture {
-				height: 1.5rem;
-				width: 1.5rem;
-			}
-		}
-		nb-card-body {
-			padding-left: 0;
-			padding-right: 0;
-		}
-	}
-}
+// 	@include media-breakpoint-down(xs) {
+// 		nb-action {
+// 			padding: 0 0.375rem;
+// 			::ng-deep .control-icon {
+// 				font-size: 1.5rem;
+// 			}
+// 		}
+// 		nb-user ::ng-deep {
+// 			.user-container {
+// 				font-size: 0.75rem;
+// 			}
+// 			.user-picture {
+// 				height: 1.5rem;
+// 				width: 1.5rem;
+// 			}
+// 		}
+// 		nb-card-body {
+// 			padding-left: 0;
+// 			padding-right: 0;
+// 		}
+// 	}
+// }
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/buttons.component.scss
index 303110f50..61d16fcbd 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/buttons.component.scss
@@ -1,102 +1,102 @@
-@import '../../../@theme/styles/themes';
-@import '~@nebular/theme/styles/global/bootstrap/buttons';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-	::ng-deep {
-		$button-size: 50px;
-
-		.container-title {
-			color: nb-theme(text-basic-color);
-			font-family: nb-theme(font-secondary);
-			margin-bottom: 0.5rem;
-		}
-
-		.header {
-			color: nb-theme(color-fg-header);
-			font-size: 0.875rem;
-		}
-
-		.subheader {
-			font-size: 0.75rem;
-			font-weight: nb-theme(text-subtitle-font-weight);
-			color: nb-theme(text-basic-color);
-		}
-
-		.btn-demo {
-			width: 180px;
-		}
-
-		.state-container {
-			display: flex;
-
-			&:not(:last-child) {
-				margin-bottom: 1rem;
-			}
-
-			.state-value {
-				width: $button-size;
-				height: $button-size;
-				border-radius: nb-theme(border-radius);
-
-				@include nb-for-theme(corporate) {
-					border-radius: nb-theme(btn-semi-round-border-radius);
-				}
-			}
-
-			.state-details {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				margin-left: 1rem;
-				margin-right: 1rem;
-				height: $button-size;
-			}
-		}
-
-		.example-container {
-			@include nb-ltr(padding-right, 0);
-			@include nb-rtl(padding-left, 0);
-		}
-
-		.example-container .container-btn {
-			margin-bottom: 1.5rem;
-		}
-
-		.block-level-buttons .btn-group {
-			margin-bottom: 1rem;
-		}
-	}
-
-	@include media-breakpoint-down(is) {
-		ngx-default-buttons ::ng-deep nb-card-header {
-			flex-direction: column;
-			align-items: left;
-
-			span {
-				margin-bottom: 1rem;
-			}
-		}
-	}
-
-	@include media-breakpoint-down(xs) {
-		::ng-deep.icon-buttons .icon-button-examples {
-			button {
-				@include nb-ltr(margin-right, 1rem);
-				@include nb-rtl(margin-left, 1rem);
-			}
-		}
-
-		ngx-default-buttons ::ng-deep nb-card-header {
-			flex-direction: column;
-			margin-bottom: 0.5rem;
-		}
-
-		ngx-block-level-buttons ::ng-deep {
-			.btn-primary {
-				padding: 0.75rem 1rem;
-			}
-		}
-	}
-}
+// @import '../../../@theme/styles/themes';
+// @import '~@nebular/theme/styles/global/bootstrap/buttons';
+// @import '~bootstrap/scss/mixins/breakpoints';
+// @import '~@nebular/theme/styles/global/breakpoints';
+
+// @include nb-install-component() {
+// 	::ng-deep {
+// 		$button-size: 50px;
+
+// 		.container-title {
+// 			color: nb-theme(color-fg);
+// 			font-family: nb-theme(font-secondary);
+// 			margin-bottom: 0.5rem;
+// 		}
+
+// 		.header {
+// 			color: nb-theme(color-fg-header);
+// 			font-size: 0.875rem;
+// 		}
+
+// 		.subheader {
+// 			font-size: 0.75rem;
+// 			font-weight: nb-theme(font-weight-light);
+// 			color: nb-theme(color-fg);
+// 		}
+
+// 		.btn-demo {
+// 			width: 180px;
+// 		}
+
+// 		.state-container {
+// 			display: flex;
+
+// 			&:not(:last-child) {
+// 				margin-bottom: 1rem;
+// 			}
+
+// 			.state-value {
+// 				width: $button-size;
+// 				height: $button-size;
+// 				border-radius: nb-theme(btn-border-radius);
+
+// 				@include nb-for-theme(corporate) {
+// 					border-radius: nb-theme(btn-semi-round-border-radius);
+// 				}
+// 			}
+
+// 			.state-details {
+// 				display: flex;
+// 				flex-direction: column;
+// 				justify-content: center;
+// 				margin-left: 1rem;
+// 				margin-right: 1rem;
+// 				height: $button-size;
+// 			}
+// 		}
+
+// 		.example-container {
+// 			@include nb-ltr(padding-right, 0);
+// 			@include nb-rtl(padding-left, 0);
+// 		}
+
+// 		.example-container .container-btn {
+// 			margin-bottom: 1.5rem;
+// 		}
+
+// 		.block-level-buttons .btn-group {
+// 			margin-bottom: 1rem;
+// 		}
+// 	}
+
+// 	@include media-breakpoint-down(is) {
+// 		ngx-default-buttons ::ng-deep nb-card-header {
+// 			flex-direction: column;
+// 			align-items: left;
+
+// 			span {
+// 				margin-bottom: 1rem;
+// 			}
+// 		}
+// 	}
+
+// 	@include media-breakpoint-down(xs) {
+// 		::ng-deep.icon-buttons .icon-button-examples {
+// 			button {
+// 				@include nb-ltr(margin-right, 1rem);
+// 				@include nb-rtl(margin-left, 1rem);
+// 			}
+// 		}
+
+// 		ngx-default-buttons ::ng-deep nb-card-header {
+// 			flex-direction: column;
+// 			margin-bottom: 0.5rem;
+// 		}
+
+// 		ngx-block-level-buttons ::ng-deep {
+// 			.btn-primary {
+// 				padding: 0.75rem 1rem;
+// 			}
+// 		}
+// 	}
+// }
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss
index e90bab370..3ca5b5158 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/default-buttons/default-buttons.component.scss
@@ -1,126 +1,126 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/theme/styles/global/bootstrap/buttons';
-
-@include nb-install-component() {
-
-  nb-card-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .dropdown {
-      flex-basis: 30%;
-      min-width: 220px;
-    }
-  }
-
-  nb-card-body {
-    padding-bottom: 0;
-  }
-
-  .example-container {
-    margin-bottom: 1.5rem;
-  }
-
-  .primary-container {
-    .original {
-      background-color: nb-theme(btn-primary-bg);
-    }
-    .hover {
-      @include btn-primary-hover();
-    }
-    .active {
-      @include btn-primary-active();
-    }
-  }
-
-  .primary-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-primary-bg);
-  }
-
-  .success-container {
-    .original {
-      background-color: nb-theme(btn-success-bg);
-    }
-    .hover {
-      @include btn-success-hover();
-    }
-    .active {
-      @include btn-success-active();
-    }
-  }
-
-  .success-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-success-bg);
-  }
-
-  .warning-container {
-    .original {
-      background-color: nb-theme(btn-warning-bg);
-    }
-    .hover {
-      @include btn-warning-hover();
-    }
-    .active {
-      @include btn-warning-active();
-    }
-  }
-
-  .warning-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-warning-bg);
-  }
-
-  .info-container {
-    .original {
-      background-color: nb-theme(btn-info-bg);
-    }
-    .hover {
-      @include btn-info-hover();
-    }
-    .active {
-      @include btn-info-active();
-    }
-  }
-
-  .info-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-info-bg);
-  }
-
-  .danger-container {
-    .original {
-      background-color: nb-theme(btn-danger-bg);
-    }
-    .hover {
-      @include btn-danger-hover();
-    }
-    .active {
-      @include btn-danger-active();
-    }
-  }
-
-  .danger-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-danger-bg);
-  }
-
-  .secondary-container {
-    .original {
-      border: 2px solid nb-theme(btn-secondary-border);
-    }
-    .hover {
-      @include btn-secondary-hover();
-    }
-    .active {
-      @include btn-secondary-active();
-    }
-  }
-
-  .secondary-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-secondary-border);
-  }
-}
+// @import '../../../../@theme/styles/themes';
+// @import '~@nebular/theme/styles/global/bootstrap/buttons';
+
+// @include nb-install-component() {
+
+//   nb-card-header {
+//     display: flex;
+//     align-items: center;
+//     justify-content: space-between;
+
+//     .dropdown {
+//       flex-basis: 30%;
+//       min-width: 220px;
+//     }
+//   }
+
+//   nb-card-body {
+//     padding-bottom: 0;
+//   }
+
+//   .example-container {
+//     margin-bottom: 1.5rem;
+//   }
+
+//   .primary-container {
+//     .original {
+//       background-color: nb-theme(btn-primary-bg);
+//     }
+//     .hover {
+//       @include btn-primary-hover();
+//     }
+//     .active {
+//       @include btn-primary-active();
+//     }
+//   }
+
+//   .primary-container.outline .original {
+//     background-color: transparent;
+//     border: 2px solid nb-theme(btn-primary-bg);
+//   }
+
+//   .success-container {
+//     .original {
+//       background-color: nb-theme(btn-success-bg);
+//     }
+//     .hover {
+//       @include btn-success-hover();
+//     }
+//     .active {
+//       @include btn-success-active();
+//     }
+//   }
+
+//   .success-container.outline .original {
+//     background-color: transparent;
+//     border: 2px solid nb-theme(btn-success-bg);
+//   }
+
+//   .warning-container {
+//     .original {
+//       background-color: nb-theme(btn-warning-bg);
+//     }
+//     .hover {
+//       @include btn-warning-hover();
+//     }
+//     .active {
+//       @include btn-warning-active();
+//     }
+//   }
+
+//   .warning-container.outline .original {
+//     background-color: transparent;
+//     border: 2px solid nb-theme(btn-warning-bg);
+//   }
+
+//   .info-container {
+//     .original {
+//       background-color: nb-theme(btn-info-bg);
+//     }
+//     .hover {
+//       @include btn-info-hover();
+//     }
+//     .active {
+//       @include btn-info-active();
+//     }
+//   }
+
+//   .info-container.outline .original {
+//     background-color: transparent;
+//     border: 2px solid nb-theme(btn-info-bg);
+//   }
+
+//   .danger-container {
+//     .original {
+//       background-color: nb-theme(btn-danger-bg);
+//     }
+//     .hover {
+//       @include btn-danger-hover();
+//     }
+//     .active {
+//       @include btn-danger-active();
+//     }
+//   }
+
+//   .danger-container.outline .original {
+//     background-color: transparent;
+//     border: 2px solid nb-theme(btn-danger-bg);
+//   }
+
+//   .secondary-container {
+//     .original {
+//       border: 2px solid nb-theme(btn-secondary-border);
+//     }
+//     .hover {
+//       @include btn-secondary-hover();
+//     }
+//     .active {
+//       @include btn-secondary-active();
+//     }
+//   }
+
+//   .secondary-container.outline .original {
+//     background-color: transparent;
+//     border: 2px solid nb-theme(btn-secondary-border);
+//   }
+// }
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss
index 239521554..4a658d363 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.scss
@@ -1,136 +1,135 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/theme/styles/global/bootstrap/buttons';
+// @import '../../../../@theme/styles/themes';
+// @import '~@nebular/theme/styles/global/bootstrap/buttons';
 
-@include nb-install-component() {
-	nb-card-body {
-		padding-bottom: 0;
-	}
+// @include nb-install-component() {
 
-	.none {
-		position: relative;
-		transform: rotate(45deg);
+//   nb-card-body {
+//     padding-bottom: 0;
+//   }
 
-		&::before,
-		&::after {
-			position: absolute;
-			content: '';
-			background: nb-theme(form-control-border-color);
-		}
+//   .none {
+//     position: relative;
+//     transform: rotate(45deg);
 
-		&::before {
-			left: 50%;
-			top: 10%;
-			transform: translateX(-50%);
-			width: 1px;
-			height: 80%;
-		}
+//     &::before, &::after {
+//       position: absolute;
+//       content: '';
+//       background: nb-theme(form-control-border-color);
+//     }
 
-		&::after {
-			top: 50%;
-			left: 10%;
-			transform: translateY(-50%);
-			height: 1px;
-			width: 80%;
-		}
-	}
+//     &::before {
+//       left: 50%;
+//       top: 10%;
+//       transform: translateX(-50%);
+//       width: 1px;
+//       height: 80%;
+//     }
 
-	.shadow {
-		box-shadow: nb-theme(btn-hero-shadow);
-	}
+//     &::after {
+//       top: 50%;
+//       left: 10%;
+//       transform: translateY(-50%);
+//       height: 1px;
+//       width: 80%;
+//     }
+//   }
 
-	.primary-container {
-		.color {
-			background-color: nb-theme(color-primary-500);
-		}
-		.gradient {
-			@include btn-hero-primary-gradient();
-		}
-		.glow {
-			box-shadow: btn-hero-primary-glow();
-		}
-		.bevel {
-			box-shadow: btn-hero-primary-bevel();
-		}
-	}
+//   .shadow {
+//     box-shadow: nb-theme(btn-hero-shadow);
+//   }
 
-	.warning-container {
-		.color {
-			background-color: nb-theme(color-warning);
-		}
-		.gradient {
-			@include btn-hero-warning-gradient();
-		}
-		.glow {
-			box-shadow: btn-hero-warning-glow();
-		}
-		.bevel {
-			box-shadow: btn-hero-warning-bevel();
-		}
-	}
+//   .primary-container {
+//     .color {
+//       background-color: nb-theme(color-primary);
+//     }
+//     .gradient {
+//       @include btn-hero-primary-gradient();
+//     }
+//     .glow {
+//       box-shadow: btn-hero-primary-glow();
+//     }
+//     .bevel {
+//       box-shadow: btn-hero-primary-bevel();
+//     }
+//   }
 
-	.success-container {
-		.color {
-			background-color: nb-theme(color-success-500);
-		}
-		.gradient {
-			@include btn-hero-success-gradient();
-		}
-		.glow {
-			box-shadow: btn-hero-success-glow();
-		}
-		.bevel {
-			box-shadow: btn-hero-success-bevel();
-		}
-	}
+//   .warning-container {
+//     .color {
+//       background-color: nb-theme(color-warning);
+//     }
+//     .gradient {
+//       @include btn-hero-warning-gradient();
+//     }
+//     .glow {
+//       box-shadow: btn-hero-warning-glow();
+//     }
+//     .bevel {
+//       box-shadow: btn-hero-warning-bevel();
+//     }
+//   }
 
-	.info-container {
-		.color {
-			background-color: nb-theme(color-info);
-		}
-		.gradient {
-			@include btn-hero-info-gradient();
-		}
-		.glow {
-			box-shadow: btn-hero-info-glow();
-		}
-		.bevel {
-			box-shadow: btn-hero-info-bevel();
-		}
-	}
+//   .success-container {
+//     .color {
+//       background-color: nb-theme(color-success);
+//     }
+//     .gradient {
+//       @include btn-hero-success-gradient();
+//     }
+//     .glow {
+//       box-shadow: btn-hero-success-glow();
+//     }
+//     .bevel {
+//       box-shadow: btn-hero-success-bevel();
+//     }
+//   }
 
-	.danger-container {
-		.color {
-			background-color: nb-theme(color-danger);
-		}
-		.gradient {
-			@include btn-hero-danger-gradient();
-		}
-		.glow {
-			box-shadow: btn-hero-danger-glow();
-		}
-		.bevel {
-			box-shadow: btn-hero-danger-bevel();
-		}
-	}
+//   .info-container {
+//     .color {
+//       background-color: nb-theme(color-info);
+//     }
+//     .gradient {
+//       @include btn-hero-info-gradient();
+//     }
+//     .glow {
+//       box-shadow: btn-hero-info-glow();
+//     }
+//     .bevel {
+//       box-shadow: btn-hero-info-bevel();
+//     }
+//   }
 
-	.secondary-container {
-		.color {
-			background-color: nb-theme(btn-secondary-bg);
-		}
-		.border {
-			color: nb-theme(btn-secondary-color);
-			border: nb-theme(btn-secondary-border-width) solid
-				nb-theme(btn-secondary-border);
-		}
-		.glow {
-			box-shadow: btn-hero-secondary-glow();
-		}
-		.bevel {
-			box-shadow: btn-hero-secondary-bevel();
-		}
-	}
+//   .danger-container {
+//     .color {
+//       background-color: nb-theme(color-danger);
+//     }
+//     .gradient {
+//       @include btn-hero-danger-gradient();
+//     }
+//     .glow {
+//       box-shadow: btn-hero-danger-glow();
+//     }
+//     .bevel {
+//       box-shadow: btn-hero-danger-bevel();
+//     }
+//   }
 
-	.example-container {
-		margin-bottom: 1.5rem;
-	}
-}
+//   .secondary-container {
+//     .color {
+//       background-color: nb-theme(btn-secondary-bg);
+//     }
+//     .border {
+//       color: nb-theme(btn-secondary-color);
+//       border: nb-theme(btn-secondary-border-width) solid nb-theme(btn-secondary-border);
+//     }
+//     .glow {
+//       box-shadow: btn-hero-secondary-glow();
+//     }
+//     .bevel {
+//       box-shadow: btn-hero-secondary-bevel();
+//     }
+//   }
+
+//   .example-container {
+//     margin-bottom: 1.5rem;
+//   }
+// }
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
index 88bc996bd..3ba3dc99a 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
@@ -1,59 +1,59 @@
-@import '../../../../@theme/styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
+// @import '../../../../@theme/styles/themes';
+// @import '~bootstrap/scss/mixins/breakpoints';
+// @import '~@nebular/theme/styles/global/breakpoints';
 
-@include nb-install-component() {
-	nb-actions > nb-action {
-		padding: 0;
-	}
+// @include nb-install-component() {
+// 	nb-actions > nb-action {
+// 		padding: 0;
+// 	}
 
-	nb-action {
-		i {
-			color: nb-theme(text-basic-color);
-			font-size: 2.5rem;
-			@include nb-ltr(margin-right, 1rem);
-			@include nb-rtl(margin-left, 1rem);
+// 	nb-action {
+// 		i {
+// 			color: nb-theme(color-fg);
+// 			font-size: 2.5rem;
+// 			@include nb-ltr(margin-right, 1rem);
+// 			@include nb-rtl(margin-left, 1rem);
 
-			@include nb-for-theme(corporate) {
-				color: nb-theme(actions-fg);
-			}
-		}
+// 			@include nb-for-theme(corporate) {
+// 				color: nb-theme(actions-fg);
+// 			}
+// 		}
 
-		span {
-			font-family: nb-theme(font-secondary);
-			font-weight: nb-theme(text-heading-2-font-weight);
-			color: nb-theme(text-basic-color);
-			text-transform: uppercase;
-		}
-	}
+// 		span {
+// 			font-family: nb-theme(font-secondary);
+// 			font-weight: nb-theme(font-weight-bold);
+// 			color: nb-theme(color-fg-heading);
+// 			text-transform: uppercase;
+// 		}
+// 	}
 
-	@include media-breakpoint-down(md) {
-		nb-actions nb-action {
-			padding: 0 0.75rem;
-		}
-	}
-	@include media-breakpoint-down(sm) {
-		nb-card-body {
-			padding: 1rem;
-		}
+// 	@include media-breakpoint-down(md) {
+// 		nb-actions nb-action {
+// 			padding: 0 0.75rem;
+// 		}
+// 	}
+// 	@include media-breakpoint-down(sm) {
+// 		nb-card-body {
+// 			padding: 1rem;
+// 		}
 
-		nb-action {
-			font-size: 0.75rem;
-			i {
-				font-size: 2rem;
-				@include nb-ltr(margin-right, 0.5rem);
-				@include nb-rtl(margin-left, 0.5rem);
-			}
-		}
-	}
+// 		nb-action {
+// 			font-size: 0.75rem;
+// 			i {
+// 				font-size: 2rem;
+// 				@include nb-ltr(margin-right, 0.5rem);
+// 				@include nb-rtl(margin-left, 0.5rem);
+// 			}
+// 		}
+// 	}
 
-	@include media-breakpoint-down(is) {
-		nb-action i {
-			font-size: 1.75rem;
-			margin: 0;
-		}
-		span {
-			display: none;
-		}
-	}
-}
+// 	@include media-breakpoint-down(is) {
+// 		nb-action i {
+// 			font-size: 1.75rem;
+// 			margin: 0;
+// 		}
+// 		span {
+// 			display: none;
+// 		}
+// 	}
+// }
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
index 02e461ade..22fdb3829 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
@@ -1,29 +1,30 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/theme/styles/global/bootstrap/buttons';
+// @import '../../../../@theme/styles/themes';
+// @import '~@nebular/theme/styles/global/bootstrap/buttons';
 
-@include nb-install-component() {
-	nb-card-body {
-		padding: 0 0 29px;
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-	}
+// @include nb-install-component() {
 
-	.shape-container {
-		margin: 1.25rem 1.25rem 0;
-	}
+//   nb-card-body {
+//     padding: 0 0 29px;
+//     display: flex;
+//     flex-wrap: wrap;
+//     justify-content: space-between;
+//   }
 
-	.container-title {
-		margin-bottom: 0.25rem;
-	}
+//   .shape-container {
+//     margin: 1.25rem 1.25rem 0;
+//   }
 
-	.subheader {
-		margin-bottom: 1rem;
-		font-size: 0.875rem;
+//   .container-title {
+//     margin-bottom: 0.25rem;
+//   }
 
-		span:nth-child(2) {
-			color: nb-theme(text-basic-color);
-			font-weight: nb-theme(text-heading-2-font-weight);
-		}
-	}
-}
+//   .subheader {
+//     margin-bottom: 1rem;
+//     font-size: 0.875rem;
+
+//     span:nth-child(2) {
+//       color: nb-theme(color-fg-heading);
+//       font-weight: nb-theme(font-weight-bold);
+//     }
+//   }
+// }
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
index d7a4ddf19..38f0750c6 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
@@ -1,25 +1,26 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/theme/styles/global/bootstrap/buttons';
+// @import '../../../../@theme/styles/themes';
+// @import '~@nebular/theme/styles/global/bootstrap/buttons';
 
-@include nb-install-component() {
-	nb-card-body {
-		padding: 0 1.25rem 1.25rem 0;
-		display: flex;
-		flex-wrap: wrap;
-	}
+// @include nb-install-component() {
 
-	.container-title {
-		margin-bottom: 0.25rem;
-	}
+//   nb-card-body {
+//     padding: 0 1.25rem 1.25rem 0;
+//     display: flex;
+//     flex-wrap: wrap;
+//   }
 
-	.size-container {
-		margin: 1.25rem 0 0 1.25rem;
-	}
+//   .container-title {
+//     margin-bottom: 0.25rem;
+//   }
 
-	.subheader {
-		margin-bottom: 0.75rem;
-		font-size: 0.875rem;
-		font-weight: nb-theme(text-subtitle-font-weight);
-		color: nb-theme(text-basic-color);
-	}
-}
+//   .size-container {
+//     margin: 1.25rem 0 0 1.25rem;
+//   }
+
+//   .subheader {
+//     margin-bottom: 0.75rem;
+//     font-size: 0.875rem;
+//     font-weight: nb-theme(font-weight-bolder);
+//     color: nb-theme(color-fg-heading);
+//   }
+// }
diff --git a/admin/website-angular/src/app/pages/ui-features/grid/grid.component.scss b/admin/website-angular/src/app/pages/ui-features/grid/grid.component.scss
index f0490a481..9efb383e1 100644
--- a/admin/website-angular/src/app/pages/ui-features/grid/grid.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/grid/grid.component.scss
@@ -1,33 +1,33 @@
-@import '../../../@theme/styles/themes';
+// @import '../../../@theme/styles/themes';
 
-@include nb-install-component() {
-  .show-grid {
-    .row {
-      margin: -0.5rem;
-    }
+// @include nb-install-component() {
+//   .show-grid {
+//     .row {
+//       margin: -0.5rem;
+//     }
 
-    div[class^=col-] {
-      padding: 0.5rem;
-      box-sizing: border-box;
+//     div[class^=col-] {
+//       padding: 0.5rem;
+//       box-sizing: border-box;
 
-      div {
-        text-align: center;
-        background-color: nb-theme(color-bg-active);
-        padding: 0.75rem 0.25rem;
-        border-radius: 0.25rem;
-      }
-    }
-  }
+//       div {
+//         text-align: center;
+//         background-color: nb-theme(color-bg-active);
+//         padding: 0.75rem 0.25rem;
+//         border-radius: 0.25rem;
+//       }
+//     }
+//   }
 
-  .grid-h {
-    margin-top: 1.5rem;
+//   .grid-h {
+//     margin-top: 1.5rem;
 
-    &:first-child {
-      margin-top: 0;
-    }
-  }
+//     &:first-child {
+//       margin-top: 0;
+//     }
+//   }
 
-  .table-responsive {
-    margin-top: 1rem;
-  }
-}
+//   .table-responsive {
+//     margin-top: 1rem;
+//   }
+// }
diff --git a/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss b/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss
index f812e3c30..4244f2f01 100644
--- a/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss
@@ -1,30 +1,28 @@
-@import '../../../@theme/styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
+// @import '../../../@theme/styles/themes';
+// @import '~bootstrap/scss/mixins/breakpoints';
+// @import '~@nebular/theme/styles/global/breakpoints';
 
-@include nb-install-component() {
-	nb-tabset {
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-	}
+// @include nb-install-component() {
+// 	nb-tabset {
+// 		height: 100%;
+// 		display: flex;
+// 		flex-direction: column;
+// 	}
 
-	nb-tab {
-		// TODO get padding form the theme
-		padding: nb-theme(1.25rem);
-	}
+// 	nb-tab {
+// 		padding: nb-theme(padding);
+// 	}
 
-	::ng-deep ngx-tab1,
-	::ng-deep ngx-tab2 {
-		display: block;
-		// TODO get padding form the theme
-		padding: nb-theme(1.25rem);
-	}
+// 	::ng-deep ngx-tab1,
+// 	::ng-deep ngx-tab2 {
+// 		display: block;
+// 		padding: nb-theme(padding);
+// 	}
 
-	@include media-breakpoint-down(xs) {
-		nb-tabset ::ng-deepul {
-			font-size: 1rem;
-			padding: 0 0.25rem;
-		}
-	}
-}
+// 	@include media-breakpoint-down(xs) {
+// 		nb-tabset ::ng-deepul {
+// 			font-size: 1rem;
+// 			padding: 0 0.25rem;
+// 		}
+// 	}
+// }
diff --git a/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss b/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss
index afd33bfb4..ef5ade43f 100644
--- a/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss
@@ -1,139 +1,128 @@
-@import '../../../@theme/styles/themes';
-
-@include nb-install-component() {
-	.font-secondary .font-header .name {
-		font-size: 4.5rem;
-		line-height: 4rem;
-		font-weight: nb-theme(text-heading-2-font-weight);
-	}
-
-	.font-main .font-header .name {
-		font-size: 3rem;
-		font-weight: nb-theme(text-heading-2-font-weight);
-	}
-
-	.font-row {
-		&:first-child {
-			margin-bottom: 2rem;
-		}
-
-		.header {
-			align-items: baseline;
-		}
-
-		p {
-			margin: 0;
-		}
-	}
-
-	.headings-card {
-		nb-card-body {
-			padding: 1rem 1.25rem;
-		}
-		.header {
-			padding-bottom: 0.675rem;
-			margin-bottom: 0.675rem;
-
-			&:last-child {
-				padding-bottom: 0;
-				margin-bottom: 0;
-			}
-		}
-	}
-
-	.header {
-		display: flex;
-		flex-wrap: wrap;
-		align-items: center;
-		padding-bottom: 1rem;
-		margin-bottom: 1rem;
-		border-bottom: 1px solid nb-theme(divider-color);
-		color: nb-theme(text-basic-color);
-
-		&:last-child {
-			border-bottom: none;
-			padding: 0;
-			margin: 0;
-		}
-
-		div:first-child {
-			flex: 2;
-			-ms-flex: 2 1 auto;
-			line-height: 1;
-			align-items: flex-end;
-
-			h1,
-			h2,
-			h3,
-			h4,
-			h5,
-			h6 {
-				margin-bottom: 0;
-			}
-		}
-
-		.variants {
-			flex: 1;
-			-ms-flex: 1 1 auto;
-			display: flex;
-			justify-content: space-between;
-			align-items: flex-end;
-
-			span {
-				padding-right: 1rem;
-				padding-left: 1rem;
-				font-size: 1.5rem;
-			}
-		}
-
-		.detail {
-			flex: 1;
-			display: flex;
-			justify-content: flex-end;
-			align-items: flex-end;
-			color: nb-theme(text-basic-color);
-		}
-	}
-
-	.colors {
-		display: flex;
-		flex-direction: column;
-
-		.item {
-			display: flex;
-			align-items: center;
-			margin-bottom: 1.25rem;
-			&:last-child {
-				margin-bottom: 0;
-			}
-		}
-
-		.color {
-			width: 86px;
-			height: 60px;
-			border-top-right-radius: 1rem;
-			border-bottom-left-radius: 1rem;
-			@include nb-ltr(margin-right, 1rem);
-			@include nb-rtl(margin-left, 1rem);
-		}
-
-		h1,
-		h2,
-		h3,
-		h4,
-		h5,
-		h6 {
-			margin-bottom: 0.25rem;
-		}
-	}
-
-	.text-link {
-		// TODO nb-theme
-		color: #3dcc6d;
-	}
-
-	.bg-link {
-		// TODO nb-theme
-		background: #3dcc6d;
-	}
-}
+// @import '../../../@theme/styles/themes';
+
+// @include nb-install-component() {
+
+//   .font-secondary .font-header .name {
+//     font-size: 4.5rem;
+//     line-height: 4rem;
+//     font-weight: nb-theme(font-weight-bold);
+//   }
+
+//   .font-main .font-header .name {
+//     font-size: 3rem;
+//     font-weight: nb-theme(font-weight-bold);
+//   }
+
+//   .font-row {
+//     &:first-child {
+//       margin-bottom: 2rem;
+//     }
+
+//     .header {
+//       align-items: baseline;
+//     }
+
+//     p {
+//       margin: 0;
+//     }
+//   }
+
+//   .headings-card {
+//     nb-card-body {
+//       padding: 1rem 1.25rem;
+//     }
+//     .header {
+//       padding-bottom: 0.675rem;
+//       margin-bottom: 0.675rem;
+
+//       &:last-child {
+//         padding-bottom: 0;
+//         margin-bottom: 0;
+//       }
+//     }
+//   }
+
+//   .header {
+//     display: flex;
+//     flex-wrap: wrap;
+//     align-items: center;
+//     padding-bottom: 1rem;
+//     margin-bottom: 1rem;
+//     border-bottom: 1px solid nb-theme(separator);
+//     color: nb-theme(color-fg-heading);
+
+//     &:last-child {
+//       border-bottom: none;
+//       padding: 0;
+//       margin: 0;
+//     }
+
+//     div:first-child {
+//       flex: 2;
+//       -ms-flex: 2 1 auto;
+//       line-height: 1;
+//       align-items: flex-end;
+
+//       h1, h2, h3, h4, h5, h6 {
+//         margin-bottom: 0;
+//       }
+//     }
+
+//     .variants {
+//       flex: 1;
+//       -ms-flex: 1 1 auto;
+//       display: flex;
+//       justify-content: space-between;
+//       align-items: flex-end;
+
+//       span {
+//         padding-right: 1rem;
+//         padding-left: 1rem;
+//         font-size: 1.5rem;
+//       }
+//     }
+
+//     .detail {
+//       flex: 1;
+//       display: flex;
+//       justify-content: flex-end;
+//       align-items: flex-end;
+//       color: nb-theme(color-fg);
+//     }
+//   }
+
+//   .colors {
+//     display: flex;
+//     flex-direction: column;
+
+//     .item {
+//       display: flex;
+//       align-items: center;
+//       margin-bottom: 1.25rem;
+//       &:last-child {
+//         margin-bottom: 0;
+//       }
+//     }
+
+//     .color {
+//       width: 86px;
+//       height: 60px;
+//       border-top-right-radius: 1rem;
+//       border-bottom-left-radius: 1rem;
+//       @include nb-ltr(margin-right, 1rem);
+//       @include nb-rtl(margin-left, 1rem);
+//     }
+
+//     h1, h2, h3, h4, h5, h6 {
+//       margin-bottom: 0.25rem;
+//     }
+//   }
+
+//   .text-link {
+//     color: nb-theme(link-color);
+//   }
+
+//   .bg-link {
+//     background: nb-theme(link-color);
+//   }
+// }
diff --git a/admin/website-angular/yarn.lock b/admin/website-angular/yarn.lock
index 636117707..4f654dc37 100644
--- a/admin/website-angular/yarn.lock
+++ b/admin/website-angular/yarn.lock
@@ -7,24 +7,24 @@
   resolved "https://registry.yarnpkg.com/@agm/core/-/core-1.0.0-beta.5.tgz#6dbceb666b2dbc4a868b97e1340a3faceb5f2113"
   integrity sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ==
 
-"@angular-devkit/architect@0.800.1", "@angular-devkit/architect@^0.800.1":
-  version "0.800.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.1.tgz#decff7e973b9459834ec256f4329a49420757c1f"
-  integrity sha512-zDueOtGo8q9zAUWL2baLIwc5hlLkNtSr5ud1yTuhS4EmYbXJOvV2BPyXx4d77iL+SK4AMG/FyDsi1ZUxXubHIA==
+"@angular-devkit/architect@0.800.2", "@angular-devkit/architect@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.2.tgz#0924864e57d1e56bddeae257c8779a2662c34e69"
+  integrity sha512-251GOQwI3254AtnGWZoHmjOMFcz7h6M3fPmRHpYuuhRPIwZnQCKaszYI7gaP9zR7uArLUwsuPo+YYz8lb6Giwg==
   dependencies:
-    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/core" "8.0.2"
     rxjs "6.4.0"
 
-"@angular-devkit/build-angular@^0.800.1":
-  version "0.800.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.1.tgz#1c203c37a7cdf0f47215ad9b74aa4d4c6ec27d69"
-  integrity sha512-woZH0gJb9aGZjJx5Z7ai8FtT2HAcsMNZ+u5pfKn8qmSspbc0DobTeHQ/giTTHY+kfphXuxNeCEWC/lJIEcbBDA==
+"@angular-devkit/build-angular@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.2.tgz#712f106f50fb8301816e4417493e98e1e12eb296"
+  integrity sha512-RlYPEp5FVKosgzWhbI7llM3lGIxAYuCwEPloeUL4XaDasNe2zmLNUlYDVTrF7GpZRoAgiIejmT0HvvKfEuZNZQ==
   dependencies:
-    "@angular-devkit/architect" "0.800.1"
-    "@angular-devkit/build-optimizer" "0.800.1"
-    "@angular-devkit/build-webpack" "0.800.1"
-    "@angular-devkit/core" "8.0.1"
-    "@ngtools/webpack" "8.0.1"
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/build-optimizer" "0.800.2"
+    "@angular-devkit/build-webpack" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    "@ngtools/webpack" "8.0.2"
     ajv "6.10.0"
     autoprefixer "9.5.1"
     browserslist "4.5.5"
@@ -70,30 +70,30 @@
     webpack-subresource-integrity "1.1.0-rc.6"
     worker-plugin "3.1.0"
 
-"@angular-devkit/build-optimizer@0.800.1":
-  version "0.800.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.1.tgz#9300232f3aa2bd3e39b624ba0dad1873353f2a55"
-  integrity sha512-JES4aXyLDtuI2mXZOkrVD3WRLgicC+/ub13j0sIW3ceBJ4VCuPOJnCVb5To8hEy6E4uKJGFe9dXDQjOis7rmeg==
+"@angular-devkit/build-optimizer@0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.2.tgz#4223b2ac8c2a4c05682d1f3cb0417b4630b4a943"
+  integrity sha512-A/lX7Fjfeh5PspGURV8fJeOsrIYM/7why7mC6v78zdxaErd4S18wUXJDfndjx3qiKyuq76Uu4cQcS7XfClpb8Q==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.4.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.800.1", "@angular-devkit/build-webpack@^0.800.1":
-  version "0.800.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.1.tgz#e9924b98da51ee5271d4b04a83c394deef96be90"
-  integrity sha512-tJda9/vnYsg2CY2i9RiP/W63m5VIAbIRznD7Jn+cCiPrIyCDnpgqbccHMeo8LGv3jIVwdlNKidG1AtzTx3jczg==
+"@angular-devkit/build-webpack@0.800.2", "@angular-devkit/build-webpack@^0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.2.tgz#af90ea503eece948390bce154a53df9d7c566539"
+  integrity sha512-Bd/sazcriUTFQCGFDyUkjXSmpn8hRLIyLIXBLAn+5coH4Y4xNy8PXt+hnr6ffwu92h/WnyxKIJi44+5aoUBURA==
   dependencies:
-    "@angular-devkit/architect" "0.800.1"
-    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
     rxjs "6.4.0"
     webpack-merge "4.2.1"
 
-"@angular-devkit/core@8.0.1", "@angular-devkit/core@^8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.1.tgz#4a38141006deefa2f60f105b458d32885ffc1bec"
-  integrity sha512-GQtspR2umZeuTUDTLy2dpUstvQfK7oAwE0o+rWSa8mx0DyhYssrfBbvfE4GzUzKp6OSz1sbZAatSO+iimZjbQw==
+"@angular-devkit/core@8.0.2", "@angular-devkit/core@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.2.tgz#22b017b38b4d6127ab2e39a27990fd7962d3844a"
+  integrity sha512-S2OPYe6Qu7qTS8Q2lzf4qNjXdbN/J2YVnd3wGauMI8Tih5tY/NzUW3h5ds09nRcjsdBDuT0qgf3IMlCZWIABvQ==
   dependencies:
     ajv "6.10.0"
     fast-json-stable-stringify "2.0.0"
@@ -101,12 +101,12 @@
     rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@8.0.1", "@angular-devkit/schematics@^8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.1.tgz#1f0f616681eb451de31fa5f2d848f5ecbc6226d4"
-  integrity sha512-AbE/Gt0h/6pGu/sQ2oMXZo5ZMDeUhkdU32Nq5styh+B5nVXzGuZK4CGqyDNttdnzebhHt4Bi5ZtF2Avlwt+KEA==
+"@angular-devkit/schematics@8.0.2", "@angular-devkit/schematics@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.2.tgz#854a4366c7dc7462bebd10c24e808b5c9f65b6e2"
+  integrity sha512-v+g0MOPADJJ5QNNmojCyh2sw1GOzadlbHPdTFqZOm77b2Bi79dRm+yuYMuY6a2nUt7DIcioLRcOFwV8UctajRg==
   dependencies:
-    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/core" "8.0.2"
     rxjs "6.4.0"
 
 "@angular/animations@^8.0.0":
@@ -125,16 +125,16 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@^8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.1.tgz#7982f3297ba324d8865ac72b581f2cd4d7953089"
-  integrity sha512-V8U4jNE9khQd7ykzewTpGcB7AjRhWIGb3opPfYux5umQsVhlhQqj/jVgGMu+kN9Jl7KkjFzQTjsJws7wODP6MA==
-  dependencies:
-    "@angular-devkit/architect" "0.800.1"
-    "@angular-devkit/core" "8.0.1"
-    "@angular-devkit/schematics" "8.0.1"
-    "@schematics/angular" "8.0.1"
-    "@schematics/update" "0.800.1"
+"@angular/cli@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.2.tgz#b64c044342f0af2ed7e78e51c54087693407a47b"
+  integrity sha512-xXSCwTKonC6nMqKPDlEFhXjKBu85jVB+KYo2tLU+RKtgFeIF/hTaUWQTvWXRwRsQAfBhB1cwe0oijdljOItTgw==
+  dependencies:
+    "@angular-devkit/architect" "0.800.2"
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
+    "@schematics/angular" "8.0.2"
+    "@schematics/update" "0.800.2"
     "@yarnpkg/lockfile" "1.1.0"
     debug "^4.1.1"
     ini "1.3.5"
@@ -1150,12 +1150,12 @@
   dependencies:
     tslib "^1.9.0"
 
-"@ngtools/webpack@8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.1.tgz#892ca23277e2602447fc093380dae585782d1557"
-  integrity sha512-ly+KyzD5S8dVbwDv4pWt8+NNevPskmdXYJVxa068nE1dQV+CCK4mi6aR0GqrRR9zPvhgRoQKK8tMbN6WDCJS7g==
+"@ngtools/webpack@8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.2.tgz#d60167b514b531ed6ae308b4911739dd102e41c7"
+  integrity sha512-5P0FHF4p5H/G9xGjOG9meDViXcdW3RPdJa2nX1gGpii3/dhFhmU4pxjKn1Bfs4x+PB9FQQvhSvGIBLNf+B4y5Q==
   dependencies:
-    "@angular-devkit/core" "8.0.1"
+    "@angular-devkit/core" "8.0.2"
     enhanced-resolve "4.1.0"
     rxjs "6.4.0"
     tree-kill "1.2.1"
@@ -1191,21 +1191,21 @@
     react-lifecycles-compat "^3.0.4"
     warning "^3.0.0"
 
-"@schematics/angular@8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.1.tgz#8d5bfb00c0ba79cc248c6d17b4782b00b6453d79"
-  integrity sha512-/FyFJbHuxWfvVgTBSnEa0fiDgeLhAmfK7NeT8Owj2xDAqvVMxfSxupfdr7a9cDr82WImW09SX7PUlv2EomcGLA==
+"@schematics/angular@8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.2.tgz#80d2a4d55f89b0f843f64d38f588ccca4fdf4de2"
+  integrity sha512-mN9qsoBVpbY1Q7BP8WaiHsyDv+kl5WrIHw/9OASLrGZcoVY7+oj2CfznVq0XRwvVjDtm6ZFor5ruxLF9dQUOSw==
   dependencies:
-    "@angular-devkit/core" "8.0.1"
-    "@angular-devkit/schematics" "8.0.1"
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
 
-"@schematics/update@0.800.1":
-  version "0.800.1"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.1.tgz#73497d3a0a763119ec30e50823c8e87866d6e540"
-  integrity sha512-1Bnn6RJ7tzlaZRpvE6oQl7oem0zMMtNn2ygiMb2FxW97FHvW4hLIDrP31V3s5n8Ku+RBFMgr1z1P+GBZnbaubg==
+"@schematics/update@0.800.2":
+  version "0.800.2"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.2.tgz#48d23bf60f2870f0887946165cad42c243c4faac"
+  integrity sha512-HPjbzr/LfFLdMzi6zMQK8mPyLw+nt+m7OQsdoeOkFgHkHVfHrKQWcOGt4A0D6keDJ6K2g7W5CsqFR6/GMac7Mg==
   dependencies:
-    "@angular-devkit/core" "8.0.1"
-    "@angular-devkit/schematics" "8.0.1"
+    "@angular-devkit/core" "8.0.2"
+    "@angular-devkit/schematics" "8.0.2"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.5.0"

From 28997b58ef1de1d7594157ec94a1b8ce0f8c59b1 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 13 Jun 2019 16:26:02 +0300
Subject: [PATCH 377/382] fix(ever-admin): fixed dashboard style EV-1240

---
 admin/website-angular/package.json            |   2 +-
 .../components/footer/footer.component.scss   |   8 +-
 .../components/header/header.component.scss   |   2 +-
 .../src/app/@theme/components/index.ts        |   4 +-
 .../switcher/switcher.component.scss          |   2 +-
 .../theme-settings.component.html             |  20 +-
 .../theme-settings.component.scss             |  22 +-
 .../theme-settings.component.ts               |   8 +-
 .../theme-switcher-list.component.scss        |   2 +-
 .../src/app/@theme/layouts/index.ts           |   2 +
 .../layouts/one-column/one-column.layout.scss | 226 +++++++++---------
 .../@theme/layouts/sample/sample.layout.scss  |   2 +-
 .../three-columns/three-columns.layout.scss   |   2 -
 .../two-columns/two-columns.layout.scss       |   2 -
 .../src/app/@theme/styles/pace.theme.scss     |  13 +-
 .../src/app/@theme/styles/styles.scss         |  10 +-
 .../src/app/@theme/styles/theme.corporate.ts  |  16 +-
 .../src/app/@theme/styles/theme.default.ts    |  16 +-
 .../src/app/@theme/styles/themes.scss         | 114 ++++-----
 .../chart-panel-header.component.scss         |   2 +-
 .../chart-panel-summary.component.scss        |  43 ++--
 .../charts-panel/charts-panel.component.scss  |   1 +
 .../legend-chart/legend-chart.component.scss  |   2 +-
 .../dashboard-select-store.component.scss     |  21 ++
 .../pages/+dashboard/dashboard.component.scss |  21 +-
 .../warehouse-order-view.component.scss       |   2 +-
 .../+warehouse/warehouse.component.scss       |   2 +-
 .../src/app/pages/charts/d3/d3.component.scss |   8 +-
 .../form-inputs/form-inputs.component.scss    |   4 +-
 .../src/app/pages/pages.component.ts          |   2 +-
 .../labeled-actions-group.component.scss      |   4 +-
 .../shape-buttons.component.scss              |   4 +-
 .../size-buttons/size-buttons.component.scss  |   2 +-
 .../ui-features/tabs/tabs.component.scss      |   4 +-
 .../typography/typography.component.scss      |   6 +-
 35 files changed, 316 insertions(+), 285 deletions(-)

diff --git a/admin/website-angular/package.json b/admin/website-angular/package.json
index 78e8db4b7..22b52d030 100644
--- a/admin/website-angular/package.json
+++ b/admin/website-angular/package.json
@@ -40,7 +40,7 @@
 		"config": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn ts-node ./scripts/configure.ts",
 		"config:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=dev",
 		"config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=prod",
-		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng serve --port 4444",
+		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng serve",
 		"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng build",
 		"build:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn run build -- --prod --aot",
 		"test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng test",
diff --git a/admin/website-angular/src/app/@theme/components/footer/footer.component.scss b/admin/website-angular/src/app/@theme/components/footer/footer.component.scss
index 77b2437ec..fc196de45 100644
--- a/admin/website-angular/src/app/@theme/components/footer/footer.component.scss
+++ b/admin/website-angular/src/app/@theme/components/footer/footer.component.scss
@@ -13,12 +13,12 @@
 
 		a {
 			padding: 0.4rem;
-			// color: nb-theme(color-fg);
+			color: #a4abb3;
 			transition: color ease-out 0.1s;
 
-			// &:hover {
-			// color: nb-theme(color-fg-heading);
-			// }
+			&:hover {
+				color: #2a2a2a;
+			}
 		}
 	}
 
diff --git a/admin/website-angular/src/app/@theme/components/header/header.component.scss b/admin/website-angular/src/app/@theme/components/header/header.component.scss
index 595f88c40..0d2c2ad99 100644
--- a/admin/website-angular/src/app/@theme/components/header/header.component.scss
+++ b/admin/website-angular/src/app/@theme/components/header/header.component.scss
@@ -50,7 +50,7 @@
 			text-decoration: none;
 
 			nb-icon {
-				font-size: 2.5rem;
+				font-size: 2rem;
 			}
 		}
 
diff --git a/admin/website-angular/src/app/@theme/components/index.ts b/admin/website-angular/src/app/@theme/components/index.ts
index 86b7f91e2..3cf247dda 100644
--- a/admin/website-angular/src/app/@theme/components/index.ts
+++ b/admin/website-angular/src/app/@theme/components/index.ts
@@ -1,7 +1,9 @@
-export * from './header/header.component';
 export * from './footer/footer.component';
 export * from './search-input/search-input.component';
 export * from './tiny-mce/tiny-mce.component';
+
+// TODO remvoe
+export * from './header/header.component';
 export * from './theme-settings/theme-settings.component';
 export * from './theme-switcher/theme-switcher.component';
 export * from './switcher/switcher.component';
diff --git a/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss b/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
index abadd6837..7978defb0 100644
--- a/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
+++ b/admin/website-angular/src/app/@theme/components/switcher/switcher.component.scss
@@ -28,7 +28,7 @@
 
 // 		& > span {
 // 			font-size: 1.125rem;
-// 			font-weight: nb-theme(font-weight-bold);
+// 			font-weight: 500;
 // 			transition: opacity 0.3s ease;
 // 			color: nb-theme(color-fg);
 
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
index 0674ceb5c..1a1869782 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
@@ -26,22 +26,23 @@ <h6 [hidden]="true">SIDEBAR</h6>
 <h6>THEMES</h6>
 <div class="settings-row theme-button">
 	<!-- <ngx-theme-switcher></ngx-theme-switcher> -->
-	<nb-select
-		[(selected)]="currentTheme"
-		(selectedChange)="toggleTheme()"
+	<select
+		[(ngModel)]="currentTheme"
+		(change)="toggleTheme()"
 		status="primary"
+		class="form-control"
 	>
-		<nb-option *ngFor="let theme of themes" [value]="theme.value">
-			{{ theme.name }}</nb-option
+		<option *ngFor="let theme of themes" [value]="theme.value">
+			{{ theme.name }}</option
 		>
-	</nb-select>
+	</select>
 </div>
 
 <h6>LANGUAGE</h6>
 <div class="settings-row">
 	<select
 		class="col-sm-1"
-		class="form-control language-select"
+		class="form-control"
 		#langSelect
 		(change)="switchLanguage(langSelect.value)"
 	>
@@ -56,8 +57,7 @@ <h6>LANGUAGE</h6>
 </div>
 
 <div class="switcher">
-	<!-- TODO  -->
-	<!-- <ngx-layout-direction-switcher
+	<ngx-layout-direction-switcher
 		[vertical]="true"
-	></ngx-layout-direction-switcher> -->
+	></ngx-layout-direction-switcher>
 </div>
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss
index 6e593655e..945a787f5 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.scss
@@ -3,6 +3,8 @@
 @include nb-install-component() {
 	h6 {
 		margin-bottom: 0.5rem;
+		font-weight: 500;
+		font-size: 1rem;
 	}
 
 	.settings-row {
@@ -18,17 +20,17 @@
 			text-decoration: none;
 			font-size: 2.25rem;
 
-			//   color: nb-theme(color-fg);
+			color: #a4abb3;
 
-			//   &.selected {
-			//     color: nb-theme(color-success);
-			//   }
+			&.selected {
+				color: #40dc7e;
+			}
 
-			//   @include nb-for-theme(cosmic) {
-			//     &.selected {
-			//       color: nb-theme(link-color);
-			//     }
-			//   }
+			@include nb-for-theme(cosmic) {
+				&.selected {
+					color: #3dcc6d;
+				}
+			}
 		}
 	}
 
@@ -68,7 +70,7 @@
 		}
 	}
 
-	.language-select {
+	.settings-row select {
 		max-height: 40px;
 		padding: 0;
 		padding-left: 10px;
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
index 6595ec03a..4ff79f6ff 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
@@ -17,12 +17,16 @@ export class ThemeSettingsComponent {
 	themes = [
 		{
 			value: 'default',
-			name: 'Light'
+			name: 'White'
 		},
 		{
-			value: 'dark',
+			value: 'everdark',
 			name: 'Dark'
 		},
+		{
+			value: 'everlight',
+			name: 'Light'
+		},
 		{
 			value: 'cosmic',
 			name: 'Cosmic'
diff --git a/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss b/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
index 22f1a1e7a..0bb6aab3a 100644
--- a/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
+++ b/admin/website-angular/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
@@ -97,7 +97,7 @@ $icon-top-color-everdark: black;
 				font-weight: 300;
 				vertical-align: super;
 				padding-left: 1rem;
-				// color: nb-theme(color-fg-heading);
+				// color: #2a2a2a;
 			}
 		}
 	}
diff --git a/admin/website-angular/src/app/@theme/layouts/index.ts b/admin/website-angular/src/app/@theme/layouts/index.ts
index 812e427d3..a9e1add39 100644
--- a/admin/website-angular/src/app/@theme/layouts/index.ts
+++ b/admin/website-angular/src/app/@theme/layouts/index.ts
@@ -1,4 +1,6 @@
 export * from './one-column/one-column.layout';
 export * from './two-columns/two-columns.layout';
 export * from './three-columns/three-columns.layout';
+
+// TODO remove
 export * from './sample/sample.layout';
diff --git a/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss b/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss
index 330751d07..ad0ad5709 100644
--- a/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/one-column/one-column.layout.scss
@@ -43,117 +43,117 @@
 		}
 	}
 
-	nb-sidebar.menu-sidebar {
-		// margin-top: nb-theme(sidebar-header-gap);
-
-		@include nb-for-theme(corporate) {
-			margin-top: 0;
-		}
-
-		// ::ng-deep .main-container {
-		// height: calc(
-		// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
-		// 			sidebar-header-gap
-		// 		)}
-		// ) !important;
-		// @include nb-ltr(border-top-right-radius, nb-theme(radius));
-		// @include nb-rtl(border-top-left-radius, nb-theme(radius));
-
-		// @include nb-for-theme(corporate) {
-		// 	border: 1px solid nb-theme(separator);
-		// 	height: calc(
-		// 		#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-		// 	) !important;
-		// }
-		// }
-
-		// ::ng-deep .scrollable {
-		// 	@include nb-for-theme(corporate) {
-		// 		padding-top: 0;
-
-		// 		.menu-item:first-child {
-		// 			border-top: none;
-		// 		}
-		// 	}
-		// }
-
-		::ng-deep nb-sidebar-header {
-			padding-bottom: 0.5rem;
-			text-align: center;
-		}
-
-		background: transparent;
-
-		.main-btn {
-			padding: 0.75rem 2.5rem;
-			margin-top: -2rem;
-			font-weight: bold;
-			transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
-
-			// @include nb-for-theme(corporate) {
-			// 	border-radius: nb-theme(radius);
-			// }
-
-			i {
-				font-size: 2rem;
-				text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-			}
-			span {
-				@include nb-ltr(padding-left, 0.25rem);
-				@include nb-rtl(padding-right, 0.25rem);
-			}
-
-			i,
-			span {
-				vertical-align: middle;
-			}
-		}
-
-		&.compacted {
-			::ng-deep nb-sidebar-header {
-				padding-left: 0;
-				padding-right: 0;
-			}
-
-			.main-btn {
-				width: 46px;
-				height: 44px;
-				padding: 0.375rem;
-				border-radius: 5px;
-				transition: none;
-
-				span {
-					display: none;
-				}
-			}
-		}
-	}
-
-	@include media-breakpoint-down(xs) {
-		.main-content {
-			padding: 0.75rem !important;
-		}
-	}
-
-	@include media-breakpoint-down(sm) {
-		nb-sidebar.menu-sidebar {
-			margin-top: 0;
-
-			::ng-deep .main-container {
-				// height: calc(
-				// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
-				// ) !important;
-				@include nb-ltr(border-top-right-radius, 0);
-				@include nb-rtl(border-top-left-radius, 0);
-
-				.scrollable {
-					padding-top: 0;
-				}
-			}
-		}
-
-		.main-btn {
-			display: none;
-		}
-	}
+	// nb-sidebar.menu-sidebar {
+	// 	// margin-top: nb-theme(sidebar-header-gap);
+
+	// 	@include nb-for-theme(corporate) {
+	// 		margin-top: 0;
+	// 	}
+
+	// 	// ::ng-deep .main-container {
+	// 	// height: calc(
+	// 	// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(
+	// 	// 			sidebar-header-gap
+	// 	// 		)}
+	// 	// ) !important;
+	// 	// @include nb-ltr(border-top-right-radius, nb-theme(radius));
+	// 	// @include nb-rtl(border-top-left-radius, nb-theme(radius));
+
+	// 	// @include nb-for-theme(corporate) {
+	// 	// 	border: 1px solid nb-theme(separator);
+	// 	// 	height: calc(
+	// 	// 		#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+	// 	// 	) !important;
+	// 	// }
+	// 	// }
+
+	// 	// ::ng-deep .scrollable {
+	// 	// 	@include nb-for-theme(corporate) {
+	// 	// 		padding-top: 0;
+
+	// 	// 		.menu-item:first-child {
+	// 	// 			border-top: none;
+	// 	// 		}
+	// 	// 	}
+	// 	// }
+
+	// 	::ng-deep nb-sidebar-header {
+	// 		padding-bottom: 0.5rem;
+	// 		text-align: center;
+	// 	}
+
+	// 	background: transparent;
+
+	// 	.main-btn {
+	// 		padding: 0.75rem 2.5rem;
+	// 		margin-top: -2rem;
+	// 		font-weight: bold;
+	// 		transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
+
+	// 		// @include nb-for-theme(corporate) {
+	// 		// 	border-radius: nb-theme(radius);
+	// 		// }
+
+	// 		i {
+	// 			font-size: 2rem;
+	// 			text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+	// 		}
+	// 		span {
+	// 			@include nb-ltr(padding-left, 0.25rem);
+	// 			@include nb-rtl(padding-right, 0.25rem);
+	// 		}
+
+	// 		i,
+	// 		span {
+	// 			vertical-align: middle;
+	// 		}
+	// 	}
+
+	// 	&.compacted {
+	// 		::ng-deep nb-sidebar-header {
+	// 			padding-left: 0;
+	// 			padding-right: 0;
+	// 		}
+
+	// 		.main-btn {
+	// 			width: 46px;
+	// 			height: 44px;
+	// 			padding: 0.375rem;
+	// 			border-radius: 5px;
+	// 			transition: none;
+
+	// 			span {
+	// 				display: none;
+	// 			}
+	// 		}
+	// 	}
+	// }
+
+	// @include media-breakpoint-down(xs) {
+	// 	.main-content {
+	// 		padding: 0.75rem !important;
+	// 	}
+	// }
+
+	// @include media-breakpoint-down(sm) {
+	// 	nb-sidebar.menu-sidebar {
+	// 		margin-top: 0;
+
+	// 		::ng-deep .main-container {
+	// 			// height: calc(
+	// 			// 	#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}
+	// 			// ) !important;
+	// 			@include nb-ltr(border-top-right-radius, 0);
+	// 			@include nb-rtl(border-top-left-radius, 0);
+
+	// 			.scrollable {
+	// 				padding-top: 0;
+	// 			}
+	// 		}
+	// 	}
+
+	// 	.main-btn {
+	// 		display: none;
+	// 	}
+	// }
 }
diff --git a/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss b/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss
index d2fcce9f6..bbf9fe509 100644
--- a/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/sample/sample.layout.scss
@@ -82,7 +82,7 @@
 			text-align: center;
 		}
 
-		background: transparent;
+		// background: transparent;
 
 		.main-btn {
 			padding: 0.75rem 2.5rem;
diff --git a/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss b/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss
index e51af3096..cc8803129 100644
--- a/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/three-columns/three-columns.layout.scss
@@ -82,8 +82,6 @@
 			text-align: center;
 		}
 
-		background: transparent;
-
 		.main-btn {
 			padding: 0.75rem 2.5rem;
 			margin-top: -2rem;
diff --git a/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss b/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss
index 77abce194..9d703518d 100644
--- a/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss
+++ b/admin/website-angular/src/app/@theme/layouts/two-columns/two-columns.layout.scss
@@ -82,8 +82,6 @@
 			text-align: center;
 		}
 
-		background: transparent;
-
 		.main-btn {
 			padding: 0.75rem 2.5rem;
 			margin-top: -2rem;
diff --git a/admin/website-angular/src/app/@theme/styles/pace.theme.scss b/admin/website-angular/src/app/@theme/styles/pace.theme.scss
index 622660d79..cd5ed9594 100644
--- a/admin/website-angular/src/app/@theme/styles/pace.theme.scss
+++ b/admin/website-angular/src/app/@theme/styles/pace.theme.scss
@@ -5,13 +5,14 @@
  */
 
 @mixin ngx-pace-theme() {
-	//   .pace .pace-progress {
-	// background: nb-theme(color-fg-highlight);
-	//   }
+	.pace .pace-progress {
+		background: nb-theme(color-primary-default);
+	}
 
-	//   .pace .pace-progress-inner {
-	// box-shadow: 0 0 10px nb-theme(color-fg-highlight), 0 0 5px nb-theme(color-fg-highlight);
-	//   }
+	.pace .pace-progress-inner {
+		box-shadow: 0 0 10px nb-theme(color-primary-default),
+			0 0 5px nb-theme(color-primary-default);
+	}
 
 	.pace .pace-activity {
 		display: none;
diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index 16e479bc6..62c82edef 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -3,12 +3,11 @@
 // framework component themes (styles tied to theme variables)
 @import '~@nebular/theme/styles/globals';
 @import '~@nebular/auth/styles/all';
-// TODO style
-// @import '~@nebular/bootstrap/styles/globals';
+
+@import '~@nebular/bootstrap/styles/globals';
 //angular2-toaster
 @import 'node_modules/angular2-toaster/toaster';
-// global app font size
-@import './font-size';
+
 // custom global ng-bootstrap modal
 @import './ng-bootstrap.modal';
 // loading progress bar theme
@@ -30,8 +29,7 @@
 // install the framework and custom global styles
 @include nb-install() {
 	// framework global styles
-	// TODO style
-	// @include nb-bootstrap-global();
+	@include nb-bootstrap-global();
 	@include nb-auth-global();
 	@include nb-theme-global();
 
diff --git a/admin/website-angular/src/app/@theme/styles/theme.corporate.ts b/admin/website-angular/src/app/@theme/styles/theme.corporate.ts
index a77268751..2a84d4004 100644
--- a/admin/website-angular/src/app/@theme/styles/theme.corporate.ts
+++ b/admin/website-angular/src/app/@theme/styles/theme.corporate.ts
@@ -16,7 +16,7 @@ export const CORPORATE_THEME = {
 			tooltipBg: '#eef2f5',
 			tooltipBorderColor: '#eef2f5',
 			tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: '400',
 
 			lineBg: '#cae6f3',
@@ -36,11 +36,11 @@ export const CORPORATE_THEME = {
 			tooltipLineWidth: '0',
 			tooltipBorderColor: '#ebeef2',
 			tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder',
 
 			axisLineColor: 'rgba(0, 0, 0, 0)',
-			xAxisTextColor: '#2a2a2a',
+			xAxisTextColor: '#2a2a2a;',
 			yAxisSplitLine: '#ebeef2',
 
 			itemBorderColor: '#73a1ff',
@@ -72,7 +72,7 @@ export const CORPORATE_THEME = {
 			splitLineStyleWidth: '1',
 			splitLineStyleColor: '#000000',
 
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: '400',
 			tooltipFontSize: '16',
 			tooltipBg: '#eef2f5',
@@ -93,7 +93,7 @@ export const CORPORATE_THEME = {
 			tooltipBg: '#edf0f4',
 			tooltipBorderColor: '#ebeef2',
 			tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder'
 		},
 
@@ -139,7 +139,7 @@ export const CORPORATE_THEME = {
 			tooltipLineWidth: '0',
 			tooltipBorderColor: '#ebeef2',
 			tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder',
 			tooltipFontSize: '20',
 
@@ -212,7 +212,7 @@ export const CORPORATE_THEME = {
 			tooltipLineWidth: '0',
 			tooltipBorderColor: '#ebeef2',
 			tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder',
 			tooltipFontSize: '20',
 
@@ -286,7 +286,7 @@ export const CORPORATE_THEME = {
 			gradFrom: '#e3ecfe',
 			gradTo: '#e3ecfe',
 
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: '400',
 			tooltipFontSize: '16',
 			tooltipBg: '#eef2f5',
diff --git a/admin/website-angular/src/app/@theme/styles/theme.default.ts b/admin/website-angular/src/app/@theme/styles/theme.default.ts
index 9a5bbce11..7cd56e2a3 100644
--- a/admin/website-angular/src/app/@theme/styles/theme.default.ts
+++ b/admin/website-angular/src/app/@theme/styles/theme.default.ts
@@ -17,7 +17,7 @@ export const DEFAULT_THEME = {
 			tooltipBg: '#ffffff',
 			tooltipBorderColor: '#c0c8d1',
 			tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder',
 
 			lineBg: '#c0c8d1',
@@ -37,11 +37,11 @@ export const DEFAULT_THEME = {
 			tooltipLineWidth: '0',
 			tooltipBorderColor: '#ebeef2',
 			tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder',
 
 			axisLineColor: 'rgba(0, 0, 0, 0)',
-			xAxisTextColor: '#2a2a2a',
+			xAxisTextColor: '#2a2a2a;',
 			yAxisSplitLine: '#ebeef2',
 
 			itemBorderColor: '#42db7d',
@@ -73,7 +73,7 @@ export const DEFAULT_THEME = {
 			splitLineStyleWidth: '1',
 			splitLineStyleColor: '#000000',
 
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder',
 			tooltipFontSize: '16',
 			tooltipBg: '#ffffff',
@@ -94,7 +94,7 @@ export const DEFAULT_THEME = {
 			tooltipBg: '#ffffff',
 			tooltipBorderColor: '#c0c8d1',
 			tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder'
 		},
 
@@ -140,7 +140,7 @@ export const DEFAULT_THEME = {
 			tooltipLineWidth: '0',
 			tooltipBorderColor: '#ebeef2',
 			tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder',
 			tooltipFontSize: '20',
 
@@ -214,7 +214,7 @@ export const DEFAULT_THEME = {
 			tooltipLineWidth: '0',
 			tooltipBorderColor: '#ebeef2',
 			tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder',
 			tooltipFontSize: '20',
 
@@ -288,7 +288,7 @@ export const DEFAULT_THEME = {
 			gradFrom: 'rgba(188, 92, 255, 0.5)',
 			gradTo: 'rgba(188, 92, 255, 0.5)',
 
-			tooltipTextColor: '#2a2a2a',
+			tooltipTextColor: '#2a2a2a;',
 			tooltipFontWeight: 'bolder',
 			tooltipFontSize: '16',
 			tooltipBg: '#ffffff',
diff --git a/admin/website-angular/src/app/@theme/styles/themes.scss b/admin/website-angular/src/app/@theme/styles/themes.scss
index 921668cdc..8148a3ae8 100644
--- a/admin/website-angular/src/app/@theme/styles/themes.scss
+++ b/admin/website-angular/src/app/@theme/styles/themes.scss
@@ -15,23 +15,23 @@ $nb-themes: nb-register-theme(
 		header-height: 5.45rem,
 		font-family-primary: Roboto,
 		font-family-secondary: Exo,
-		// font-main: Roboto,
-			// font-secondary: Exo,
-			// switcher-background: #ebeff5,
-			// switcher-background-percentage: 50%,
-			// drops-icon-line-gadient: -webkit-linear-gradient(#01dbb5, #0bbb79),
-			// list-item-border-width: 1px,
-			// slide-out-container-width: 30%,
-			// slide-out-background: linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
-			// slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
-			// slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
-			// chart-panel-summary-box-shadow: none,
-			// chart-panel-summary-background-color: #ecf2f5,
-			// chart-panel-summary-border-color: #ebeff1,
-			// chart-panel-summary-border-width: 1px,
-			// ecommerce-card-border-width: 1px,
-			// progress-bar-background:
-			// 	linear-gradient(90deg, #3edd81 0%, #3bddaf 100%)
+		font-main: Roboto,
+		font-secondary: Exo,
+		switcher-background: #ebeff5,
+		switcher-background-percentage: 50%,
+		drops-icon-line-gadient: -webkit-linear-gradient(#01dbb5, #0bbb79),
+		list-item-border-width: 1px,
+		slide-out-container-width: 30%,
+		slide-out-background: linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
+		slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
+		slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
+		chart-panel-summary-box-shadow: none,
+		chart-panel-summary-background-color: #ecf2f5,
+		chart-panel-summary-border-color: #ebeff1,
+		chart-panel-summary-border-width: 1px,
+		ecommerce-card-border-width: 1px,
+		progress-bar-background:
+			linear-gradient(90deg, #3edd81 0%, #3bddaf 100%)
 	),
 	default,
 	default
@@ -40,26 +40,26 @@ $nb-themes: nb-register-theme(
 $nb-themes: nb-register-theme(
 	(
 		// app wise variables for each theme
-			// 	sidebar-header-gap: 2rem,
-			// sidebar-header-height: initial,
-			// layout-content-width: 1400px,
-			// font-main: Roboto,
-			// font-secondary: Exo,
-			// switcher-background: #4e41a5,
-			// switcher-background-percentage: 14%,
-			// drops-icon-line-gadient: -webkit-linear-gradient(#a258fe, #7958fa),
-			// list-item-border-width: 1px,
-			// slide-out-container-width: 30%,
-			// slide-out-background: radial-gradient(circle, #302c6e 0%, #423f8c 100%),
-			// slide-out-shadow-color: 2px 0 3px rgba(19, 19, 94, 0.9),
-			// slide-out-shadow-color-rtl: -2px 0 3px rgba(19, 19, 94, 0.9),
-			// chart-panel-summary-box-shadow: none,
-			// chart-panel-summary-background-color: rgba(0, 0, 0, 0.1),
-			// chart-panel-summary-border-color: #332e73,
-			// chart-panel-summary-border-width: 1px,
-			// ecommerce-card-border-width: 1px,
-			// progress-bar-background:
-			// 	linear-gradient(90deg, #00c7c7 0%, #00d977 100%) !important
+			sidebar-header-gap: 2rem,
+		sidebar-header-height: initial,
+		layout-content-width: 1400px,
+		font-main: Roboto,
+		font-secondary: Exo,
+		switcher-background: #4e41a5,
+		switcher-background-percentage: 14%,
+		drops-icon-line-gadient: -webkit-linear-gradient(#a258fe, #7958fa),
+		list-item-border-width: 1px,
+		slide-out-container-width: 30%,
+		slide-out-background: radial-gradient(circle, #302c6e 0%, #423f8c 100%),
+		slide-out-shadow-color: 2px 0 3px rgba(19, 19, 94, 0.9),
+		slide-out-shadow-color-rtl: -2px 0 3px rgba(19, 19, 94, 0.9),
+		chart-panel-summary-box-shadow: none,
+		chart-panel-summary-background-color: rgba(0, 0, 0, 0.1),
+		chart-panel-summary-border-color: #332e73,
+		chart-panel-summary-border-width: 1px,
+		ecommerce-card-border-width: 1px,
+		progress-bar-background:
+			linear-gradient(90deg, #00c7c7 0%, #00d977 100%) !important
 	),
 	cosmic,
 	cosmic
@@ -68,26 +68,26 @@ $nb-themes: nb-register-theme(
 $nb-themes: nb-register-theme(
 	(
 		// app wise variables for each theme
-			// 	sidebar-header-gap: 2rem,
-			// sidebar-header-height: initial,
-			// layout-content-width: 1400px,
-			// font-main: Roboto,
-			// font-secondary: Exo,
-			// switcher-background: #2b2d34,
-			// switcher-background-percentage: 14%,
-			// drops-icon-line-gadient: -webkit-linear-gradient(#e9e8eb, #a7a2be),
-			// list-item-border-width: 1px,
-			// slide-out-container-width: 30%,
-			// slide-out-background: linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
-			// slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
-			// slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
-			// chart-panel-summary-box-shadow: none,
-			// chart-panel-summary-background-color: #f7fafb,
-			// chart-panel-summary-border-color: #ebeff1,
-			// chart-panel-summary-border-width: 1px,
-			// ecommerce-card-border-width: 1px,
-			// progress-bar-background:
-			// 	linear-gradient(90deg, #ff9f6f 0%, #ff8b97 100%)
+			sidebar-header-gap: 2rem,
+		sidebar-header-height: initial,
+		layout-content-width: 1400px,
+		font-main: Roboto,
+		font-secondary: Exo,
+		switcher-background: #2b2d34,
+		switcher-background-percentage: 14%,
+		drops-icon-line-gadient: -webkit-linear-gradient(#e9e8eb, #a7a2be),
+		list-item-border-width: 1px,
+		slide-out-container-width: 30%,
+		slide-out-background: linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
+		slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
+		slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
+		chart-panel-summary-box-shadow: none,
+		chart-panel-summary-background-color: #f7fafb,
+		chart-panel-summary-border-color: #ebeff1,
+		chart-panel-summary-border-width: 1px,
+		ecommerce-card-border-width: 1px,
+		progress-bar-background:
+			linear-gradient(90deg, #ff9f6f 0%, #ff8b97 100%)
 	),
 	corporate,
 	corporate
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss
index a9405be22..a3448db06 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.scss
@@ -48,7 +48,7 @@
 
 			::ng-deep .legends {
 				padding-left: 0;
-				// font-size: nb-theme(font-size-sm);
+				font-size: 0.875rem;
 			}
 
 			::ng-deep .legend {
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
index cf95d258f..5efe5be84 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
@@ -6,25 +6,28 @@
 	.summary-container {
 		display: flex;
 		flex: 1;
-		// background-color: nb-theme(chart-panel-summary-background-color);
-		// box-shadow: nb-theme(chart-panel-summary-box-shadow);
+		background-color: nb-theme(chart-panel-summary-background-color);
+		box-shadow: nb-theme(chart-panel-summary-box-shadow);
 		justify-content: space-between;
 		padding: 1.8rem 4rem 1.2rem;
 		margin-bottom: 1rem;
-		// border: nb-theme(chart-panel-summary-border-width) solid
-		// 	nb-theme(chart-panel-summary-border-color);
+		border: nb-theme(chart-panel-summary-border-width) solid
+			nb-theme(chart-panel-summary-border-color);
 		border-left: none;
 		border-right: none;
 
 		.summary {
 			width: 100%;
 		}
+
+		small {
+			margin-bottom: 0.5rem;
+		}
 	}
 
 	.value {
 		font-size: 2rem;
-		// color: nb-theme(color-fg-heading);
-
+		color: #2a2a2a;
 		span div small {
 			font-size: 0.5em;
 			display: block;
@@ -32,25 +35,25 @@
 	}
 
 	@include media-breakpoint-down(sm) {
-		// .value,
-		// .title {
-		// font-weight: nb-theme(font-weight-bold);
-		// }
+		.value,
+		.title {
+			font-weight: 500;
+		}
 
-		// .title {
-		// 	font-size: nb-theme(font-size-sm);
-		// }
+		.title {
+			font-size: 0.875rem;
+		}
 
-		// .value {
-		// 	font-size: nb-theme(font-size-xlg);
-		// }
+		.value {
+			font-size: 1.25rem;
+		}
 	}
 
 	@include media-breakpoint-down(is) {
-		// .summary-container {
-		// padding-left: nb-theme(padding);
-		// padding-right: nb-theme(padding);
-		// }
+		.summary-container {
+			padding-left: 1.25rem;
+			padding-right: 1.25rem;
+		}
 
 		.value {
 			margin-top: 0.5rem;
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.scss
index 4cf8b654f..34a7de3ef 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.scss
@@ -17,6 +17,7 @@ $legend-canceled-color: #3f4fda;
 
 	nb-tab {
 		flex: 1;
+		padding: 0;
 		padding-bottom: 1.25rem;
 	}
 
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss b/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss
index 7ddb834fd..e002976bb 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/legend-chart/legend-chart.component.scss
@@ -6,7 +6,7 @@
 	.legends {
 		display: flex;
 		@include nb-rtl(flex-direction, row-reverse);
-		// color: nb-theme(color-fg);
+		color: #a4abb3;
 		padding: 0 0 0 2.85rem;
 	}
 
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.scss b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.scss
index f70513aef..42289581a 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.scss
@@ -1,5 +1,26 @@
 nb-card#dashboard-select-stores {
+	h5 {
+		font-family: Exo;
+		color: #2a2a2a;
+		font-weight: 500;
+		font-size: 1.25rem;
+	}
+
+	li {
+		font-size: 0.9rem;
+		line-height: 1.25;
+
+		font-weight: 400;
+	}
 	nb-card-body {
 		overflow: inherit !important;
+
+		h6 {
+			font-family: Exo;
+			color: #2a2a2a;
+			font-weight: 500;
+			line-height: 1.2;
+			font-size: 1rem;
+		}
 	}
 }
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
index 646325d33..36f9e86c0 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
@@ -4,7 +4,7 @@ $shadow-green: #00977e;
 
 @include nb-install-component() {
 	.progress-info {
-		// color: nb-theme(color-fg-heading);
+		color: #2a2a2a;
 		margin-top: 2.5rem;
 
 		&:first-child {
@@ -12,20 +12,21 @@ $shadow-green: #00977e;
 		}
 	}
 
-	// .title {
-	// 	font-family: nb-theme(font-secondary);
-	// 	font-size: nb-theme(font-size-lg);
-	// 	font-weight: nb-theme(font-weight-bold);
-	// }
+	.title {
+		font-family: font-main;
+		font-size: 1.125rem;
+		font-weight: 600;
+	}
 
 	.value {
-		font-size: 3rem;
-		// font-weight: nb-theme(font-weight-light);
+		font-size: 2.4rem;
+		font-weight: 300;
 		margin-top: 0.5rem;
+		line-height: 1.1;
 	}
 
 	.description {
-		// color: nb-theme(color-fg);
+		color: #a4abb3;
 		margin-top: 0.5rem;
 	}
 
@@ -39,7 +40,7 @@ $shadow-green: #00977e;
 
 		.progress-value {
 			height: 0.6rem;
-			// background: nb-theme(progress-bar-background);
+			background: nb-theme(progress-bar-background);
 
 			@include nb-for-theme(cosmic) {
 				box-shadow: 0 0.2rem $shadow-green;
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
index f2be6a4c1..fbc2ede4a 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
@@ -46,7 +46,7 @@ $brand-darken: darken($brand, 5%);
 	font-size: 0.875rem;
 	// TODO style
 	// font-weight: nb-theme(font-weight-bolder);
-	// color: nb-theme(color-fg-heading);
+	// color: #2a2a2a;
 }
 
 .example-container:not(:last-child) {
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
index 36235f9d2..1da385bf9 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
@@ -46,7 +46,7 @@ $brand-darken: darken($brand, 5%);
 	font-size: 0.875rem;
 	// TODO style
 	// font-weight: nb-theme(font-weight-bolder);
-	// color: nb-theme(color-fg-heading);
+	// color: #2a2a2a;
 }
 
 .example-container:not(:last-child) {
diff --git a/admin/website-angular/src/app/pages/charts/d3/d3.component.scss b/admin/website-angular/src/app/pages/charts/d3/d3.component.scss
index bf6a16c9c..bf7ff8a54 100644
--- a/admin/website-angular/src/app/pages/charts/d3/d3.component.scss
+++ b/admin/website-angular/src/app/pages/charts/d3/d3.component.scss
@@ -13,7 +13,7 @@
 
 //     ::ng-deep {
 //       .pie-label {
-//         fill: nb-theme(color-fg-heading);
+//         fill: #2a2a2a;
 //       }
 
 //       .grid-line-path {
@@ -21,7 +21,7 @@
 //       }
 
 //       text {
-//         fill: nb-theme(color-fg-heading);
+//         fill: #2a2a2a;
 //       }
 
 //       .chart-legend {
@@ -29,9 +29,9 @@
 //           background: nb-theme(color-bg);
 //         }
 //         .legend-label {
-//           color: nb-theme(color-fg-heading);
+//           color: #2a2a2a;
 //           .active .legend-label-text {
-//             color: nb-theme(color-fg-heading);
+//             color: #2a2a2a;
 //           }
 //         }
 //       }
diff --git a/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss b/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss
index d63c5a5d1..d55805fd0 100644
--- a/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss
+++ b/admin/website-angular/src/app/pages/forms/form-inputs/form-inputs.component.scss
@@ -64,14 +64,14 @@
 // 		font-size: 1.25rem;
 // 		font-family: nb-theme(font-secondary);
 // 		font-weight: nb-theme(font-weight-bolder);
-// 		color: nb-theme(color-fg-heading);
+// 		color: #2a2a2a;
 // 	}
 
 // 	.current-rate {
 // 		font-size: 1.5rem;
 // 		@include nb-ltr(padding-left, 1rem);
 // 		@include nb-rtl(padding-right, 1rem);
-// 		color: nb-theme(color-fg-heading);
+// 		color: #2a2a2a;
 // 	}
 
 // 	.full-name-inputs {
diff --git a/admin/website-angular/src/app/pages/pages.component.ts b/admin/website-angular/src/app/pages/pages.component.ts
index 92f0f2d44..8bff64916 100644
--- a/admin/website-angular/src/app/pages/pages.component.ts
+++ b/admin/website-angular/src/app/pages/pages.component.ts
@@ -19,7 +19,7 @@ export class PagesComponent {
 		this.menu = [
 			{
 				title: this.getTranslation('MENU_VIEW.DASHBOARD'),
-				icon: 'person-outline',
+				icon: 'pie-chart-outline',
 				link: '/dashboard',
 				pathMatch: 'prefix'
 			},
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
index 3ba3dc99a..e83b92455 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/labeled-actions-group/labeled-actions-group.component.scss
@@ -21,8 +21,8 @@
 
 // 		span {
 // 			font-family: nb-theme(font-secondary);
-// 			font-weight: nb-theme(font-weight-bold);
-// 			color: nb-theme(color-fg-heading);
+// 			font-weight: 500;
+// 			color: #2a2a2a;
 // 			text-transform: uppercase;
 // 		}
 // 	}
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
index 22fdb3829..150f032f4 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/shape-buttons/shape-buttons.component.scss
@@ -23,8 +23,8 @@
 //     font-size: 0.875rem;
 
 //     span:nth-child(2) {
-//       color: nb-theme(color-fg-heading);
-//       font-weight: nb-theme(font-weight-bold);
+//       color: #2a2a2a;
+//       font-weight: 500;
 //     }
 //   }
 // }
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss b/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
index 38f0750c6..bd674789a 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
@@ -21,6 +21,6 @@
 //     margin-bottom: 0.75rem;
 //     font-size: 0.875rem;
 //     font-weight: nb-theme(font-weight-bolder);
-//     color: nb-theme(color-fg-heading);
+//     color: #2a2a2a;
 //   }
 // }
diff --git a/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss b/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss
index 4244f2f01..964fa997a 100644
--- a/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/tabs/tabs.component.scss
@@ -10,13 +10,13 @@
 // 	}
 
 // 	nb-tab {
-// 		padding: nb-theme(padding);
+// 		padding: 1.25rem;
 // 	}
 
 // 	::ng-deep ngx-tab1,
 // 	::ng-deep ngx-tab2 {
 // 		display: block;
-// 		padding: nb-theme(padding);
+// 		padding: 1.25rem;
 // 	}
 
 // 	@include media-breakpoint-down(xs) {
diff --git a/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss b/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss
index ef5ade43f..ab3b0a7ca 100644
--- a/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss
+++ b/admin/website-angular/src/app/pages/ui-features/typography/typography.component.scss
@@ -5,12 +5,12 @@
 //   .font-secondary .font-header .name {
 //     font-size: 4.5rem;
 //     line-height: 4rem;
-//     font-weight: nb-theme(font-weight-bold);
+//     font-weight: 500;
 //   }
 
 //   .font-main .font-header .name {
 //     font-size: 3rem;
-//     font-weight: nb-theme(font-weight-bold);
+//     font-weight: 500;
 //   }
 
 //   .font-row {
@@ -49,7 +49,7 @@
 //     padding-bottom: 1rem;
 //     margin-bottom: 1rem;
 //     border-bottom: 1px solid nb-theme(separator);
-//     color: nb-theme(color-fg-heading);
+//     color: #2a2a2a;
 
 //     &:last-child {
 //       border-bottom: none;

From 76de6bf3fa9fc0993ed906efdf36c9db2068b871 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Thu, 13 Jun 2019 18:34:03 +0300
Subject: [PATCH 378/382] fix(ever-admin): fixed all pages style with default
 theme EV-1240

---
 .../carriers-table.component.ts               |  4 +-
 .../file-uploader/file-uploader.component.ts  |  2 +-
 .../forms/google-map/google-map.component.ts  |  2 +-
 .../invite-request-modal.component.ts         |  2 +-
 .../carreir-location/carreir-location.ts      |  2 +-
 .../user-warehouse-map/user-warehouse-map.ts  |  2 +-
 .../categories-table.component.ts             |  4 +-
 .../category-image.component.ts               |  2 +-
 .../basic-info/basic-info-form.component.ts   |  2 +-
 .../products-table.component.ts               |  4 +-
 .../product-create.component.ts               |  2 +-
 .../render-component/created.component.ts     |  2 +-
 .../created/created.component.ts              |  2 +-
 .../warehouse-table/elapsed.component.ts      |  2 +-
 .../elapsed/elapsed.component.ts              |  2 +-
 .../warehouse-products-table.component.ts     |  4 +-
 .../warehouse-product-create.component.ts     |  4 +-
 .../basic-info/basic-info-form.component.ts   |  2 +-
 ...se-manage-tabs-delivery-areas.component.ts |  2 +-
 .../warehouse-mutation.component.ts           | 12 ++-
 .../search-input/search-input.component.ts    |  2 +-
 .../theme-settings.component.html             |  1 +
 .../theme-switcher.component.ts               |  2 +-
 .../src/app/@theme/styles/font-size.scss      |  7 +-
 .../src/app/@theme/styles/styles.scss         | 17 ++++
 .../+carrier-edit/carrier-edit.component.html | 93 ++++++++++++++-----
 .../carrier-map/carrier-map.component.ts      |  2 +-
 .../+carriers/+carrier/carrier.component.html |  2 +-
 .../+carriers/+carrier/carrier.component.ts   |  2 +-
 .../location/carrier-location.component.ts    |  2 +-
 .../app/pages/+carriers/carriers.component.ts |  2 +-
 .../carrier-tracking.component.ts             |  2 +-
 .../+customer/customer.component.html         |  4 +-
 .../ea-customer-location.component.ts         |  2 +-
 .../ea-customer-stores.component.html         |  4 +-
 .../invites-requests.component.ts             | 16 ++--
 .../+customers/+invites/invites.component.ts  | 16 ++--
 .../chart-panel-header.component.ts           |  2 +-
 .../dashboard-select-store.component.scss     | 21 -----
 .../src/app/pages/+device/device.component.ts |  4 +-
 .../+categories/categories.component.ts       |  2 +-
 .../product-edit/product-edit.component.ts    |  2 +-
 .../app/pages/+products/products.component.ts |  2 +-
 .../edit/account/account.component.html       | 10 +-
 .../edit/basic-info/basic-info.component.html |  2 +-
 .../components/account/account.component.ts   |  2 +-
 .../basic-info/basic-info.component.ts        |  2 +-
 .../contact-info/contact-info.component.ts    |  2 +-
 .../components/location/location.component.ts |  2 +-
 .../payPal-gateway.component.ts               |  2 +-
 .../stripe-gateway.component.ts               |  2 +-
 .../components/payments/payments.component.ts |  2 +-
 .../add-products/add-products.component.ts    |  2 +-
 .../product-mutation.component.ts             |  2 +-
 .../products-catalog.component.ts             |  2 +-
 .../add-new-carrier.component.ts              |  2 +-
 .../shared-carriers.component.ts              |  2 +-
 .../+setup/+merchants/merchants.component.ts  |  8 +-
 .../+simulation/order/order.component.ts      |  2 +-
 .../pages/+simulation/simulation.component.ts |  2 +-
 .../warehouse-track.component.ts              |  2 +-
 .../warehouse-order.component.ts              |  2 +-
 .../products-table.component.ts               |  2 +-
 .../warehouse-order-view.component.html       |  4 +-
 .../warehouse-order-view.component.ts         |  2 +-
 .../search-map/search/search.component.ts     |  2 +-
 .../smart-table/smart-table.component.ts      | 23 +++--
 .../block-level-buttons.component.html        | 35 ++++---
 68 files changed, 227 insertions(+), 162 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
index cca13fd5d..274787c8a 100644
--- a/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
+++ b/admin/website-angular/src/app/@shared/carrier/carriers-table/carriers-table.component.ts
@@ -116,10 +116,10 @@ export class CarriersSmartTableComponent
 							add: false
 						},
 						edit: {
-							editButtonContent: '<i class="nb-edit"></i>'
+							editButtonContent: '<i class="ion-md-create"></i>'
 						},
 						delete: {
-							deleteButtonContent: '<i class="nb-trash"></i>',
+							deleteButtonContent: '<i class="ion-md-trash"></i>',
 							confirmDelete: true
 						},
 
diff --git a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
index d848f1d9b..2bfef7bbd 100644
--- a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
+++ b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
@@ -17,7 +17,7 @@ import { NgModel } from '@angular/forms';
 	styleUrls: ['./file-uploader.component.scss']
 })
 export class FileUploaderComponent {
-	@ViewChild('shownInput', { static: false })
+	@ViewChild('shownInput', { static: true })
 	shownInput: NgModel;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts b/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
index 2fb6122f7..31731bad6 100644
--- a/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
+++ b/admin/website-angular/src/app/@shared/forms/google-map/google-map.component.ts
@@ -10,7 +10,7 @@ import { takeUntil } from 'rxjs/operators';
 	`
 })
 export class GoogleMapComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	mapElement: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
index 164fa651c..06314a563 100644
--- a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
+++ b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.ts
@@ -12,7 +12,7 @@ import { InviteRequestRouter } from '@modules/client.common.angular2/routers/inv
 	styleUrls: ['/invite-request-modal.component.scss']
 })
 export class InviteRequestModalComponent {
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	mapTypeEmitter = new EventEmitter<string>();
diff --git a/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts b/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
index f756a2f76..7a56a2a16 100644
--- a/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
+++ b/admin/website-angular/src/app/@shared/order/order-map/carreir-location/carreir-location.ts
@@ -16,7 +16,7 @@ import { environment } from 'environments/environment';
 	`
 })
 export class CarrierLocationComponent implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 	public map: google.maps.Map;
 	private directionsDisplay = new google.maps.DirectionsRenderer();
diff --git a/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts b/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
index 975cad233..d6aaa1c41 100644
--- a/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
+++ b/admin/website-angular/src/app/@shared/order/order-map/user-warehouse-map/user-warehouse-map.ts
@@ -22,7 +22,7 @@ const userIcon = environment.MAP_USER_ICON_LINK;
 })
 export class UserWarehouseLocationComponent
 	implements AfterViewInit, OnDestroy, OnChanges {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: ElementRef;
 
 	public map: google.maps.Map;
diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
index 895b7ff79..49aacf5e4 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
@@ -183,10 +183,10 @@ export class CategoriesTableComponent implements OnInit, OnDestroy {
 						position: 'left'
 					},
 					edit: {
-						editButtonContent: '<i class="nb-edit"></i>'
+						editButtonContent: '<i class="ion-md-create"></i>'
 					},
 					delete: {
-						deleteButtonContent: '<i class="nb-trash"></i>',
+						deleteButtonContent: '<i class="ion-md-trash"></i>',
 						confirmDelete: true
 					},
 					columns: {
diff --git a/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts b/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
index fd9567f1e..e3e03236b 100644
--- a/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/categories-table/category-image.component.ts
@@ -12,7 +12,7 @@ export class CategoryImageComponent implements ViewCell, OnInit {
 	value: string;
 	rowData: any;
 
-	@ViewChild('image', { static: false })
+	@ViewChild('image', { static: true })
 	image: ElementRef;
 
 	ngOnInit() {
diff --git a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
index da5ddb500..b284932f2 100644
--- a/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
@@ -24,7 +24,7 @@ import { IProductsCategoryCreateObject } from '@modules/server.common/interfaces
 	styleUrls: ['basic-info-form.component.scss']
 })
 export class BasicInfoFormComponent implements OnInit, AfterViewInit {
-	@ViewChild('imagePreview', { static: false })
+	@ViewChild('imagePreview', { static: true })
 	imagePreviewElement: ElementRef;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts
index 4741fe6b0..ca33db27c 100644
--- a/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts
+++ b/admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts
@@ -258,10 +258,10 @@ export class ProductsTableComponent implements OnInit, OnDestroy {
 						position: 'left'
 					},
 					edit: {
-						editButtonContent: '<i class="nb-edit"></i>'
+						editButtonContent: '<i class="ion-md-create"></i>'
 					},
 					delete: {
-						deleteButtonContent: '<i class="nb-trash"></i>',
+						deleteButtonContent: '<i class="ion-md-trash"></i>',
 						confirmDelete: true
 					},
 					mode: 'external',
diff --git a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
index d649a0cd5..1be2c8c5e 100644
--- a/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
+++ b/admin/website-angular/src/app/@shared/product/product-create/product-create.component.ts
@@ -14,7 +14,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	styleUrls: ['./product-create.component.scss']
 })
 export class ProductCreateComponent implements OnInit {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
 	public loading: boolean;
diff --git a/admin/website-angular/src/app/@shared/render-component/created.component.ts b/admin/website-angular/src/app/@shared/render-component/created.component.ts
index 1b99257f9..46b825e6b 100644
--- a/admin/website-angular/src/app/@shared/render-component/created.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/created.component.ts
@@ -25,7 +25,7 @@ import OrderStatus from '@modules/server.common/enums/OrderStatus';
 	`
 })
 export class CreatedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('createdTimer', { static: false })
+	@ViewChild('createdTimer', { static: true })
 	createdTimer: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/created/created.component.ts b/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
index 76501213d..4998ea497 100644
--- a/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/created/created.component.ts
@@ -16,7 +16,7 @@ import OrderStatus from '@modules/server.common/enums/OrderStatus';
 	templateUrl: './created.component.html'
 })
 export class CreatedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('createdTimer', { static: false })
+	@ViewChild('createdTimer', { static: true })
 	createdTimer: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
index 71a32b5e9..8f4ec00d6 100644
--- a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed.component.ts
@@ -20,7 +20,7 @@ import OrderWarehouseStatus from '@modules/server.common/enums/OrderWarehouseSta
 	`
 })
 export class ElapsedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('elapsedTime', { static: false })
+	@ViewChild('elapsedTime', { static: true })
 	elapsedTime: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
index 9fd653fab..27a442858 100644
--- a/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
@@ -20,7 +20,7 @@ import OrderWarehouseStatus from '@modules/server.common/enums/OrderWarehouseSta
 	`
 })
 export class ElapsedComponent implements ViewCell, OnInit, OnDestroy {
-	@ViewChild('elapsedTime', { static: false })
+	@ViewChild('elapsedTime', { static: true })
 	elapsedTime: ElementRef;
 
 	private ngDestroy$ = new Subject<void>();
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
index 33f70cbf5..b7aaf9879 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
@@ -163,10 +163,10 @@ export class WarehouseProductsComponent implements OnInit, OnDestroy {
 							position: 'left'
 						},
 						edit: {
-							editButtonContent: '<i class="nb-edit"></i>'
+							editButtonContent: '<i class="ion-md-create"></i>'
 						},
 						delete: {
-							deleteButtonContent: '<i class="nb-trash"></i>',
+							deleteButtonContent: '<i class="ion-md-trash"></i>',
 							confirmDelete: true
 						},
 						selectMode: this.selectMode,
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
index 281cad797..ebc6aeaaf 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
@@ -41,7 +41,7 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 	perPage: number;
 	choiced: string;
 
-	@ViewChild('warehouseAddChoice', { static: false })
+	@ViewChild('warehouseAddChoice', { static: true })
 	warehouseAddChoice: WarehouseAddChoiceComponent;
 
 	@ViewChild('basicInfoForm', { static: false })
@@ -56,7 +56,7 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
 	@ViewChild('wizzardFrom', { static: false })
 	wizzardFrom: WizardComponent;
 
-	@ViewChild('wizzardFromStep1', { static: false })
+	@ViewChild('wizzardFromStep1', { static: true })
 	wizzardFromStep1: any;
 
 	hasSelectedProducts = () => false;
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
index e44febcb1..2ebd9c191 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
@@ -32,7 +32,7 @@ export type WarehouseBasicInfo = Pick<
 	templateUrl: 'basic-info-form.component.html'
 })
 export class BasicInfoFormComponent implements OnInit {
-	@ViewChild('fileInput', { static: false })
+	@ViewChild('fileInput', { static: true })
 	fileInput: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
index 159e43efe..5eea0a425 100644
--- a/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts
@@ -10,7 +10,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 })
 export class WarehouseManageTabsDeliveryAreasComponent
 	implements OnInit, OnDestroy {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	mapElement: any;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
index 420008e97..8a55b6f47 100644
--- a/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts
@@ -27,7 +27,7 @@ export class WarehouseMutationComponent implements AfterViewInit {
 	@ViewChild('basicInfoForm', { static: false })
 	basicInfoForm: BasicInfoFormComponent;
 
-	@ViewChild('contactInfoForm', { static: false })
+	@ViewChild('contactInfoForm', { static: true })
 	contactInfoForm: ContactInfoFormComponent;
 
 	@ViewChild('locationForm', { static: false })
@@ -78,9 +78,13 @@ export class WarehouseMutationComponent implements AfterViewInit {
 		// This hack is need because the styles of 'ng-bootstrap' modal and google autocomplete api
 		// collide and autocomplete field just doesn't show without larger z-index.
 		setTimeout(() => {
-			document.querySelector('body > div.pac-container.pac-logo')[
-				'style'
-			]['zIndex'] = 10000;
+			const elementRef = document.querySelector(
+				'body > div.pac-container.pac-logo'
+			);
+
+			if (elementRef) {
+				elementRef['style']['zIndex'] = 10000;
+			}
 		}, 2000);
 	}
 
diff --git a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
index f14a7de7e..df83f26f4 100644
--- a/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
+++ b/admin/website-angular/src/app/@theme/components/search-input/search-input.component.ts
@@ -21,7 +21,7 @@ import {
 	`
 })
 export class SearchInputComponent {
-	@ViewChild('input', { static: false }) input: ElementRef;
+	@ViewChild('input', { static: true }) input: ElementRef;
 
 	@Output() search: EventEmitter<string> = new EventEmitter<string>();
 
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
index 1a1869782..9a2f39373 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
@@ -31,6 +31,7 @@ <h6>THEMES</h6>
 		(change)="toggleTheme()"
 		status="primary"
 		class="form-control"
+		disabled
 	>
 		<option *ngFor="let theme of themes" [value]="theme.value">
 			{{ theme.name }}</option
diff --git a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
index 9ecf57c4a..a04914d45 100644
--- a/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
+++ b/admin/website-angular/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
@@ -10,7 +10,7 @@ import { AnalyticsService } from 'app/@core/utils/analytics.service';
 	styleUrls: ['./theme-switcher.component.scss']
 })
 export class ThemeSwitcherComponent {
-	@ViewChild(NbPopoverDirective, { static: false })
+	@ViewChild(NbPopoverDirective, { static: true })
 	popover: NbPopoverDirective;
 
 	@Input()
diff --git a/admin/website-angular/src/app/@theme/styles/font-size.scss b/admin/website-angular/src/app/@theme/styles/font-size.scss
index 3b8d84b7d..d142d76c5 100644
--- a/admin/website-angular/src/app/@theme/styles/font-size.scss
+++ b/admin/website-angular/src/app/@theme/styles/font-size.scss
@@ -1,6 +1,5 @@
 html {
-	// TODO style
-	// font-size: 14px;
+	font-size: 14px;
 }
 
 span.space {
@@ -15,6 +14,10 @@ div.redirectBtn {
 	border-radius: 0.375rem;
 	position: relative;
 	cursor: pointer;
+
+	strong {
+		font-weight: 500;
+	}
 }
 
 div.redirectBtn:hover {
diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index 62c82edef..98e70b2ab 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -8,6 +8,9 @@
 //angular2-toaster
 @import 'node_modules/angular2-toaster/toaster';
 
+// global app font size
+@import './font-size';
+
 // custom global ng-bootstrap modal
 @import './ng-bootstrap.modal';
 // loading progress bar theme
@@ -227,3 +230,17 @@ nb-card.no-box-shadow {
 		}
 	}
 }
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-family: Exo !important;
+	font-weight: 500 !important;
+}
+
+.ng2-smart-action.ng-star-inserted i {
+	font-size: 1.5rem;
+}
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html
index 9a08c5c43..e3d53eabb 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html
@@ -1,21 +1,32 @@
 <toaster-container></toaster-container>
 
 <div>
-
 	<nb-card *ngIf="carrier$ | async as carrier">
 		<nb-card-header>
 			<!-- back -->
 			<div class="d-inline-flex">
-				<svg viewBox="0 0 24 24" class="control-icon control-icon-left" [routerLink]="['/carriers/' + carrier.id]">
-					<path d="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" />
+				<svg
+					viewBox="0 0 24 24"
+					class="control-icon control-icon-left"
+					[routerLink]="['/carriers/' + carrier.id]"
+				>
+					<path
+						d="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z"
+					/>
 				</svg>
 
-				<h1>{{'CARRIERS_VIEW.EDIT.EDIT_CARRIER' | translate}}</h1>
+				<h1>{{ 'CARRIERS_VIEW.EDIT.EDIT_CARRIER' | translate }}</h1>
 			</div>
-			<button type="button" class="btn btn-success btn-icon pull-right btn-with-icon no-text-transform" (click)="updateCarrier()"
-			 [disabled]="!isCarrierValid">
-				<i class="nb-checkmark"></i>
-				<small>{{"CARRIERS_VIEW.CARRIER_PAGE.SAVE" | translate}}</small>
+			<button
+				type="button"
+				class="btn btn-success btn-icon pull-right btn-with-icon no-text-transform"
+				(click)="updateCarrier()"
+				[disabled]="!isCarrierValid"
+			>
+				<i class="ion-md-checkmark"></i>
+				<small>{{
+					'CARRIERS_VIEW.CARRIER_PAGE.SAVE' | translate
+				}}</small>
 			</button>
 		</nb-card-header>
 	</nb-card>
@@ -23,46 +34,84 @@ <h1>{{'CARRIERS_VIEW.EDIT.EDIT_CARRIER' | translate}}</h1>
 	<div class="row">
 		<div class="col-sm-12">
 			<nb-tabset fullWidth>
-
-				<nb-tab tabTitle="{{'CARRIERS_VIEW.EDIT.BASIC_INFO' | translate}}">
+				<nb-tab
+					tabTitle="{{ 'CARRIERS_VIEW.EDIT.BASIC_INFO' | translate }}"
+				>
 					<nb-card [nbSpinner]="loading">
 						<nb-card-header>
-							<div class="text">{{'CARRIERS_VIEW.EDIT.BASIC_INFO' | translate}}</div>
+							<div class="text">
+								{{
+									'CARRIERS_VIEW.EDIT.BASIC_INFO' | translate
+								}}
+							</div>
 						</nb-card-header>
 
 						<nb-card-body>
-							<ea-carrier-basic-info-form #basicInfoForm [form]="basicInfo"></ea-carrier-basic-info-form>
+							<ea-carrier-basic-info-form
+								#basicInfoForm
+								[form]="basicInfo"
+							></ea-carrier-basic-info-form>
 						</nb-card-body>
 					</nb-card>
 				</nb-tab>
 
-				<nb-tab tabTitle="{{'CARRIERS_VIEW.EDIT.LOCATION' | translate}}">
+				<nb-tab
+					tabTitle="{{ 'CARRIERS_VIEW.EDIT.LOCATION' | translate }}"
+				>
 					<nb-card>
 						<nb-card-header>
-							<div class="text">{{'CARRIERS_VIEW.EDIT.LOCATION' | translate}}</div>
+							<div class="text">
+								{{ 'CARRIERS_VIEW.EDIT.LOCATION' | translate }}
+							</div>
 
-							<button (click)="emitMapType('terrain')" class="btn btn-link btn-sm text-dark" id="map-type">{{'TERRAIN' | translate}}
+							<button
+								(click)="emitMapType('terrain')"
+								class="btn btn-link btn-sm text-dark"
+								id="map-type"
+							>
+								{{ 'TERRAIN' | translate }}
 							</button>
-							<button (click)="emitMapType('satellite')" class="btn btn-link btn-sm text-dark" id="map-type">{{'SATELLITE' | translate}}
+							<button
+								(click)="emitMapType('satellite')"
+								class="btn btn-link btn-sm text-dark"
+								id="map-type"
+							>
+								{{ 'SATELLITE' | translate }}
 							</button>
-							<button (click)="emitMapType('roadmap')" class="btn btn-link btn-sm text-dark" id="map-type">{{'ROAD_MAP' | translate}}
+							<button
+								(click)="emitMapType('roadmap')"
+								class="btn btn-link btn-sm text-dark"
+								id="map-type"
+							>
+								{{ 'ROAD_MAP' | translate }}
 							</button>
 						</nb-card-header>
 
 						<nb-card-body>
-							<ea-location-form #locationForm [form]="location" [showAutocompleteSearch]="true" [apartment]="apartment" (mapCoordinatesEmitter)="onCoordinatesChanges($event)"
-							 (mapGeometryEmitter)="onGeometrySend($event)">
+							<ea-location-form
+								#locationForm
+								[form]="location"
+								[showAutocompleteSearch]="true"
+								[apartment]="apartment"
+								(mapCoordinatesEmitter)="
+									onCoordinatesChanges($event)
+								"
+								(mapGeometryEmitter)="onGeometrySend($event)"
+							>
 							</ea-location-form>
 						</nb-card-body>
 
 						<nb-card-footer class="p-0">
-							<google-map [mapTypeEvent]="mapTypeEmitter" [mapCoordEvent]="mapCoordEmitter" [mapGeometryEvent]="mapGeometryEmitter">
+							<google-map
+								[mapTypeEvent]="mapTypeEmitter"
+								[mapCoordEvent]="mapCoordEmitter"
+								[mapGeometryEvent]="mapGeometryEmitter"
+							>
 							</google-map>
 						</nb-card-footer>
 					</nb-card>
 				</nb-tab>
-
 			</nb-tabset>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
index b0bdf0459..289071116 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-map/carrier-map.component.ts
@@ -26,7 +26,7 @@ export class CarrierMapComponent {
 	private ngDestroy$ = new Subject();
 	public carrierId: string;
 
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html
index 38e67ce97..5ff24649a 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html
@@ -29,7 +29,7 @@ <h4>{{ 'Manage carrier and deliveries' | translate }}</h4>
 					class="btn btn-primary btn-with-icon no-text-transform"
 					[routerLink]="['./edit']"
 				>
-					<i class="nb-edit"></i>
+					<i class="ion-md-create"></i>
 					<span>{{
 						'CARRIERS_VIEW.CARRIER_PAGE.EDIT' | translate
 					}}</span>
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
index f7c2bcb55..ff6ce2397 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.ts
@@ -19,7 +19,7 @@ import { CarrierOrdersComponent } from './carrier-orders/carrier-orders.componen
 	styleUrls: ['./carrier.component.scss']
 })
 export class CarrierComponent implements OnInit, OnDestroy {
-	@ViewChild('carrierOrders', { static: false })
+	@ViewChild('carrierOrders', { static: true })
 	public carrierOrders: CarrierOrdersComponent;
 
 	private ngDestroy$ = new Subject();
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
index d5ec41ed0..f8c771261 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
@@ -22,7 +22,7 @@ const directionsService = new google.maps.DirectionsService();
 export class CarrierLocationComponent implements OnDestroy, OnInit {
 	private ngDestroy$ = new Subject();
 
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
index 127c9f13d..d75c0eeb1 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.ts
@@ -20,7 +20,7 @@ const perPage = 5;
 	styleUrls: ['carriers.component.scss']
 })
 export class CarriersComponent implements OnDestroy, AfterViewInit {
-	@ViewChild('carriersTable', { static: false })
+	@ViewChild('carriersTable', { static: true })
 	carriersTable: CarriersSmartTableComponent;
 
 	loading: boolean;
diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
index e0e0f9136..d95726f80 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.ts
@@ -34,7 +34,7 @@ export class CarrierTrackingComponent implements OnInit, OnDestroy {
 	private ngDestroy$ = new Subject();
 	public carrierId: string;
 
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 	carrierSub$: any;
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html b/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html
index 03865de1d..b7bc59b92 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html
@@ -1,6 +1,6 @@
 <toaster-container> </toaster-container>
 
-<div *ngIf="(user$ | async) as user" class="row">
+<div *ngIf="user$ | async as user" class="row">
 	<div class="col-md-8">
 		<nb-card>
 			<nb-card-header class="row">
@@ -34,7 +34,7 @@ <h4>
 						class="btn btn-primary active"
 						[routerLink]="['./edit']"
 					>
-						<i class="nb-edit button-icon"></i>
+						<i class="ion-md-create button-icon"></i>
 						<small>{{
 							'CUSTOMERS_VIEW.CUSTOMER_VIEW.EDIT' | translate
 						}}</small>
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
index 62a21addd..88f2cea4c 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
@@ -10,7 +10,7 @@ declare var google: any;
 	templateUrl: './ea-customer-location.component.html'
 })
 export class CustomerLocationComponent implements OnDestroy, OnInit {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 	marker: any;
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-stores/ea-customer-stores.component.html b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-stores/ea-customer-stores.component.html
index f187b7f23..9395bd027 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-stores/ea-customer-stores.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-stores/ea-customer-stores.component.html
@@ -4,10 +4,10 @@
 
 		<div class="btn-group btn-divided-group pull-right">
 			<button class="btn btn-icon btn-success active" (click)="createWarehouseModel()">
-				<i class="nb-plus"></i>
+				<i class="ion-md-add"></i>
 			</button>
 			<button class="btn btn-icon btn-danger active" [disabled]="!hasSelectedWarehouses" (click)="deleteSelectedRows()">
-				<i class="nb-trash"></i>
+				<i class="ion-md-trash"></i>
 			</button>
 		</div>
 	</nb-card-header> -->
diff --git a/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.ts b/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.ts
index 171015122..d4b1809c5 100644
--- a/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.ts
@@ -346,19 +346,21 @@ export class InvitesRequestsComponent implements OnDestroy, AfterViewChecked {
 					this.settingsSmartTable = {
 						selectMode: 'multi',
 						add: {
-							addButtonContent: '<i class="nb-plus"></i>',
-							createButtonContent: '<i class="nb-checkmark"></i>',
-							cancelButtonContent: '<i class="nb-close"></i>',
+							addButtonContent: '<i class="ion-md-add"></i>',
+							createButtonContent:
+								'<i class="ion-md-checkmark"></i>',
+							cancelButtonContent: '<i class="ion-md-close"></i>',
 							confirmCreate: true
 						},
 						edit: {
-							editButtonContent: '<i class="nb-edit"></i>',
-							saveButtonContent: '<i class="nb-checkmark"></i>',
-							cancelButtonContent: '<i class="nb-close"></i>',
+							editButtonContent: '<i class="ion-md-create"></i>',
+							saveButtonContent:
+								'<i class="ion-md-checkmark"></i>',
+							cancelButtonContent: '<i class="ion-md-close"></i>',
 							confirmSave: true
 						},
 						delete: {
-							deleteButtonContent: '<i class="nb-trash"></i>',
+							deleteButtonContent: '<i class="ion-md-trash"></i>',
 							confirmDelete: true
 						},
 						columns: {
diff --git a/admin/website-angular/src/app/pages/+customers/+invites/invites.component.ts b/admin/website-angular/src/app/pages/+customers/+invites/invites.component.ts
index fc918e42c..2070755a6 100644
--- a/admin/website-angular/src/app/pages/+customers/+invites/invites.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+invites/invites.component.ts
@@ -242,19 +242,21 @@ export class InvitesComponent implements OnInit, OnDestroy, AfterViewChecked {
 					this.settingsSmartTable = {
 						selectMode: 'multi',
 						add: {
-							addButtonContent: '<i class="nb-plus"></i>',
-							createButtonContent: '<i class="nb-checkmark"></i>',
-							cancelButtonContent: '<i class="nb-close"></i>',
+							addButtonContent: '<i class="ion-md-add"></i>',
+							createButtonContent:
+								'<i class="ion-md-checkmark"></i>',
+							cancelButtonContent: '<i class="ion-md-close"></i>',
 							confirmCreate: true
 						},
 						edit: {
-							editButtonContent: '<i class="nb-edit"></i>',
-							saveButtonContent: '<i class="nb-checkmark"></i>',
-							cancelButtonContent: '<i class="nb-close"></i>',
+							editButtonContent: '<i class="ion-md-create"></i>',
+							saveButtonContent:
+								'<i class="ion-md-checkmark"></i>',
+							cancelButtonContent: '<i class="ion-md-close"></i>',
 							confirmSave: true
 						},
 						delete: {
-							deleteButtonContent: '<i class="nb-trash"></i>',
+							deleteButtonContent: '<i class="ion-md-trash"></i>',
 							confirmDelete: true
 						},
 						columns: {
diff --git a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
index c5ad4bcb4..d1a03149a 100644
--- a/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
+++ b/admin/website-angular/src/app/pages/+dashboard/charts-panel/chart-panel-header/chart-panel-header.component.ts
@@ -48,7 +48,7 @@ export class ChartPanelHeaderComponent implements OnInit, OnDestroy {
 		daysDiff: number;
 	}>();
 
-	@ViewChild('customDateRangeButton', { static: false })
+	@ViewChild('customDateRangeButton', { static: true })
 	customDateRangeButton: ElementRef;
 
 	isDateRangeSelected = false;
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.scss b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.scss
index 42289581a..f70513aef 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.scss
@@ -1,26 +1,5 @@
 nb-card#dashboard-select-stores {
-	h5 {
-		font-family: Exo;
-		color: #2a2a2a;
-		font-weight: 500;
-		font-size: 1.25rem;
-	}
-
-	li {
-		font-size: 0.9rem;
-		line-height: 1.25;
-
-		font-weight: 400;
-	}
 	nb-card-body {
 		overflow: inherit !important;
-
-		h6 {
-			font-family: Exo;
-			color: #2a2a2a;
-			font-weight: 500;
-			line-height: 1.2;
-			font-size: 1rem;
-		}
 	}
 }
diff --git a/admin/website-angular/src/app/pages/+device/device.component.ts b/admin/website-angular/src/app/pages/+device/device.component.ts
index 08930ecea..2eee30d45 100644
--- a/admin/website-angular/src/app/pages/+device/device.component.ts
+++ b/admin/website-angular/src/app/pages/+device/device.component.ts
@@ -168,10 +168,10 @@ export class DeviceComponent implements OnDestroy, OnInit {
 						position: 'left'
 					},
 					edit: {
-						editButtonContent: '<i class="nb-edit"></i>'
+						editButtonContent: '<i class="ion-md-create"></i>'
 					},
 					delete: {
-						deleteButtonContent: '<i class="nb-trash"></i>',
+						deleteButtonContent: '<i class="ion-md-trash"></i>',
 						confirmDelete: true
 					},
 					mode: 'external',
diff --git a/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts b/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
index 49c1ab60d..3d6fea288 100644
--- a/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
+++ b/admin/website-angular/src/app/pages/+products/+categories/categories.component.ts
@@ -15,7 +15,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	styleUrls: ['/categories.component.scss']
 })
 export class CategoriesComponent implements OnDestroy {
-	@ViewChild('categoriesTable', { static: false })
+	@ViewChild('categoriesTable', { static: true })
 	categoriesTable: CategoriesTableComponent;
 
 	protected settingsSmartTable: object;
diff --git a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
index abc3a1c2d..82a1d27bc 100644
--- a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
+++ b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
@@ -17,7 +17,7 @@ import 'rxjs/add/operator/switchMap';
 export class ProductEditComponent implements OnInit, OnDestroy {
 	private ngDestroy$ = new Subject<void>();
 
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	public basicInfoForm: BasicInfoFormComponent;
 
 	public readonly form: FormGroup = this.formBuilder.group({
diff --git a/admin/website-angular/src/app/pages/+products/products.component.ts b/admin/website-angular/src/app/pages/+products/products.component.ts
index 8ec304d19..499b5ba43 100644
--- a/admin/website-angular/src/app/pages/+products/products.component.ts
+++ b/admin/website-angular/src/app/pages/+products/products.component.ts
@@ -18,7 +18,7 @@ const perPage = 5;
 	styleUrls: ['/products.component.scss']
 })
 export class ProductsComponent implements OnDestroy, AfterViewInit {
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	protected productsTable: ProductsTableComponent;
 
 	public productsCategories: any;
diff --git a/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html b/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html
index 2b54662cf..ff5238ed3 100644
--- a/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html
+++ b/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html
@@ -17,7 +17,7 @@
 							: ''
 					"
 					formControlName="oldPassword"
-					placeholder="{{&quot;PROFILE_VIEW.OLD_PASSWORD&quot; | translate}}"
+					placeholder="{{ 'PROFILE_VIEW.OLD_PASSWORD' | translate }}"
 				/>
 				<span *ngIf="oldPasswordErrorMsg">
 					<strong class="text-danger">
@@ -42,7 +42,7 @@
 							: ''
 					"
 					formControlName="password"
-					placeholder="{{&quot;PROFILE_VIEW.NEW_PASSWORD&quot; | translate}}"
+					placeholder="{{ 'PROFILE_VIEW.NEW_PASSWORD' | translate }}"
 				/>
 				<span *ngIf="passwordErrorMsg">
 					<strong class="text-danger">
@@ -67,7 +67,9 @@
 							: ''
 					"
 					formControlName="repeatPassword"
-					placeholder="{{&quot;PROFILE_VIEW.REPEAT_NEW_PASSWORD&quot; | translate}}"
+					placeholder="{{
+						'PROFILE_VIEW.REPEAT_NEW_PASSWORD' | translate
+					}}"
 				/>
 				<span *ngIf="repeatPasswordErrorMsg">
 					<strong class="text-danger">
@@ -86,7 +88,7 @@
 				type="button"
 				(click)="saveChanges()"
 			>
-				<i class="nb-checkmark"></i>
+				<i class="ion-md-checkmark"></i>
 				<span> {{ 'PROFILE_VIEW.SAVE' | translate }} </span>
 			</button>
 		</form>
diff --git a/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
index c32fe7073..66d71c679 100644
--- a/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
+++ b/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
@@ -162,7 +162,7 @@
 				[disabled]="!basicInfoForm.valid || !basicInfoForm.dirty"
 				(click)="saveChanges()"
 			>
-				<i class="nb-checkmark"></i>
+				<i class="ion-md-checkmark"></i>
 				<span> {{ 'PROFILE_VIEW.SAVE' | translate }} </span>
 			</button>
 		</form>
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
index 041c42527..8b478336b 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
@@ -7,7 +7,7 @@ import { NgForm } from '@angular/forms';
 	styleUrls: ['./account.component.scss']
 })
 export class SetupMerchantAccountComponent {
-	@ViewChild('accountForm', { static: false })
+	@ViewChild('accountForm', { static: true })
 	accountForm: NgForm;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
index 40ceec21c..fecc9a39c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
@@ -19,7 +19,7 @@ import { getDummyImage } from '@modules/server.common/utils';
 	styleUrls: ['./basic-info.component.scss']
 })
 export class SetupMerchantBasicInfoComponent implements OnInit, OnDestroy {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: NgForm;
 
 	@ViewChild('name', { static: false })
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
index 3da546ea1..81c1e7c54 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
@@ -7,7 +7,7 @@ import { NgForm } from '@angular/forms';
 	styleUrls: ['./contact-info.component.scss']
 })
 export class SetupMerchantContactInfoComponent {
-	@ViewChild('contactInfoForm', { static: false })
+	@ViewChild('contactInfoForm', { static: true })
 	contactInfoForm: NgForm;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
index 61e9b5151..595d698a1 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
@@ -8,7 +8,7 @@ import { FormBuilder } from '@angular/forms';
 	styleUrls: ['./location.component.scss']
 })
 export class SetupMerchantLocationComponent {
-	@ViewChild('locationForm', { static: false })
+	@ViewChild('locationForm', { static: true })
 	locationForm: LocationFormComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
index b84fda026..f7ac0fec2 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/payPal-gateway/payPal-gateway.component.ts
@@ -12,7 +12,7 @@ import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaym
 	templateUrl: './payPal-gateway.component.html'
 })
 export class PayPalGatewayComponent implements OnChanges {
-	@ViewChild('payPalConfigForm', { static: false })
+	@ViewChild('payPalConfigForm', { static: true })
 	payPalConfigForm: NgForm;
 
 	isPayPalEnabled: boolean;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
index a78802901..bca5c1b0e 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payment-gateways/stripe-gateway/stripe-gateway.component.ts
@@ -15,7 +15,7 @@ import { Subject } from 'rxjs';
 	templateUrl: './stripe-gateway.component.html'
 })
 export class StripeGatewayComponent implements OnChanges {
-	@ViewChild('stripeConfigForm', { static: false })
+	@ViewChild('stripeConfigForm', { static: true })
 	stripeConfigForm: NgForm;
 
 	isStripeEnabled: boolean;
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
index adbb901e8..db1f7a479 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
@@ -15,7 +15,7 @@ import IPaymentGatewayCreateObject from '@modules/server.common/interfaces/IPaym
 	styleUrls: ['./payments.component.scss']
 })
 export class SetupMerchantPaymentsComponent {
-	@ViewChild('paymentGateways', { static: false })
+	@ViewChild('paymentGateways', { static: true })
 	paymentGateways: PaymentGatewaysComponent;
 	@Output()
 	previousStep: EventEmitter<boolean> = new EventEmitter<boolean>();
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
index 642860c29..7f9bceb65 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
@@ -17,7 +17,7 @@ import { NotifyService } from 'app/@core/services/notify/notify.service';
 	templateUrl: './add-products.component.html'
 })
 export class SetupMerchantAddProductsComponent implements OnInit {
-	@ViewChild('addWarehouseProductsTable', { static: false })
+	@ViewChild('addWarehouseProductsTable', { static: true })
 	addWarehouseProductsTable: AddWarehouseProductsComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
index 0a06ef1b8..92408777c 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
@@ -21,7 +21,7 @@ import Product from '@modules/server.common/entities/Product';
 	templateUrl: './product-mutation.component.html'
 })
 export class SetupMerchantProductMutationComponent {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
index d0d0f75d7..f36e39371 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
@@ -10,7 +10,7 @@ import { Subject } from 'rxjs';
 })
 export class SetupMerchantProductsCatalogComponent
 	implements OnInit, OnDestroy {
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	productsTable: ProductsTableComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
index 6fbe200db..9c9bb5fbe 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/add-new-carrier/add-new-carrier.component.ts
@@ -16,7 +16,7 @@ import { first } from 'rxjs/operators';
 })
 export class SetupMerchantAddNewCarrierComponent
 	implements AfterViewInit, OnInit {
-	@ViewChild('basicInfoForm', { static: false })
+	@ViewChild('basicInfoForm', { static: true })
 	basicInfoForm: BasicInfoFormComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
index c3d4d2ccf..1a5efb0cc 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/components/settings/delivery-takeaway/shared-carriers/shared-carriers.component.ts
@@ -21,7 +21,7 @@ const perPage = 5;
 })
 export class SetupMerchantSharedCarriersComponent
 	implements OnDestroy, AfterViewInit {
-	@ViewChild('carriersTable', { static: false })
+	@ViewChild('carriersTable', { static: true })
 	carriersTable: CarriersSmartTableComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
index 144fc92cd..8cd1028ad 100644
--- a/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
+++ b/admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
@@ -22,13 +22,13 @@ export class SetupMerchantsComponent {
 	@ViewChild('nbStepper', { static: false })
 	nbStepper: NbStepperComponent;
 
-	@ViewChild('account', { static: false })
+	@ViewChild('account', { static: true })
 	stepAccount: SetupMerchantAccountComponent;
-	@ViewChild('basicInfo', { static: false })
+	@ViewChild('basicInfo', { static: true })
 	stepBasicInfo: SetupMerchantBasicInfoComponent;
-	@ViewChild('contactInfo', { static: false })
+	@ViewChild('contactInfo', { static: true })
 	stepContactInfo: SetupMerchantContactInfoComponent;
-	@ViewChild('location', { static: false })
+	@ViewChild('location', { static: true })
 	stepLocation: SetupMerchantLocationComponent;
 	@ViewChild('payments', { static: false })
 	stepPayments: SetupMerchantPaymentsComponent;
diff --git a/admin/website-angular/src/app/pages/+simulation/order/order.component.ts b/admin/website-angular/src/app/pages/+simulation/order/order.component.ts
index 209642b76..f19467c69 100644
--- a/admin/website-angular/src/app/pages/+simulation/order/order.component.ts
+++ b/admin/website-angular/src/app/pages/+simulation/order/order.component.ts
@@ -22,7 +22,7 @@ export enum DeliveryStatus {
 	styleUrls: ['./order.component.scss']
 })
 export class SimulationOrderComponent implements OnDestroy, OnInit {
-	@ViewChild('elapsedTime', { static: false })
+	@ViewChild('elapsedTime', { static: true })
 	elapsedTime: ElapsedTimeComponent;
 
 	@Input()
diff --git a/admin/website-angular/src/app/pages/+simulation/simulation.component.ts b/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
index a54c5835f..f1b460b0a 100644
--- a/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
+++ b/admin/website-angular/src/app/pages/+simulation/simulation.component.ts
@@ -36,7 +36,7 @@ import { IOrderCreateInput } from '@modules/server.common/routers/IWarehouseOrde
 	styleUrls: ['/simulation.component.scss']
 })
 export class SimulationComponent implements OnDestroy, OnInit {
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	productsTable: SimulationProductsComponent;
 
 	@ViewChild('instructions', { static: false })
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
index 5d1400323..be3e888f8 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.ts
@@ -13,7 +13,7 @@ import {
 	styleUrls: ['./warehouse-track.component.scss']
 })
 export class WarehouseTrackComponent implements OnInit {
-	@ViewChild('gmap', { static: false })
+	@ViewChild('gmap', { static: true })
 	gmapElement: any;
 	map: google.maps.Map;
 
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
index 11adad435..d7ceb0339 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-order/warehouse-order.component.ts
@@ -45,7 +45,7 @@ export class WarehouseOrderComponent implements OnInit, OnDestroy {
 	createUserEmitter = new EventEmitter<void>();
 	orderFinishedEmitter = new EventEmitter<void>();
 
-	@ViewChild('wizardForm', { static: false })
+	@ViewChild('wizardForm', { static: true })
 	private _wizardForm: WizardComponent;
 
 	@ViewChild('wizardFormStepTwo', { static: false })
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
index c06651569..b52556adb 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
@@ -30,7 +30,7 @@ import {
 	styleUrls: ['./products-table.component.scss']
 })
 export class ProductsTableComponent implements OnDestroy {
-	@ViewChild('productsTable', { static: false })
+	@ViewChild('productsTable', { static: true })
 	productsTable: WarehouseProductsComponent;
 
 	@Output()
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.html
index a4c85efc9..c6d898748 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.html
@@ -23,7 +23,7 @@
 					[nbSpinner]="loading"
 					nbSpinnerStatus="success"
 				>
-					<span class="nb-skip-forward"></span>
+					<span class="ion-md-skip-forward"></span>
 					{{ 'WAREHOUSE_VIEW.ORDER.CONFIRM' | translate }}
 				</button>
 			</div>
@@ -51,7 +51,7 @@
 					[nbSpinner]="loading"
 					nbSpinnerStatus="success"
 				>
-					<span class="nb-list" aria-hidden="true"></span>
+					<span class="ion-md-list" aria-hidden="true"></span>
 					{{ 'WAREHOUSE_VIEW.ORDER.START_ALLOCATION' | translate }}
 				</button>
 			</div>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
index 58df0b683..5bbfb4c6f 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.ts
@@ -30,7 +30,7 @@ export class WarehouseOrderViewComponent
 	selectedOrder: Order;
 	@Input()
 	hideHeader: boolean;
-	@ViewChild('slideshow', { static: false })
+	@ViewChild('slideshow', { static: true })
 	slideshow: any;
 
 	isSelectedOrderActionsAvailable: boolean = true;
diff --git a/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts b/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
index 4441d5ee8..d348b9b58 100644
--- a/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
+++ b/admin/website-angular/src/app/pages/maps/search-map/search/search.component.ts
@@ -17,7 +17,7 @@ import { Location } from '../entity/Location';
 export class SearchComponent implements OnInit {
 	@Output() positionChanged = new EventEmitter<Location>();
 
-	@ViewChild('search', { static: false })
+	@ViewChild('search', { static: true })
 	public searchElementRef: ElementRef;
 
 	constructor(private mapsAPILoader: MapsAPILoader, private ngZone: NgZone) {}
diff --git a/admin/website-angular/src/app/pages/tables/smart-table/smart-table.component.ts b/admin/website-angular/src/app/pages/tables/smart-table/smart-table.component.ts
index fdb6e4269..5988e6800 100644
--- a/admin/website-angular/src/app/pages/tables/smart-table/smart-table.component.ts
+++ b/admin/website-angular/src/app/pages/tables/smart-table/smart-table.component.ts
@@ -8,27 +8,26 @@ import { SmartTableService } from '../../../@core/data/smart-table.service';
 	templateUrl: './smart-table.component.html',
 	styles: [
 		`
-    nb-card {
-      transform: translate3d(0, 0, 0);
-    }
-  `
+			nb-card {
+				transform: translate3d(0, 0, 0);
+			}
+		`
 	]
 })
 export class SmartTableComponent {
-
 	settings = {
 		add: {
-			addButtonContent: '<i class="nb-plus"></i>',
-			createButtonContent: '<i class="nb-checkmark"></i>',
-			cancelButtonContent: '<i class="nb-close"></i>'
+			addButtonContent: '<i class="ion-md-add"></i>',
+			createButtonContent: '<i class="ion-md-checkmark"></i>',
+			cancelButtonContent: '<i class="ion-md-close"></i>'
 		},
 		edit: {
-			editButtonContent: '<i class="nb-edit"></i>',
-			saveButtonContent: '<i class="nb-checkmark"></i>',
-			cancelButtonContent: '<i class="nb-close"></i>'
+			editButtonContent: '<i class="ion-md-create"></i>',
+			saveButtonContent: '<i class="ion-md-checkmark"></i>',
+			cancelButtonContent: '<i class="ion-md-close"></i>'
 		},
 		delete: {
-			deleteButtonContent: '<i class="nb-trash"></i>',
+			deleteButtonContent: '<i class="ion-md-trash"></i>',
 			confirmDelete: true
 		},
 		columns: {
diff --git a/admin/website-angular/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html b/admin/website-angular/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html
index 9bf3d1241..1f4f0045f 100644
--- a/admin/website-angular/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html
+++ b/admin/website-angular/src/app/pages/ui-features/buttons/block-level-buttons/block-level-buttons.component.html
@@ -1,16 +1,23 @@
 <nb-card>
-  <nb-card-header>Block Level Buttons</nb-card-header>
-  <nb-card-body>
-    <div class="row block-level-buttons">
-      <div class="col-md-12">
-        <div class="btn-group btn-group-full-width" role="group">
-          <button type="button" class="btn btn-primary btn-group-icon btn-group-divider btn-fixed">
-            <i class="nb-home"></i>
-          </button>
-          <button type="button" class="btn btn-primary">Icon Block Button</button>
-        </div>
-        <button type="button" class="btn btn-outline-primary btn-block">Block Button</button>
-      </div>
-    </div>
-  </nb-card-body>
+	<nb-card-header>Block Level Buttons</nb-card-header>
+	<nb-card-body>
+		<div class="row block-level-buttons">
+			<div class="col-md-12">
+				<div class="btn-group btn-group-full-width" role="group">
+					<button
+						type="button"
+						class="btn btn-primary btn-group-icon btn-group-divider btn-fixed"
+					>
+						<i class="ion-md-home"></i>
+					</button>
+					<button type="button" class="btn btn-primary">
+						Icon Block Button
+					</button>
+				</div>
+				<button type="button" class="btn btn-outline-primary btn-block">
+					Block Button
+				</button>
+			</div>
+		</div>
+	</nb-card-body>
 </nb-card>

From cedbfd9421f4f5a9e4e9b53791cc26fa5d43c7ac Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 14 Jun 2019 12:10:39 +0300
Subject: [PATCH 379/382] style(ever-admin): fixed lot of buttons EV-1240

---
 .../confirmation-modal.component.html         | 18 ++++--
 .../confirmation-modal.module.ts              |  5 +-
 .../file-uploader.component.html              |  5 +-
 .../file-uploader/file-uploader.module.ts     |  4 +-
 .../by-code/by-code-modal.component.html      | 20 +++++--
 .../invite/by-code/by-code-modal.module.ts    |  9 +--
 .../invite-request-modal.component.html       |  4 +-
 .../invite-request-modal.module.ts            |  4 +-
 .../category-create.component.html            |  4 +-
 .../category-edit.component.html              |  4 +-
 .../customer-orders-table.module.ts           |  8 ++-
 .../redirect-order.component.ts               |  4 +-
 .../@shared/render-component/redirect-id.ts   |  4 +-
 .../store-products-table.module.ts            |  5 +-
 .../warehouse-add-choice.component.html       |  2 +-
 .../warehouse-add-choice.component.scss       |  1 +
 .../warehouse-order-modal.component.html      |  3 +-
 .../warehouse-order-modal.module.ts           |  5 +-
 .../select-warehouse.component.ts             | 11 ++--
 .../src/app/@theme/styles/font-size.scss      | 25 ---------
 .../src/app/@theme/styles/styles.scss         | 30 +++++++++-
 .../+carrier-edit/carrier-edit.component.html | 11 ++--
 .../+carrier-edit/carrier-edit.module.ts      |  5 +-
 .../carrier-info/carrier-info.component.html  | 55 +++++++++++++++----
 .../carrier-orders-status.component.html      | 18 ++++--
 .../carrier-orders-status.component.scss      | 20 ++++---
 .../+carriers/+carrier/carrier.component.html |  6 +-
 .../+carriers/+carrier/carrier.module.ts      |  5 +-
 .../customer-edit.component.html              |  9 ++-
 .../+customer-edit/customer-edit.module.ts    |  5 +-
 .../+customer/customer.component.html         |  5 +-
 .../+customers/+customer/customer.module.ts   |  4 +-
 .../invites-requests.component.html           | 10 +++-
 .../invites-requests.module.ts                |  4 +-
 .../+invites/invites.component.html           |  6 +-
 .../+customers/+invites/invites.module.ts     |  5 +-
 .../pages/+customers/customers.component.html | 22 +++++---
 .../app/pages/+customers/customers.module.ts  |  5 +-
 .../pages/+dashboard/dashboard.component.scss |  6 +-
 .../app/pages/+device/device.component.html   |  5 +-
 .../src/app/pages/+device/device.module.ts    |  5 +-
 .../order-products.component.html             | 18 ++++--
 .../order-products/order-products.module.ts   |  5 +-
 .../+categories/categories.component.html     | 12 ++--
 .../product-edit/product-edit.component.html  |  7 ++-
 .../product-edit/product-edit.module.ts       |  5 +-
 .../pages/+products/products.component.html   | 12 ++--
 .../app/pages/+products/products.module.ts    |  5 +-
 .../edit/account/account.component.html       |  8 ++-
 .../edit/basic-info/basic-info.component.html |  8 ++-
 .../app/pages/+profile/edit/edit.module.ts    |  5 +-
 .../src/app/pages/+setup/setup.component.html | 10 +++-
 .../src/app/pages/+setup/setup.module.ts      |  5 +-
 .../+warehouses/warehouses.component.html     | 12 +++-
 .../pages/+warehouses/warehouses.module.ts    |  5 +-
 55 files changed, 330 insertions(+), 173 deletions(-)
 delete mode 100644 admin/website-angular/src/app/@theme/styles/font-size.scss

diff --git a/admin/website-angular/src/app/@shared/confirmation-modal/confirmation-modal.component.html b/admin/website-angular/src/app/@shared/confirmation-modal/confirmation-modal.component.html
index 78b2ce3de..8ce7f0968 100644
--- a/admin/website-angular/src/app/@shared/confirmation-modal/confirmation-modal.component.html
+++ b/admin/website-angular/src/app/@shared/confirmation-modal/confirmation-modal.component.html
@@ -1,7 +1,15 @@
-<div class="modal-header"><span>{{mainTextTr()}}</span><button aria-label="Close" class="close"
-	 (click)="cancel()"><span aria-hidden="true">×</span></button></div>
+<div class="modal-header">
+	<span>{{ mainTextTr() }}</span
+	><button aria-label="Close" class="close" (click)="cancel()">
+		<span aria-hidden="true">×</span>
+	</button>
+</div>
 
 <div class="modal-footer">
-	<button class="btn btn-sm btn-danger" (click)="cancel()">{{cancelButtonTr()}}</button>
-	<button class="btn btn-sm btn-success" (click)="confirmEvent.emit()">{{confirmButtonTr()}}</button>
-</div>
\ No newline at end of file
+	<button nbButton status="danger" (click)="cancel()">
+		{{ cancelButtonTr() }}
+	</button>
+	<button nbButton status="success" (click)="confirmEvent.emit()">
+		{{ confirmButtonTr() }}
+	</button>
+</div>
diff --git a/admin/website-angular/src/app/@shared/confirmation-modal/confirmation-modal.module.ts b/admin/website-angular/src/app/@shared/confirmation-modal/confirmation-modal.module.ts
index 5848cf5c4..3a31b78f1 100644
--- a/admin/website-angular/src/app/@shared/confirmation-modal/confirmation-modal.module.ts
+++ b/admin/website-angular/src/app/@shared/confirmation-modal/confirmation-modal.module.ts
@@ -4,7 +4,7 @@ import { ThemeModule } from '../../@theme';
 import { TranslateModule } from '@ngx-translate/core';
 import { ConfimationModalComponent } from './confirmation-modal.component';
 import { ToasterModule } from 'angular2-toaster';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 
 const COMPONENTS = [ConfimationModalComponent];
 
@@ -14,7 +14,8 @@ const COMPONENTS = [ConfimationModalComponent];
 		ThemeModule,
 		TranslateModule.forChild(),
 		ToasterModule.forRoot(),
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	declarations: COMPONENTS,
 	entryComponents: COMPONENTS,
diff --git a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.html b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.html
index 99c6314a9..5ef6b4a52 100644
--- a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.html
+++ b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.html
@@ -18,10 +18,7 @@
 		(change)="imageUrlChanged()"
 		[(ngModel)]="fileUrl"
 	/>
-	<button
-		(click)="fileInput.click()"
-		class="btn btn-primary btn-rectangle col-2"
-	>
+	<button nbButton status="primary" (click)="fileInput.click()" class="col-2">
 		{{ 'BROWSE' | translate }}
 	</button>
 </div>
diff --git a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.module.ts b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.module.ts
index cc9b3c99c..a63fcdad1 100644
--- a/admin/website-angular/src/app/@shared/file-uploader/file-uploader.module.ts
+++ b/admin/website-angular/src/app/@shared/file-uploader/file-uploader.module.ts
@@ -4,13 +4,15 @@ import { TranslateModule } from '@ngx-translate/core';
 import { FileUploadModule } from 'ng2-file-upload';
 import { FileUploaderComponent } from './file-uploader.component';
 import { FormsModule } from '@angular/forms';
+import { NbButtonModule } from '@nebular/theme';
 
 @NgModule({
 	imports: [
 		CommonModule,
 		FormsModule,
 		TranslateModule.forChild(),
-		FileUploadModule
+		FileUploadModule,
+		NbButtonModule
 	],
 	exports: [FileUploaderComponent],
 	declarations: [FileUploaderComponent]
diff --git a/admin/website-angular/src/app/@shared/invite/by-code/by-code-modal.component.html b/admin/website-angular/src/app/@shared/invite/by-code/by-code-modal.component.html
index ca5101d4f..e2e3e9c41 100644
--- a/admin/website-angular/src/app/@shared/invite/by-code/by-code-modal.component.html
+++ b/admin/website-angular/src/app/@shared/invite/by-code/by-code-modal.component.html
@@ -6,12 +6,24 @@
 </div>
 <div class="modal-body">
 	<div class="col-12 input-group">
-		<input type="number" [(ngModel)]="code" placeholder="Code" class="form-control" />
+		<input
+			type="number"
+			[(ngModel)]="code"
+			placeholder="Code"
+			class="form-control"
+		/>
 	</div>
 </div>
 <div class="modal-footer">
 	<div class="row" style="width: 90%; margin: auto;">
-		<button class="btn btn-md btn-primary col-12" [disabled]='(!code || (code < 1000 || code > 9999))' (click)="login()">Get
-			inside</button>
+		<button
+			nbButton
+			status="primary"
+			class="col-12"
+			[disabled]="!code || (code < 1000 || code > 9999)"
+			(click)="login()"
+		>
+			Get inside
+		</button>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/admin/website-angular/src/app/@shared/invite/by-code/by-code-modal.module.ts b/admin/website-angular/src/app/@shared/invite/by-code/by-code-modal.module.ts
index 4f1ef0f9f..4af8b8e64 100644
--- a/admin/website-angular/src/app/@shared/invite/by-code/by-code-modal.module.ts
+++ b/admin/website-angular/src/app/@shared/invite/by-code/by-code-modal.module.ts
@@ -2,15 +2,12 @@ import { NgModule } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { ThemeModule } from '../../../@theme/theme.module';
 import { ByCodeModalComponent } from './by-code-modal.component';
+import { NbButtonModule } from '@nebular/theme';
 
 @NgModule({
-	imports: [
-		ThemeModule,
-		TranslateModule.forChild(),
-	],
+	imports: [ThemeModule, TranslateModule.forChild(), NbButtonModule],
 	exports: [ByCodeModalComponent],
 	declarations: [ByCodeModalComponent],
 	entryComponents: [ByCodeModalComponent]
 })
-export class ByCodeModalModule {
-}
+export class ByCodeModalModule {}
diff --git a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.html b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.html
index 0aaa9102d..0ea81fb43 100644
--- a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.html
+++ b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.component.html
@@ -24,7 +24,9 @@ <h3>{{ 'SIMULATION_VIEW.CREATE_INVITE_REQUEST' | translate }}</h3>
 	</div>
 	<div class="modal-footer">
 		<button
-			class="btn btn-md btn-hero-success"
+			nbButton
+			status="success"
+			hero
 			[disabled]="location?.invalid"
 			(click)="create()"
 		>
diff --git a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.module.ts b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.module.ts
index 1edad2567..2642956ef 100644
--- a/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.module.ts
+++ b/admin/website-angular/src/app/@shared/invite/invite-request/invite-request-modal.module.ts
@@ -5,6 +5,7 @@ import { ThemeModule } from '../../../@theme/theme.module';
 import { LocationFormModule } from '../../forms/location';
 import { GoogleMapModule } from '../../forms/google-map/google-map.module';
 import { InviteRequestModalComponent } from './invite-request-modal.component';
+import { NbButtonModule } from '@nebular/theme';
 
 @NgModule({
 	imports: [
@@ -12,7 +13,8 @@ import { InviteRequestModalComponent } from './invite-request-modal.component';
 		FormWizardModule,
 		TranslateModule.forChild(),
 		LocationFormModule,
-		GoogleMapModule
+		GoogleMapModule,
+		NbButtonModule
 	],
 	exports: [InviteRequestModalComponent],
 	declarations: [InviteRequestModalComponent],
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
index 032f28adf..c3403e7b5 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
+++ b/admin/website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
@@ -15,7 +15,9 @@
 	<div class="col-sm-9"></div>
 	<div class="col">
 		<button
-			class="btn btn-success"
+			nbButton
+			status="success"
+			size="large"
 			type="button"
 			(click)="createCategory(basicInfo.createObject)"
 			[disabled]="basicInfo.form.invalid"
diff --git a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
index 07c03970c..74b466913 100644
--- a/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
+++ b/admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
@@ -17,7 +17,9 @@
 
 <div class="modal-footer">
 	<button
-		class="btn btn-success"
+		nbButton
+		status="success"
+		size="large"
 		type="button"
 		(click)="editCategory(basicInfo.getEditObject(currentCategory))"
 		[disabled]="basicInfo.form.invalid"
diff --git a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/customer-orders-table.module.ts b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/customer-orders-table.module.ts
index 984715afd..04cadcfc8 100644
--- a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/customer-orders-table.module.ts
+++ b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/customer-orders-table.module.ts
@@ -7,6 +7,7 @@ import { RedirectOrderComponent } from './redirect-order.component';
 import { RedirectProductComponent } from './redirect-product/redirect-product.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { CustomerOrderActionsComponent } from './customer-order-actions/customer-order-actions.component';
+import { NbButtonModule } from '@nebular/theme';
 
 const COMPONENTS = [
 	RedirectStoreComponent,
@@ -17,7 +18,12 @@ const COMPONENTS = [
 ];
 
 @NgModule({
-	imports: [CommonModule, ThemeModule, TranslateModule.forChild()],
+	imports: [
+		CommonModule,
+		ThemeModule,
+		TranslateModule.forChild(),
+		NbButtonModule
+	],
 	declarations: COMPONENTS,
 	entryComponents: COMPONENTS,
 	exports: COMPONENTS
diff --git a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-order.component.ts b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-order.component.ts
index e4f3a6211..7ace5d487 100644
--- a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-order.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-order.component.ts
@@ -5,7 +5,9 @@ import { getIdFromTheDate } from '@modules/server.common/utils';
 
 @Component({
 	template: `
-		<button class="btn btn-sm btn-outline-secondary" (click)="redirect()">{{orderId}}</button>
+		<button class="btn btn-sm btn-outline-secondary" (click)="redirect()">
+			{{ orderId }}
+		</button>
 	`
 })
 export class RedirectOrderComponent implements ViewCell, OnInit {
diff --git a/admin/website-angular/src/app/@shared/render-component/redirect-id.ts b/admin/website-angular/src/app/@shared/render-component/redirect-id.ts
index 0d7cc6aa2..5c396e99e 100644
--- a/admin/website-angular/src/app/@shared/render-component/redirect-id.ts
+++ b/admin/website-angular/src/app/@shared/render-component/redirect-id.ts
@@ -4,7 +4,9 @@ import { Router } from '@angular/router';
 
 @Component({
 	template: `
-		<button class="btn btn-sm btn-outline-secondary" (click)="redirect()">{{rowData.id}}</button>
+		<button class="btn btn-sm btn-outline-secondary" (click)="redirect()">
+			{{ rowData.id }}
+		</button>
 	`
 })
 export class RedirectIdComponent implements ViewCell {
diff --git a/admin/website-angular/src/app/@shared/render-component/store-products-table/store-products-table.module.ts b/admin/website-angular/src/app/@shared/render-component/store-products-table/store-products-table.module.ts
index bada1a34d..efc4da135 100644
--- a/admin/website-angular/src/app/@shared/render-component/store-products-table/store-products-table.module.ts
+++ b/admin/website-angular/src/app/@shared/render-component/store-products-table/store-products-table.module.ts
@@ -4,7 +4,7 @@ import { ThemeModule } from '../../../@theme';
 import { StoreProductImageComponent } from './store-product-image/store-product-image.component';
 import { StoreProductPriceComponent } from './store-product-price.component';
 import { StoreProductQtyComponent } from './store-product-qty.component';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { StoreProductAmountComponent } from './store-product-amount/store-product-amount.component';
 import { StoreOrderProductAmountComponent } from './store-order-product-amount/store-order-product-amount.component';
 import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
@@ -22,7 +22,8 @@ const COMPONENTS = [
 		CommonModule,
 		ThemeModule,
 		NbSpinnerModule,
-		ConfirmationModalModule
+		ConfirmationModalModule,
+		NbButtonModule
 	],
 	declarations: COMPONENTS,
 	entryComponents: COMPONENTS,
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-add-choice/warehouse-add-choice.component.html b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-add-choice/warehouse-add-choice.component.html
index 666664ced..34d091964 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-add-choice/warehouse-add-choice.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-add-choice/warehouse-add-choice.component.html
@@ -18,7 +18,7 @@
 				[ngClass]="choiceType == 2 ? 'selected' : ''"
 				class="option"
 				(click)="changeChoice('new')"
-				class="btn btn-outline-secondary p-5 "
+				class="btn btn-outline-secondary p-5"
 			>
 				{{
 					'WAREHOUSE_VIEW.NEW_PRODUCT.CREATE_NEW_PRODUCT' | translate
diff --git a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-add-choice/warehouse-add-choice.component.scss b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-add-choice/warehouse-add-choice.component.scss
index bf1b01320..12ed2eaf9 100644
--- a/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-add-choice/warehouse-add-choice.component.scss
+++ b/admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-add-choice/warehouse-add-choice.component.scss
@@ -32,6 +32,7 @@
 	font-size: 0.95rem;
 
 	button {
+		text-transform: uppercase;
 		margin: 10%;
 		margin-top: 11%;
 		margin: auto !important !important;
diff --git a/admin/website-angular/src/app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.component.html b/admin/website-angular/src/app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.component.html
index 3e197746b..fd124d744 100644
--- a/admin/website-angular/src/app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.component.html
+++ b/admin/website-angular/src/app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.component.html
@@ -27,7 +27,8 @@
 		<button
 			(click)="makeOrder()"
 			[disabled]="!canOrder"
-			class="btn btn-sm btn-primary"
+			nbButton
+			status="primary"
 		>
 			<span *ngIf="!actionBtnText">{{
 				TRANSLATE_PREFIXES.ORDER | translate
diff --git a/admin/website-angular/src/app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.module.ts b/admin/website-angular/src/app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.module.ts
index 2237251bf..ff0c5b72f 100644
--- a/admin/website-angular/src/app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.module.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.module.ts
@@ -5,7 +5,7 @@ import { ThemeModule } from '../../../@theme';
 import { WarehouseOrderModalComponent } from './warehouse-order-modal.component';
 import { WarehouseOrderInputComponent } from './warehouse-order-input.component';
 import { TranslateModule } from '@ngx-translate/core';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 
 const COMPONENTS = [WarehouseOrderModalComponent, WarehouseOrderInputComponent];
 
@@ -16,7 +16,8 @@ const COMPONENTS = [WarehouseOrderModalComponent, WarehouseOrderInputComponent];
 		Ng2SmartTableModule,
 		NbSpinnerModule,
 		NbSpinnerModule,
-		TranslateModule.forChild()
+		TranslateModule.forChild(),
+		NbButtonModule
 	],
 	declarations: [WarehouseOrderModalComponent, WarehouseOrderInputComponent],
 	entryComponents: COMPONENTS,
diff --git a/admin/website-angular/src/app/@shared/warehouse/select-warehouse.component/select-warehouse.component.ts b/admin/website-angular/src/app/@shared/warehouse/select-warehouse.component/select-warehouse.component.ts
index 65ea0173d..c591bed8a 100644
--- a/admin/website-angular/src/app/@shared/warehouse/select-warehouse.component/select-warehouse.component.ts
+++ b/admin/website-angular/src/app/@shared/warehouse/select-warehouse.component/select-warehouse.component.ts
@@ -4,10 +4,13 @@ import { ViewCell } from 'ng2-smart-table';
 
 @Component({
 	template: `
-        <button class="btn btn-sm btn-outline-secondary" (click)="selectWarehouse(renderValue)">
-            {{ renderValue }}
-        </button>
-    `
+		<button
+			class="btn btn-sm btn-outline-secondary"
+			(click)="selectWarehouse(renderValue)"
+		>
+			{{ renderValue }}
+		</button>
+	`
 })
 export class SelectWarehouseComponent implements ViewCell, OnInit {
 	@Input()
diff --git a/admin/website-angular/src/app/@theme/styles/font-size.scss b/admin/website-angular/src/app/@theme/styles/font-size.scss
deleted file mode 100644
index d142d76c5..000000000
--- a/admin/website-angular/src/app/@theme/styles/font-size.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-html {
-	font-size: 14px;
-}
-
-span.space {
-	margin-right: 5px;
-}
-
-div.redirectBtn {
-	border: 2px solid #dadfe6;
-	color: #2a2a2a;
-	background-color: transparent;
-	padding: 0.525rem 0.6rem 0.525rem 0.6rem;
-	border-radius: 0.375rem;
-	position: relative;
-	cursor: pointer;
-
-	strong {
-		font-weight: 500;
-	}
-}
-
-div.redirectBtn:hover {
-	background: #dadfe6;
-}
diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index 98e70b2ab..f756d0cd5 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -8,9 +8,6 @@
 //angular2-toaster
 @import 'node_modules/angular2-toaster/toaster';
 
-// global app font size
-@import './font-size';
-
 // custom global ng-bootstrap modal
 @import './ng-bootstrap.modal';
 // loading progress bar theme
@@ -244,3 +241,30 @@ h6 {
 .ng2-smart-action.ng-star-inserted i {
 	font-size: 1.5rem;
 }
+
+span.space {
+	margin-right: 5px;
+}
+
+div.redirectBtn {
+	border: 2px solid #dadfe6;
+	color: #2a2a2a;
+	background-color: transparent;
+	padding: 0.525rem 0.6rem 0.525rem 0.6rem;
+	border-radius: 0.375rem;
+	position: relative;
+	cursor: pointer;
+
+	strong {
+		font-weight: 500;
+	}
+}
+
+div.redirectBtn:hover {
+	background: #dadfe6;
+}
+
+button,
+.btn {
+	font-weight: 500 !important;
+}
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html
index e3d53eabb..5249c78b1 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html
@@ -18,15 +18,16 @@
 				<h1>{{ 'CARRIERS_VIEW.EDIT.EDIT_CARRIER' | translate }}</h1>
 			</div>
 			<button
+				nbButton
+				size="large"
+				status="success"
 				type="button"
-				class="btn btn-success btn-icon pull-right btn-with-icon no-text-transform"
+				class="btn-icon pull-right btn-with-icon no-text-transform"
 				(click)="updateCarrier()"
 				[disabled]="!isCarrierValid"
 			>
-				<i class="ion-md-checkmark"></i>
-				<small>{{
-					'CARRIERS_VIEW.CARRIER_PAGE.SAVE' | translate
-				}}</small>
+				<i class="ion-md-checkmark mr-2"></i>
+				{{ 'CARRIERS_VIEW.CARRIER_PAGE.SAVE' | translate }}
 			</button>
 		</nb-card-header>
 	</nb-card>
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.module.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.module.ts
index f3601073b..78309adca 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.module.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.module.ts
@@ -8,7 +8,7 @@ import { GoogleMapModule } from '../../../../@shared/forms/google-map/google-map
 import { RouterModule } from '@angular/router';
 import { routes } from './carrier-edit.routes';
 import { ToasterModule } from 'angular2-toaster';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 
 @NgModule({
 	imports: [
@@ -19,7 +19,8 @@ import { NbSpinnerModule } from '@nebular/theme';
 		CarrierFormsModule,
 		LocationFormModule,
 		GoogleMapModule,
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	exports: [CarrierEditComponent],
 	declarations: [CarrierEditComponent]
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-info/carrier-info.component.html b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-info/carrier-info.component.html
index 9bfc65b7e..2cc8d8e7b 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-info/carrier-info.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-info/carrier-info.component.html
@@ -1,16 +1,38 @@
 <nb-card>
 	<nb-card-header>
-		{{carrier.firstName}} {{carrier.firstName && carrier.lastName}} {{carrier.firstName ? '' : '# ' + carrier.id }}
+		{{ carrier.firstName }} {{ carrier.firstName && carrier.lastName }}
+		{{ carrier.firstName ? '' : '# ' + carrier.id }}
 		<span class="isActive" [ngSwitch]="carrier.isActive">
-			<span *ngSwitchCase="true" class="label-is-active label-success">{{"CARRIERS_VIEW.CARRIER_PAGE.ACTIVE" | translate}}</span>
-			<span *ngSwitchCase="false" class="label-is-active label-warning">{{"CARRIERS_VIEW.CARRIER_PAGE.NOT_ACTIVE" | translate}}
+			<span *ngSwitchCase="true" class="label-is-active label-success">{{
+				'CARRIERS_VIEW.CARRIER_PAGE.ACTIVE' | translate
+			}}</span>
+			<span *ngSwitchCase="false" class="label-is-active label-warning"
+				>{{ 'CARRIERS_VIEW.CARRIER_PAGE.NOT_ACTIVE' | translate }}
 			</span>
 		</span>
 		<span class="pull-right carrierStatus" [ngSwitch]="carrier.status">
-			<button *ngSwitchCase="0" (click)='toogleStatus()' class="btn btn-success carrierStatus" [nbSpinner]="loading" nbSpinnerStatus="success">{{"CARRIERS_VIEW.CARRIER_PAGE.WORKING"
-				| translate}}</button>
-			<button *ngSwitchCase="1" (click)='toogleStatus()' class="btn btn-danger carrierStatus" [nbSpinner]="loading" nbSpinnerStatus="danger">{{"CARRIERS_VIEW.CARRIER_PAGE.NOT_WORKING"
-				| translate}}</button>
+			<button
+				*ngSwitchCase="0"
+				(click)="toogleStatus()"
+				nbButton
+				status="success"
+				class="carrierStatus"
+				[nbSpinner]="loading"
+				nbSpinnerStatus="success"
+			>
+				{{ 'CARRIERS_VIEW.CARRIER_PAGE.WORKING' | translate }}
+			</button>
+			<button
+				*ngSwitchCase="1"
+				(click)="toogleStatus()"
+				nbButton
+				status="danger"
+				class="carrierStatus"
+				[nbSpinner]="loading"
+				nbSpinnerStatus="danger"
+			>
+				{{ 'CARRIERS_VIEW.CARRIER_PAGE.NOT_WORKING' | translate }}
+			</button>
 		</span>
 	</nb-card-header>
 	<nb-card-body>
@@ -21,16 +43,25 @@
 				</strong>
 			</div>
 			<div>
-				{{ carrier.geoLocation.streetAddress }}, {{ carrier.geoLocation.house }}
+				{{ carrier.geoLocation.streetAddress }},
+				{{ carrier.geoLocation.house }}
 			</div>
 			<div>
-				{{ carrier.geoLocation.city }} {{ carrier.geoLocation.postcode }}, {{ carrier.geoLocation.countryName }}
+				{{ carrier.geoLocation.city }}
+				{{ carrier.geoLocation.postcode }},
+				{{ carrier.geoLocation.countryName }}
 			</div>
 		</div>
 
-		<button type="button" class="btn btn-dark btn-icon pull-right" (click)="showCode = !showCode">
+		<button
+			type="button"
+			class="btn btn-dark btn-icon pull-right"
+			(click)="showCode = !showCode"
+		>
 			<svg width="24px" viewBox="0 0 24 24">
-				<path fill="#fff" d="M14.6,16.6L19.2,12L14.6,7.4L16,6L22,12L16,18L14.6,16.6M9.4,16.6L4.8,12L9.4,7.4L8,6L2,12L8,18L9.4,16.6Z"
+				<path
+					fill="#fff"
+					d="M14.6,16.6L19.2,12L14.6,7.4L16,6L22,12L16,18L14.6,16.6M9.4,16.6L4.8,12L9.4,7.4L8,6L2,12L8,18L9.4,16.6Z"
 				/>
 			</svg>
 		</button>
@@ -38,4 +69,4 @@
 	<nb-card-footer *ngIf="showCode">
 		<pre><code highlight [language]="['json']" [code]="carrier | json"></code></pre>
 	</nb-card-footer>
-</nb-card>
\ No newline at end of file
+</nb-card>
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.html b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.html
index 580d36301..f23372f31 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.html
@@ -36,7 +36,9 @@
 					<button
 						[disabled]="!pageBtnStates.isCarrierPickupOrder"
 						type="button"
-						class="btn btn-outline-primary btn-sm btn-rectangle"
+						nbButton
+						outline
+						status="primary"
 						(click)="
 							updateCarrierOrdersStatus(
 								enumOrderCarrierStatus.CarrierPickedUpOrder
@@ -44,7 +46,10 @@
 						"
 						[nbSpinner]="loading"
 					>
-						<span class="ion-md-filing" aria-hidden="true"></span>
+						<span
+							class="ion-md-filing mr-2"
+							aria-hidden="true"
+						></span>
 						{{
 							'CARRIERS_VIEW.CARRIER_PAGE.PICKED_UP_ORDER'
 								| translate
@@ -54,11 +59,16 @@
 					<button
 						[disabled]="!pageBtnStates.isCarrierPickupOrder"
 						type="button"
-						class="btn btn-outline-danger btn-sm btn-rectangle"
+						nbButton
+						outline
+						status="danger"
 						(click)="cancelDelivery()"
 						[nbSpinner]="loading"
 					>
-						<span class="ion-md-alert" aria-hidden="true"></span>
+						<span
+							class="ion-md-alert mr-2"
+							aria-hidden="true"
+						></span>
 						{{ 'CARRIERS_VIEW.CARRIER_PAGE.CANCEL' | translate }}
 					</button>
 				</div>
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.scss b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.scss
index 9ec9033bd..49ecb619b 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.scss
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.scss
@@ -1,13 +1,15 @@
 .btn-startProcessing {
-    color: #333;
-    background-color: #fff;
-    border-color: #ccc;
-    margin-bottom: 5px;
+	color: #333;
+	background-color: #fff;
+	border-color: #ccc;
+	margin-bottom: 5px;
+	font-weight: 500;
+	padding: 0.75rem 1.5rem;
 }
 
 .btn-startProcessing:hover {
-    color: rgb(24, 22, 22);
-    background-color: rgb(241, 239, 239);
-    border-color: rgb(182, 176, 176);
-    cursor: pointer;
-}
\ No newline at end of file
+	color: rgb(24, 22, 22);
+	background-color: rgb(241, 239, 239);
+	border-color: rgb(182, 176, 176);
+	cursor: pointer;
+}
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html
index 5ff24649a..c91da269f 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html
@@ -26,10 +26,12 @@ <h4>{{ 'Manage carrier and deliveries' | translate }}</h4>
 			<nb-card-body>
 				<button
 					type="button"
-					class="btn btn-primary btn-with-icon no-text-transform"
+					nbButton
+					status="primary"
+					class="btn-with-icon no-text-transform"
 					[routerLink]="['./edit']"
 				>
-					<i class="ion-md-create"></i>
+					<i class="ion-md-create mr-2"></i>
 					<span>{{
 						'CARRIERS_VIEW.CARRIER_PAGE.EDIT' | translate
 					}}</span>
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.module.ts b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.module.ts
index 2512ff971..b354cd8e6 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.module.ts
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.module.ts
@@ -14,7 +14,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Ng2SmartTableModule } from 'ng2-smart-table/ng2-smart-table.module';
 import { CarrierMutationModule } from '../../../@shared/carrier/carrier-mutation';
 import { HighlightModule } from 'ngx-highlightjs';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { CarriersTableModule } from '../../../@shared/render-component/carriers-table/carriers-table.module';
 import { CarrierOrdersHistoryComponent } from './carrier-orders-history/carrier-orders-history.component';
 import { RenderComponentsModule } from '../../../@shared/render-component/render-components.module';
@@ -42,7 +42,8 @@ import { FormsModule } from '@angular/forms';
 		NbSpinnerModule,
 		CarrierOrdersTableModule,
 		NgSelectModule,
-		FormsModule
+		FormsModule,
+		NbButtonModule
 	],
 	declarations: [
 		CarrierComponent,
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.html b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.html
index 0cc4556e8..fa76d8e22 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.html
@@ -1,7 +1,7 @@
 <toaster-container></toaster-container>
 
 <div>
-	<nb-card *ngIf="(customer$ | async) as customer">
+	<nb-card *ngIf="customer$ | async as customer">
 		<nb-card-header>
 			<div class="d-inline-flex">
 				<svg
@@ -18,11 +18,14 @@ <h1>{{ 'CUSTOMERS_VIEW.EDIT.EDIT_CUSTOMER' | translate }}</h1>
 			</div>
 
 			<button
-				class="btn btn-success pull-right text-center"
+				nbButton
+				status="success"
+				size="large"
+				class="pull-right text-center"
 				(click)="updateCustomer()"
 				[disabled]="!form.valid"
 			>
-				<i class="ion-md-checkmark button-icon"></i>
+				<i class="ion-md-checkmark button-icon mr-2"></i>
 				<span>{{ 'PRODUCTS_VIEW.EDIT_VIEW.SAVE' | translate }}</span>
 			</button>
 		</nb-card-header>
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.module.ts b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.module.ts
index 44f389b5e..6ddcfc99d 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.module.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.module.ts
@@ -7,7 +7,7 @@ import { LocationFormModule } from '../../../../@shared/forms/location';
 import { GoogleMapModule } from '../../../../@shared/forms/google-map/google-map.module';
 import { CustomerEditComponent } from './customer-edit.component';
 import { ToasterModule } from 'angular2-toaster';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 
 const routes: Routes = [
 	{
@@ -26,7 +26,8 @@ const routes: Routes = [
 		UserFormsModule,
 		LocationFormModule,
 		GoogleMapModule,
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	declarations: [CustomerEditComponent]
 })
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html b/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html
index b7bc59b92..efbdfcf2d 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html
@@ -31,10 +31,11 @@ <h4>
 				<div class="col-3 edit-wrapper">
 					<button
 						type="button"
-						class="btn btn-primary active"
+						nbButton
+						status="primary"
 						[routerLink]="['./edit']"
 					>
-						<i class="ion-md-create button-icon"></i>
+						<i class="ion-md-create button-icon mr-2"></i>
 						<small>{{
 							'CUSTOMERS_VIEW.CUSTOMER_VIEW.EDIT' | translate
 						}}</small>
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/customer.module.ts b/admin/website-angular/src/app/pages/+customers/+customer/customer.module.ts
index 6cc8dd9fd..a481ce29e 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/customer.module.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/customer.module.ts
@@ -21,6 +21,7 @@ import { CustomerOrdersModule } from './ea-customer-orders/ea-customer-orders.mo
 import { CustomerMetricsComponent } from './ea-customer-metrics/ea-customer-metrics.component';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { FormsModule } from '@angular/forms';
+import { NbButtonModule } from '@nebular/theme';
 
 const routes = [
 	{
@@ -50,7 +51,8 @@ const routes = [
 		WarehouseOrderModalModule,
 		CustomerOrdersModule,
 		NgSelectModule,
-		FormsModule
+		FormsModule,
+		NbButtonModule
 	],
 	declarations: [
 		CustomerComponent,
diff --git a/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.html b/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.html
index 6e006a2b3..707b2443e 100644
--- a/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.html
@@ -1,17 +1,21 @@
 <nb-card class="no-margin">
 	<nb-card-header>
 		<button
-			class="btn btn-icon btn-danger btn-sm mr-2 d-inline-block"
+			nbButton
+			status="danger"
+			class="btn-sm mr-2 d-inline-block"
 			[disabled]="!hasSelectedInvitesRequests"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon"></i>
+			<i class="ion-md-trash button-icon mr-2"></i>
 			<small>{{
 				'CUSTOMERS_VIEW.INVITES_VIEW.DELETE' | translate
 			}}</small>
 		</button>
 		<button
-			class="btn btn-info btn-sm mr-2 d-inline-block"
+			nbButton
+			status="info"
+			class="mr-2 d-inline-block"
 			[disabled]="!hasSelectedInvitesRequestsForInvite"
 			(click)="inviteSelectedRows()"
 		>
diff --git a/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.module.ts b/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.module.ts
index 0e4d651be..36c0aac16 100644
--- a/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.module.ts
+++ b/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.module.ts
@@ -13,6 +13,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { InvitesRequestsTableModule } from 'app/@shared/render-component/invites-requests/invites-requests.module';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
 import { ConfirmationModalModule } from '../../../../@shared/confirmation-modal/confirmation-modal.module';
+import { NbButtonModule } from '@nebular/theme';
 @NgModule({
 	imports: [
 		CommonModule,
@@ -22,7 +23,8 @@ import { ConfirmationModalModule } from '../../../../@shared/confirmation-modal/
 		TranslateModule.forChild(),
 		HighlightModule.forRoot({ theme: 'github' }),
 		InvitesRequestsTableModule,
-		ConfirmationModalModule
+		ConfirmationModalModule,
+		NbButtonModule
 	],
 	declarations: [InvitesRequestsComponent, CountryRenderComponent],
 	entryComponents: [CountryRenderComponent],
diff --git a/admin/website-angular/src/app/pages/+customers/+invites/invites.component.html b/admin/website-angular/src/app/pages/+customers/+invites/invites.component.html
index 3426a3011..29129f5ac 100644
--- a/admin/website-angular/src/app/pages/+customers/+invites/invites.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+invites/invites.component.html
@@ -8,11 +8,13 @@
 			<nb-card class="no-margin">
 				<nb-card-header>
 					<button
-						class="btn btn-icon btn-danger btn-sm mr-2 d-inline-block"
+						nbButton
+						status="danger"
+						class=" btn-sm mr-2 d-inline-block"
 						[disabled]="!hasSelectedInvites"
 						(click)="deleteSelectedRows()"
 					>
-						<i class="ion-md-trash button-icon"></i>
+						<i class="ion-md-trash button-icon mr-2"></i>
 						<small>{{
 							'CUSTOMERS_VIEW.INVITES_VIEW.DELETE' | translate
 						}}</small>
diff --git a/admin/website-angular/src/app/pages/+customers/+invites/invites.module.ts b/admin/website-angular/src/app/pages/+customers/+invites/invites.module.ts
index c665a3e0e..34d3145b8 100644
--- a/admin/website-angular/src/app/pages/+customers/+invites/invites.module.ts
+++ b/admin/website-angular/src/app/pages/+customers/+invites/invites.module.ts
@@ -10,7 +10,7 @@ import { InvitesComponent } from './invites.component';
 import { InvitesService } from '../../../@core/data/invites.service';
 import { InvitesRequestsModule } from './+invites-requests/invites-requests.module';
 import { CountryRenderComponent } from './country-render/country-render.component';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { ConfirmationModalModule } from '../../../@shared/confirmation-modal/confirmation-modal.module';
 
 const routes: Routes = [
@@ -31,7 +31,8 @@ const routes: Routes = [
 		HighlightModule.forRoot({ theme: 'github' }),
 		InvitesRequestsModule,
 		NbSpinnerModule,
-		ConfirmationModalModule
+		ConfirmationModalModule,
+		NbButtonModule
 	],
 	declarations: [InvitesComponent],
 	entryComponents: [CountryRenderComponent],
diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.html b/admin/website-angular/src/app/pages/+customers/customers.component.html
index cbb7862d5..343e315e5 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.component.html
+++ b/admin/website-angular/src/app/pages/+customers/customers.component.html
@@ -3,10 +3,12 @@
 
 	<nb-card-header>
 		<button
-			class="btn btn-success mr-2 d-inline-block"
+			nbButton
+			status="success"
+			class="mr-2 d-inline-block"
 			(click)="showCreateUserModal()"
 		>
-			<i class="ion-md-add button-icon"></i>
+			<i class="ion-md-add button-icon mr-2"></i>
 
 			<small _ngcontent-c55="">{{
 				'CUSTOMERS_VIEW.CREATE' | translate
@@ -14,11 +16,13 @@
 		</button>
 
 		<button
-			class="btn btn-danger mr-2 d-inline-block"
+			nbButton
+			status="danger"
+			class="mr-2 d-inline-block"
 			[disabled]="!hasSelectedCustomers"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon"></i>
+			<i class="ion-md-trash button-icon mr-2"></i>
 
 			<small _ngcontent-c55="">{{
 				'CUSTOMERS_VIEW.DELETE' | translate
@@ -26,7 +30,9 @@
 		</button>
 
 		<button
-			class="btn btn-info mr-2 d-inline-block"
+			nbButton
+			status="info"
+			class="mr-2 d-inline-block"
 			[routerLink]="['/devices']"
 		>
 			<i class="ion-md-phone-portrait"></i>&nbsp;&nbsp;
@@ -34,12 +40,14 @@
 		</button>
 
 		<button
-			class="btn btn-danger mr-2 d-inline-block"
+			nbButton
+			status="danger"
+			class="mr-2 d-inline-block"
 			[disabled]="!isOnlyOneCustomerSelected || showBanLoading"
 			[nbSpinner]="showBanLoading"
 			(click)="banSelectedRows()"
 		>
-			<i class="ion-md-close-circle button-icon"></i>
+			<i class="ion-md-close-circle button-icon mr-2"></i>
 
 			<small _ngcontent-c55="" *ngIf="isUserBanned">{{
 				'CUSTOMERS_VIEW.UNBAN' | translate
diff --git a/admin/website-angular/src/app/pages/+customers/customers.module.ts b/admin/website-angular/src/app/pages/+customers/customers.module.ts
index 031924d42..c813e5b11 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.module.ts
+++ b/admin/website-angular/src/app/pages/+customers/customers.module.ts
@@ -11,7 +11,7 @@ import { RenderComponentsModule } from '../../@shared/render-component/render-co
 import { GeoLocationService } from '../../@core/data/geo-location.service';
 import { UserMutationModule } from '../../@shared/user/user-mutation';
 import { CustomerTableModule } from '../../@shared/render-component/customer-table/customer-table.module';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
 import { BanConfirmModule } from 'app/@shared/user/ban-confirm';
 
@@ -43,7 +43,8 @@ const routes: Routes = [
 		UserMutationModule,
 		CustomerTableModule,
 		NbSpinnerModule,
-		BanConfirmModule
+		BanConfirmModule,
+		NbButtonModule
 	],
 	declarations: [CustomersComponent],
 	providers: [JsonPipe, GeoLocationService, NotifyService]
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
index 36f9e86c0..3f29f185a 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard.component.scss
@@ -19,15 +19,13 @@ $shadow-green: #00977e;
 	}
 
 	.value {
-		font-size: 2.4rem;
+		font-size: 2.5rem;
 		font-weight: 300;
-		margin-top: 0.5rem;
-		line-height: 1.1;
+		line-height: 1.3;
 	}
 
 	.description {
 		color: #a4abb3;
-		margin-top: 0.5rem;
 	}
 
 	::ng-deep nb-progress-bar {
diff --git a/admin/website-angular/src/app/pages/+device/device.component.html b/admin/website-angular/src/app/pages/+device/device.component.html
index 1346be9c5..b5271581a 100644
--- a/admin/website-angular/src/app/pages/+device/device.component.html
+++ b/admin/website-angular/src/app/pages/+device/device.component.html
@@ -10,11 +10,12 @@ <h1>{{ 'CUSTOMERS_VIEW.DEVICE.CUSTOMERS_DEVICES' | translate }}</h1>
 		<div class="row">
 			<div class="col">
 				<button
-					class="btn btn-danger active"
+					nbButton
+					status="danger"
 					[disabled]="!hasSelectedDevices"
 					(click)="deleteSelectedDevices()"
 				>
-					<i class="ion-md-trash button-icon"></i>
+					<i class="ion-md-trash button-icon mr-2"></i>
 					<small _ngcontent-c55="">{{
 						'CUSTOMERS_VIEW.DEVICE.DELETE' | translate
 					}}</small>
diff --git a/admin/website-angular/src/app/pages/+device/device.module.ts b/admin/website-angular/src/app/pages/+device/device.module.ts
index 0dc4173bf..c416f96a1 100644
--- a/admin/website-angular/src/app/pages/+device/device.module.ts
+++ b/admin/website-angular/src/app/pages/+device/device.module.ts
@@ -7,7 +7,7 @@ import { DeviceMutationComponent } from './device-mutation/device-mutation.compo
 import { TranslateModule } from '@ngx-translate/core';
 import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { ToasterModule } from 'angular2-toaster';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
 import { ConfirmationModalModule } from '../../@shared/confirmation-modal/confirmation-modal.module';
 
@@ -27,7 +27,8 @@ const routes: Routes = [
 		ConfirmationModalModule,
 		ToasterModule.forRoot(),
 		TranslateModule.forChild(),
-		RouterModule.forChild(routes)
+		RouterModule.forChild(routes),
+		NbButtonModule
 	],
 	providers: [NotifyService],
 	declarations: [DeviceComponent, DeviceMutationComponent],
diff --git a/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.html b/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.html
index 92706cfbc..5b216154d 100644
--- a/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.html
+++ b/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.html
@@ -21,22 +21,26 @@ <h4>
 			>
 				<div class="col-8 p-0 btn-group">
 					<button
-						class="btn btn-icon btn-success btn-sm d-inline-block"
+						nbButton
+						status="success"
+						class="d-inline-block"
 						(click)="addProducts()"
 					>
-						<i class="ion-md-add button-icon"></i
+						<i class="ion-md-add button-icon mr-2"></i
 						>{{
 							'ORDER_VIEW.ORDER_PRODUCT_INFO.ADD_PRODUCTS'
 								| translate
 						}}
 					</button>
 					<button
-						class="btn btn-icon btn-dark btn-sm mr-2 d-inline-block"
+						nbButton
+						status="warning"
+						class="mr-2 d-inline-block"
 						[disabled]="!selectedProducts.length"
 						(click)="removeSelectedProducts()"
 						[nbSpinner]="loading"
 					>
-						<i class="ion-md-trash button-icon"></i>
+						<i class="ion-md-trash button-icon mr-2"></i>
 						{{
 							'ORDER_VIEW.ORDER_PRODUCT_INFO.REMOVE_PRODUCTS'
 								| translate
@@ -45,11 +49,13 @@ <h4>
 				</div>
 				<div class="col-4 pull-right p-0">
 					<button
-						class="btn btn-icon btn-danger btn-sm mr-2 d-inline-block float-right"
+						nbButton
+						status="danger"
+						class="mr-2 d-inline-block float-right"
 						(click)="cancelOrder()"
 						[nbSpinner]="loading"
 					>
-						<i class="ion-md-close button-icon"></i>
+						<i class="ion-md-close button-icon mr-2"></i>
 						{{
 							'ORDER_VIEW.ORDER_PRODUCT_INFO.CANCEL_ORDER'
 								| translate
diff --git a/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.module.ts b/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.module.ts
index 567e1483c..f488601b1 100644
--- a/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.module.ts
+++ b/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.module.ts
@@ -8,7 +8,7 @@ import { RenderComponentsModule } from 'app/@shared/render-component/render-comp
 import { StoreProductsTableModule } from 'app/@shared/render-component/store-products-table/store-products-table.module';
 import { WarehouseOrderModalModule } from 'app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.module';
 import { TranslateModule } from '@ngx-translate/core';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
 
 @NgModule({
@@ -22,7 +22,8 @@ import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirma
 		StoreProductsTableModule,
 		WarehouseOrderModalModule,
 		NbSpinnerModule,
-		ConfirmationModalModule
+		ConfirmationModalModule,
+		NbButtonModule
 	],
 	declarations: [OrderProductsComponent],
 	exports: [OrderProductsComponent]
diff --git a/admin/website-angular/src/app/pages/+products/+categories/categories.component.html b/admin/website-angular/src/app/pages/+products/+categories/categories.component.html
index f53b3843b..240840f4f 100644
--- a/admin/website-angular/src/app/pages/+products/+categories/categories.component.html
+++ b/admin/website-angular/src/app/pages/+products/+categories/categories.component.html
@@ -3,22 +3,26 @@
 
 	<nb-card-header>
 		<button
-			class="btn btn-sm btn-success mr-2 d-inline-block"
+			nbButton
+			status="success"
+			class="mr-2 d-inline-block"
 			type="button"
 			tabindex="0"
 			(click)="openWizardNewCategory()"
 		>
-			<i class="ion-md-add button-icon"></i>
+			<i class="ion-md-add button-icon mr-2"></i>
 			<small>{{ 'CATEGORY_VIEW.CREATE_BUTTON' | translate }}</small>
 		</button>
 		<button
-			class="btn btn-danger btn-sm mr-2 d-inline-block"
+			nbButton
+			status="danger"
+			class="mr-2 d-inline-block"
 			type="button"
 			tabindex="0"
 			[disabled]="!hasSelectedCategories"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon"></i>
+			<i class="ion-md-trash button-icon mr-2"></i>
 			<span _ngcontent-c24="">{{
 				'CATEGORY_VIEW.DELETE' | translate
 			}}</span>
diff --git a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.html b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.html
index e46c3cdee..ffdc780c5 100644
--- a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.html
+++ b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.html
@@ -16,11 +16,14 @@ <h1>{{ 'PRODUCTS_VIEW.EDIT_VIEW.EDIT_PRODUCT' | translate }}</h1>
 		</div>
 
 		<button
-			class="btn btn-success pull-right text-center"
+			nbButton
+			status="success"
+			size="large"
+			class="pull-right text-center"
 			(click)="updateProduct()"
 			[disabled]="!isProductValid"
 		>
-			<i class="ion-md-checkmark button-icon"></i>
+			<i class="ion-md-checkmark button-icon mr-2"></i>
 			<span>{{ 'PRODUCTS_VIEW.EDIT_VIEW.SAVE' | translate }}</span>
 		</button>
 	</nb-card-header>
diff --git a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.module.ts b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.module.ts
index a3a6a65e4..e77279b5c 100644
--- a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.module.ts
+++ b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.module.ts
@@ -7,7 +7,7 @@ import { ProductEditComponent } from './product-edit.component';
 import { ProductFormsModule } from '../../../../@shared/product/forms';
 import { FormWizardModule } from 'angular2-wizard';
 import { ProductsCategoryService } from '../../../../@core/data/productsCategory.service';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 
 export const routes: Routes = [
 	{
@@ -24,7 +24,8 @@ export const routes: Routes = [
 		RouterModule.forChild(routes),
 		ProductFormsModule,
 		FormWizardModule,
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	exports: [],
 	declarations: [ProductEditComponent],
diff --git a/admin/website-angular/src/app/pages/+products/products.component.html b/admin/website-angular/src/app/pages/+products/products.component.html
index bb8612f43..dc6786712 100644
--- a/admin/website-angular/src/app/pages/+products/products.component.html
+++ b/admin/website-angular/src/app/pages/+products/products.component.html
@@ -3,20 +3,24 @@
 
 	<nb-card-header>
 		<button
-			class="btn btn-success mr-2 d-inline-block"
+			nbButton
+			status="success"
+			class="mr-2 d-inline-block"
 			(click)="openWizardNewProduct()"
 		>
-			<i class="ion-md-add button-icon"></i>
+			<i class="ion-md-add button-icon mr-2"></i>
 			<small _ngcontent-c55="">{{
 				'PRODUCTS_VIEW.CREATE' | translate
 			}}</small>
 		</button>
 		<button
-			class="btn btn-danger mr-2 d-inline-block"
+			nbButton
+			status="danger"
+			class="mr-2 d-inline-block"
 			[disabled]="!hasSelectedProducts"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon"></i>
+			<i class="ion-md-trash button-icon mr-2"></i>
 			<small _ngcontent-c55="">{{
 				'PRODUCTS_VIEW.DELETE' | translate
 			}}</small>
diff --git a/admin/website-angular/src/app/pages/+products/products.module.ts b/admin/website-angular/src/app/pages/+products/products.module.ts
index 1a88f8869..62d08c6d3 100644
--- a/admin/website-angular/src/app/pages/+products/products.module.ts
+++ b/admin/website-angular/src/app/pages/+products/products.module.ts
@@ -11,7 +11,7 @@ import { ProductCreateModule } from '../../@shared/product/product-create';
 import { ProductFormsModule } from '../../@shared/product/forms';
 import { CategoryCreateComponent } from '../../@shared/product/categories/category-create';
 import { CategoryEditComponent } from '../../@shared/product/categories/category-edit/category-edit.component';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
 import { ConfirmationModalModule } from '../../@shared/confirmation-modal/confirmation-modal.module';
 import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
@@ -45,7 +45,8 @@ const routes: Routes = [
 		NbSpinnerModule,
 		ConfirmationModalModule,
 		FileUploaderModule,
-		ProductCategoriesFormsModule
+		ProductCategoriesFormsModule,
+		NbButtonModule
 	],
 	declarations: [
 		ProductsComponent,
diff --git a/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html b/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html
index ff5238ed3..4d8183eb1 100644
--- a/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html
+++ b/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html
@@ -79,7 +79,11 @@
 				>
 			</div>
 			<button
-				class="btn btn-with-icon btn-outline-success btn-lg float-right save-button-profile"
+				nbButton
+				status="success"
+				outline
+				size="large"
+				class="float-right save-button-profile"
 				[disabled]="
 					!accountForm.valid ||
 					((password.dirty || password.touched) &&
@@ -88,7 +92,7 @@
 				type="button"
 				(click)="saveChanges()"
 			>
-				<i class="ion-md-checkmark"></i>
+				<i class="ion-md-checkmark mr-2"></i>
 				<span> {{ 'PROFILE_VIEW.SAVE' | translate }} </span>
 			</button>
 		</form>
diff --git a/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
index 66d71c679..25a2ed166 100644
--- a/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
+++ b/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
@@ -158,11 +158,15 @@
 			</div>
 
 			<button
-				class="btn btn-with-icon btn-outline-success btn-lg float-right save-button-profile"
+				nbButton
+				status="success"
+				outline
+				size="large"
+				class="float-right save-button-profile"
 				[disabled]="!basicInfoForm.valid || !basicInfoForm.dirty"
 				(click)="saveChanges()"
 			>
-				<i class="ion-md-checkmark"></i>
+				<i class="ion-md-checkmark mr-2"></i>
 				<span> {{ 'PROFILE_VIEW.SAVE' | translate }} </span>
 			</button>
 		</form>
diff --git a/admin/website-angular/src/app/pages/+profile/edit/edit.module.ts b/admin/website-angular/src/app/pages/+profile/edit/edit.module.ts
index fa3db99c7..56d86a0e3 100644
--- a/admin/website-angular/src/app/pages/+profile/edit/edit.module.ts
+++ b/admin/website-angular/src/app/pages/+profile/edit/edit.module.ts
@@ -5,7 +5,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ThemeModule } from '../../../@theme';
 import { AccountComponent } from './account/account.component';
 import { BasicInfoComponent } from './basic-info/basic-info.component';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';
 
 const EDIT_PROFILE_COMPONENTS = [AccountComponent, BasicInfoComponent];
@@ -17,7 +17,8 @@ const EDIT_PROFILE_COMPONENTS = [AccountComponent, BasicInfoComponent];
 		ToasterModule.forRoot(),
 		TranslateModule.forChild(),
 		FileUploaderModule,
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	declarations: [...EDIT_PROFILE_COMPONENTS],
 	exports: [...EDIT_PROFILE_COMPONENTS],
diff --git a/admin/website-angular/src/app/pages/+setup/setup.component.html b/admin/website-angular/src/app/pages/+setup/setup.component.html
index 148a92f8f..d8330bb3c 100644
--- a/admin/website-angular/src/app/pages/+setup/setup.component.html
+++ b/admin/website-angular/src/app/pages/+setup/setup.component.html
@@ -4,11 +4,17 @@ <h1>{{ 'FAKE_DATA.SETUP' | translate }}</h1>
 	</nb-card-header>
 
 	<nb-card-body>
-		<button class="btn btn-primary mr-3" (click)="navigateToFakeDataPage()">
+		<button
+			nbButton
+			status="primary"
+			class="mr-3"
+			(click)="navigateToFakeDataPage()"
+		>
 			{{ 'FAKE_DATA.GENERATE_INITIAL_DATA' | translate }}
 		</button>
 		<button
-			class="btn btn-primary"
+			nbButton
+			status="primary"
 			(click)="navigateToSetupMerchantsPage()"
 		>
 			{{ 'FAKE_DATA.SETUP_MERCHANTS.SETUP_MERCHANTS' | translate }}
diff --git a/admin/website-angular/src/app/pages/+setup/setup.module.ts b/admin/website-angular/src/app/pages/+setup/setup.module.ts
index 759f817dc..b364a927d 100644
--- a/admin/website-angular/src/app/pages/+setup/setup.module.ts
+++ b/admin/website-angular/src/app/pages/+setup/setup.module.ts
@@ -4,7 +4,7 @@ import { SetupComponent } from './setup.component';
 import { CommonModule } from '@angular/common';
 import { ThemeModule } from '../../@theme';
 import { TranslateModule } from '@ngx-translate/core';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 
 const routes: Routes = [
 	{
@@ -23,7 +23,8 @@ const routes: Routes = [
 		ThemeModule,
 		RouterModule.forChild(routes),
 		TranslateModule.forChild(),
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	declarations: [SetupComponent]
 })
diff --git a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
index 03a562748..26e19d63e 100644
--- a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
@@ -3,7 +3,9 @@
 
 	<nb-card-header>
 		<button
-			class="btn btn-success btn-sm mr-2 d-inline-block"
+			nbButton
+			status="success"
+			class="mr-2 d-inline-block"
 			(click)="createWarehouseModel()"
 		>
 			<i class="ion-md-add button-icon"></i>
@@ -12,7 +14,9 @@
 			}}</small>
 		</button>
 		<button
-			class="btn btn-danger btn-sm mr-2 d-inline-block"
+			nbButton
+			status="danger"
+			class="mr-2 d-inline-block"
 			[disabled]="!hasSelectedWarehouses"
 			(click)="deleteSelectedRows()"
 		>
@@ -22,7 +26,9 @@
 			}}</small>
 		</button>
 		<button
-			class="btn btn-warning btn-sm mr-2 d-inline-block"
+			nbButton
+			status="warning"
+			class="mr-2 d-inline-block"
 			routerLink="track"
 		>
 			<i class="ion-md-trash button-icon"></i>
diff --git a/admin/website-angular/src/app/pages/+warehouses/warehouses.module.ts b/admin/website-angular/src/app/pages/+warehouses/warehouses.module.ts
index b51efd133..ba71edc8e 100644
--- a/admin/website-angular/src/app/pages/+warehouses/warehouses.module.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/warehouses.module.ts
@@ -13,7 +13,7 @@ import { WarehouseMutationModule } from '../../@shared/warehouse/warehouse-mutat
 import { HighlightModule } from 'ngx-highlightjs';
 import { RenderComponentsModule } from '../../@shared/render-component/render-components.module';
 import { WarehouseTableModule } from '../../@shared/render-component/warehouse-table/warehouse-table.module';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { ConfirmationModalModule } from 'app/@shared/confirmation-modal/confirmation-modal.module';
 import { WarehouseTrackModule } from './+warehouse-track/warehouse-track.module';
 
@@ -38,7 +38,8 @@ import { WarehouseTrackModule } from './+warehouse-track/warehouse-track.module'
 		HighlightModule.forRoot({ theme: 'github' }),
 		RenderComponentsModule,
 		WarehouseTableModule,
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	declarations: [WarehousesComponent],
 	entryComponents: [],

From 281f13957143ffbdccf7255eca51f15557852e9e Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 14 Jun 2019 13:13:02 +0300
Subject: [PATCH 380/382] style(ever-admin): fixed all buttons EV-1240

---
 .../src/app/@theme/styles/styles.scss         |   1 +
 .../pages/+fakeData/fakeData.component.html   |   6 +-
 .../app/pages/+fakeData/fakeData.module.ts    |   5 +-
 .../+simulation/simulation.component.html     | 142 ++++++++++++++----
 .../pages/+simulation/simulation.module.ts    |   5 +-
 .../warehouse-order.component.html            |   1 -
 .../warehouse-manage.component.html           |   9 +-
 .../warehouse-manage.module.ts                |   5 +-
 .../products-table.component.html             |  12 +-
 .../products-table/products-table.module.ts   |   5 +-
 .../warehouse-order-view.component.scss       |   2 +
 .../warehouse-orders-table.component.html     |   5 +-
 .../warehouse-orders-table.module.ts          |   5 +-
 .../warehouse-select-view.component.html      |   6 +-
 .../warehouse-select-view.module.ts           |   5 +-
 .../+warehouse/warehouse.component.html       |   7 +-
 .../+warehouse/warehouse.module.ts            |   5 +-
 17 files changed, 167 insertions(+), 59 deletions(-)

diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index f756d0cd5..bf5cb35a6 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -267,4 +267,5 @@ div.redirectBtn:hover {
 button,
 .btn {
 	font-weight: 500 !important;
+	padding: 0.625rem 1.125rem !important;
 }
diff --git a/admin/website-angular/src/app/pages/+fakeData/fakeData.component.html b/admin/website-angular/src/app/pages/+fakeData/fakeData.component.html
index 9430f917e..4577dd1ca 100644
--- a/admin/website-angular/src/app/pages/+fakeData/fakeData.component.html
+++ b/admin/website-angular/src/app/pages/+fakeData/fakeData.component.html
@@ -10,7 +10,8 @@ <h1>{{ 'FAKE_DATA.FAKE_DATA_GENERATOR' | translate }}</h1>
 			<div class="fakeData col">
 				<div class="container-btn d-flex align-items-center">
 					<button
-						class="btn btn-primary"
+						nbButton
+						status="primary"
 						[disabled]="isBtnDisabled.all"
 						(click)="callAll()"
 						[nbSpinner]="loading.all"
@@ -36,7 +37,8 @@ <h1>{{ 'FAKE_DATA.FAKE_DATA_GENERATOR' | translate }}</h1>
 			<div class="fakeData my-auto col">
 				<div class="container-btn float-right">
 					<button
-						class="btn btn-danger btn-sm"
+						nbButton
+						status="danger"
 						(click)="clearAll()"
 						[disabled]="isBtnDisabled.clearAll"
 						[nbSpinner]="loading.clearAll"
diff --git a/admin/website-angular/src/app/pages/+fakeData/fakeData.module.ts b/admin/website-angular/src/app/pages/+fakeData/fakeData.module.ts
index b353dc297..060ac9bc7 100644
--- a/admin/website-angular/src/app/pages/+fakeData/fakeData.module.ts
+++ b/admin/website-angular/src/app/pages/+fakeData/fakeData.module.ts
@@ -15,7 +15,7 @@ import { HttpClient } from '@angular/common/http';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { ToasterModule } from 'angular2-toaster';
 import FakeDataProductsCategories from '../../@core/data/fakeDataServices/productsCategories';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { NotifyService } from 'app/@core/services/notify/notify.service';
 import { InvitesService } from 'app/@core/data/invites.service';
 import { InvitesRequestsService } from 'app/@core/data/invites-requests.service';
@@ -39,7 +39,8 @@ export function HttpLoaderFactory(http: HttpClient) {
 			}
 		}),
 		RouterModule.forChild(routes),
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	declarations: [FakeDataComponent],
 	providers: [
diff --git a/admin/website-angular/src/app/pages/+simulation/simulation.component.html b/admin/website-angular/src/app/pages/+simulation/simulation.component.html
index 2b53642fd..ef48bf96a 100644
--- a/admin/website-angular/src/app/pages/+simulation/simulation.component.html
+++ b/admin/website-angular/src/app/pages/+simulation/simulation.component.html
@@ -5,54 +5,138 @@
 			<nb-card-header>
 				<div class="col-md-8">
 					<h1>{{ 'SIMULATION_VIEW.SIMULATION' | translate }}</h1>
-					<br>
-					<h4>{{ "SIMULATION_VIEW.PURCHASE_PRODUCTS" | translate }}</h4>
+					<br />
+					<h4>
+						{{ 'SIMULATION_VIEW.PURCHASE_PRODUCTS' | translate }}
+					</h4>
 				</div>
 			</nb-card-header>
 
 			<nb-card-body>
-				<div *ngIf='loadButtons' id="simulations-buttons" class="row">
-					<div *ngIf='user == null'>
-						<button class="btn btn-hero-info" *ngIf="inviteSystem && !inviteRequest && !invite" (click)="showInviteRequestModal()">{{
-							"SIMULATION_VIEW.INVITE_REQUEST" | translate }}</button>
-						<button class="btn btn-hero-success" *ngIf="inviteSystem && inviteRequest" (click)="inviteUser()">{{ "SIMULATION_VIEW.INVITE_USER"
-							| translate }}
+				<div *ngIf="loadButtons" id="simulations-buttons" class="row">
+					<div *ngIf="user == null">
+						<button
+							nbButton
+							hero
+							status="info"
+							*ngIf="inviteSystem && !inviteRequest && !invite"
+							(click)="showInviteRequestModal()"
+						>
+							{{ 'SIMULATION_VIEW.INVITE_REQUEST' | translate }}
+						</button>
+						<button
+							nbButton
+							hero
+							status="success"
+							*ngIf="inviteSystem && inviteRequest"
+							(click)="inviteUser()"
+						>
+							{{ 'SIMULATION_VIEW.INVITE_USER' | translate }}
 						</button>
 					</div>
-					<button class="btn btn-hero-info" *ngIf="((!inviteSystem && user == null) || (invite && user == null))" (click)="createUser()">
-						{{ "SIMULATION_VIEW.CREATE_USER" | translate }}
+					<button
+						nbButton
+						hero
+						status="info"
+						*ngIf="
+							(!inviteSystem && user == null) ||
+							(invite && user == null)
+						"
+						(click)="createUser()"
+					>
+						{{ 'SIMULATION_VIEW.CREATE_USER' | translate }}
+					</button>
+					<button
+						nbButton
+						status="success"
+						id="order"
+						(click)="orderCreate()"
+						[disabled]="!hasProductsForOrder"
+						[hidden]="order != null || user == null"
+						[nbSpinner]="loading"
+					>
+						{{ 'SIMULATION_VIEW.ORDER' | translate }}
 					</button>
-					<button id="order" (click)="orderCreate()" [disabled]="!hasProductsForOrder" [hidden]="order != null || user == null" class="btn btn-success"
-					 [nbSpinner]="loading">
-						{{"SIMULATION_VIEW.ORDER" | translate }}</button>
-					<div *ngIf='hasProductsForOrder' class="order-info bg-warning">
-						<span class="text-white d-block">{{"SIMULATION_VIEW.PRODUCTS" | translate }}: <h6 class="d-inline-block"> {{productsCount}}</h6></span>
-						<span class="text-white d-block">{{"SIMULATION_VIEW.STORE" | translate }}: <h6 class="d-inline-block"> {{warehouse?.name}}</h6></span>
+					<div
+						*ngIf="hasProductsForOrder"
+						class="order-info bg-warning"
+					>
+						<span class="text-white d-block"
+							>{{ 'SIMULATION_VIEW.PRODUCTS' | translate }}:
+							<h6 class="d-inline-block">
+								{{ productsCount }}
+							</h6></span
+						>
+						<span class="text-white d-block"
+							>{{ 'SIMULATION_VIEW.STORE' | translate }}:
+							<h6 class="d-inline-block">
+								{{ warehouse?.name }}
+							</h6></span
+						>
 					</div>
 
 					<div id="orders" class="btn-group" *ngIf="order != null">
-						<button id="orderConfirm" [disabled]='!order?.isCompleted' (click)="orderConfirm()" class="btn btn-success" [nbSpinner]="loading">{{
-							"SIMULATION_VIEW.ORDER_CONFIRM" | translate }}</button>
-						<button id="orderCancel" [disabled]='order?.isCompleted' (click)="orderCancel()" class="btn btn-danger" [nbSpinner]="loading">{{
-							"SIMULATION_VIEW.ORDER_CANCEL" | translate }}</button>
+						<button
+							nbButton
+							status="success"
+							id="orderConfirm"
+							[disabled]="!order?.isCompleted"
+							(click)="orderConfirm()"
+							[nbSpinner]="loading"
+						>
+							{{ 'SIMULATION_VIEW.ORDER_CONFIRM' | translate }}
+						</button>
+						<button
+							nbButton
+							status="danger"
+							id="orderCancel"
+							[disabled]="order?.isCompleted"
+							(click)="orderCancel()"
+							[nbSpinner]="loading"
+						>
+							{{ 'SIMULATION_VIEW.ORDER_CANCEL' | translate }}
+						</button>
 					</div>
 				</div>
 
-				<nb-tabset class="row" [hidden]="(order != null || user == null)" fullWidth>
-					<nb-tab tabTitle='{{"SIMULATION_VIEW.TAB_BUTTONS.PRODUCTS" | translate }}'>
-						<ea-simulation-products #productsTable></ea-simulation-products>
+				<nb-tabset
+					class="row"
+					[hidden]="order != null || user == null"
+					fullWidth
+				>
+					<nb-tab
+						tabTitle="{{
+							'SIMULATION_VIEW.TAB_BUTTONS.PRODUCTS' | translate
+						}}"
+					>
+						<ea-simulation-products
+							#productsTable
+						></ea-simulation-products>
 					</nb-tab>
-					<nb-tab tabTitle='{{"SIMULATION_VIEW.TAB_BUTTONS.ORDER_HISTORY" | translate }}'>
-						<ea-customer-orders #orderHistoryTable [userId]='user?.id'></ea-customer-orders>
+					<nb-tab
+						tabTitle="{{
+							'SIMULATION_VIEW.TAB_BUTTONS.ORDER_HISTORY'
+								| translate
+						}}"
+					>
+						<ea-customer-orders
+							#orderHistoryTable
+							[userId]="user?.id"
+						></ea-customer-orders>
 					</nb-tab>
 				</nb-tabset>
 
-				<ea-simulation-order *ngIf="order != null" [order]='order'></ea-simulation-order>
+				<ea-simulation-order
+					*ngIf="order != null"
+					[order]="order"
+				></ea-simulation-order>
 			</nb-card-body>
-
 		</nb-card>
 	</div>
 	<div class="col-md-3">
-		<ea-simulation-instructions [inviteSystem]='inviteSystem' #instructions></ea-simulation-instructions>
+		<ea-simulation-instructions
+			[inviteSystem]="inviteSystem"
+			#instructions
+		></ea-simulation-instructions>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/admin/website-angular/src/app/pages/+simulation/simulation.module.ts b/admin/website-angular/src/app/pages/+simulation/simulation.module.ts
index 140796407..76d02aa96 100644
--- a/admin/website-angular/src/app/pages/+simulation/simulation.module.ts
+++ b/admin/website-angular/src/app/pages/+simulation/simulation.module.ts
@@ -21,7 +21,7 @@ import { InviteRequestModalModule } from 'app/@shared/invite/invite-request/invi
 import { ByCodeModalModule } from 'app/@shared/invite/by-code/by-code-modal.module';
 import { SimulationOrderModule } from './order/order.module';
 import { RenderComponentsModule } from 'app/@shared/render-component/render-components.module';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 
 @NgModule({
 	imports: [
@@ -41,7 +41,8 @@ import { NbSpinnerModule } from '@nebular/theme';
 		CustomerOrdersModule,
 		SimulationOrderModule,
 		RenderComponentsModule,
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 
 	declarations: [
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-order/warehouse-order.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse-order/warehouse-order.component.html
index a97a609d5..95156db39 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-order/warehouse-order.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-order/warehouse-order.component.html
@@ -5,7 +5,6 @@
 	{{ renderValue | translate }}
 </button>
 <div class="iconsCont">
-	tessssst
 	<h4 class="text-center iconBtns">
 		<i (click)="openInfo()" class="fa fa-info-circle infoBtn"></i>
 	</h4>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html
index 54550d00c..af8c73d13 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html
@@ -1,7 +1,7 @@
 <toaster-container></toaster-container>
 
 <div [nbSpinner]="loading">
-	<nb-card *ngIf="(warehouse$ | async) as warehouse">
+	<nb-card *ngIf="warehouse$ | async as warehouse">
 		<nb-card-header>
 			<div class="d-inline-flex">
 				<svg
@@ -18,12 +18,15 @@ <h1>{{ 'WAREHOUSE_MANAGE.MANAGE_STORE' | translate }}</h1>
 			</div>
 
 			<button
+				nbButton
+				status="success"
 				type="button"
-				class="btn btn-success pull-right text-center"
+				size="large"
+				class="pull-right text-center"
 				(click)="updateWarehouse()"
 				[disabled]="!validForm"
 			>
-				<i class="ion-md-checkmark button-icon"></i>
+				<i class="ion-md-checkmark button-icon mr-2"></i>
 				<span>{{ 'WAREHOUSE_MANAGE.SAVE' | translate }}</span>
 			</button>
 		</nb-card-header>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.module.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.module.ts
index f1b36c68c..52a4ccde4 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.module.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.module.ts
@@ -7,7 +7,7 @@ import { GoogleMapModule } from '../../../../@shared/forms/google-map/google-map
 import { ThemeModule } from '../../../../@theme';
 import { WarehouseManageComponent } from './warehouse-manage.component';
 import { ToasterModule } from 'angular2-toaster';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 
 const routes: Routes = [
 	{
@@ -25,7 +25,8 @@ const routes: Routes = [
 		WarehouseFormsModule,
 		LocationFormModule,
 		GoogleMapModule,
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	declarations: [WarehouseManageComponent]
 })
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
index 2d1563fa1..da9c00034 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
@@ -1,18 +1,22 @@
 <nb-card [nbSpinner]="loading">
 	<nb-card-header>
 		<button
-			class="btn btn-sm btn-success btn-icon d-inline-block mr-2"
+			nbButton
+			status="success"
+			class="d-inline-block mr-2"
 			(click)="addProducts.emit()"
 		>
-			<i class="ion-md-add active button-icon"></i>
+			<i class="ion-md-add active button-icon mr-2"></i>
 			{{ 'WAREHOUSE_VIEW.PRODUCTS_TAB.ADD_PRODUCTS' | translate }}
 		</button>
 		<button
-			class="btn btn-sm btn-danger btn-icon d-inline-block"
+			nbButton
+			status="danger"
+			class="d-inline-block"
 			[disabled]="!productsTable.hasSelectedProducts"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon"></i>
+			<i class="ion-md-trash button-icon mr-2"></i>
 			{{ 'WAREHOUSE_VIEW.PRODUCTS_TAB.DELETE' | translate }}
 		</button>
 		<small class="pull-right">{{
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts
index 925b430d4..5c132b575 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts
@@ -5,7 +5,7 @@ import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 import { HttpClient } from '@angular/common/http';
 import { ProductsTableComponent } from './products-table.component';
 import { ToasterModule } from 'angular2-toaster';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { ConfirmationModalModule } from '../../../../@shared/confirmation-modal/confirmation-modal.module';
 import { WarehouseProductFormsModule } from 'app/@shared/warehouse-product/forms';
 
@@ -26,7 +26,8 @@ const COMPONENTS = [ProductsTableComponent];
 
 		NbSpinnerModule,
 		ConfirmationModalModule,
-		WarehouseProductFormsModule
+		WarehouseProductFormsModule,
+		NbButtonModule
 	],
 	declarations: [...COMPONENTS],
 	exports: [...COMPONENTS]
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
index fbc2ede4a..3cd05a1db 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-order-view/warehouse-order-view.component.scss
@@ -11,6 +11,8 @@ $brand-darken: darken($brand, 5%);
 
 .btn {
 	cursor: pointer;
+	font-weight: 500 !important;
+	padding: 0.625rem 1.125rem !important;
 }
 
 .btn:hover {
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.html
index 828af818c..655c2c3b6 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.html
@@ -5,10 +5,11 @@
 		<div class="row">
 			<div class="col-md-12">
 				<button
-					class="btn btn-icon btn-sm btn-success"
+					nbButton
+					status="success"
 					(click)="openWarehouseOrderCreateModal()"
 				>
-					<i class="ion-md-add button-icon"></i>
+					<i class="ion-md-add button-icon mr-2"></i>
 					{{ 'WAREHOUSE_VIEW.CREATE_ORDER' | translate }}
 				</button>
 			</div>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.module.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.module.ts
index fec307197..e747e5e0b 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.module.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { FormWizardModule } from 'angular2-wizard';
 import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { TranslateModule } from '@ngx-translate/core';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { ThemeModule } from '../../../../@theme';
 import { WarehouseOrdersTableComponent } from './warehouse-orders-table.component';
 
@@ -14,7 +14,8 @@ import { WarehouseOrdersTableComponent } from './warehouse-orders-table.componen
 		FormWizardModule,
 		Ng2SmartTableModule,
 		TranslateModule.forChild(),
-		NbSpinnerModule
+		NbSpinnerModule,
+		NbButtonModule
 	],
 	declarations: [WarehouseOrdersTableComponent],
 	exports: [WarehouseOrdersTableComponent]
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.component.html
index d05856000..51b1233fa 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.component.html
@@ -46,17 +46,19 @@ <h6 class="card-title">
 
 				<div class="btnManage">
 					<button
+						nbButton
+						status="success"
 						type="button"
-						class="btn btn-sm btn-success"
 						[routerLink]="['./manage']"
 					>
 						{{ 'WAREHOUSE_VIEW.MANAGE_STORE' | translate }}
 					</button>
 
 					<button
+						nbButton
 						title="JSON"
 						type="button"
-						class="btn btn-sm btn-dark btn-icon pull-right"
+						class="pull-right bg-dark border-dark"
 						(click)="openInfo()"
 					>
 						<svg width="15px" viewBox="0 0 24 24">
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.module.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.module.ts
index ced48e5fe..e14276235 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.module.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { FormWizardModule } from 'angular2-wizard';
 import { Ng2SmartTableModule } from 'ng2-smart-table';
 import { TranslateModule } from '@ngx-translate/core';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { ThemeModule } from '../../../../@theme';
 import { WarehouseSelectViewComponent } from './warehouse-select-view.component';
 import { RouterModule } from '@angular/router';
@@ -22,7 +22,8 @@ import { FormsModule } from '@angular/forms';
 		NbSpinnerModule,
 		JsonModalModule,
 		NgSelectModule,
-		FormsModule
+		FormsModule,
+		NbButtonModule
 	],
 	declarations: [WarehouseSelectViewComponent],
 	exports: [WarehouseSelectViewComponent]
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html
index 4a34950f8..3c524a9d0 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html
@@ -19,12 +19,15 @@
 							<div class="row">
 								<div class="col-md-12">
 									<button
-										class="btn btn-icon btn-sm btn-success"
+										nbButton
+										status="success"
 										(click)="
 											openWarehouseOrderCreateModal()
 										"
 									>
-										<i class="ion-md-add button-icon"></i>
+										<i
+											class="ion-md-add button-icon mr-2"
+										></i>
 										{{
 											'WAREHOUSE_VIEW.CREATE_ORDER'
 												| translate
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.module.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.module.ts
index 238b60560..d2c835e84 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.module.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.module.ts
@@ -13,7 +13,7 @@ import { WarehouseTableModule } from '../../../@shared/render-component/warehous
 import { WarehouseOrderModule } from './+warehouse-order/warehouse-order.module';
 import { CustomerOrdersTableModule } from '../../../@shared/render-component/customer-orders-table/customer-orders-table.module';
 import { JsonModalModule } from '../../../@shared/json-modal/json-modal.module';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { ProductsTableModule } from './products-table/products-table.module';
 import { WarehouseProductsViewModule } from './+warehouse-products-view/warehouse-products-view.module';
 import { WarehouseMainInfoViewModule } from './warehouse-main-info/warehouse-main-info.module';
@@ -58,7 +58,8 @@ const routes: Routes = [
 		WarehouseMainInfoViewModule,
 		WarehouseSelectViewModule,
 		WarehouseOrderViewModule,
-		WarehouseOrdersTableModule
+		WarehouseOrdersTableModule,
+		NbButtonModule
 	],
 	declarations: [WarehouseComponent]
 })

From 7722434ea49f836c7000491420aeffbdf4571fa1 Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 14 Jun 2019 14:41:19 +0300
Subject: [PATCH 381/382] style(ever-admin): lost style fixing EV-1240

---
 .../carrier-actions.component.html             |  6 +++---
 .../customer-order-actions.component.html      |  8 ++++----
 .../redirect-carrier.component.html            |  6 +++---
 .../redirect-product.component.html            |  4 ++--
 .../redirect-store.component.html              |  8 ++++----
 .../product-order-products.component.ts        |  4 ++--
 .../product-order-products.component.html      |  4 ++--
 .../store-order-products.component.html        |  4 ++--
 .../name-redirect/name-redirect.component.html |  4 ++--
 .../name-redirect/name-redirect.component.scss |  4 +++-
 .../product-title/product-title.component.html |  4 ++--
 .../product-title/product-title.component.scss |  7 ++++---
 .../sumulation-json.component.html             |  4 ++--
 .../warehouse-actions.component.scss           |  3 +++
 .../src/app/@theme/styles/styles.scss          |  1 -
 .../pages/+carriers/carriers.component.html    | 18 ++++++++++++------
 .../src/app/pages/+carriers/carriers.module.ts |  5 +++--
 .../ea-customer-orders.component.ts            | 12 ++++++------
 .../ea-customer-products.component.ts          |  2 +-
 .../ea-customer-products.component.ts          |  4 ++--
 .../pages/+fakeData/fakeData.component.scss    |  4 ++++
 .../warehouse-main-info.component.html         |  8 +++++---
 .../+warehouse/warehouse.component.html        |  5 ++++-
 .../+warehouse/warehouse.component.scss        |  6 ++++++
 .../+warehouse/warehouse.component.ts          |  4 ++--
 .../+warehouses/warehouses.component.html      |  2 +-
 26 files changed, 84 insertions(+), 57 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/render-component/carriers-table/carrier-actions/carrier-actions.component.html b/admin/website-angular/src/app/@shared/render-component/carriers-table/carrier-actions/carrier-actions.component.html
index 20d8cdd90..5ec9f74a9 100644
--- a/admin/website-angular/src/app/@shared/render-component/carriers-table/carrier-actions/carrier-actions.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/carriers-table/carrier-actions/carrier-actions.component.html
@@ -1,6 +1,6 @@
 <div class="iconsCont" style="display:flex;">
-	<h4 class="text-center iconBtns">
+	<h6 class="text-center iconBtns">
 		<i (click)="openInfo()" class="fa fa-info-circle infoBtn"></i>
-	</h4>
-	<h4><i (click)="openMap()" class="fa fa-search infoBtn"></i></h4>
+	</h6>
+	<h6><i (click)="openMap()" class="fa fa-search infoBtn"></i></h6>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/customer-order-actions/customer-order-actions.component.html b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/customer-order-actions/customer-order-actions.component.html
index e9e18daac..9f900786e 100644
--- a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/customer-order-actions/customer-order-actions.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/customer-order-actions/customer-order-actions.component.html
@@ -1,8 +1,8 @@
 <div class="iconsCont">
-	<h4 class="text-center iconBtns">
+	<h6 class="text-center iconBtns">
 		<i (click)="openInfo()" class="fa fa-info-circle infoBtn"></i>
-	</h4>
-	<h4 class="text-center iconBtns">
+	</h6>
+	<h6 class="text-center iconBtns">
 		<i (click)="openCancel()" class="fa fa-close cancelBtn"></i>
-	</h4>
+	</h6>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-carrier/redirect-carrier.component.html b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-carrier/redirect-carrier.component.html
index a498253af..d7b8d2a96 100644
--- a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-carrier/redirect-carrier.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-carrier/redirect-carrier.component.html
@@ -1,7 +1,7 @@
 <div (click)="redirect()" class="redirectBtn">
-	<h6 *ngIf="(carrier$ | async) as carrier">
+	<span *ngIf="carrier$ | async as carrier">
 		<img class="carrier-image" alt="" src="{{ carrier.logo }}" />
 		<div class="carrier-name">{{ carrier.firstName }}</div>
-	</h6>
-	<h6>{{ carrierStatusText | translate }}</h6>
+	</span>
+	<p>{{ carrierStatusText | translate }}</p>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-product/redirect-product.component.html b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-product/redirect-product.component.html
index a7b98ec96..3f3df4aa2 100644
--- a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-product/redirect-product.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-product/redirect-product.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="product" (click)="redirect()" class="redirectBtn productBtn">
-	<h6>
+	<p>
 		{{ productTitle }}
 		<span class="badge badge-secondary">{{ product.count }}</span>
-	</h6>
+	</p>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-store/redirect-store.component.html b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-store/redirect-store.component.html
index 6400a5df9..552bcfdad 100644
--- a/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-store/redirect-store.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/customer-orders-table/redirect-store/redirect-store.component.html
@@ -1,7 +1,7 @@
-<div *ngIf="(store$ | async) as store" (click)="redirect()" class="redirectBtn">
-	<h6>
+<div *ngIf="store$ | async as store" (click)="redirect()" class="redirectBtn">
+	<span>
 		<img class="warehouse-image" alt="" src="{{ store.logo }}" />
 		<div class="warehouse-name">{{ store.name }}</div>
-	</h6>
-	<h6>{{ warehouseStatusText | translate }}</h6>
+	</span>
+	<p>{{ warehouseStatusText | translate }}</p>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/customer-products-table/product-order-products.component.ts b/admin/website-angular/src/app/@shared/render-component/customer-products-table/product-order-products.component.ts
index e18ed23f8..733f13352 100644
--- a/admin/website-angular/src/app/@shared/render-component/customer-products-table/product-order-products.component.ts
+++ b/admin/website-angular/src/app/@shared/render-component/customer-products-table/product-order-products.component.ts
@@ -7,7 +7,7 @@ import { ProductLocalesService } from '@modules/client.common.angular2/locale/pr
 @Component({
 	template: `
 		<div class="product">
-			<h6 class="text-center">
+			<p class="text-center">
 				<span (click)="redirect()" class="button-redirect productBtn">
 					<img
 						alt=""
@@ -17,7 +17,7 @@ import { ProductLocalesService } from '@modules/client.common.angular2/locale/pr
 					/>
 					<span class="productTitle">{{ productTitle }}</span>
 				</span>
-			</h6>
+			</p>
 		</div>
 	`
 })
diff --git a/admin/website-angular/src/app/@shared/render-component/customer-products-table/product-order-products/product-order-products.component.html b/admin/website-angular/src/app/@shared/render-component/customer-products-table/product-order-products/product-order-products.component.html
index 49b44fb7c..b14d219ef 100644
--- a/admin/website-angular/src/app/@shared/render-component/customer-products-table/product-order-products/product-order-products.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/customer-products-table/product-order-products/product-order-products.component.html
@@ -1,5 +1,5 @@
 <div class="product">
-	<h6 class="text-center">
+	<p class="text-center">
 		<span (click)="redirect()" class="button-redirect productBtn">
 			<img
 				alt=""
@@ -7,5 +7,5 @@ <h6 class="text-center">
 			/>
 			<span class="productTitle">{{ productTitle }}</span>
 		</span>
-	</h6>
+	</p>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/customer-products-table/store-order-products/store-order-products.component.html b/admin/website-angular/src/app/@shared/render-component/customer-products-table/store-order-products/store-order-products.component.html
index ae3028779..0c9a50ea2 100644
--- a/admin/website-angular/src/app/@shared/render-component/customer-products-table/store-order-products/store-order-products.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/customer-products-table/store-order-products/store-order-products.component.html
@@ -1,7 +1,7 @@
 <div class="product">
-	<h6 *ngIf="(store$ | async) as store" class="text-center">
+	<p *ngIf="store$ | async as store" class="text-center">
 		<span (click)="redirect()" class="button-redirect warhouseBtn">
 			<span class="productTitle">{{ store.name }}</span>
 		</span>
-	</h6>
+	</p>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
index c2a32344a..ef4803048 100644
--- a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
@@ -1,10 +1,10 @@
 <div (click)="redirect()" class="{{ redirectPage ? 'redirectBtn' : '' }}">
-	<h6 class="warehouse-name-smt">
+	<p class="warehouse-name-smt">
 		<strong
 			>{{ rowData.name
 			}}<span *ngIf="rowData.isBanned" class="badge badge-danger"
 				>ban</span
 			></strong
 		>
-	</h6>
+	</p>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.scss b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.scss
index cffa09015..a30e0c1e2 100644
--- a/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.scss
+++ b/admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.scss
@@ -1,5 +1,5 @@
 .redirectBtn {
-	h6 {
+	p {
 		margin-bottom: 0;
 		text-align: center !important;
 	}
@@ -9,4 +9,6 @@
 .warehouse-name-smt {
 	text-align: left !important;
 	width: auto;
+	font-size: 0.9rem;
+	line-height: 1;
 }
diff --git a/admin/website-angular/src/app/@shared/render-component/product-title/product-title.component.html b/admin/website-angular/src/app/@shared/render-component/product-title/product-title.component.html
index c82d4bfbf..c0768b937 100644
--- a/admin/website-angular/src/app/@shared/render-component/product-title/product-title.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/product-title/product-title.component.html
@@ -2,7 +2,7 @@
 	(click)="$event.preventDefault(); $event.stopPropagation(); redirect()"
 	class="redirectBtn"
 >
-	<h6>
+	<p>
 		<strong>{{ rowData.title }}</strong>
-	</h6>
+	</p>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/product-title/product-title.component.scss b/admin/website-angular/src/app/@shared/render-component/product-title/product-title.component.scss
index f9ae7e7a4..28186f6ef 100644
--- a/admin/website-angular/src/app/@shared/render-component/product-title/product-title.component.scss
+++ b/admin/website-angular/src/app/@shared/render-component/product-title/product-title.component.scss
@@ -1,4 +1,5 @@
-div h6 {
-	margin-bottom: 0;
-	text-align: center;
+div p {
+	margin-bottom: 0 !important;
+	text-align: center !important;
+	width: 100%;
 }
diff --git a/admin/website-angular/src/app/@shared/render-component/simulation-table/sumulation-json.component.html b/admin/website-angular/src/app/@shared/render-component/simulation-table/sumulation-json.component.html
index 2f3cfce1b..5a525d0b2 100644
--- a/admin/website-angular/src/app/@shared/render-component/simulation-table/sumulation-json.component.html
+++ b/admin/website-angular/src/app/@shared/render-component/simulation-table/sumulation-json.component.html
@@ -1,5 +1,5 @@
 <div class="iconsCont">
-	<h4 class="text-center iconBtns">
+	<h6 class="text-center iconBtns">
 		<i (click)="openInfo()" class="fa fa-info-circle infoBtn"></i>
-	</h4>
+	</h6>
 </div>
diff --git a/admin/website-angular/src/app/@shared/render-component/warehouse-table/warehouse-actions/warehouse-actions.component.scss b/admin/website-angular/src/app/@shared/render-component/warehouse-table/warehouse-actions/warehouse-actions.component.scss
index bf9ce8f59..8ffae2c49 100644
--- a/admin/website-angular/src/app/@shared/render-component/warehouse-table/warehouse-actions/warehouse-actions.component.scss
+++ b/admin/website-angular/src/app/@shared/render-component/warehouse-table/warehouse-actions/warehouse-actions.component.scss
@@ -1,4 +1,7 @@
 .iconsCont {
 	cursor: pointer;
 	margin-top: 11px;
+	i {
+		font-size: 1.4rem;
+	}
 }
diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index bf5cb35a6..f756d0cd5 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -267,5 +267,4 @@ div.redirectBtn:hover {
 button,
 .btn {
 	font-weight: 500 !important;
-	padding: 0.625rem 1.125rem !important;
 }
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.html b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
index 0033e3687..7bbbf67ca 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
@@ -3,25 +3,31 @@
 
 	<nb-card-header>
 		<button
-			class="btn btn-icon btn-success btn-sm mr-2 d-inline-block"
+			nbButton
+			status="success"
+			class="mr-2 d-inline-block"
 			(click)="openWizardNewCarrier()"
 		>
-			<i class="ion-md-add button-icon"></i>
+			<i class="ion-md-add button-icon mr-2"></i>
 			{{ 'CARRIERS_VIEW.CREATE_BUTTON' | translate }}
 		</button>
 		<button
-			class="btn btn-icon btn-danger btn-sm mr-2 d-inline-block"
+			nbButton
+			status="danger"
+			class="mr-2 d-inline-block"
 			[disabled]="!carriersTable.hasSelectedCarriers"
 			(click)="deleteSelectedCarriers()"
 		>
-			<i class="ion-md-trash button-icon"></i>
+			<i class="ion-md-trash button-icon mr-2"></i>
 			{{ 'CARRIERS_VIEW.DELETE' | translate }}
 		</button>
 		<button
-			class="btn btn-icon btn-primary btn-sm mr-2 d-inline-block"
+			nbButton
+			status="primary"
+			class="mr-2 d-inline-block"
 			routerLink="track"
 		>
-			<i class="ion-md-map button-icon"></i>
+			<i class="ion-md-map button-icon mr-2"></i>
 			{{ 'CARRIERS_VIEW.TRACK' | translate }}
 		</button>
 	</nb-card-header>
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.module.ts b/admin/website-angular/src/app/pages/+carriers/carriers.module.ts
index b7ff4c097..b9869482c 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.module.ts
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.module.ts
@@ -7,7 +7,7 @@ import { ThemeModule } from '../../@theme';
 import { FormWizardModule } from 'angular2-wizard';
 import { CarriersRoutingModule } from './carriers-routing.module';
 import { RenderComponentsModule } from '../../@shared/render-component/render-components.module';
-import { NbSpinnerModule } from '@nebular/theme';
+import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
 import { TrackModule } from './track/track.module';
 import { CarrierLocationModule } from './+carrier/location/carrier-location.module';
 import { CarriersSmartTableModule } from 'app/@shared/carrier/carriers-table/carriers-table.module';
@@ -26,7 +26,8 @@ import { CarrierMutationModule } from 'app/@shared/carrier/carrier-mutation';
 		TrackModule,
 		CarriersSmartTableModule,
 		RenderComponentsModule,
-		CarrierMutationModule
+		CarrierMutationModule,
+		NbButtonModule
 	],
 	declarations: [CarriersComponent]
 })
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-orders/ea-customer-orders.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-orders/ea-customer-orders.component.ts
index 668515e76..d058422ef 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-orders/ea-customer-orders.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-orders/ea-customer-orders.component.ts
@@ -133,14 +133,14 @@ export class CustomerOrdersComponent implements OnDestroy, OnInit, OnChanges {
 								valuePrepareFunction: (_, order: Order) => {
 									if (order.isCancelled) {
 										return `
-									<h6 > <span class='warnCancelled'>${cancelled}</span></h6>
+									<span class='warnCancelled'>${cancelled}</span>
 									`;
 									} else {
 										return `
-									<h6 > <span class=' space'>${completed}</span>${
+									<span > <span class=' space'>${completed}</span>${
 											order.isCompleted ? '✔' : '✘'
-										}</h6>
-									<h6> <span class='space'>${paid}</span>${order.isPaid ? '✔' : '✘'}</h6>
+										}</span>
+									<span> <span class='space'>${paid}</span>${order.isPaid ? '✔' : '✘'}</span>
 									`;
 									}
 								}
@@ -158,7 +158,7 @@ export class CustomerOrdersComponent implements OnDestroy, OnInit, OnChanges {
 												'short'
 										  )
 										: `${notDelivered}`;
-									return `<h6>${formatted}</h6>`;
+									return `<p>${formatted}</p>`;
 								}
 							},
 							Created: {
@@ -171,7 +171,7 @@ export class CustomerOrdersComponent implements OnDestroy, OnInit, OnChanges {
 									const formatted: string = new DatePipe(
 										'en-EN'
 									).transform(raw, 'short');
-									return `<h6>${formatted}</h6>`;
+									return `<p>${formatted}</p>`;
 								}
 							},
 							actions: {
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products.component.ts
index 972a5da42..29a9890e1 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products.component.ts
@@ -114,7 +114,7 @@ export class CustomerProductsComponent implements OnDestroy, OnInit {
 							) => {
 								return this._sanitizer.bypassSecurityTrustHtml(
 									`<div class="product">
-											<h6>${product.warehouseProduct.price}</h6>
+											<p>${product.warehouseProduct.price}</p>
 										</div>
 									</div>`
 								);
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.component.ts b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.component.ts
index 4f6a9a067..4561eeaaa 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.component.ts
+++ b/admin/website-angular/src/app/pages/+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.component.ts
@@ -105,7 +105,7 @@ export class CustomerProductsComponent implements OnDestroy, OnInit {
 							) => {
 								return this._sanitizer.bypassSecurityTrustHtml(
 									`<div class="product">
-											<h6>${product.warehouseProduct.price}</h6>
+											<p>${product.warehouseProduct.price}</p>
 										</div>
 									</div>`
 								);
@@ -125,7 +125,7 @@ export class CustomerProductsComponent implements OnDestroy, OnInit {
 							) => {
 								return this._sanitizer.bypassSecurityTrustHtml(
 									`<div class="product">
-											<h6>${product.warehouseProduct.count}</h6>
+											<p>${product.warehouseProduct.count}</p>
 										</div>
 									</div>`
 								);
diff --git a/admin/website-angular/src/app/pages/+fakeData/fakeData.component.scss b/admin/website-angular/src/app/pages/+fakeData/fakeData.component.scss
index b65dce00f..8556940b5 100644
--- a/admin/website-angular/src/app/pages/+fakeData/fakeData.component.scss
+++ b/admin/website-angular/src/app/pages/+fakeData/fakeData.component.scss
@@ -18,3 +18,7 @@
 input[type='checkbox'] {
 	zoom: 1.3;
 }
+
+.btn {
+	padding: 0.625rem 1.125rem !important;
+}
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-main-info/warehouse-main-info.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-main-info/warehouse-main-info.component.html
index c59199c71..425f8487c 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-main-info/warehouse-main-info.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-main-info/warehouse-main-info.component.html
@@ -12,11 +12,11 @@ <h2 class="col-md-8">{{ selectedWarehouse?.name }}</h2>
 				</div>
 
 				<div class="col-md-9 content-center">
-					<h6>
+					<span>
 						{{
 							'WAREHOUSE_VIEW.PRODUCTS_MANUFACTURING' | translate
 						}}
-					</h6>
+					</span>
 				</div>
 			</div>
 			<div class="row store-info" [hidden]="!isCarrierRequired">
@@ -25,7 +25,9 @@ <h6>
 				</div>
 
 				<div class="col-md-9 content-center">
-					<h6>{{ 'WAREHOUSE_VIEW.CARRIER_REQUIRED' | translate }}</h6>
+					<span>{{
+						'WAREHOUSE_VIEW.CARRIER_REQUIRED' | translate
+					}}</span>
 				</div>
 			</div>
 		</div>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html
index 3c524a9d0..29e4ee140 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html
@@ -37,7 +37,10 @@
 							</div>
 						</nb-card-header>
 
-						<nb-card-body style="overflow: hidden;">
+						<nb-card-body
+							class="process-orders"
+							style="overflow: hidden;"
+						>
 							<div
 								ngbRadioGroup
 								[(ngModel)]="filterMode"
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
index 1da385bf9..139b2db80 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.scss
@@ -272,3 +272,9 @@ nb-card-header {
 .orders-filters {
 	padding: 0 1.25rem;
 }
+
+.process-orders {
+	label:hover {
+		color: #000;
+	}
+}
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
index 6084e2c37..515784e84 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
@@ -357,10 +357,10 @@ export class WarehouseComponent implements OnDestroy, AfterViewInit, OnChanges {
 								<img width="32" height="32" src="${this.localeTranslate(
 									order.products[0].product.images
 								)}" />
-								<h6 class="d-inline-block">
+								<p class="d-inline-block">
 									${this.localeTranslate(order.products[0].product.title)}
 									<span class="badge badge-pill badge-secondary">${order.products[0].count}</span>
-								</h6>
+								</p>
 							</div>
 						`
 								: '',
diff --git a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
index 26e19d63e..9617be0df 100644
--- a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
@@ -31,7 +31,7 @@
 			class="mr-2 d-inline-block"
 			routerLink="track"
 		>
-			<i class="ion-md-trash button-icon"></i>
+			<i class="ion-md-map button-icon"></i>
 			<small _ngcontent-c55="">Show on Map</small>
 		</button>
 	</nb-card-header>

From ca2377ead38d0188c9ec6f2ce2a29cd921193b8b Mon Sep 17 00:00:00 2001
From: alish <alish931@abv.bg>
Date: Fri, 14 Jun 2019 16:08:18 +0300
Subject: [PATCH 382/382] fix(ever-admin): a lot of fixings EV-1240

---
 .../location/location-form.component.html     |  6 ++--
 .../location/location-form.component.scss     |  7 +++++
 .../layout-direction-switcher.component.html  | 26 +++++++++-------
 .../theme-settings.component.html             |  1 -
 .../theme-settings.component.ts               | 30 +++++++++----------
 .../src/app/@theme/styles/styles.scss         |  2 +-
 .../src/app/@theme/styles/themes.scss         |  2 +-
 .../src/app/@theme/theme.module.ts            |  6 ++--
 .../+carrier-edit/carrier-edit.component.html |  2 +-
 .../carrier-orders-status.component.html      |  4 +--
 .../+carriers/+carrier/carrier.component.html |  8 ++---
 .../pages/+carriers/carriers.component.html   |  6 ++--
 .../carrier-tracking.component.html           | 16 +++++-----
 .../customer-edit.component.html              |  2 +-
 .../+customer/customer.component.html         |  8 ++---
 .../invites-requests.component.html           |  4 +--
 .../+invites/invites.component.html           |  2 +-
 .../pages/+customers/customers.component.html |  6 ++--
 .../dashboard-select-store.component.html     | 10 +++----
 .../app/pages/+device/device.component.html   |  2 +-
 .../order-products.component.html             |  6 ++--
 .../+categories/categories.component.html     |  4 +--
 .../product-edit/product-edit.component.html  |  2 +-
 .../pages/+products/products.component.html   |  4 +--
 .../edit/account/account.component.html       |  2 +-
 .../edit/basic-info/basic-info.component.html |  2 +-
 .../warehouse-track.component.html            | 16 +++++-----
 .../warehouse-manage.component.html           |  2 +-
 .../products-table.component.html             |  4 +--
 .../warehouse-orders-table.component.html     |  2 +-
 .../warehouse-select-view.component.html      | 12 ++++----
 .../+warehouse/warehouse.component.html       |  2 +-
 .../+warehouses/warehouses.component.html     |  6 ++--
 shared/core-angular/scss/everbie.common.scss  |  2 +-
 34 files changed, 116 insertions(+), 100 deletions(-)

diff --git a/admin/website-angular/src/app/@shared/forms/location/location-form.component.html b/admin/website-angular/src/app/@shared/forms/location/location-form.component.html
index b9a027af3..8336857b9 100644
--- a/admin/website-angular/src/app/@shared/forms/location/location-form.component.html
+++ b/admin/website-angular/src/app/@shared/forms/location/location-form.component.html
@@ -4,8 +4,10 @@
 			<label class="col-sm-2 control-label"> </label>
 
 			<div class="col-sm-9 input-group">
-				<div class="input-group-addon search-addon-wrapper">
-					<i class="fa fa-search"></i>
+				<div class="input-group-prepend p-0">
+					<span class="input-group-text" id="basic-addon1"
+						><i class="fa fa-search"></i
+					></span>
 				</div>
 				<input
 					#autocomplete
diff --git a/admin/website-angular/src/app/@shared/forms/location/location-form.component.scss b/admin/website-angular/src/app/@shared/forms/location/location-form.component.scss
index 543a15c19..f04c74b9b 100644
--- a/admin/website-angular/src/app/@shared/forms/location/location-form.component.scss
+++ b/admin/website-angular/src/app/@shared/forms/location/location-form.component.scss
@@ -13,6 +13,13 @@
 	}
 }
 
+.input-group-prepend {
+	.input-group-text {
+		background-color: #f7f9fc !important;
+		border-color: #edf1f7 !important;
+	}
+}
+
 ul {
 	padding-left: 0 !important !important;
 }
diff --git a/admin/website-angular/src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.html b/admin/website-angular/src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.html
index eaf8a2307..f4292093a 100644
--- a/admin/website-angular/src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.html
+++ b/admin/website-angular/src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.html
@@ -1,10 +1,16 @@
-<ngx-switcher
-	[firstValue]="directions.RTL"
-	[secondValue]="directions.LTR"
-	[firstValueLabel]="'RTL'"
-	[secondValueLabel]="'LTR'"
-	[value]="currentDirection"
-	(valueChange)="toggleDirection($event)"
-	[vertical]="vertical"
->
-</ngx-switcher>
+<fieldset>
+	<p>Directions:</p>
+
+	<nb-radio-group
+		(valueChange)="toggleDirection($event)"
+		[(value)]="currentDirection"
+		name="size"
+	>
+		<nb-radio name="size" [value]="directions.LTR"
+			><small>LTR </small></nb-radio
+		>
+		<nb-radio name="size" [value]="directions.RTL">
+			<small>RTL</small>
+		</nb-radio>
+	</nb-radio-group>
+</fieldset>
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
index 9a2f39373..1a1869782 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.html
@@ -31,7 +31,6 @@ <h6>THEMES</h6>
 		(change)="toggleTheme()"
 		status="primary"
 		class="form-control"
-		disabled
 	>
 		<option *ngFor="let theme of themes" [value]="theme.value">
 			{{ theme.name }}</option
diff --git a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
index 4ff79f6ff..ac333d751 100644
--- a/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
+++ b/admin/website-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
@@ -15,29 +15,29 @@ export class ThemeSettingsComponent {
 	languages = { en: 'English', bg: 'Bulgarian', he: 'Hebrew', ru: 'Russian' };
 
 	themes = [
-		{
-			value: 'default',
-			name: 'White'
-		},
-		{
-			value: 'everdark',
-			name: 'Dark'
-		},
 		{
 			value: 'everlight',
 			name: 'Light'
 		},
 		{
-			value: 'cosmic',
-			name: 'Cosmic'
-		},
-		{
-			value: 'corporate',
-			name: 'Corporate'
+			value: 'everdark',
+			name: 'Dark'
 		}
+		// {
+		// 	value: 'default',
+		// 	name: 'White'
+		// },
+		// {
+		// 	value: 'cosmic',
+		// 	name: 'Cosmic'
+		// },
+		// {
+		// 	value: 'corporate',
+		// 	name: 'Corporate'
+		// }
 	];
 
-	currentTheme = 'default';
+	currentTheme = 'everlight';
 
 	constructor(
 		protected stateService: StateService,
diff --git a/admin/website-angular/src/app/@theme/styles/styles.scss b/admin/website-angular/src/app/@theme/styles/styles.scss
index f756d0cd5..6f502d96a 100644
--- a/admin/website-angular/src/app/@theme/styles/styles.scss
+++ b/admin/website-angular/src/app/@theme/styles/styles.scss
@@ -117,7 +117,7 @@ nb-card.no-margin {
 	align-items: center !important;
 }
 
-.button-icon {
+.button-icon mr-1 {
 	margin-right: 3px;
 }
 
diff --git a/admin/website-angular/src/app/@theme/styles/themes.scss b/admin/website-angular/src/app/@theme/styles/themes.scss
index 8148a3ae8..e1e09bc78 100644
--- a/admin/website-angular/src/app/@theme/styles/themes.scss
+++ b/admin/website-angular/src/app/@theme/styles/themes.scss
@@ -4,7 +4,7 @@
 @import '~@nebular/theme/styles/themes';
 
 // which themes you what to enable (empty to enable all)
-$nb-enabled-themes: (default /*, cosmic, corporate, everlight, everdark*/);
+$nb-enabled-themes: (default, cosmic, corporate, everlight, everdark);
 
 $nb-themes: nb-register-theme(
 	(
diff --git a/admin/website-angular/src/app/@theme/theme.module.ts b/admin/website-angular/src/app/@theme/theme.module.ts
index d9cb7dec4..79d7ea6cc 100644
--- a/admin/website-angular/src/app/@theme/theme.module.ts
+++ b/admin/website-angular/src/app/@theme/theme.module.ts
@@ -19,7 +19,8 @@ import {
 	NbContextMenuModule,
 	NbProgressBarModule,
 	NbIconModule,
-	NbSelectModule
+	NbSelectModule,
+	NbRadioModule
 } from '@nebular/theme';
 
 import { NbEvaIconsModule } from '@nebular/eva-icons';
@@ -80,7 +81,8 @@ const NB_MODULES = [
 	NbProgressBarModule,
 	NbIconModule,
 	NbEvaIconsModule,
-	NbSelectModule
+	NbSelectModule,
+	NbRadioModule
 ];
 
 const COMPONENTS = [
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html
index 5249c78b1..91e03c4e3 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/+carrier-edit/carrier-edit.component.html
@@ -26,7 +26,7 @@ <h1>{{ 'CARRIERS_VIEW.EDIT.EDIT_CARRIER' | translate }}</h1>
 				(click)="updateCarrier()"
 				[disabled]="!isCarrierValid"
 			>
-				<i class="ion-md-checkmark mr-2"></i>
+				<i class="ion-md-checkmark mr-1"></i>
 				{{ 'CARRIERS_VIEW.CARRIER_PAGE.SAVE' | translate }}
 			</button>
 		</nb-card-header>
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.html b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.html
index f23372f31..0d5220167 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier-orders-status/carrier-orders-status.component.html
@@ -47,7 +47,7 @@
 						[nbSpinner]="loading"
 					>
 						<span
-							class="ion-md-filing mr-2"
+							class="ion-md-filing mr-1"
 							aria-hidden="true"
 						></span>
 						{{
@@ -66,7 +66,7 @@
 						[nbSpinner]="loading"
 					>
 						<span
-							class="ion-md-alert mr-2"
+							class="ion-md-alert mr-1"
 							aria-hidden="true"
 						></span>
 						{{ 'CARRIERS_VIEW.CARRIER_PAGE.CANCEL' | translate }}
diff --git a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html
index c91da269f..5183f1468 100644
--- a/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/+carrier/carrier.component.html
@@ -31,7 +31,7 @@ <h4>{{ 'Manage carrier and deliveries' | translate }}</h4>
 					class="btn-with-icon no-text-transform"
 					[routerLink]="['./edit']"
 				>
-					<i class="ion-md-create mr-2"></i>
+					<i class="ion-md-create mr-1"></i>
 					<span>{{
 						'CARRIERS_VIEW.CARRIER_PAGE.EDIT' | translate
 					}}</span>
@@ -79,7 +79,7 @@ <h4>{{ 'Manage carrier and deliveries' | translate }}</h4>
 					*ngIf="selectedCarrier"
 					(change)="carrierSelect($event)"
 					[items]="carriers"
-					[(ngModel)]="selectedCarrier.id"
+					[ngModel]="selectedCarrier.id"
 					[clearable]="false"
 					placeholder="{{
 						'CARRIERS_VIEW.CARRIER_PAGE.SELECT_CARRIER' | translate
@@ -104,7 +104,7 @@ <h4>{{ 'Manage carrier and deliveries' | translate }}</h4>
 						let-item="item"
 						let-index="index"
 					>
-						<h6 class="card-title">
+						<p class="card-title">
 							<img
 								*ngIf="item.logo"
 								height="40"
@@ -115,7 +115,7 @@ <h6 class="card-title">
 							{{ item.firstName }}
 							{{ item.firstName && item.lastName }}
 							{{ item.firstName ? '' : '# ' + item.id }}
-						</h6>
+						</p>
 					</ng-template>
 				</ng-select>
 			</nb-card-body>
diff --git a/admin/website-angular/src/app/pages/+carriers/carriers.component.html b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
index 7bbbf67ca..f56966bee 100644
--- a/admin/website-angular/src/app/pages/+carriers/carriers.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/carriers.component.html
@@ -8,7 +8,7 @@
 			class="mr-2 d-inline-block"
 			(click)="openWizardNewCarrier()"
 		>
-			<i class="ion-md-add button-icon mr-2"></i>
+			<i class="ion-md-add button-icon mr-1"></i>
 			{{ 'CARRIERS_VIEW.CREATE_BUTTON' | translate }}
 		</button>
 		<button
@@ -18,7 +18,7 @@
 			[disabled]="!carriersTable.hasSelectedCarriers"
 			(click)="deleteSelectedCarriers()"
 		>
-			<i class="ion-md-trash button-icon mr-2"></i>
+			<i class="ion-md-trash button-icon mr-1"></i>
 			{{ 'CARRIERS_VIEW.DELETE' | translate }}
 		</button>
 		<button
@@ -27,7 +27,7 @@
 			class="mr-2 d-inline-block"
 			routerLink="track"
 		>
-			<i class="ion-md-map button-icon mr-2"></i>
+			<i class="ion-md-map button-icon mr-1"></i>
 			{{ 'CARRIERS_VIEW.TRACK' | translate }}
 		</button>
 	</nb-card-header>
diff --git a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
index 439a54978..3bf1f0bc8 100644
--- a/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
+++ b/admin/website-angular/src/app/pages/+carriers/track/carrier-tracking/carrier-tracking.component.html
@@ -52,7 +52,7 @@
 									let-item="item"
 									let-index="index"
 								>
-									<h6 class="card-title">
+									<p class="card-title">
 										<img
 											*ngIf="item.logo"
 											height="40"
@@ -61,7 +61,7 @@ <h6 class="card-title">
 											[src]="item.logo"
 										/>
 										{{ item.name }}
-									</h6>
+									</p>
 								</ng-template>
 							</ng-select>
 							<ng-select
@@ -91,7 +91,7 @@ <h6 class="card-title">
 									let-item="item"
 									let-index="index"
 								>
-									<h6 class="card-title">
+									<p class="card-title">
 										<img
 											*ngIf="item.logo"
 											height="40"
@@ -100,16 +100,16 @@ <h6 class="card-title">
 											[src]="item.logo"
 										/>
 										{{ item.fullName }}
-									</h6>
+									</p>
 								</ng-template>
 							</ng-select>
 						</div>
 						<nb-card-footer>
 							<div class="details">
 								<div class="warehouse" *ngIf="selectedStore">
-									<h5>
+									<h6>
 										<b>{{ selectedStore.name }}</b>
-									</h5>
+									</h6>
 									<ul>
 										<li>
 											{{
@@ -138,9 +138,9 @@ <h5>
 									</ul>
 								</div>
 								<div class="carrier" *ngIf="selectedCarrier">
-									<h5>
+									<h6>
 										<b>{{ selectedCarrier.fullName }}</b>
-									</h5>
+									</h6>
 									<ul>
 										<li>
 											{{
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.html b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.html
index fa76d8e22..8578cdf53 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+customer/+customer-edit/customer-edit.component.html
@@ -25,7 +25,7 @@ <h1>{{ 'CUSTOMERS_VIEW.EDIT.EDIT_CUSTOMER' | translate }}</h1>
 				(click)="updateCustomer()"
 				[disabled]="!form.valid"
 			>
-				<i class="ion-md-checkmark button-icon mr-2"></i>
+				<i class="ion-md-checkmark button-icon mr-1"></i>
 				<span>{{ 'PRODUCTS_VIEW.EDIT_VIEW.SAVE' | translate }}</span>
 			</button>
 		</nb-card-header>
diff --git a/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html b/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html
index efbdfcf2d..32c1fe5ce 100644
--- a/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+customer/customer.component.html
@@ -35,7 +35,7 @@ <h4>
 						status="primary"
 						[routerLink]="['./edit']"
 					>
-						<i class="ion-md-create button-icon mr-2"></i>
+						<i class="ion-md-create button-icon mr-1"></i>
 						<small>{{
 							'CUSTOMERS_VIEW.CUSTOMER_VIEW.EDIT' | translate
 						}}</small>
@@ -83,7 +83,7 @@ <h4>
 					*ngIf="selectedUser"
 					(change)="customerSelect($event)"
 					[items]="users"
-					[(ngModel)]="selectedUser.id"
+					[ngModel]="selectedUser.id"
 					[clearable]="false"
 					placeholder="Select customer"
 					bindLabel="id"
@@ -106,7 +106,7 @@ <h4>
 						let-item="item"
 						let-index="index"
 					>
-						<h6 class="card-title">
+						<p class="card-title">
 							<img
 								*ngIf="item.image"
 								height="40"
@@ -117,7 +117,7 @@ <h6 class="card-title">
 							{{ item.firstName }}
 							{{ item.firstName && item.lastName }}
 							{{ item.firstName ? '' : '# ' + item.id }}
-						</h6>
+						</p>
 					</ng-template>
 				</ng-select>
 			</nb-card-body>
diff --git a/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.html b/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.html
index 707b2443e..401315e51 100644
--- a/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.html
@@ -7,7 +7,7 @@
 			[disabled]="!hasSelectedInvitesRequests"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon mr-2"></i>
+			<i class="ion-md-trash button-icon mr-1"></i>
 			<small>{{
 				'CUSTOMERS_VIEW.INVITES_VIEW.DELETE' | translate
 			}}</small>
@@ -19,7 +19,7 @@
 			[disabled]="!hasSelectedInvitesRequestsForInvite"
 			(click)="inviteSelectedRows()"
 		>
-			<i class="fa fa-envelope-open-o button-icon"></i>
+			<i class="fa fa-envelope-open-o button-icon mr-1"></i>
 			<small>{{
 				'CUSTOMERS_VIEW.INVITES_VIEW.INVITE' | translate
 			}}</small>
diff --git a/admin/website-angular/src/app/pages/+customers/+invites/invites.component.html b/admin/website-angular/src/app/pages/+customers/+invites/invites.component.html
index 29129f5ac..4ba7daa1c 100644
--- a/admin/website-angular/src/app/pages/+customers/+invites/invites.component.html
+++ b/admin/website-angular/src/app/pages/+customers/+invites/invites.component.html
@@ -14,7 +14,7 @@
 						[disabled]="!hasSelectedInvites"
 						(click)="deleteSelectedRows()"
 					>
-						<i class="ion-md-trash button-icon mr-2"></i>
+						<i class="ion-md-trash button-icon mr-1"></i>
 						<small>{{
 							'CUSTOMERS_VIEW.INVITES_VIEW.DELETE' | translate
 						}}</small>
diff --git a/admin/website-angular/src/app/pages/+customers/customers.component.html b/admin/website-angular/src/app/pages/+customers/customers.component.html
index 343e315e5..be2b76bb6 100644
--- a/admin/website-angular/src/app/pages/+customers/customers.component.html
+++ b/admin/website-angular/src/app/pages/+customers/customers.component.html
@@ -8,7 +8,7 @@
 			class="mr-2 d-inline-block"
 			(click)="showCreateUserModal()"
 		>
-			<i class="ion-md-add button-icon mr-2"></i>
+			<i class="ion-md-add button-icon mr-1"></i>
 
 			<small _ngcontent-c55="">{{
 				'CUSTOMERS_VIEW.CREATE' | translate
@@ -22,7 +22,7 @@
 			[disabled]="!hasSelectedCustomers"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon mr-2"></i>
+			<i class="ion-md-trash button-icon mr-1"></i>
 
 			<small _ngcontent-c55="">{{
 				'CUSTOMERS_VIEW.DELETE' | translate
@@ -47,7 +47,7 @@
 			[nbSpinner]="showBanLoading"
 			(click)="banSelectedRows()"
 		>
-			<i class="ion-md-close-circle button-icon mr-2"></i>
+			<i class="ion-md-close-circle button-icon mr-1"></i>
 
 			<small _ngcontent-c55="" *ngIf="isUserBanned">{{
 				'CUSTOMERS_VIEW.UNBAN' | translate
diff --git a/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.html b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.html
index 49218a63a..38fd71fdb 100644
--- a/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.html
+++ b/admin/website-angular/src/app/pages/+dashboard/dashboard-select-store/dashboard-select-store.component.html
@@ -1,6 +1,6 @@
 <nb-card id="dashboard-select-stores" size="medium" class="h-auto">
 	<nb-card-header>
-		<h5>{{ 'DASHBOARD_VIEW.SELECT_COMPONENT.STORES' | translate }}</h5>
+		<h6>{{ 'DASHBOARD_VIEW.SELECT_COMPONENT.STORES' | translate }}</h6>
 	</nb-card-header>
 
 	<nb-card-body>
@@ -24,7 +24,7 @@ <h5>{{ 'DASHBOARD_VIEW.SELECT_COMPONENT.STORES' | translate }}</h5>
 				<b>{{ item.name }}</b>
 			</ng-template>
 			<ng-template ng-option-tmp let-item="item" let-index="index">
-				<h6 class="card-title">
+				<p class="card-title">
 					<img
 						*ngIf="item.logo"
 						height="40"
@@ -34,18 +34,18 @@ <h6 class="card-title">
 					/>
 
 					{{ item.name }}
-				</h6>
+				</p>
 			</ng-template>
 		</ng-select>
 
 		<div *ngIf="selectedStore">
 			<div class="mt-4">
-				<h5>
+				<h6>
 					{{
 						'DASHBOARD_VIEW.SELECT_COMPONENT.CONTACT_DETAILS'
 							| translate
 					}}
-				</h5>
+				</h6>
 				<ul>
 					<li>
 						{{
diff --git a/admin/website-angular/src/app/pages/+device/device.component.html b/admin/website-angular/src/app/pages/+device/device.component.html
index b5271581a..d442a09fd 100644
--- a/admin/website-angular/src/app/pages/+device/device.component.html
+++ b/admin/website-angular/src/app/pages/+device/device.component.html
@@ -15,7 +15,7 @@ <h1>{{ 'CUSTOMERS_VIEW.DEVICE.CUSTOMERS_DEVICES' | translate }}</h1>
 					[disabled]="!hasSelectedDevices"
 					(click)="deleteSelectedDevices()"
 				>
-					<i class="ion-md-trash button-icon mr-2"></i>
+					<i class="ion-md-trash button-icon mr-1"></i>
 					<small _ngcontent-c55="">{{
 						'CUSTOMERS_VIEW.DEVICE.DELETE' | translate
 					}}</small>
diff --git a/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.html b/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.html
index 5b216154d..77e92c458 100644
--- a/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.html
+++ b/admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.html
@@ -26,7 +26,7 @@ <h4>
 						class="d-inline-block"
 						(click)="addProducts()"
 					>
-						<i class="ion-md-add button-icon mr-2"></i
+						<i class="ion-md-add button-icon mr-1"></i
 						>{{
 							'ORDER_VIEW.ORDER_PRODUCT_INFO.ADD_PRODUCTS'
 								| translate
@@ -40,7 +40,7 @@ <h4>
 						(click)="removeSelectedProducts()"
 						[nbSpinner]="loading"
 					>
-						<i class="ion-md-trash button-icon mr-2"></i>
+						<i class="ion-md-trash button-icon mr-1"></i>
 						{{
 							'ORDER_VIEW.ORDER_PRODUCT_INFO.REMOVE_PRODUCTS'
 								| translate
@@ -55,7 +55,7 @@ <h4>
 						(click)="cancelOrder()"
 						[nbSpinner]="loading"
 					>
-						<i class="ion-md-close button-icon mr-2"></i>
+						<i class="ion-md-close button-icon mr-1"></i>
 						{{
 							'ORDER_VIEW.ORDER_PRODUCT_INFO.CANCEL_ORDER'
 								| translate
diff --git a/admin/website-angular/src/app/pages/+products/+categories/categories.component.html b/admin/website-angular/src/app/pages/+products/+categories/categories.component.html
index 240840f4f..56d8fe6b0 100644
--- a/admin/website-angular/src/app/pages/+products/+categories/categories.component.html
+++ b/admin/website-angular/src/app/pages/+products/+categories/categories.component.html
@@ -10,7 +10,7 @@
 			tabindex="0"
 			(click)="openWizardNewCategory()"
 		>
-			<i class="ion-md-add button-icon mr-2"></i>
+			<i class="ion-md-add button-icon mr-1"></i>
 			<small>{{ 'CATEGORY_VIEW.CREATE_BUTTON' | translate }}</small>
 		</button>
 		<button
@@ -22,7 +22,7 @@
 			[disabled]="!hasSelectedCategories"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon mr-2"></i>
+			<i class="ion-md-trash button-icon mr-1"></i>
 			<span _ngcontent-c24="">{{
 				'CATEGORY_VIEW.DELETE' | translate
 			}}</span>
diff --git a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.html b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.html
index ffdc780c5..caca4dabc 100644
--- a/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.html
+++ b/admin/website-angular/src/app/pages/+products/+product/product-edit/product-edit.component.html
@@ -23,7 +23,7 @@ <h1>{{ 'PRODUCTS_VIEW.EDIT_VIEW.EDIT_PRODUCT' | translate }}</h1>
 			(click)="updateProduct()"
 			[disabled]="!isProductValid"
 		>
-			<i class="ion-md-checkmark button-icon mr-2"></i>
+			<i class="ion-md-checkmark button-icon mr-1"></i>
 			<span>{{ 'PRODUCTS_VIEW.EDIT_VIEW.SAVE' | translate }}</span>
 		</button>
 	</nb-card-header>
diff --git a/admin/website-angular/src/app/pages/+products/products.component.html b/admin/website-angular/src/app/pages/+products/products.component.html
index dc6786712..29aa643d6 100644
--- a/admin/website-angular/src/app/pages/+products/products.component.html
+++ b/admin/website-angular/src/app/pages/+products/products.component.html
@@ -8,7 +8,7 @@
 			class="mr-2 d-inline-block"
 			(click)="openWizardNewProduct()"
 		>
-			<i class="ion-md-add button-icon mr-2"></i>
+			<i class="ion-md-add button-icon mr-1"></i>
 			<small _ngcontent-c55="">{{
 				'PRODUCTS_VIEW.CREATE' | translate
 			}}</small>
@@ -20,7 +20,7 @@
 			[disabled]="!hasSelectedProducts"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon mr-2"></i>
+			<i class="ion-md-trash button-icon mr-1"></i>
 			<small _ngcontent-c55="">{{
 				'PRODUCTS_VIEW.DELETE' | translate
 			}}</small>
diff --git a/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html b/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html
index 4d8183eb1..d7bc7dabd 100644
--- a/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html
+++ b/admin/website-angular/src/app/pages/+profile/edit/account/account.component.html
@@ -92,7 +92,7 @@
 				type="button"
 				(click)="saveChanges()"
 			>
-				<i class="ion-md-checkmark mr-2"></i>
+				<i class="ion-md-checkmark mr-1"></i>
 				<span> {{ 'PROFILE_VIEW.SAVE' | translate }} </span>
 			</button>
 		</form>
diff --git a/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html b/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
index 25a2ed166..921444b95 100644
--- a/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
+++ b/admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
@@ -166,7 +166,7 @@
 				[disabled]="!basicInfoForm.valid || !basicInfoForm.dirty"
 				(click)="saveChanges()"
 			>
-				<i class="ion-md-checkmark mr-2"></i>
+				<i class="ion-md-checkmark mr-1"></i>
 				<span> {{ 'PROFILE_VIEW.SAVE' | translate }} </span>
 			</button>
 		</form>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
index 860a67b93..e73defdbf 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html
@@ -53,7 +53,7 @@
 									let-item="item"
 									let-index="index"
 								>
-									<h6 class="card-title">
+									<p class="card-title">
 										<img
 											*ngIf="item.logo"
 											height="40"
@@ -62,7 +62,7 @@ <h6 class="card-title">
 											[src]="item.logo"
 										/>
 										{{ item }}
-									</h6>
+									</p>
 								</ng-template>
 							</ng-select>
 							<ng-select
@@ -79,7 +79,7 @@ <h6 class="card-title">
 									let-item="item"
 									let-index="index"
 								>
-									<h6 class="card-title">
+									<p class="card-title">
 										<img
 											*ngIf="item.logo"
 											height="40"
@@ -88,16 +88,16 @@ <h6 class="card-title">
 											[src]="item.logo"
 										/>
 										{{ item }}
-									</h6>
+									</p>
 								</ng-template>
 							</ng-select>
 						</div>
 						<nb-card-footer>
 							<div class="details">
 								<div class="warehouse" *ngIf="selectedStore">
-									<h5>
+									<h6>
 										<b>{{ selectedStore.name }}</b>
-									</h5>
+									</h6>
 									<ul>
 										<li>
 											Phone:
@@ -117,9 +117,9 @@ <h5>
 									</ul>
 								</div>
 								<div class="carrier" *ngIf="selectedCarrier">
-									<h5>
+									<h6>
 										<b>{{ selectedCarrier.fullName }}</b>
-									</h5>
+									</h6>
 									<ul>
 										<li>
 											Delivery Count:
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html
index af8c73d13..07e0de784 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/+warehouse-manage/warehouse-manage.component.html
@@ -26,7 +26,7 @@ <h1>{{ 'WAREHOUSE_MANAGE.MANAGE_STORE' | translate }}</h1>
 				(click)="updateWarehouse()"
 				[disabled]="!validForm"
 			>
-				<i class="ion-md-checkmark button-icon mr-2"></i>
+				<i class="ion-md-checkmark button-icon mr-1"></i>
 				<span>{{ 'WAREHOUSE_MANAGE.SAVE' | translate }}</span>
 			</button>
 		</nb-card-header>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
index da9c00034..863ac0cc6 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
@@ -6,7 +6,7 @@
 			class="d-inline-block mr-2"
 			(click)="addProducts.emit()"
 		>
-			<i class="ion-md-add active button-icon mr-2"></i>
+			<i class="ion-md-add active button-icon mr-1"></i>
 			{{ 'WAREHOUSE_VIEW.PRODUCTS_TAB.ADD_PRODUCTS' | translate }}
 		</button>
 		<button
@@ -16,7 +16,7 @@
 			[disabled]="!productsTable.hasSelectedProducts"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon mr-2"></i>
+			<i class="ion-md-trash button-icon mr-1"></i>
 			{{ 'WAREHOUSE_VIEW.PRODUCTS_TAB.DELETE' | translate }}
 		</button>
 		<small class="pull-right">{{
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.html
index 655c2c3b6..4514d3405 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.html
@@ -9,7 +9,7 @@
 					status="success"
 					(click)="openWarehouseOrderCreateModal()"
 				>
-					<i class="ion-md-add button-icon mr-2"></i>
+					<i class="ion-md-add button-icon mr-1"></i>
 					{{ 'WAREHOUSE_VIEW.CREATE_ORDER' | translate }}
 				</button>
 			</div>
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.component.html
index 51b1233fa..08a95b9fe 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.component.html
@@ -10,7 +10,7 @@
 					*ngIf="selectedWarehouse"
 					(change)="selectWarehouse($event)"
 					[items]="warehouses"
-					[(ngModel)]="selectedWarehouse.id"
+					[ngModel]="selectedWarehouse.id"
 					[clearable]="false"
 					placeholder="Select store"
 					bindLabel="id"
@@ -31,7 +31,7 @@
 						let-item="item"
 						let-index="index"
 					>
-						<h6 class="card-title">
+						<p class="card-title">
 							<img
 								*ngIf="item.logo"
 								height="40"
@@ -40,7 +40,7 @@ <h6 class="card-title">
 								[src]="item.logo"
 							/>
 							{{ item.name }}
-						</h6>
+						</p>
 					</ng-template>
 				</ng-select>
 
@@ -78,7 +78,7 @@ <h6 class="card-title">
 					selectedWarehouse?.contactPhone && warehouse?.contactEmail
 				"
 			>
-				<h5>{{ 'WAREHOUSE_VIEW.CONTACT_DETAILS' | translate }}</h5>
+				<h6>{{ 'WAREHOUSE_VIEW.CONTACT_DETAILS' | translate }}</h6>
 				<ul>
 					<li>
 						{{ 'WAREHOUSE_VIEW.PHONE' | translate }}:
@@ -109,9 +109,9 @@ <h5>{{ 'WAREHOUSE_VIEW.CONTACT_DETAILS' | translate }}</h5>
 			<div
 				*ngIf="selectedWarehouse?.ordersPhone && warehouse?.ordersEmail"
 			>
-				<h5>
+				<h6>
 					{{ 'WAREHOUSE_VIEW.ORDERS_FORWARDING_DETAILS' | translate }}
-				</h5>
+				</h6>
 				<ul>
 					<li>
 						{{ 'WAREHOUSE_VIEW.PHONE' | translate }}:
diff --git a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html
index 29e4ee140..b7b38e9b0 100644
--- a/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.html
@@ -26,7 +26,7 @@
 										"
 									>
 										<i
-											class="ion-md-add button-icon mr-2"
+											class="ion-md-add button-icon mr-1"
 										></i>
 										{{
 											'WAREHOUSE_VIEW.CREATE_ORDER'
diff --git a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
index 9617be0df..d354c6eac 100644
--- a/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
+++ b/admin/website-angular/src/app/pages/+warehouses/warehouses.component.html
@@ -8,7 +8,7 @@
 			class="mr-2 d-inline-block"
 			(click)="createWarehouseModel()"
 		>
-			<i class="ion-md-add button-icon"></i>
+			<i class="ion-md-add button-icon mr-1"></i>
 			<small _ngcontent-c55="">{{
 				'WAREHOUSES_VIEW.CREATE' | translate
 			}}</small>
@@ -20,7 +20,7 @@
 			[disabled]="!hasSelectedWarehouses"
 			(click)="deleteSelectedRows()"
 		>
-			<i class="ion-md-trash button-icon"></i>
+			<i class="ion-md-trash button-icon mr-1"></i>
 			<small _ngcontent-c55="">{{
 				'WAREHOUSES_VIEW.DELETE' | translate
 			}}</small>
@@ -31,7 +31,7 @@
 			class="mr-2 d-inline-block"
 			routerLink="track"
 		>
-			<i class="ion-md-map button-icon"></i>
+			<i class="ion-md-map button-icon mr-1"></i>
 			<small _ngcontent-c55="">Show on Map</small>
 		</button>
 	</nb-card-header>
diff --git a/shared/core-angular/scss/everbie.common.scss b/shared/core-angular/scss/everbie.common.scss
index 93f309cf8..cbf560d9f 100644
--- a/shared/core-angular/scss/everbie.common.scss
+++ b/shared/core-angular/scss/everbie.common.scss
@@ -147,7 +147,7 @@ body {
 		.title {
 			color: white;
 		}
-		.button-icon {
+		.button-icon mr-1 {
 			color: white;
 		}
 	}